rpms/openoffice.org/devel openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch, NONE, 1.1 openoffice.org-1.9.89.ooo44027.pthreadchange.patch, NONE, 1.1 openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch, NONE, 1.1 openoffice.org.spec, 1.140, 1.141 sources, 1.47, 1.48 openoffice.org-1.9.89.glibcXXXXX.changedundermyfeet.patch, 1.2, NONE openoffice.org-1.9.89.rhXXXXX.randomsetjmpmissing.binfilter.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 7 15:10:50 UTC 2005
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18329
Modified Files:
openoffice.org.spec sources
Added Files:
openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch
openoffice.org-1.9.89.ooo44027.pthreadchange.patch
openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch
Removed Files:
openoffice.org-1.9.89.glibcXXXXX.changedundermyfeet.patch
openoffice.org-1.9.89.rhXXXXX.randomsetjmpmissing.binfilter.patch
Log Message:
seeing as the build failed I might as well add in some more fixes
openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch:
makefile.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch ---
Index: makefile.mk
===================================================================
RCS file: /cvs/external/hsqldb/makefile.mk,v
retrieving revision 1.6
diff -u -p -r1.6 makefile.mk
--- openoffice.org.orig/hsqldb/makefile.mk 23 Mar 2005 14:55:56 -0000 1.6
+++ openoffice.org/hsqldb/makefile.mk 7 Apr 2005 13:43:40 -0000
@@ -75,9 +75,9 @@ TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
TARFILE_ROOTDIR=hsqldb
-PATCH_FILE_NAME=hsqldb_1_8_0
+#PATCH_FILE_NAME=hsqldb_1_8_0
-ADDITIONAL_FILES= src$/org$/hsqldb$/Collation.java \
+#ADDITIONAL_FILES= src$/org$/hsqldb$/Collation.java \
src$/org$/hsqldb$/TxManager.java \
src$/org$/hsqldb$/lib$/LongKeyIntValueHashMap.java \
src$/org$/hsqldb$/persist$/ScaledRAFileInJar.java \
openoffice.org-1.9.89.ooo44027.pthreadchange.patch:
osl/unx/process.c | 0
sal/osl/unx/process.c | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE openoffice.org-1.9.89.ooo44027.pthreadchange.patch ---
Index: osl/unx/process.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/process.c,v
retrieving revision 1.35
diff -u -r1.35 process.c
--- openoffice.org.orig/sal/osl/unx/process.c 28 Oct 2004 16:25:13 -0000 1.35
+++ openoffice.org/sal/osl/unx/process.c 3 Apr 2005 02:24:55 -0000
@@ -533,7 +533,7 @@
for (i = 0; data.m_pszEnv[i] != NULL; i++)
putenv(data.m_pszEnv[i]);
-#if defined(LINUX)
+#if 0
/* mfe: linux likes to have just one thread when the exec family is called */
/* this np function has this purpose ... */
pthread_kill_other_threads_np();
openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch:
bf_sc/source/core/data/sc_documen4.cxx | 0
bf_sc/source/core/data/sc_pivot.cxx | 0
bf_sc/source/core/tool/sc_subtotal.cxx | 0
binfilter/bf_sc/source/core/data/sc_documen4.cxx | 2 ++
binfilter/bf_sc/source/core/data/sc_pivot.cxx | 1 +
binfilter/bf_sc/source/core/tool/sc_subtotal.cxx | 2 ++
6 files changed, 5 insertions(+)
--- NEW FILE openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch ---
Index: bf_sc/source/core/data/sc_documen4.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_sc/source/core/data/sc_documen4.cxx,v
retrieving revision 1.4
diff -u -r1.4 sc_documen4.cxx
--- openoffice.org.orig/binfilter/bf_sc/source/core/data/sc_documen4.cxx 3 Aug 2004 11:04:48 -0000 1.4
+++ openoffice.org/binfilter/bf_sc/source/core/data/sc_documen4.cxx 5 Apr 2005 11:58:13 -0000
@@ -63,6 +63,8 @@
// auto strip #include "core_pch.hxx"
#endif
+#include "interpre.hxx"
+
#pragma hdrstop
// INCLUDE ---------------------------------------------------------------
Index: bf_sc/source/core/data/sc_pivot.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_sc/source/core/data/sc_pivot.cxx,v
retrieving revision 1.4
diff -u -r1.4 sc_pivot.cxx
--- openoffice.org.orig/binfilter/bf_sc/source/core/data/sc_pivot.cxx 3 Aug 2004 11:08:55 -0000 1.4
+++ openoffice.org/binfilter/bf_sc/source/core/data/sc_pivot.cxx 5 Apr 2005 11:58:14 -0000
@@ -58,6 +58,7 @@
*
*
************************************************************************/
+#include "interpre.hxx"
#ifdef PCH
// auto strip #include "core_pch.hxx"
Index: bf_sc/source/core/tool/sc_subtotal.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_sc/source/core/tool/sc_subtotal.cxx,v
retrieving revision 1.3
diff -u -r1.3 sc_subtotal.cxx
--- openoffice.org.orig/binfilter/bf_sc/source/core/tool/sc_subtotal.cxx 3 Aug 2004 11:22:47 -0000 1.3
+++ openoffice.org/binfilter/bf_sc/source/core/tool/sc_subtotal.cxx 5 Apr 2005 11:58:18 -0000
@@ -60,6 +60,8 @@
************************************************************************/
// INCLUDE ---------------------------------------------------------------
+#include "interpre.hxx"
+
#ifdef RS6000
#include <fptrap.h>
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- openoffice.org.spec 7 Apr 2005 11:50:02 -0000 1.140
+++ openoffice.org.spec 7 Apr 2005 15:10:47 -0000 1.141
@@ -25,7 +25,6 @@
Source: SRC680_m%{ooo2ver}.tar.bz2
Source1: openoffice.org-myspell-contrib.tar.gz
Source2: Archive-Zip-1.13.tar.gz
-Source3: hsqldb_1_8_0_RC9.zip
BuildRequires: perl, sed, zip, bzip2, unzip, tar, findutils
BuildRequires: autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
BuildRequires: gcc >= %{gccver}, gcc-c++ >= %{gccver}, binutils
@@ -74,12 +73,13 @@
Patch29: openoffice.org-1.9.89.oooXXXXX.systemjpeg.tools.patch
Patch30: openoffice.org-1.9.89.ooo46481.parallel.svx.patch
Patch31: openoffice.org-1.9.89.ooo46528.stillnotpic.icu.patch
-Patch32: openoffice.org-1.9.89.glibcXXXXX.changedundermyfeet.patch
-Patch33: openoffice.org-1.9.89.rhXXXXX.randomsetjmpmissing.binfilter.patch
+Patch32: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
+Patch33: openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch
Patch34: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
Patch35: openoffice.org-1.9.89.rh152269.nfs.desktop.patch
Patch36: openoffice.org-1.9.89.rhXXXXX.bastardingppcgivesillegalinstructionrandomly.sysui.patch
Patch37: openoffice.org-1.9.89.rh153674.changeppclinkflags.solenv.patch
+Patch38: openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch
%define instdir %{_libdir}/openoffice.org%{version}
@@ -573,17 +573,17 @@
%patch1 -p1 -b .workspace-systemmozilla
%patch2 -p1 -b .noregisterwizard
%patch3 -p1 -b .ArchiveZip
-%patch4 -p1 -b .mktemp
-%patch5 -p1 -b .singleton
-%patch6 -p1 -b .wmclass.patch
+%patch4 -p1 -b .ooo41875.mktemp.patch
+%patch5 -p1 -b .ooo41904.singleton.patch
+%patch6 -p1 -b .ooo43466.wmclass.patch
%patch7 -p1 -b .workspace-gccfour
-%patch8 -p1 -b .noznow.patch
-%patch9 -p1 -b .sdcasting.patch
-%patch10 -p1 -b .svxcasting.patch
+%patch8 -p1 -b .ooo45628.noznow.patch
+%patch9 -p1 -b .ooo44843.sdcasting.patch
+%patch10 -p1 -b .ooo44846.svxcasting.patch
%patch11 -p1 -b .dictionaries.contribdict.patch
-%patch12 -p1 -b .lingucomponent.contribdict.patch
-%patch13 -p1 -b .mandrakelicence.patch
-%patch14 -p1 -b .svxcasting2.patch
+%patch12 -p1 -b .ooo45725.lingucomponent.contribdict.patch
+%patch13 -p1 -b .ooo45146.mandrakelicence.patch
+%patch14 -p1 -b .ooo45162.svxcasting2.patch
%patch15 -p1 -b .workspace-gcj4.patch
%patch16 -p1 -b .usetwodotzeropath.patch
%patch17 -p1 -b .rh150650.gcjneedstoresolveallrequirements.patch
@@ -601,18 +601,18 @@
%patch29 -p1 -b .oooXXXXX.systemjpeg.tools.patch
%patch30 -p1 -b .ooo46481.parallel.svx.patch
%patch31 -p1 -b .ooo46528.stillnotpic.icu.patch
-%patch32 -p1 -b .glibcXXXXX.changedundermyfeet.patch
-%patch33 -p1 -b .randomsetjmpmissing.binfilter.patch
+%patch32 -p1 -b .ooo44027.pthreadchange.patch
+%patch33 -p1 -b .ooo46912.setjmpoutsidenamespace.binfilter.patch
%patch34 -p1 -b .oooXXXXX.upstreamhatesthefp.officecfg.patch
%patch35 -p1 -b .rh152269.nfs.desktop.patch
%patch36 -p1 -b .bastardingppcgivesillegalinstructionrandomly.sysui.patch
%patch37 -p1 -b .rh153674.changeppclinkflags.solenv.patch
+%patch38 -p1 -b .gccXXXXX.hsqldbproblems.hsqldb.patch
cd solenv/bin
tar xvzf %{SOURCE2} Archive-Zip-1.13/lib
cd ../..
tar xvzf %{SOURCE1}
-cp %{SOURCE3} hsqldb/download/hsqldb_1_8_0.zip
%build
echo build start time is `date`
if [ -z "$RPM_BUILD_NCPUS" ] ; then
@@ -642,7 +642,8 @@
fi
#we'll build with at least build -P2 so we can do something useful while
#helpcontent2 is wasting our time
-export MAXBUILDS=$[RPM_BUILD_NCPUS/2]
+#export MAXBUILDS=$[RPM_BUILD_NCPUS/2]
+export MAXBUILDS=$RPM_BUILD_NCPUS
if [ $MAXBUILDS -lt 2 ]; then
export MAXBUILDS=2
fi
@@ -670,8 +671,8 @@
echo end langpack install time is `date`
%endif
-# We don't need to carry around all the letter templates for all the languages in each langpack!
-# In addition, all the bitmaps are the same!
+# We don't need to carry around all the letter templates for all the languages
+# in each langpack! In addition, all the bitmaps are the same!
pushd $RPM_BUILD_ROOT/%{instdir}/share/template
mkdir -p wizard
for I in %{langpack_langs}; do
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 6 Apr 2005 15:38:42 -0000 1.47
+++ sources 7 Apr 2005 15:10:47 -0000 1.48
@@ -1,4 +1,3 @@
c94a123e4006b410706a5b550f007e93 Archive-Zip-1.13.tar.gz
032cebc4431091ac7023b50c88797ffe openoffice.org-myspell-contrib.tar.gz
-2919258ddbeb61b981f54e4b1fdade30 hsqldb_1_8_0_RC9.zip
0a7beb24e74131cb875491eac8a7bd45 SRC680_m89.tar.bz2
--- openoffice.org-1.9.89.glibcXXXXX.changedundermyfeet.patch DELETED ---
--- openoffice.org-1.9.89.rhXXXXX.randomsetjmpmissing.binfilter.patch DELETED ---
More information about the fedora-cvs-commits
mailing list