native widget stuff now also for gtk

4 files changed, 36 insertions, 21 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index aecd634bd1de..9df935fa24d4 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.39 2004/05/07 15:30:49 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.40 2004/05/12 09:02:43 suka Exp $
+
+  12 May 2004; suka@gentoo.org +files/1.1.1/gentoo-1.1.55.patch,
+  openoffice-ximian-1.1.55-r1.ebuild:
+  Enable Native Widget stuff also for the gtk build, also some further cleanups
 
 *openoffice-ximian-1.1.55-r1 (07 May 2004)
 
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index d0eaf588a2a0..0016a599a508 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,9 +1,9 @@
 MD5 52e27b9b0c1d0fe5aeb780ee95d688a3 openoffice-ximian-1.1.53.ebuild 14861
-MD5 1799ceaa43daed54b1dc0465c9b6eadb openoffice-ximian-1.1.55-r1.ebuild 15437
+MD5 55055b45744d13228e8dce0538aa0a84 openoffice-ximian-1.1.55-r1.ebuild 15484
 MD5 665131dd815e781e7fb75a405e7c8c11 openoffice-ximian-1.1.51-r1.ebuild 15080
 MD5 5a8067cff008bb262faf659be4f79d03 openoffice-ximian-1.1.55.ebuild 14965
 MD5 306123f155769cc00478ece73816167b openoffice-ximian-1.1.54.ebuild 14856
-MD5 9579ea6afbfd51831b58efff767daa85 ChangeLog 10017
+MD5 afb5879a78016ff46250fdebf4f80433 ChangeLog 10201
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 bd8a36025a84cb2ad840e822f513e468 files/digest-openoffice-ximian-1.1.51-r1 213
 MD5 f1c9394d16cfa3ba87a38e7bb7c50a04 files/digest-openoffice-ximian-1.1.55-r1 293
@@ -29,3 +29,4 @@ MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285
 MD5 fc8711196de6324c9fae45342d159bf3 files/1.1.1/build.patch 330
 MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.1/newstlportfix.patch 10362
 MD5 6fd623d53d17e17f953232da5b04447f files/1.1.1/fixscale.patch 1035
+MD5 31663a485adc28ea4f98c20d16b186c2 files/1.1.1/gentoo-1.1.55.patch 606
diff --git a/app-office/openoffice-ximian/files/1.1.1/gentoo-1.1.55.patch b/app-office/openoffice-ximian/files/1.1.1/gentoo-1.1.55.patch
new file mode 100644
index 000000000000..21e15c29d953
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.1/gentoo-1.1.55.patch
@@ -0,0 +1,9 @@
+--- patches/OOO_1_1_1/apply 2004-05-08 08:54:17.055306480 +0200
++++ patches/OOO_1_1_1/apply 2004-05-08 08:54:17.057306176 +0200
+@@ -25,6 +25,7 @@
+ SuSE : SuSEOnly, LinuxCommon, KDEBase, GlobalDesktopFiles, VBABits
+ PLD : PLDOnly, LinuxCommon, KDEBase, OOoCUPS, GlobalDesktopFiles, StartupNotification, ODKFixes, VBABits
+ Ark : ArkOnly, LinuxCommon, NativeWidgets, GlobalDesktopFiles, ODKFixes, VBABits, OOoCUPS
++Gentoo : XimianOnly, LinuxCommon, GnomeVFS, GnomeCUPS, GlobalDesktopFiles, StartupNotification, ODKFixes, VBABits, NativeWidgets
+ # somewhat odder:
+ Win32 : Common, ODKFixes, VBABits, Win32Only
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild
index 786466c258dc..d2e87d191bd7 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild,v 1.2 2004/05/07 20:50:04 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild,v 1.3 2004/05/12 09:02:44 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -30,15 +30,6 @@ inherit flag-o-matic eutils gcc
 
 IUSE="gnome kde ooo-kde"
 
-# We want gcc3 if possible!!!!
-export WANT_GCC_3="yes"
-
-# Set $ECPUS to amount of processes multiprocessing build should use.
-# NOTE:  Setting this too high might cause dmake to segfault!!
-#        Setting this to anything but "1" on my pentium4 causes things
-#        to segfault :(
-[ -z "${ECPUS}" ] && export ECPUS="1"
-
 OO_VER=1.1.1
 PATCHLEVEL=OOO_1_1_1
 ICON_VER=OOO_1_1-9
@@ -187,6 +178,9 @@ oo_setup() {
 	unset LANG
 	unset LC_ALL
 
+	# We want gcc3 if possible!!!!
+	export WANT_GCC_3="yes"
+
 	export NEW_GCC="0"
 
 	if [ -x /usr/sbin/gcc-config ]
@@ -231,6 +225,9 @@ src_unpack() {
 	cd ${PATCHDIR}
 	epatch ${FILESDIR}/${OO_VER}/fixscale.patch
 
+	#Beginnings of our own patchset
+	epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch
+
 	#Still needed: The STLport patch
 	cd ${S}
 	rm stlport/STLport-4.5.3.patch
@@ -242,9 +239,6 @@ src_unpack() {
 	#Additional patch for Kernel 2.6
 	epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-linux-2.6-fix.patch
 
-	#Work around recent portage sandbox troubles
-	epatch ${FILESDIR}/${OO_VER}/build.patch
-
 	if [ ${ARCH} = "sparc" ]; then
 		epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch
 	fi
@@ -252,9 +246,11 @@ src_unpack() {
 	if [ `use ooo-kde` ]; then
 		DISTRO=KDE
 		ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER}
+		WIDGETSET=kde
 	else
-		DISTRO=Ximian
+		DISTRO=Gentoo
 		ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
+		WIDGETSET=gtk
 	fi
 
 	einfo "Applying Ximian OO.org Patches"
@@ -324,6 +320,7 @@ src_compile() {
 	# get linker errors due to the ABI being different (STLport will be
 	# compiled with 2.95.3, while OO is compiled with 3.x). (Az)
 	einfo "Configuring OpenOffice.org with language support for ${LFULLNAME}..."
+	einfo "Using Native widgest set for ${WIDGETSET}"
 	cd ${S}/config_office
 	rm -f config.cache
 	autoconf
@@ -338,8 +335,8 @@ src_compile() {
 		--with-system-zlib \
 		--with-system-freetype \
 		--with-system-curl \
-		--disable-java"
-	use ooo-kde && myconf="${myconf} --with-widgetset=kde"
+		--disable-java
+		--with-widgetset=${WIDGETSET}"
 	./configure ${myconf} || die
 
 	cd ${S}
@@ -348,6 +345,12 @@ src_compile() {
 	# Build as minimal as possible
 	export BUILD_MINIMAL="${LANGNO}"
 
+	# Set $ECPUS to amount of processes multiprocessing build should use.
+	# NOTE:  Setting this too high might cause dmake to segfault!!
+	#        Setting this to anything but "1" on my pentium4 causes things
+	#        to segfault :(
+	[ -z "${ECPUS}" ] && export ECPUS="1"
+
 	# Should the build use multiprocessing?
 	if [ "${ECPUS}" -gt 1 ]
 	then
@@ -385,8 +388,6 @@ src_install() {
 	addpredict "/usr/bin/soffice"
 	addpredict "/pspfontcache"
 
-	get_EnvSet
-
 	# The install part should now be relatively OK compared to
 	# what it was.  Basically we use autoresponse files to install
 	# unattended.  Afterwards we