From 614666ac1982172ab5fb7386f44232caeabdca4d Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Wed, 27 Jul 2011 19:27:24 +0000 Subject: [PATCH] Use proper gb call to add GTK_LIBS, this should fix bug #376609. Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- app-office/libreoffice/ChangeLog | 6 ++++- app-office/libreoffice/Manifest | 10 ++++---- .../files/libreoffice-as-needed-gtk.patch | 24 +++++++------------ 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 90f6036a5ff8..0c0c73275225 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # 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.63 2011/07/27 11:48:22 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.64 2011/07/27 19:27:24 scarabeus Exp $ + + 27 Jul 2011; Tomáš Chvátal + files/libreoffice-as-needed-gtk.patch: + Use proper gb call to add GTK_LIBS, this should fix bug #376609. *libreoffice-3.4.2.3 (27 Jul 2011) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 25fdc2488bf8..237f264d43e9 100644 --- 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 619 RMD160 4fab1bec996f5f15da389de0cdfbb16b2323663d SHA1 541616c0376876e22411272ec48547eb9a4b6926 SHA256 f871f8d498271a58507bdbcfeefe056741166277f3ce31628d21fbfea9aa2de6 +AUX libreoffice-as-needed-gtk.patch 516 RMD160 f04da0c1bd9c46327655fa309a96e19d4f9cb986 SHA1 f22cebeb6e2674f7c648e0316058d12c49872d2e SHA256 5782d6b174c20b6d2846b2e8a542441305e905399656dac7f87ce78146a39c31 AUX libreoffice-fix-sandbox-install.patch 1015 RMD160 3d5781b685958e106c745da0c94f33ebc097679c SHA1 2f5c3f9090e375e703cf19ef661e5743f2367075 SHA256 5890c3cbea327a930ede356e07c59096ce73941c4472b3d157b9f6542f3822de 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 18205 RMD160 e53845e90a9db0442d89c4aebc0dd8a99c83b3ee SHA1 4c0635506c4932c10559ac65f31cbd203afae190 SHA256 9953f13d822c24b13e58a7d60675800f5271b48eea0221740912b6474381df5d -MISC ChangeLog 13209 RMD160 b794bd0bdb4434f4632cf5e3a125403f140225f7 SHA1 114df65bda2626a8a94f5960e0056a22f64b2a9b SHA256 901097dab435402f720c42c7d113391b5613c94466dd9cb52289f6c61ce6a3b2 +MISC ChangeLog 13373 RMD160 cea3ebe6b7b6dfdaf13d55d886d91a2dd357c043 SHA1 16ca657750f6b464459b5b9251ca6341f468aade SHA256 195e5124691922a58cba325dc57400c6e12d98bd08db61d8dff77a7a671d1e44 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4v+vkACgkQHB6c3gNBRYf+JQCgqaCLa0OnIpRfyaQkYkHQQ/hX -SsAAn1L8OZGqQRM3QPqo5VrwVeOsLhIe -=Pcfw +iEYEARECAAYFAk4wZqEACgkQHB6c3gNBRYdqhACeKH+H5xUxKFU1tbsHrWv2qMJg +YXAAnjZgo5/8sHGF/H1RAJmMbHnVf0c0 +=dtYU -----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 a45eb20f5b42..b53c67ec10e6 100644 --- a/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch +++ b/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch @@ -1,19 +1,13 @@ -diff -urN libreoffice-libs-core-3.4.2.2.old//sfx2/Library_qstart.mk libreoffice-libs-core-3.4.2.2/sfx2/Library_qstart.mk ---- libreoffice-libs-core-3.4.2.2.old//sfx2/Library_qstart.mk 2011-07-26 14:28:50.000000000 +0200 -+++ libreoffice-libs-core-3.4.2.2/sfx2/Library_qstart.mk 2011-07-26 14:31:09.000000000 +0200 -@@ -58,7 +58,6 @@ - - $(eval $(call gb_Library_set_ldflags,qstart_gtk,\ - $$(LDFLAGS) \ -- $(GTK_LIBS) \ +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 @@ + $(filter-out -I%,$(GTK_CFLAGS)) \ )) - $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\ -@@ -80,6 +79,7 @@ - vcl \ - xml2 \ - sfx \ -+ $(GTK_LIBS) \ +-$(eval $(call gb_Library_set_ldflags,qstart_gtk,\ +- $$(LDFLAGS) \ ++$(eval $(call gb_Library_add_libs,qstart_gtk,\ + $(GTK_LIBS) \ )) - $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\ \ No newline at end of file -- 2.26.2