Fix build problems without gtk, see bug #306181

Package-Manager: portage-2.2_rc63/cvs/Linux i686

4 files changed, 22 insertions, 4 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 0eff427c04e1..3d5e0a12c7c1 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.513 2010/02/22 17:17:16 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.514 2010/02/22 17:22:37 suka Exp $
+
+  22 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.2.0.ebuild, +files/npwrap-fix-nogtk.diff:
+  Fix build problems without gtk, see bug #306181
 
   22 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.2.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 510aa38e27c9..afa2f63d1c9a 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -5,6 +5,7 @@ AUX gentoo-3.1.1.diff 2229 RMD160 543824148af41cfcdeaf1198591679b6c366c61e SHA1
 AUX gentoo-3.2.0.diff 554 RMD160 9e226cf6dd9b2123685c3ca20e304eb0834f381b SHA1 8b45c342c7894e0b474efe87cce59bcbaa488e6b SHA256 2ccec0d96f8a5a260c449013f949ac544b959478e7c5931350422a8e45239ae2
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX nocairofonts.diff 437 RMD160 56d7929870c122b228a1e673f4743cf91958753b SHA1 6a7e0a92155ad33e255d17961a2121857bf8a1fe SHA256 8afc0dee4778a46198ae95699243749cc62ee943229e42f0b827b55aa52c89a9
+AUX npwrap-fix-nogtk.diff 382 RMD160 557fe38a19d9a0e4505af34bed4033884f1075ab SHA1 209f73c706adabb1e2b2b3e4bc706f9afbbee172 SHA256 ad64cea66e4e4d9b351a44b3ed2774484baaaebe5e37ebea3121f4a0981d231f
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX qt-use-native-backend.diff 391 RMD160 602d444e9768c1bb0a8f2ad36567c8ab571bc569 SHA1 148a3431222e7405eb16c42330da7f0a2f01e1eb SHA256 f3ba5e9390f47d42acb955c04f5ef62a5b62a5776bd9d5d3226d5034fafe6be9
 DIST OOo_3.2.0_src_binfilter.tar.bz2 6485071 RMD160 1a92582f7e9dc4c3dd57be6db0519f5d53e0b9ad SHA1 ef1041645ae444395f004eef4dbe31c472501476 SHA256 2acbd583f8b090e0fbdb5ea01d5362ad467b713299d29344fc7c80e5ff5083ca
@@ -49,6 +50,6 @@ DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6c
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD openoffice-3.1.1.ebuild 13586 RMD160 f09fb2f1ae5b2692758bd148a0bd1ecaa9c261b7 SHA1 d60f323041fb5e6a46fa383f5d3325fd5ab448be SHA256 216a9487563b78614d57e6464cc3d493357d5b6bf34f23d84255611e6859f39c
-EBUILD openoffice-3.2.0.ebuild 12474 RMD160 1a551c4dfc2a15b5ce1533ac36e44d748058a111 SHA1 c602cc593f5e7d98cc222f1139b1dfcd023a7f94 SHA256 0f3ab4806e1d93b878de8bac88ecaf808be613dbeeee7bd592123d847f7a2c16
-MISC ChangeLog 105834 RMD160 dbd8b11ef9ded7537e3a6735e030d3271d4de862 SHA1 f0171d0df578e87f35012bda42842c5d7556478c SHA256 4d55dee081752a61d71cddd1638a1c2f069b198cd81cc5ab408669b74035331f
+EBUILD openoffice-3.2.0.ebuild 12548 RMD160 cbcaa733cbc6bab3252e55f4bf86974e8d1429fa SHA1 eae1dc4379e29b9c3bf259c1eb5c9c99805a0c14 SHA256 901be656926fa85780c593c45cd97d63b8d7b9e3533fcf58a80291fdb85d8560
+MISC ChangeLog 105995 RMD160 ce7e2921d804491b744e216ca002e2967004ee0f SHA1 b5d6c188edee3a47eba8c33bec67ba5ee811d62a SHA256 f1925ba1759b935708d32b507a3560803b288eaafc9725116c6b4c09a6c9105a
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/npwrap-fix-nogtk.diff b/app-office/openoffice/files/npwrap-fix-nogtk.diff
new file mode 100644
index 000000000000..8ce807186d79
--- /dev/null
+++ b/app-office/openoffice/files/npwrap-fix-nogtk.diff
@@ -0,0 +1,12 @@
+--- extensions/source/plugin/unx/npwrap.cxx	2010-02-22 02:31:31.000000000 +0300
++++ extensions/source/plugin/unx/npwrap.cxx	2010-02-22 02:32:04.000000000 +0300
+@@ -485,7 +485,9 @@
+ 
+     medDebug( 1, "left plugin app main loop\n" );
+ 
++    #ifdef ENABLE_GTK
+     g_source_remove(xt_polling_timer_id);
++    #endif
+     
+     pNP_Shutdown();
+     medDebug( 1, "NP_Shutdown done\n" );
diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild
index f67bb2d9ca09..f4917ec9a047 100644
--- a/app-office/openoffice/openoffice-3.2.0.ebuild
+++ b/app-office/openoffice/openoffice-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.7 2010/02/22 17:17:16 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.8 2010/02/22 17:22:37 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -215,6 +215,7 @@ src_prepare() {
 	epatch "${FILESDIR}/ooo-env_log.diff"
 	cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/qt-use-native-backend.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/npwrap-fix-nogtk.diff" "${S}/patches/hotfixes" || die
 
 	#Use flag checks
 	if use java ; then