rpms/openoffice.org/devel workspace.cmcfixes11.patch, NONE, 1.1 openoffice.org-1.9.114.oooXXXXX.nostlport.patch, 1.5, 1.6 openoffice.org-1.9.115.ooo51931.systemxmlsec.patch, 1.1, 1.2 openoffice.org.spec, 1.305, 1.306 openoffice.org-1.9.113.ooo51973.cvskk.np_sdk.patch, 1.1, NONE openoffice.org-1.9.114.ooo51978.systemboost.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jul 15 07:20:51 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11142
Modified Files:
openoffice.org-1.9.114.oooXXXXX.nostlport.patch
openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
openoffice.org.spec
Added Files:
workspace.cmcfixes11.patch
Removed Files:
openoffice.org-1.9.113.ooo51973.cvskk.np_sdk.patch
openoffice.org-1.9.114.ooo51978.systemboost.patch
Log Message:
merge patches by their workspace
workspace.cmcfixes11.patch:
forms/source/xforms/propertysetbase.cxx | 2
forms/source/xforms/submission.cxx | 2
np_sdk/mozilla-source-M16-stub.patch | 16 ------
openoffice.org/stlport/systemstl/numeric | 80 +++++++++++++++++++++++++++++++
scp2/source/ure/makefile.mk | 4 +
source/ui/app/makefile.mk | 0
source/ure/makefile.mk | 0
source/xforms/propertysetbase.cxx | 0
source/xforms/submission.cxx | 0
stlport/makefile.mk | 1
stlport/systemstl/functional | 4 -
stlport/systemstl/rope | 2
stlport/systemstl/vector | 16 ------
sw/source/ui/app/makefile.mk | 1
systemstl/functional | 0
systemstl/rope | 0
systemstl/vector | 0
17 files changed, 92 insertions(+), 36 deletions(-)
--- NEW FILE workspace.cmcfixes11.patch ---
Index: source/xforms/propertysetbase.cxx
===================================================================
RCS file: /cvs/gsl/forms/source/xforms/propertysetbase.cxx,v
retrieving revision 1.3
diff -u -p -r1.3 propertysetbase.cxx
--- openoffice.org.orig/forms/source/xforms/propertysetbase.cxx 23 Mar 2005 11:38:13 -0000 1.3
+++ openoffice.org/forms/source/xforms/propertysetbase.cxx 6 Jul 2005 10:32:50 -0000
@@ -114,7 +114,7 @@ cppu::IPropertyArrayHelper& SAL_CALL Pro
if ( !m_pProperties )
{
DBG_ASSERT( !m_aProperties.empty(), "PropertySetBase::getInfoHelper: no registered properties!" );
- m_pProperties = new cppu::OPropertyArrayHelper( m_aProperties.begin(), m_aProperties.size(), sal_False );
+ m_pProperties = new cppu::OPropertyArrayHelper( &m_aProperties[0], m_aProperties.size(), sal_False );
}
return *m_pProperties;
}
Index: source/xforms/submission.cxx
===================================================================
RCS file: /cvs/gsl/forms/source/xforms/submission.cxx,v
retrieving revision 1.5
diff -u -p -r1.5 submission.cxx
--- openoffice.org.orig/forms/source/xforms/submission.cxx 3 May 2005 14:41:36 -0000 1.5
+++ openoffice.org/forms/source/xforms/submission.cxx 6 Jul 2005 10:32:50 -0000
@@ -497,7 +497,7 @@ sal_Bool SAL_CALL Submission::convertFas
while ( p >= 0 )
aPrefixes.push_back( sTokenList.getToken( 0, ',', p ) );
- Sequence< ::rtl::OUString > aConvertedPrefixes( aPrefixes.begin(), aPrefixes.size() );
+ Sequence< ::rtl::OUString > aConvertedPrefixes( &aPrefixes[0], aPrefixes.size() );
return PropertySetBase::convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, makeAny( aConvertedPrefixes ) );
}
}
? source/base/localize.sdf
Index: source/ure/makefile.mk
===================================================================
RCS file: /cvs/installation/scp2/source/ure/makefile.mk,v
retrieving revision 1.2
diff -u -p -r1.2 makefile.mk
--- openoffice.org.orig/scp2/source/ure/makefile.mk 17 Jun 2005 10:18:23 -0000 1.2
+++ openoffice.org/scp2/source/ure/makefile.mk 6 Jul 2005 15:04:52 -0000
@@ -68,4 +68,8 @@ TARGET := ure
SCP_PRODUCT_TYPE = ure
PARFILES = ure.par
+.IF "$(USE_SYSTEM_STL)" == "YES"
+SCPDEFS+=-DUSE_SYSTEM_STL
+.ENDIF
+
.INCLUDE: target.mk
? systemstl/numeric
Index: makefile.mk
===================================================================
RCS file: /cvs/external/stlport/makefile.mk,v
retrieving revision 1.30
diff -u -p -r1.30 makefile.mk
--- openoffice.org.orig/stlport/makefile.mk 31 May 2005 17:04:13 -0000 1.30
+++ openoffice.org/stlport/makefile.mk 6 Jul 2005 15:05:35 -0000
@@ -76,6 +76,7 @@ $(INCCOM)$/stlport$/hash_map : systemstl
+$(COPY) systemstl/functional $(INCCOM)$/stlport
+$(COPY) systemstl/hash_map $(INCCOM)$/stlport
+$(COPY) systemstl/hash_set $(INCCOM)$/stlport
+ +$(COPY) systemstl/numeric $(INCCOM)$/stlport
+$(COPY) systemstl/slist $(INCCOM)$/stlport
+$(COPY) systemstl/rope $(INCCOM)$/stlport
+$(COPY) systemstl/vector $(INCCOM)$/stlport
Index: systemstl/functional
===================================================================
RCS file: /cvs/external/stlport/systemstl/functional,v
retrieving revision 1.3
diff -u -p -r1.3 functional
--- openoffice.org.orig/stlport/systemstl/functional 24 Feb 2005 14:47:25 -0000 1.3
+++ openoffice.org/stlport/systemstl/functional 6 Jul 2005 15:11:37 -0000
@@ -63,9 +63,7 @@
#define SYSTEM_STL_FUNCTIONAL
#ifdef GCC
-#include <bits/c++config.h>
-#include <cstddef>
-#include <bits/stl_function.h>
+#include <ext/../functional>
#include <ext/functional>
namespace std
Index: systemstl/rope
===================================================================
RCS file: /cvs/external/stlport/systemstl/rope,v
retrieving revision 1.2
diff -u -p -r1.2 rope
--- openoffice.org.orig/stlport/systemstl/rope 24 Feb 2005 14:47:52 -0000 1.2
+++ openoffice.org/stlport/systemstl/rope 6 Jul 2005 15:11:37 -0000
@@ -63,7 +63,9 @@
#define SYSTEM_STL_ROPE
#include <functional>
+#include <numeric>
#include <ext/rope>
+
#ifdef GCC
namespace std
{
Index: systemstl/vector
===================================================================
RCS file: /cvs/external/stlport/systemstl/vector,v
retrieving revision 1.2
diff -u -p -r1.2 vector
--- openoffice.org.orig/stlport/systemstl/vector 24 Feb 2005 14:48:01 -0000 1.2
+++ openoffice.org/stlport/systemstl/vector 6 Jul 2005 15:11:37 -0000
@@ -64,21 +64,7 @@
#ifdef GCC
-#include <bits/functexcept.h>
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_vector.h>
-#include <bits/stl_bvector.h>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/vector.tcc>
-#endif
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/vector>
-#endif
+#include <ext/../vector>
namespace std
{
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ openoffice.org/stlport/systemstl/numeric 2005-07-06 10:15:34.000000000 +0000
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (the "License"); You may not use this file
+ * except in compliance with the License. You may obtain a copy of the
+ * License at http://www.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef SYSTEM_STL_NUMERIC
+#define SYSTEM_STL_NUMERIC
+
+#ifdef GCC
+#include <functional>
+#include <ext/../numeric>
+#include <ext/numeric>
+
+namespace std
+{
+ using __gnu_cxx::iota;
+}
+
+#else
+#error UNSUPPORTED COMPILER
+#endif
+
+#endif
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
Index: source/ui/app/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/source/ui/app/makefile.mk,v
retrieving revision 1.14
diff -u -p -r1.14 makefile.mk
--- openoffice.org.orig/sw/source/ui/app/makefile.mk 10 Dec 2004 17:58:44 -0000 1.14
+++ openoffice.org/sw/source/ui/app/makefile.mk 9 Jul 2005 15:53:54 -0000
@@ -109,6 +109,7 @@ EXCEPTIONSFILES= \
$(SLO)$/docst.obj \
$(SLO)$/swmodule.obj \
$(SLO)$/swmodul1.obj \
+ $(SLO)$/apphdl.obj \
$(SLO)$/docsh2.obj
LIB1TARGET= $(SLB)$/app.lib
Index: mozilla-source-M16-stub.patch
===================================================================
RCS file: /cvs/external/np_sdk/mozilla-source-M16-stub.patch,v
retrieving revision 1.3
diff -u -p -r1.3 mozilla-source-M16-stub.patch
--- openoffice.org.orig/np_sdk/mozilla-source-M16-stub.patch 30 Mar 2005 11:38:42 -0000 1.3
+++ openoffice.org/np_sdk/mozilla-source-M16-stub.patch 1 Jul 2005 08:21:03 -0000
@@ -173,23 +173,6 @@
*** misc/mozilla/include/npupp.h Sat Nov 6 04:22:23 1999
--- misc/build/mozilla/include/npupp.h Tue Mar 19 19:32:49 2002
***************
-*** 22,28 ****
-
-
- /*
-! * npupp.h $Revision$
- * function call mecahnics needed by platform specific glue code.
- */
-
---- 22,28 ----
-
-
- /*
-! * npupp.h $Revision$
- * function call mecahnics needed by platform specific glue code.
- */
-
-***************
*** 72,82 ****
#else
openoffice.org-1.9.114.oooXXXXX.nostlport.patch:
dbaccess/source/core/api/RowSet.cxx | 17 +++++-
dbaccess/source/core/api/RowSet.hxx | 2
dbaccess/source/core/api/RowSetBase.cxx | 24 ++++-----
dbaccess/source/core/api/RowSetCache.cxx | 14 ++---
dbaccess/source/core/api/RowSetCacheIterator.cxx | 17 ++----
dbaccess/source/core/api/RowSetCacheIterator.hxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 2
dbaccess/source/filter/xml/xmlDataSource.cxx | 2
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 4 -
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2
dbaccess/source/ui/dlg/indexdialog.cxx | 42 ++++++++---------
dbaccess/source/ui/inc/indexcollection.hxx | 26 +++++-----
dbaccess/source/ui/misc/indexcollection.cxx | 40 ++++++++--------
source/accessibility/AccessibleEmptyEditSource.cxx | 0
source/core/api/RowSet.cxx | 0
source/core/api/RowSet.hxx | 0
source/core/api/RowSetBase.cxx | 0
source/core/api/RowSetCache.cxx | 0
source/core/api/RowSetCacheIterator.cxx | 0
source/core/api/RowSetCacheIterator.hxx | 0
source/core/dataaccess/datasource.cxx | 0
source/filter/xml/xmlDataSource.cxx | 0
source/filter/xml/xmlTableFilterList.cxx | 0
source/ui/dlg/DbAdminImpl.cxx | 0
source/ui/dlg/indexdialog.cxx | 0
source/ui/inc/indexcollection.hxx | 0
source/ui/misc/indexcollection.cxx | 0
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 4 +
28 files changed, 107 insertions(+), 91 deletions(-)
Index: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.114.oooXXXXX.nostlport.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.114.oooXXXXX.nostlport.patch 13 Jul 2005 12:47:38 -0000 1.5
+++ openoffice.org-1.9.114.oooXXXXX.nostlport.patch 15 Jul 2005 07:20:49 -0000 1.6
@@ -737,219 +737,6 @@
{
OSL_ENSURE(end() == find(_rName), "OIndexCollection::insert: invalid new name!");
String tmpName;
-Index: source/xforms/propertysetbase.cxx
-===================================================================
-RCS file: /cvs/gsl/forms/source/xforms/propertysetbase.cxx,v
-retrieving revision 1.3
-diff -u -p -r1.3 propertysetbase.cxx
---- openoffice.org.orig/forms/source/xforms/propertysetbase.cxx 23 Mar 2005 11:38:13 -0000 1.3
-+++ openoffice.org/forms/source/xforms/propertysetbase.cxx 6 Jul 2005 10:32:50 -0000
-@@ -114,7 +114,7 @@ cppu::IPropertyArrayHelper& SAL_CALL Pro
- if ( !m_pProperties )
- {
- DBG_ASSERT( !m_aProperties.empty(), "PropertySetBase::getInfoHelper: no registered properties!" );
-- m_pProperties = new cppu::OPropertyArrayHelper( m_aProperties.begin(), m_aProperties.size(), sal_False );
-+ m_pProperties = new cppu::OPropertyArrayHelper( &m_aProperties[0], m_aProperties.size(), sal_False );
- }
- return *m_pProperties;
- }
-Index: source/xforms/submission.cxx
-===================================================================
-RCS file: /cvs/gsl/forms/source/xforms/submission.cxx,v
-retrieving revision 1.5
-diff -u -p -r1.5 submission.cxx
---- openoffice.org.orig/forms/source/xforms/submission.cxx 3 May 2005 14:41:36 -0000 1.5
-+++ openoffice.org/forms/source/xforms/submission.cxx 6 Jul 2005 10:32:50 -0000
-@@ -497,7 +497,7 @@ sal_Bool SAL_CALL Submission::convertFas
- while ( p >= 0 )
- aPrefixes.push_back( sTokenList.getToken( 0, ',', p ) );
-
-- Sequence< ::rtl::OUString > aConvertedPrefixes( aPrefixes.begin(), aPrefixes.size() );
-+ Sequence< ::rtl::OUString > aConvertedPrefixes( &aPrefixes[0], aPrefixes.size() );
- return PropertySetBase::convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, makeAny( aConvertedPrefixes ) );
- }
- }
-? source/base/localize.sdf
-Index: source/ure/makefile.mk
-===================================================================
-RCS file: /cvs/installation/scp2/source/ure/makefile.mk,v
-retrieving revision 1.2
-diff -u -p -r1.2 makefile.mk
---- openoffice.org.orig/scp2/source/ure/makefile.mk 17 Jun 2005 10:18:23 -0000 1.2
-+++ openoffice.org/scp2/source/ure/makefile.mk 6 Jul 2005 15:04:52 -0000
-@@ -68,4 +68,8 @@ TARGET := ure
- SCP_PRODUCT_TYPE = ure
- PARFILES = ure.par
-
-+.IF "$(USE_SYSTEM_STL)" == "YES"
-+SCPDEFS+=-DUSE_SYSTEM_STL
-+.ENDIF
-+
- .INCLUDE: target.mk
-? systemstl/numeric
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/external/stlport/makefile.mk,v
-retrieving revision 1.30
-diff -u -p -r1.30 makefile.mk
---- openoffice.org.orig/stlport/makefile.mk 31 May 2005 17:04:13 -0000 1.30
-+++ openoffice.org/stlport/makefile.mk 6 Jul 2005 15:05:35 -0000
-@@ -76,6 +76,7 @@ $(INCCOM)$/stlport$/hash_map : systemstl
- +$(COPY) systemstl/functional $(INCCOM)$/stlport
- +$(COPY) systemstl/hash_map $(INCCOM)$/stlport
- +$(COPY) systemstl/hash_set $(INCCOM)$/stlport
-+ +$(COPY) systemstl/numeric $(INCCOM)$/stlport
- +$(COPY) systemstl/slist $(INCCOM)$/stlport
- +$(COPY) systemstl/rope $(INCCOM)$/stlport
- +$(COPY) systemstl/vector $(INCCOM)$/stlport
-Index: systemstl/functional
-===================================================================
-RCS file: /cvs/external/stlport/systemstl/functional,v
-retrieving revision 1.3
-diff -u -p -r1.3 functional
---- openoffice.org.orig/stlport/systemstl/functional 24 Feb 2005 14:47:25 -0000 1.3
-+++ openoffice.org/stlport/systemstl/functional 6 Jul 2005 15:11:37 -0000
-@@ -63,9 +63,7 @@
- #define SYSTEM_STL_FUNCTIONAL
-
- #ifdef GCC
--#include <bits/c++config.h>
--#include <cstddef>
--#include <bits/stl_function.h>
-+#include <ext/../functional>
- #include <ext/functional>
-
- namespace std
-Index: systemstl/rope
-===================================================================
-RCS file: /cvs/external/stlport/systemstl/rope,v
-retrieving revision 1.2
-diff -u -p -r1.2 rope
---- openoffice.org.orig/stlport/systemstl/rope 24 Feb 2005 14:47:52 -0000 1.2
-+++ openoffice.org/stlport/systemstl/rope 6 Jul 2005 15:11:37 -0000
-@@ -63,7 +63,9 @@
- #define SYSTEM_STL_ROPE
-
- #include <functional>
-+#include <numeric>
- #include <ext/rope>
-+
- #ifdef GCC
- namespace std
- {
-Index: systemstl/vector
-===================================================================
-RCS file: /cvs/external/stlport/systemstl/vector,v
-retrieving revision 1.2
-diff -u -p -r1.2 vector
---- openoffice.org.orig/stlport/systemstl/vector 24 Feb 2005 14:48:01 -0000 1.2
-+++ openoffice.org/stlport/systemstl/vector 6 Jul 2005 15:11:37 -0000
-@@ -64,21 +64,7 @@
-
- #ifdef GCC
-
--#include <bits/functexcept.h>
--#include <bits/stl_algobase.h>
--#include <bits/allocator.h>
--#include <bits/stl_construct.h>
--#include <bits/stl_uninitialized.h>
--#include <bits/stl_vector.h>
--#include <bits/stl_bvector.h>
--
--#ifndef _GLIBCXX_EXPORT_TEMPLATE
--# include <bits/vector.tcc>
--#endif
--
--#ifdef _GLIBCXX_DEBUG
--# include <debug/vector>
--#endif
-+#include <ext/../vector>
-
- namespace std
- {
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ openoffice.org/stlport/systemstl/numeric 2005-07-06 10:15:34.000000000 +0000
-@@ -0,0 +1,80 @@
-+/*************************************************************************
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
-+ *
-+ * last change: $Author$ $Date$
-+ *
-+ * The Contents of this file are made available subject to the terms of
-+ * either of the following licenses
-+ *
-+ * - GNU Lesser General Public License Version 2.1
-+ * - Sun Industry Standards Source License Version 1.1
-+ *
-+ * Sun Microsystems Inc., October, 2000
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2000 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ *
-+ * Sun Industry Standards Source License Version 1.1
-+ * =================================================
-+ * The contents of this file are subject to the Sun Industry Standards
-+ * Source License Version 1.1 (the "License"); You may not use this file
-+ * except in compliance with the License. You may obtain a copy of the
-+ * License at http://www.openoffice.org/license.html.
-+ *
-+ * Software provided under this License is provided on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ * See the License for the specific provisions governing your rights and
-+ * obligations concerning the Software.
-+ *
-+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ * Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ * All Rights Reserved.
-+ *
-+ * Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef SYSTEM_STL_NUMERIC
-+#define SYSTEM_STL_NUMERIC
-+
-+#ifdef GCC
-+#include <functional>
-+#include <ext/../numeric>
-+#include <ext/numeric>
-+
-+namespace std
-+{
-+ using __gnu_cxx::iota;
-+}
-+
-+#else
-+#error UNSUPPORTED COMPILER
-+#endif
-+
-+#endif
-+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
Index: source/accessibility/AccessibleEmptyEditSource.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/AccessibleEmptyEditSource.cxx,v
openoffice.org-1.9.115.ooo51931.systemxmlsec.patch:
config_office/configure.in | 22
config_office/set_soenv.in | 1
openoffice.org/xmlsecurity/source/xmlsec/nss/systemxmlsec.cxx | 1836 ++++++++++
openoffice.org/xmlsecurity/source/xmlsec/nss/systemxmlsec.hxx | 238 +
scp2/source/ooo/file_library_ooo.scp | 2
scp2/source/ooo/makefile.mk | 4
scp2/source/ooo/shortcut_ooo.scp | 2
source/ooo/file_library_ooo.scp | 0
source/ooo/makefile.mk | 0
source/ooo/shortcut_ooo.scp | 0
source/xmlsec/makefile.mk | 0
source/xmlsec/nss/makefile.mk | 0
source/xmlsec/nss/securityenvironment_nssimpl.cxx | 0
xmlsecurity/source/xmlsec/makefile.mk | 5
xmlsecurity/source/xmlsec/nss/makefile.mk | 10
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 4
16 files changed, 2122 insertions(+), 2 deletions(-)
Index: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.115.ooo51931.systemxmlsec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.115.ooo51931.systemxmlsec.patch 14 Jul 2005 08:08:42 -0000 1.1
+++ openoffice.org-1.9.115.ooo51931.systemxmlsec.patch 15 Jul 2005 07:20:49 -0000 1.2
@@ -43,7 +43,7 @@
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_XMLSEC=NO
-+ BUILD_TYPE="$BUILD_TYPE LIBXMSEC"
++ BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
+fi
+AC_SUBST(SYSTEM_XMLSEC)
+
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- openoffice.org.spec 14 Jul 2005 18:13:26 -0000 1.305
+++ openoffice.org.spec 15 Jul 2005 07:20:49 -0000 1.306
@@ -129,7 +129,7 @@
Patch41: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
Patch42: openoffice.org-1.9.112.ooo51724.testtools.patch
Patch43: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
-Patch44: openoffice.org-1.9.113.ooo51973.cvskk.np_sdk.patch
+Patch44: workspace.cmcfixes11.patch
Patch45: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
Patch46: openoffice.org-1.9.114.ooo51718.rpath.patch
Patch47: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
@@ -145,9 +145,8 @@
Patch57: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
Patch58: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
Patch59: workspace.impress63.patch
-Patch60: openoffice.org-1.9.114.ooo51978.systemboost.patch
-Patch61: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
-Patch62: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
+Patch60: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+Patch61: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -761,7 +760,7 @@
%patch41 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
%patch42 -p1 -b .ooo51724.testtools.patch
%patch43 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
-%patch44 -p1 -b .ooo51973.cvskk.np_sdk.patch
+%patch44 -p1 -b .workspace.cmcfixes11.patch
%patch45 -p1 -b .ooo51385.bridges.stack.patch
%patch46 -p1 -b .ooo51718.rpath.patch
%patch47 -p1 -b .rh161886.rpath.desktop.patch
@@ -779,9 +778,8 @@
%patch58 -p1 -b .oooXXXXX.extensions.evolution.patch
%endif
%patch59 -p1 -b .workspace.impress63.patch
-%patch60 -p1 -b .ooo51978.systemboost.patch
-%patch61 -p1 -b .rh163147.thorndale.fontconfig.patch
-%patch62 -p1 -b .ooo51912.nullpointer.wizards.patch
+%patch60 -p1 -b .rh163147.thorndale.fontconfig.patch
+%patch61 -p1 -b .ooo51912.nullpointer.wizards.patch
%if %{includeexternals}
#start ludicrous workaround
--- openoffice.org-1.9.113.ooo51973.cvskk.np_sdk.patch DELETED ---
--- openoffice.org-1.9.114.ooo51978.systemboost.patch DELETED ---
More information about the fedora-cvs-commits
mailing list