Add fix for building without mozilla, see bug #124540

Package-Manager: portage-2.1_pre5-r2

5 files changed, 174 insertions, 12 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index f911ad391d2e..69cc2aab61c1 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.187 2006/03/01 17:56:59 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.188 2006/03/02 09:55:07 suka Exp $
+
+  02 Mar 2006; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.2/gentoo-2.0.2.diff, +files/2.0.2/buildfix-without-mozilla.diff,
+  openoffice-2.0.2_rc3-r1.ebuild:
+  Add fix for building without mozilla, see bug #124540
 
 *openoffice-2.0.2_rc3-r1 (01 Mar 2006)
 
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 40d5c83bf5fb..e7eb6305d276 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,12 +1,15 @@
-MD5 934977cfe0f04c6fbe6528c3b38a6357 ChangeLog 40686
-RMD160 b3b63248326bc9d50d2b2451964f6a361080f8ae ChangeLog 40686
-SHA256 3eab92bff3db037c9e1888bd2deda3281afd1745eba99d6061912c6ec157ef8d ChangeLog 40686
+MD5 d787699fbde9e7f9b1f8c6b7eed985f4 ChangeLog 40907
+RMD160 57e3127b6979afde3d616d45ed12513e8e4b6e8a ChangeLog 40907
+SHA256 724ab3079474f8cb91eee55a0dc06c116b21e9e4672cb5d717ac0b5f7b41a991 ChangeLog 40907
 MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
 RMD160 6f563dccad523db881def1fdb711df3949c2a687 files/2.0.1/alwayscrystal.diff 3222
 SHA256 22af14b2c3bd7d796eeda2f4a423f4290e71d2f2790a82038b837c6219133ef1 files/2.0.1/alwayscrystal.diff 3222
-MD5 69fc998d18a15e4b491365f12ec9a5a3 files/2.0.2/gentoo-2.0.2.diff 1105
-RMD160 0c7614994d1e6b7a2acbe66203d0a5bcb47f4f69 files/2.0.2/gentoo-2.0.2.diff 1105
-SHA256 6951db658c231b927ba68b5cb07ce498c36e601f4a24cf5f2a561d1e9bef5c38 files/2.0.2/gentoo-2.0.2.diff 1105
+MD5 4f55a923f95c001976f2b8abaaad829a files/2.0.2/buildfix-without-mozilla.diff 4656
+RMD160 139421dcaafc8ac0cbd28b13d3e6f9206a83c924 files/2.0.2/buildfix-without-mozilla.diff 4656
+SHA256 f5d95319e0129d04185b427147c9df7a0c2a4f5624da08226e04951365797323 files/2.0.2/buildfix-without-mozilla.diff 4656
+MD5 e191d67d95d76eef14fb2fb08d40be7d files/2.0.2/gentoo-2.0.2.diff 1180
+RMD160 06fa034a1b0e04682c3263e72e7b52e5dbbba78d files/2.0.2/gentoo-2.0.2.diff 1180
+SHA256 8be63c4658904e28f1107d0fc07ce021a5915def3a2f3cdd28b7e0e582ad481b files/2.0.2/gentoo-2.0.2.diff 1180
 MD5 d741869e1665d1423c2086f1723b93d7 files/2.0.2/removecrystalcheck.diff 572
 RMD160 5e7b6c92506bd7d3f4e09e3ee43656a6f4f8c30d files/2.0.2/removecrystalcheck.diff 572
 SHA256 06a05ee5a27ce6a1de1c9eeebe4e22b860d0a6292f778ec6c81aa2c28c1daa08 files/2.0.2/removecrystalcheck.diff 572
@@ -22,6 +25,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 e00605b0acc60de47e6eee98a5f32894 openoffice-2.0.1.ebuild 7274
 RMD160 ed88f0dc45b87c259271f83fa9d4fd8bb55fab93 openoffice-2.0.1.ebuild 7274
 SHA256 56a67a1cd040cd120cb5227ed0fa926fbf378c5ba46e267bc43a9b0218f87fa7 openoffice-2.0.1.ebuild 7274
-MD5 3be37a6a03f673911e567619ade9e3e8 openoffice-2.0.2_rc3-r1.ebuild 7803
-RMD160 9818e9a3d36c8947a27c06106bc4abc3aba20e7d openoffice-2.0.2_rc3-r1.ebuild 7803
-SHA256 4baa54e4ea7ae1f4480630498453f9b52d21e17351a9923b74e490fd92a3a4b4 openoffice-2.0.2_rc3-r1.ebuild 7803
+MD5 2f4fb294fa08e92246649afcc6f72c52 openoffice-2.0.2_rc3-r1.ebuild 7886
+RMD160 b1df894bb0d746773a94c9db7266205f4a97d983 openoffice-2.0.2_rc3-r1.ebuild 7886
+SHA256 d81ed2041c2b5c5d1217eec8fbff575ae85a76df2986c458e5cfb3dcb156534e openoffice-2.0.2_rc3-r1.ebuild 7886
diff --git a/app-office/openoffice/files/2.0.2/buildfix-without-mozilla.diff b/app-office/openoffice/files/2.0.2/buildfix-without-mozilla.diff
new file mode 100644
index 000000000000..ecf0ff191cc1
--- /dev/null
+++ b/app-office/openoffice/files/2.0.2/buildfix-without-mozilla.diff
@@ -0,0 +1,151 @@
+Index: extensions/source/plugin/base/makefile.mk
+===================================================================
+RCS file: /cvs/util/extensions/source/plugin/base/makefile.mk,v
+retrieving revision 1.8
+diff -u -p -r1.8 makefile.mk
+--- extensions/source/plugin/base/makefile.mk	8 Sep 2005 19:50:31 -0000	1.8
++++ extensions/source/plugin/base/makefile.mk	25 Jan 2006 14:30:56 -0000
+@@ -41,6 +41,8 @@ ENABLE_EXCEPTIONS=TRUE
+ 
+ .INCLUDE :  ..$/util$/makefile.pmk
+ 
++.IF "$(WITH_MOZILLA)" != "NO"
++
+ SLOFILES=		\
+ 				$(SLO)$/plctrl.obj		\
+ 				$(SLO)$/service.obj		\
+@@ -53,6 +55,8 @@ SLOFILES=		\
+ 				$(SLO)$/multiplx.obj    \
+ 				$(SLO)$/plmodel.obj
+ 
++.ENDIF # $(WITH_MOZILLA) != "NO"
++
+ # --- Targets ------------------------------------------------------
+ 
+ .INCLUDE :  target.mk
+Index: extensions/source/plugin/unx/makefile.mk
+===================================================================
+RCS file: /cvs/util/extensions/source/plugin/unx/makefile.mk,v
+retrieving revision 1.8
+diff -u -p -r1.8 makefile.mk
+--- extensions/source/plugin/unx/makefile.mk	8 Sep 2005 19:55:36 -0000	1.8
++++ extensions/source/plugin/unx/makefile.mk	25 Jan 2006 14:30:56 -0000
+@@ -42,6 +42,8 @@ TARGETTYPE=CUI
+ 
+ # --- Files --------------------------------------------------------
+ 
++.IF "$(WITH_MOZILLA)" != "NO"
++
+ SLOFILES=\
+ 	$(SLO)$/nppapi.obj		\
+ 	$(SLO)$/sysplug.obj		\
+@@ -73,6 +75,7 @@ APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ld
+ 
+ APP1DEF=	$(MISC)$/$(TARGET).def
+ 
++.ENDIF # $(WITH_MOZILLA) != "NO"
+ 
+ # --- Targets ------------------------------------------------------
+ 
+Index: extensions/source/plugin/util/makefile.mk
+===================================================================
+RCS file: /cvs/util/extensions/source/plugin/util/makefile.mk,v
+retrieving revision 1.12
+diff -u -p -r1.12 makefile.mk
+--- extensions/source/plugin/util/makefile.mk	8 Sep 2005 19:57:10 -0000	1.12
++++ extensions/source/plugin/util/makefile.mk	25 Jan 2006 14:30:56 -0000
+@@ -43,6 +43,9 @@ TARGETTYPE=GUI
+ .INCLUDE :  settings.mk
+ 
+ # --- Files --------------------------------------------------------
++
++.IF "$(WITH_MOZILLA)" != "NO"
++
+ LIB1TARGET = $(SLB)$/plall.lib
+ LIB1FILES  = \
+ 	$(SLB)$/plbase.lib	\
+@@ -97,6 +100,8 @@ SHL1STDLIBS+= -lX11
+ 
+ SHL1STDLIBS+=$(SHL1OWNLIBS)
+ 
++.ENDIF # $(WITH_MOZILLA) != "NO"
++
+ # --- Targets ------------------------------------------------------
+ 
+ .INCLUDE :  target.mk
+Index: extensions/source/plugin/win/makefile.mk
+===================================================================
+RCS file: /cvs/util/extensions/source/plugin/win/makefile.mk,v
+retrieving revision 1.4
+diff -u -p -r1.4 makefile.mk
+--- extensions/source/plugin/win/makefile.mk	8 Sep 2005 19:58:00 -0000	1.4
++++ extensions/source/plugin/win/makefile.mk	25 Jan 2006 14:30:56 -0000
+@@ -46,6 +46,8 @@ ENABLE_EXCEPTIONS=TRUE
+ 
+ # --- Types -------------------------------------
+ 
++.IF "$(WITH_MOZILLA)" != "NO"
++
+ #UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)
+ #INCPRE+=$(UNOUCROUT)
+ 
+@@ -54,7 +56,9 @@ ENABLE_EXCEPTIONS=TRUE
+ SLOFILES =	$(SLO)$/winmgr.obj	\
+ 			$(SLO)$/sysplug.obj
+ 
++.ENDIF # $(WITH_MOZILLA) != "NO"
+ .ENDIF
++
+ # ------------------------------------------------------------------
+ 
+ 
+Index: extensions/source/ooo/file_library_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
+retrieving revision 1.177
+diff -u -p -r1.177 file_library_ooo.scp
+--- scp2/source/ooo/file_library_ooo.scp	16 Jan 2006 15:32:35 -0000	1.177
++++ scp2/source/ooo/file_library_ooo.scp	25 Jan 2006 14:43:34 -0000
+@@ -1513,7 +1513,9 @@ File gid_File_Lib_DeploymentGui
+     PACKED_UNO_LIB_FILE_BODY_PATCH;
+ End
+ 
++#ifndef WITHOUT_MOZILLA
+ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Pl , pl)
++#endif
+ 
+ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Preload, preload)
+ 
+Index: scp2/source/ooo/file_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v
+retrieving revision 1.134
+diff -u -p -r1.134 file_ooo.scp
+--- scp2/source/ooo/file_ooo.scp	5 Jan 2006 14:55:20 -0000	1.134
++++ scp2/source/ooo/file_ooo.scp	25 Jan 2006 14:43:38 -0000
+@@ -163,6 +163,8 @@ File gid_File_Bin_MsiPkgchk
+ End
+ #endif
+ 
++#ifndef WITHOUT_MOZILLA
++
+ #if !defined(UNX) || defined(ENABLE_GTK)
+ File gid_File_Lib_Npsoplugin
+         BIN_FILE_BODY;
+@@ -184,6 +186,7 @@ File gid_File_Exe_Nsplugin
+   #endif
+ End
+ #endif
++#endif
+ 
+ File gid_File_Bin_Uno
+     BIN_FILE_BODY;
+@@ -291,7 +294,7 @@ File gid_File_Rdb_Gengal
+     Name = "gengal.rdb";
+ End
+ 
+-#ifdef UNX
++#if !defined(WITHOUT_MOZILLA) && defined(UNX)
+ 
+ File gid_File_Bin_Pluginapp
+     BIN_FILE_BODY;
diff --git a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
index fabc0f390588..12f9d0aa2444 100644
--- a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
+++ b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
@@ -20,12 +20,14 @@
  # more system db >= 4.3
  system-db-4.3-use-lpthread.diff
  # iz#58474 - build this part with db 4.2/4.3/4.4
-@@ -969,6 +967,8 @@
+@@ -969,6 +967,10 @@
  gentoo-gcc-naming-and-versioning.diff
  # searchpaths of nspr/nss libs
  gentoo-xmlsecurity-system-nss.diff
 +# hack: drop gcc libs
 +store-drop-gcc-libs-on-linking.diff
++# Build without mozilla is broken i#59729
++buildfix-without-mozilla.diff
  
  #
  # NOTE: 64 bit OOo is work in progress!
diff --git a/app-office/openoffice/openoffice-2.0.2_rc3-r1.ebuild b/app-office/openoffice/openoffice-2.0.2_rc3-r1.ebuild
index e36f3fbfe7ec..e9c948fe90a3 100644
--- a/app-office/openoffice/openoffice-2.0.2_rc3-r1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.2_rc3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2_rc3-r1.ebuild,v 1.1 2006/03/01 17:56:59 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2_rc3-r1.ebuild,v 1.2 2006/03/02 09:55:07 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -145,6 +145,7 @@ src_unpack() {
 
 	#Some fixes for our patchset
 	cd ${S}
+	cp ${FILESDIR}/${MY_PV}/buildfix-without-mozilla.diff ${S}/patches/src680/ || die
 	epatch ${FILESDIR}/${MY_PV}/removecrystalcheck.diff
 	epatch ${FILESDIR}/${MY_PV}/gentoo-${MY_PV}.diff