[gentoo-commits] gentoo-x86 commit in app-office/openoffice/files/2.3.1_rc1: disable-regcomp-python.diff gentoo-2.3.1_rc1.diff ooo-env_log.diff regcompapply.diff disable-regcomp-java.diff stlport-ppc-buildfix-apply.diff stlport-ppc-buildfix.diff

[Andreas Proschofsky (suka)]

suka        07/12/02 20:32:11

  Added:                disable-regcomp-python.diff gentoo-2.3.1_rc1.diff
                        ooo-env_log.diff regcompapply.diff
                        disable-regcomp-java.diff
                        stlport-ppc-buildfix-apply.diff
                        stlport-ppc-buildfix.diff
  Log:
  Add masked release candidate for openoffice 2.3.1
  (Portage version: 2.1.4_rc4)

Revision  Changes    Path
1.1                  app-office/openoffice/files/2.3.1_rc1/disable-regcomp-python.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/disable-regcomp-python.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/disable-regcomp-python.diff?rev=1.1&content-type=text/plain

Index: disable-regcomp-python.diff
===================================================================
Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
--- solenv/bin/modules/installer/servicesfile.pm.orig	2006-10-23 13:49:24.000000000 +0200
+++ solenv/bin/modules/installer/servicesfile.pm	2006-10-23 13:50:04.000000000 +0200
@@ -472,7 +472,7 @@
 
 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
 	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
-	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
+	if ( 0 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
 		
 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
 	



1.1                  app-office/openoffice/files/2.3.1_rc1/gentoo-2.3.1_rc1.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/gentoo-2.3.1_rc1.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/gentoo-2.3.1_rc1.diff?rev=1.1&content-type=text/plain

Index: gentoo-2.3.1_rc1.diff
===================================================================
--- bin/package-ooo 
+++ bin/package-ooo 
@@ -33,6 +33,7 @@
 {
     cat <<EOT >$1
 #!/bin/sh
+unset PYTHONPATH
 $OOINSTBASE/program/soffice $2 "\$@"
 EOT
     chmod 755 $1
--- distro-configs/Gentoo.conf.in 
+++ distro-configs/Gentoo.conf.in 
@@ -3,12 +3,11 @@
 --enable-libsn
 --enable-xsltproc
 --with-dynamic-xinerama
---with-stlport=/usr
 --with-system-boost
 --with-system-curl
 --with-system-db
 --with-system-expat
---with-system-icu
+--without-system-icu
 --with-system-libxslt
 --with-system-xmlsec
 --with-system-xrender-headers
--- configure.in 
+++ configure.in 
@@ -1048,7 +1048,7 @@
 if test "$with_tag" = "OOG680_m5" ; then # more milestones to come...
    UPSTREAM_VERSION=2.3.0
 elif test "$with_tag" = "OOG680_m9" ; then
-   UPSTREAM_VERSION=2.3.1
+   UPSTREAM_VERSION=2.3.1rc1
 fi
 if test -n "$UPSTREAM_VERSION"; then
    UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"




1.1                  app-office/openoffice/files/2.3.1_rc1/ooo-env_log.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/ooo-env_log.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/ooo-env_log.diff?rev=1.1&content-type=text/plain

Index: ooo-env_log.diff
===================================================================
--- bin/build-ooo.orig	2007-04-18 18:32:06.000000000 +0200
+++ bin/build-ooo	2007-04-18 18:32:45.000000000 +0200
@@ -21,9 +21,8 @@
 echo "configuring ...";
 autoconf || exit 1;
 
-echo "Env for configure:"
-set
-echo "Env for configure ends"
+echo "Log Env for configure to `pwd`/env.log"
+set > env.log
 
 eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
 
@@ -88,8 +88,8 @@
 # similar that gives child nmake's pain.
 unset MAKEFLAGS
 
-echo "Env:"
-set
+echo "Log Env to `pwd`/env.log"
+set > env.log
 
 # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
 # already merged?



1.1                  app-office/openoffice/files/2.3.1_rc1/regcompapply.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/regcompapply.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/regcompapply.diff?rev=1.1&content-type=text/plain

Index: regcompapply.diff
===================================================================
--- patches/src680/apply 
+++ patches/src680/apply 
@@ -1087,6 +1087,9 @@
 [ GentooOnly ]
 SectionOwner => aprosky
 
+#fix build on ppc
+disable-regcomp-java.diff
+disable-regcomp-python.diff
 # Allow build to proceed with PaX enabled
 gentoo-pax-fix.diff, aprosky
 # support server-only versions of 64bit JDKs




1.1                  app-office/openoffice/files/2.3.1_rc1/disable-regcomp-java.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/disable-regcomp-java.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/disable-regcomp-java.diff?rev=1.1&content-type=text/plain

Index: disable-regcomp-java.diff
===================================================================
Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
--- solenv/bin/modules/installer/servicesfile.pm.orig	2006-04-29 11:25:25.000000000 +0200
+++ solenv/bin/modules/installer/servicesfile.pm	2006-04-29 12:24:45.000000000 +0200
@@ -471,7 +473,7 @@
 	$python_error_occured = 0;
 
 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
-	if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
+	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
 	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
 		
 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }



1.1                  app-office/openoffice/files/2.3.1_rc1/stlport-ppc-buildfix-apply.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/stlport-ppc-buildfix-apply.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/stlport-ppc-buildfix-apply.diff?rev=1.1&content-type=text/plain

Index: stlport-ppc-buildfix-apply.diff
===================================================================
--- patches/src680/apply 
+++ patches/src680/apply 
@@ -1063,6 +1063,8 @@
 vcl_font-NO_LIST.diff
 # linux-headers-2.6.22 issue?!
 linux-headers.diff
+# stlport build problem on ppc
+stlport-ppc-buildfix.diff
 
 [ DebianBaseOnly ]
 SectionOwner => rengelha




1.1                  app-office/openoffice/files/2.3.1_rc1/stlport-ppc-buildfix.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/stlport-ppc-buildfix.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1_rc1/stlport-ppc-buildfix.diff?rev=1.1&content-type=text/plain

Index: stlport-ppc-buildfix.diff
===================================================================
--- stlport/STLport-4.5.patch	2005-01-06 12:26:48.770546592 +1100
+++ stlport/STLport-4.5.patch	2005-01-06 12:26:01.125789696 +1100
@@ -509,6 +509,45 @@
   
   CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
   CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+--- misc/build/STLport-4.5/src/gcc-linux.mak.old	2005-01-06 12:22:54.127217800 +1100
++++ misc/build/STLport-4.5/src/gcc-linux.mak	2005-01-06 12:24:28.192917640 +1100
+@@ -46,8 +46,8 @@
+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+ 
+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC
+ 
+ include common_percent_rules.mak
+ include common_rules.mak
+--- misc/build/STLport-4.5/src/gcc.mak.old	2005-01-06 15:20:18.840975336 +1100
++++ misc/build/STLport-4.5/src/gcc.mak	2005-01-06 15:21:00.373661408 +1100
+@@ -44,8 +44,8 @@
+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
+ 
+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic)
+ 
+ include common_percent_rules.mak
+ include common_rules.mak
+--- misc/build/STLport-4.5/src/gcc-3.0.mak.orig
++++ misc/build/STLport-4.5/src/gcc-3.0.mak 
+@@ -43,8 +43,8 @@
+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+ 
+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic)
+ 
+ include common_percent_rules.mak
+ include common_rules.mak
 *** misc/STLport-4.5/stlport/config/stl_gcc.h	Tue Sep  4 19:10:16 2001
 --- misc/build/STLport-4.5/stlport/config/stl_gcc.h	Thu Jul 26 12:13:03 2007
 ***************




-- 
gentoo-commits@g.o mailing list