Fix building with gtk by appending no-as-needed on quickstarter. Fixes bug #376609.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index dc0d62c52d270f999588e7bfd682df4805c2f6e4..bb2da40032dec4e3ba9b9c4f530a1c6aa8477c69 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.72 2011/07/28 14:22:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.73 2011/07/28 15:30:29 scarabeus Exp $
+
+  28 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  files/libreoffice-as-needed-gtk.patch:
+  Fix building with gtk by appending no-as-needed on quickstarter. Fixes bug
+  #376609.
 
   28 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.3.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3c70dca652aabea74df0abc9942a83c762f7a735..02db3b3d3617b505180c6dfcccb2b9ae8d59185c 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -12,7 +12,7 @@ AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ce
 AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
 AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
 AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
-AUX libreoffice-as-needed-gtk.patch 516 RMD160 f04da0c1bd9c46327655fa309a96e19d4f9cb986 SHA1 f22cebeb6e2674f7c648e0316058d12c49872d2e SHA256 5782d6b174c20b6d2846b2e8a542441305e905399656dac7f87ce78146a39c31
+AUX libreoffice-as-needed-gtk.patch 403 RMD160 c1c5733d282eb3b59b7fe03d5258e9c917d9c6c4 SHA1 7516a3d554d96b7a27e5884ef124f9f5166a5939 SHA256 88609b6bac793423dee7af79110a05981669471170f9473a2bc591d35927117a
 AUX libreoffice-fix-sandbox-install.patch 1609 RMD160 e79859f6343e04808cc261c101483ff2ba0f1a5d SHA1 579d30eafb7a7e54531faf4bc8d3bd35150494f7 SHA256 fdb54126c78837d73e7a095ceedba9329b121ce2ce1d1a23ad75247b8f144b50
 AUX libreoffice-gbuild-use-cxxflags.patch 353 RMD160 97f0c4cffe624ca8df71471cae61975176464847 SHA1 d1a2de4de89055fc4150f27022ea9f0fa5a34f20 SHA256 27ccd9ec886f2f6433969524860b3fa7199531b5f5d774f7643d6bc75883222a
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
@@ -166,12 +166,12 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712
 EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.2.3.ebuild 18384 RMD160 ede96109f1902b4a0e11f82e93462566572767ac SHA1 30eea1b1425b255e1bc4e273befdd021b1f9cecb SHA256 6e8dc652afe37f6a4a897b0abfb699fb196b8b20591f53b7fbcf088678fcd302
-MISC ChangeLog 14606 RMD160 2d26b91040dac43a4e4307faccf3f6f507d6263f SHA1 ffb0525ee90c15c4b5a16ce7327cb22bf709bbab SHA256 ed0e1dfa3a5636fb5a80d313f55fa761314beb52e50a0168c48e6ce9cb1c13d2
+MISC ChangeLog 14791 RMD160 160c2dc14042b71be67d75aa6281bcf5c62c7ab0 SHA1 468b8cd2598d06c372ed2a6ce1cfad4fd4a0387c SHA256 d1d3b75491aa4204fedffeae9a39fd0e1e3dd34b8eca7a7b47935a88a7608bc4
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4xcHEACgkQHB6c3gNBRYeAmACfey03N8ysN+uUM/3J02hKGtj2
-hOQAn0f2zM+3Q3n/yQz35r3Hm9WoRnQW
-=es+l
+iEYEARECAAYFAk4xgF4ACgkQHB6c3gNBRYdM1wCgpj4AgZdeKj7LvQMZPgKLaT+P
+qZcAn3DAtbbJZYrog7cT+SMa3pYd1qs1
+=KXR3
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch b/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch
index b53c67ec10e6f849448697156a0dd7ff315287dc..ced69e2005b7b35291c28aaa74bffcfe65573c59 100644 (file)
--- a/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch
+++ b/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch
@@ -1,13 +1,14 @@
-diff -urN libreoffice-libs-core-3.4.2.3.old/sfx2/Library_qstart.mk libreoffice-libs-core-3.4.2.3/sfx2/Library_qstart.mk
---- libreoffice-libs-core-3.4.2.3.old/sfx2/Library_qstart.mk   2011-07-27 21:22:27.879153559 +0200
-+++ libreoffice-libs-core-3.4.2.3/sfx2/Library_qstart.mk       2011-07-27 21:24:26.450155394 +0200
-@@ -56,8 +56,7 @@
+--- libreoffice-libs-core-3.4.2.3.old/sfx2/Library_qstart.mk   2011-07-27 23:18:49.001531376 +0000
++++ libreoffice-libs-core-3.4.2.3/sfx2/Library_qstart.mk       2011-07-28 15:23:32.752723654 +0000
+@@ -56,8 +56,11 @@
      $(filter-out -I%,$(GTK_CFLAGS)) \
  ))
  
--$(eval $(call gb_Library_set_ldflags,qstart_gtk,\
--    $$(LDFLAGS) \
-+$(eval $(call gb_Library_add_libs,qstart_gtk,\
++NO_AS_NEEDED=-Wl,--no-as-needed
++
+ $(eval $(call gb_Library_set_ldflags,qstart_gtk,\
+     $$(LDFLAGS) \
++      $(NO_AS_NEEDED) \
      $(GTK_LIBS) \
  ))
- 
+ 
\ No newline at end of file