+++ /dev/null
---- oo_1.1rc3_src/sal/osl/unx/semaphor.c.jj 2003-08-28 10:24:23.736357952 +0100
-+++ oo_1.1rc3_src/sal/osl/unx/semaphor.c 2003-08-28 10:24:26.260974152 +0100
-@@ -79,7 +79,7 @@
- /* osl_createSemaphore */
- /*****************************************************************************/
-
--#ifdef LINUX
-+#if 0
- /* sem_t from glibc-2.1 (/usr/include/semaphore.h) */
-
- typedef struct {
-@@ -100,7 +100,7 @@
- * larger of both
- * XXX
- */
--#ifdef LINUX
-+#if 0
- if ( sizeof(glibc_21_sem_t) > sizeof(sem_t) )
- Semaphore= malloc(sizeof(glibc_21_sem_t));
- else
---- oo_1.1rc3_src/tools/source/solar/solar.c.jj 2003-08-28 11:50:57.589772216 +0100
-+++ oo_1.1rc3_src/tools/source/solar/solar.c 2003-08-28 11:50:05.167741576 +0100
-@@ -577,7 +577,7 @@
-
- {
- char* p = NULL;
-- InfoMemoryAccess( p );
-+ /*InfoMemoryAccess( p );*/
- p = (char*)&p;
- InfoMemoryAccess( p );
- InfoMemoryTypeAccess( t_short );
---- oo_1.1_src/neon/neon.patch.jj 2003-10-04 10:32:18.341106008 +0100
-+++ oo_1.1_src/neon/neon.patch 2003-10-04 10:32:49.123426384 +0100
-@@ -19,7 +19,7 @@
- !
- ! /* Define as __inline if that's what the C compiler calls it. */
- ! #ifdef UNX
--! #define inline
-+! #define inline inline
- ! #endif
- !
- ! /* Define if you need to in order for stat and other things to work. */
+++ /dev/null
-diff -urN ooo-build-1.1.54.org/bin/build-ooo ooo-build-1.1.54/bin/build-ooo
---- ooo-build-1.1.54.org/bin/build-ooo 2004-04-30 02:50:20.269649608 +0200
-+++ ooo-build-1.1.54/bin/build-ooo 2004-04-30 02:51:35.686184552 +0200
-@@ -224,19 +224,10 @@
- fi
- # -- cut --
-
--# For RH distributions, if we have the splash & about screens,
--# copy them into the source dir
--if test "z$VENDORNAME" = "zRedHat"; then
-- mkdir -p $OOBUILDDIR/offmgr/res
-- cp $SRCDIR/openabout_redhat.bmp $OOBUILDDIR/offmgr/res/
-- cp $SRCDIR/openintro_redhat.bmp $OOBUILDDIR/offmgr/res/
--fi
--# Same for SuSE.
--if test "z$VENDORNAME" = "zSuSE"; then
-- mkdir -p $OOBUILDDIR/offmgr/res
-- cp $SRCDIR/openabout_suse.bmp $OOBUILDDIR/offmgr/res/
-- cp $SRCDIR/openintro_suse.bmp $OOBUILDDIR/offmgr/res/
--fi
-+# Copy all splash & about screens even if some won't be used
-+mkdir -p $OOBUILDDIR/offmgr/res
-+cp $SRCDIR/openabout_*.bmp $OOBUILDDIR/offmgr/res/
-+cp $SRCDIR/openintro_*.bmp $OOBUILDDIR/offmgr/res/
-
- # Checkout / Update source:
- if (test "z$2" = "z--checkout") || !(test -f $OOBUILDDIR/$STAMP); then
+++ /dev/null
-diff -urN ooo-build-1.1.54.org/bin/setup.in ooo-build-1.1.54/bin/setup.in
---- ooo-build-1.1.54.org/bin/setup.in 2004-04-30 02:50:20.270649456 +0200
-+++ ooo-build-1.1.54/bin/setup.in 2004-04-30 15:34:39.655963192 +0200
-@@ -31,6 +31,7 @@
- LANGS="$LANGS,HUNG";
- fi
-
-+if test "z$CONFIGURE_OPTIONS" = "z"; then
- if test "z$DISTRO" = "zRHFedora"; then
- CONFIGURE_OPTIONS="--with-lang=$LANGS \
- --enable-libart \
-@@ -58,6 +59,7 @@
- if test "z$DISTRO" = "zKDE"; then
- CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-widgetset=kde"
- fi
-+fi
-
- ENABLE_BONOBO=@ENABLE_BONOBO@
- ENABLE_JAVA=@ENABLE_JAVA@
+++ /dev/null
-diff -urN ooo-build-1.1.54.org/patches/OOO_1_1/build-with-nptl.patch ooo-build-1.1.54/patches/OOO_1_1/build-with-nptl.patch
---- ooo-build-1.1.54.org/patches/OOO_1_1/build-with-nptl.patch 1970-01-01 01:00:00.000000000 +0100
-+++ ooo-build-1.1.54/patches/OOO_1_1/build-with-nptl.patch 2004-04-30 02:15:05.645121400 +0200
-@@ -0,0 +1,42 @@
-+--- sal/osl/unx/semaphor.c.jj 2003-08-28 10:24:23.736357952 +0100
-++++ sal/osl/unx/semaphor.c 2003-08-28 10:24:26.260974152 +0100
-+@@ -79,7 +79,7 @@
-+ /* osl_createSemaphore */
-+ /*****************************************************************************/
-+
-+-#ifdef LINUX
-++#if 0
-+ /* sem_t from glibc-2.1 (/usr/include/semaphore.h) */
-+
-+ typedef struct {
-+@@ -100,7 +100,7 @@
-+ * larger of both
-+ * XXX
-+ */
-+-#ifdef LINUX
-++#if 0
-+ if ( sizeof(glibc_21_sem_t) > sizeof(sem_t) )
-+ Semaphore= malloc(sizeof(glibc_21_sem_t));
-+ else
-+--- tools/source/solar/solar.c.jj 2003-08-28 11:50:57.589772216 +0100
-++++ tools/source/solar/solar.c 2003-08-28 11:50:05.167741576 +0100
-+@@ -577,7 +577,7 @@
-+
-+ {
-+ char* p = NULL;
-+- InfoMemoryAccess( p );
-++ /*InfoMemoryAccess( p );*/
-+ p = (char*)&p;
-+ InfoMemoryAccess( p );
-+ InfoMemoryTypeAccess( t_short );
-+--- neon/neon.patch.jj 2003-10-04 10:32:18.341106008 +0100
-++++ neon/neon.patch 2003-10-04 10:32:49.123426384 +0100
-+@@ -19,7 +19,7 @@
-+ !
-+ ! /* Define as __inline if that's what the C compiler calls it. */
-+ ! #ifdef UNX
-+-! #define inline
-++! #define inline inline
-+ ! #endif
-+ !
-+ ! /* Define if you need to in order for stat and other things to work. */
-diff -urN ooo-build-1.1.54.org/patches/OOO_1_1_1/apply ooo-build-1.1.54/patches/OOO_1_1_1/apply
---- ooo-build-1.1.54.org/patches/OOO_1_1_1/apply 2004-04-29 19:04:20.867124864 +0200
-+++ ooo-build-1.1.54/patches/OOO_1_1_1/apply 2004-04-30 02:15:33.588873304 +0200
-@@ -122,6 +122,9 @@
- # Add an ooo-build version in ProductExtension
- version-strike.diff
-
-+# Allow building with NPTL enabled
-+build-with-nptl.patch
-+
- [ ODKFixes ]
-
- # Fix ODK Java bits
+++ /dev/null
-diff -urN ooo-build-1.1.54.org/patches/OOO_1_1/crash-escherex.diff ooo-build-1.1.54/patches/OOO_1_1/crash-escherex.diff
---- ooo-build-1.1.54.org/patches/OOO_1_1/crash-escherex.diff 2004-04-30 02:50:23.167209112 +0200
-+++ ooo-build-1.1.54/patches/OOO_1_1/crash-escherex.diff 2004-05-01 20:17:19.790834296 +0200
-@@ -94,7 +94,7 @@
- #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSTATE_HPP_
- #include <com/sun/star/beans/XPropertyState.hpp>
- #endif
--+#include <stl/vector>
-++#include <vector>
-
- /*Record Name FBT-Value Instance Contents Wrd Exl PPt Ver*/
- // In der Mickysoft-Doku heissen die msofbt... statt ESCHER_...
+++ /dev/null
-diff -urN ooo-build-1.1.54.org/bin/build-ooo ooo-build-1.1.54/bin/build-ooo
---- ooo-build-1.1.54.org/bin/build-ooo 2004-04-29 19:04:12.396412608 +0200
-+++ ooo-build-1.1.54/bin/build-ooo 2004-04-29 19:06:22.411647288 +0200
-@@ -395,8 +395,9 @@
- # Warning - do not edit, this is a temporary file, see build-ooo
- # Many Java files have 8bit char-set comments, javac barfs on them in utf8 locales
- export LANG="C";
--# Many Java's can't cope with the NPTL on Linux.
--export LD_ASSUME_KERNEL="2.2.5";
-+# Many Java's can't cope with the NPTL on Linux so we try to use lowest possible kernel.
-+LD_ASSUME_KERNEL=2.2.5 /bin/true 2> /dev/null || LD_ASSUME_KERNEL=2.4.10 /bin/true 2> /dev/null || LD_ASSUME_KERNEL=2.6.0 2> /dev/null || unset LD_ASSUME_KERNEL
-+export LD_ASSUME_KERNEL
- # Don't do a massive painful install
- export BUILD_MINIMAL="01";
- # Embedded python dies without Home set
+++ /dev/null
-diff -urN ooo-build-1.1.54.org/bin/openoffice-xlate-lang ooo-build-1.1.54/bin/openoffice-xlate-lang
---- ooo-build-1.1.54.org/bin/openoffice-xlate-lang 2004-04-30 02:50:20.269649608 +0200
-+++ ooo-build-1.1.54/bin/openoffice-xlate-lang 2004-05-02 22:05:24.067686992 +0200
-@@ -44,15 +44,15 @@
- sub usage {
- my $errmsg = shift;
- my $errcode = shift;
-- print "$progname: $errmsg\n" if $errmsg;
-- print "$progname: Converts between prefix codes, iso codes and langnames\n";
-- print " Usage: $progname (-i|-l|-p|-h) <code>|all\n";
-- print " -i <code>: convert prefix to iso code (ex: 03 -> pt)\n";
-- print " -l <code>: convert iso code to language name (ex: pt -> portuguese)\n";
-- print " -p <code>: convert iso code to prefix (ex: pt -> 03)\n";
-- print " the code can either be an iso code, a prefix or even a language name\n";
-- print " The special code \"all\" asks for all possible values.\n\n";
-- print " -h : print this help\n";
-+ print STDERR "$progname: $errmsg\n" if $errmsg;
-+ print STDERR "$progname: Converts between prefix codes, iso codes and langnames\n";
-+ print STDERR " Usage: $progname (-i|-l|-p|-h) <code>|all\n";
-+ print STDERR " -i <code>: convert prefix to iso code (ex: 03 -> pt)\n";
-+ print STDERR " -l <code>: convert iso code to language name (ex: pt -> portuguese)\n";
-+ print STDERR " -p <code>: convert iso code to prefix (ex: pt -> 03)\n";
-+ print STDERR " the code can either be an iso code, a prefix or even a language name\n";
-+ print STDERR " The special code \"all\" asks for all possible values.\n\n";
-+ print STDERR " -h : print this help\n";
- exit $errcode;
- }
-
+++ /dev/null
-diff -urN ooo-build-1.1.54.org/bin/ooo-wrapper.in ooo-build-1.1.54/bin/ooo-wrapper.in
---- ooo-build-1.1.54.org/bin/ooo-wrapper.in 2004-04-30 02:50:19.000000000 +0200
-+++ ooo-build-1.1.54/bin/ooo-wrapper.in 2004-05-04 02:09:44.175215400 +0200
-@@ -317,7 +317,7 @@
- my $setup_cmd = "LD_LIBRARY_PATH=$SystemInstallDir:$SystemInstallDir/program " .
- "$SetupProgram -R:$SetupConfig -v -nogui";
- if (!$Debug) {
-- $setup_cmd .= " >& ~/.openoffice-install-log";
-+ $setup_cmd .= " > ~/.openoffice-install-log 2>&1";
- }
-
- clean_symlinks (\%config);
-diff -urN ooo-build-1.1.54.org/bin/owner ooo-build-1.1.54/bin/owner
---- ooo-build-1.1.54.org/bin/owner 2004-04-30 02:50:19.000000000 +0200
-+++ ooo-build-1.1.54/bin/owner 2004-05-04 02:09:56.015415416 +0200
-@@ -24,7 +24,7 @@
- exit 0;
- }
-
--system('cvs --version >& /dev/null') && die "Can't find cvs tool";
-+system('cvs --version > /dev/null 2>&1') && die "Can't find cvs tool";
-
- # Synchronous - but so is life.
- sub get_owner($$)
-diff -urN ooo-build-1.1.54.org/bin/package-ooo ooo-build-1.1.54/bin/package-ooo
---- ooo-build-1.1.54.org/bin/package-ooo 2004-04-30 02:50:19.000000000 +0200
-+++ ooo-build-1.1.54/bin/package-ooo 2004-05-04 02:09:03.069464424 +0200
-@@ -145,7 +145,7 @@
- Cflags: -I\${includeddir}" > $PREFIX/lib/pkgconfig/openoffice$BINSUFFIX.pc
- fi
-
--INSTALLER_PATH="`tcsh -c "cd $OOBUILDDIR; source $OOBUILDDIR/*.Set; echo \"$OOBUILDDIR/instsetoo/\\$INPATH/01/normal\""`";
-+INSTALLER_PATH="`tcsh -f -c "cd $OOBUILDDIR; source $OOBUILDDIR/*.Set; echo \"$OOBUILDDIR/instsetoo/\\$INPATH/01/normal\""`";
- export DISPLAY=''; # clobber;
- echo "Execute from $INSTALLER_PATH to $OOINSTDIR [$LANG]";
- cd $INSTALLER_PATH || exit 1;
+++ /dev/null
-diff -urN ooo-build-1.1.54.org/patches/OOO_1_1/stlport-new-versions.patch ooo-build-1.1.54/patches/OOO_1_1/stlport-new-versions.patch
---- ooo-build-1.1.54.org/patches/OOO_1_1/stlport-new-versions.patch 1970-01-01 01:00:00.000000000 +0100
-+++ ooo-build-1.1.54/patches/OOO_1_1/stlport-new-versions.patch 2004-04-30 01:55:05.144625216 +0200
-@@ -0,0 +1,12 @@
-+--- sw/source/ui/frmdlg/frmpage.cxx.orig 2004-03-31 14:55:12.000000000 +0000
-++++ sw/source/ui/frmdlg/frmpage.cxx 2004-03-31 14:55:23.000000000 +0000
-+@@ -551,7 +551,7 @@
-+ const ::std::vector< String >& rPrev, const ::std::vector< String >& rThis,
-+ const ::std::vector< String >& rNext, const ::std::vector< String >& rRemain)
-+ {
-+- ::std::vector< const String >::iterator aIt;
-++ ::std::vector< String >::const_iterator aIt;
-+ USHORT nEntry = 0;
-+ for(aIt = rPrev.begin(); aIt != rPrev.end(); aIt++)
-+ nEntry = rBox.InsertEntry(*aIt);
-+
-diff -urN ooo-build-1.1.54.org/patches/OOO_1_1_1/apply ooo-build-1.1.54/patches/OOO_1_1_1/apply
---- ooo-build-1.1.54.org/patches/OOO_1_1_1/apply 2004-04-29 19:04:20.867124864 +0200
-+++ ooo-build-1.1.54/patches/OOO_1_1_1/apply 2004-04-30 01:58:02.361684128 +0200
-@@ -65,6 +65,9 @@
- # Don't -DBUILD, -DBUILD_ID for our build system #12782: rc3
- stlport-defeat-include.diff
-
-+# Allow building with new (4.6.x) STLport
-+stlport-new-versions.patch
-+
- # Some people are unbelievable ;-)
- # spell-ximian.diff
-
+++ /dev/null
---- oo_1.1.1_src/sw/source/ui/frmdlg/frmpage.cxx.orig 2004-03-31 14:55:12.000000000 +0000
-+++ oo_1.1.1_src/sw/source/ui/frmdlg/frmpage.cxx 2004-03-31 14:55:23.000000000 +0000
-@@ -551,7 +551,7 @@
- const ::std::vector< String >& rPrev, const ::std::vector< String >& rThis,
- const ::std::vector< String >& rNext, const ::std::vector< String >& rRemain)
- {
-- ::std::vector< const String >::iterator aIt;
-+ ::std::vector< String >::iterator aIt;
- USHORT nEntry = 0;
- for(aIt = rPrev.begin(); aIt != rPrev.end(); aIt++)
- nEntry = rBox.InsertEntry(*aIt);
-
projects / packages / libreoffice.git / commitdiff