[gentoo-commits] gentoo-x86 commit in app-office/openoffice/files/2.3.0: disable-regcomp-python.diff gentoo-2.3.0.diff ooo-env_log.diff regcompapply.diff ucb-no-CURL_NO_OLDIES.diff disable-regcomp-java.diff

[Andreas Proschofsky (suka)]

suka        07/09/18 07:27:57

  Added:                disable-regcomp-python.diff gentoo-2.3.0.diff
                        ooo-env_log.diff regcompapply.diff
                        ucb-no-CURL_NO_OLDIES.diff
                        disable-regcomp-java.diff
  Log:
  Bump to OpenOffice.org 2.3.0
  (Portage version: 2.1.3.9)

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

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.0/disable-regcomp-python.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.0/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.0/gentoo-2.3.0.diff

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

Index: gentoo-2.3.0.diff
===================================================================
--- bin/package-ooo 
+++ bin/package-ooo 
@@ -57,6 +57,7 @@
 #!/bin/sh
 export OOO_EXTRA_ARG='$2'
+unset PYTHONPATH
 $OOINSTBASE/program/ooqstart $3 "\$@"
 EOT
     chmod 755 $1
 }
--- patches/src680/apply 
+++ patches/src680/apply 
@@ -80,8 +80,8 @@
 Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, NovellOnlyUnix, NotDebian, FrugalwareOnly, CalcSolver, OOXML
 QiLinux: LinuxCommon, GlobalDesktopFiles
 #Gentoo
-GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, STLport5
-GentooUnstable: GentooBase, GentooExperimental, OOXML, OOXSTLport5
+GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, STLport5, OOXML, OOXSTLport5
+GentooUnstable: GentooBase, GentooExperimental
 Gentoo : GentooBase
 Gentoo64: GentooBase
 # rPath Linux
@@ -719,6 +719,10 @@
 
 # fixes linking dependency in the reportdesign module
 buildfix-reportdesign-util-dep.diff, i#81550, pmladek
+
+# don't define -DCURL_NO_OLDIES, breaks with curl 7.17.0
+# Debian #442338, Debian #442368
+ucb-no-CURL_NO_OLDIES.diff
 
 [ NovellOnlyWin32 ]
 SectionOwner => tml
@@ -1055,18 +1055,8 @@
 [ GentooExperimental ]
 SectionOwner => hmth
 
-# deliver - sshhhh....
-silent_deliver-i79798.diff, i#79798
 # Gnu JRE paths.
 gentooexperimental-gnujre.diff
-# unused java code
-disable-parser-jaxp.diff
-# default inc/lib
-config_office-XINC-XLIB-defaults.diff, i#65976
-# gdi/font.cxx: stl list error
-vcl_font-NO_LIST.diff
-# linux-headers-2.6.22 issue?!
-linux-headers.diff
 
 [ GentooOnly ]
 SectionOwner => aprosky
@@ -1081,6 +1071,17 @@
 system-db-check.diff, i#65979, hmth
 # User ~/.ooo-2.0 as user dir
 scp2-user-config-ooo-2.0.diff, pmladek
+# deliver - sshhhh....
+silent_deliver-i79798.diff, i#79798
+# unused java code
+disable-parser-jaxp.diff
+# default inc/lib
+config_office-XINC-XLIB-defaults.diff, i#65976
+# gdi/font.cxx: stl list error
+vcl_font-NO_LIST.diff
+# linux-headers-2.6.22 issue?!
+linux-headers.diff
+
 
 [ DebianBaseOnly ]
 SectionOwner => rengelha

--- distro-configs/Gentoo.conf.in 
+++ distro-configs/Gentoo.conf.in 
@@ -3,7 +3,6 @@
 --enable-libsn
 --enable-xsltproc
 --with-dynamic-xinerama
---with-stlport=/usr
 --with-system-boost
 --with-system-curl
 --with-system-db
--- configure.in 
+++ configure.in 
@@ -1024,7 +1024,7 @@
 UPSTREAM_NAME=
 UPSTREAM_SOURCE=
 UPSTREAM_URI=
-if test "$with_tag" = "OOG680_m3" ; then # more milestones to come...
+if test "$with_tag" = "OOG680_m5" ; then # more milestones to come...
    UPSTREAM_NAME="OOo_2.3.0_src"
    if test "z$with_mirror" != "z" ; then
       UPSTREAM_SOURCE="MIRROR"




1.1                  app-office/openoffice/files/2.3.0/ooo-env_log.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.0/ooo-env_log.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.0/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.0/regcompapply.diff

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

Index: regcompapply.diff
===================================================================
--- patches/src680/apply 
+++ patches/src680/apply 
@@ -1089,6 +1089,9 @@
 system-db-check.diff, i#65979, hmth
 # User ~/.ooo-2.0 as user dir
 scp2-user-config-ooo-2.0.diff, pmladek
+#fix build on ppc
+disable-regcomp-java.diff
+disable-regcomp-python.diff
 
 [ DebianBaseOnly ]
 SectionOwner => rengelha




1.1                  app-office/openoffice/files/2.3.0/ucb-no-CURL_NO_OLDIES.diff

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

Index: ucb-no-CURL_NO_OLDIES.diff
===================================================================
Index: source/ucp/ftp/makefile.mk
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/ftp/makefile.mk,v
retrieving revision 1.13
retrieving revision 1.12
diff -u -u -r1.13 -r1.12
--- ucb/source/ucp/ftp/makefile.mk	20 Sep 2004 14:32:42 -0000	1.13
+++ ucb/source/ucp/ftp/makefile.mk	2 Feb 2004 18:36:22 -0000	1.12
@@ -75,9 +75,7 @@
 
 .INCLUDE: settings.mk
 
-.IF "$(SYSTEM_CURL)" == "YES"
-CFLAGS+=-DCURL_NO_OLDIES
-.ENDIF
+#CFLAGS +=-fno-inline
 
 # --- General -----------------------------------------------------
 



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

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.0/disable-regcomp-java.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.0/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; }



-- 
gentoo-commits@g.o mailing list