From 32e826c857bf6da1d9cf126b2fd9159eabf978c6 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Tue, 26 Jul 2011 13:05:05 +0000 Subject: [PATCH] Fix as-needed linking on the quickstarter. Patches backported from upstream trunk. Fixes gentoo bug #376469. Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- app-office/libreoffice/ChangeLog | 8 ++- app-office/libreoffice/Manifest | 12 ++-- .../files/libreoffice-as-needed-gtk-2.patch | 66 +++++++++++++++++++ .../files/libreoffice-as-needed-gtk.patch | 27 ++++++++ .../libreoffice/libreoffice-3.4.2.2.ebuild | 4 +- 5 files changed, 110 insertions(+), 7 deletions(-) create mode 100644 app-office/libreoffice/files/libreoffice-as-needed-gtk-2.patch create mode 100644 app-office/libreoffice/files/libreoffice-as-needed-gtk.patch diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index d0cb49483cb7..d88cf5ecffbd 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,12 @@ # 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.52 2011/07/25 18:15:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.53 2011/07/26 13:05:05 scarabeus Exp $ + + 26 Jul 2011; Tomáš Chvátal + +files/libreoffice-as-needed-gtk-2.patch, libreoffice-3.4.2.2.ebuild, + +files/libreoffice-as-needed-gtk.patch: + Fix as-needed linking on the quickstarter. Patches backported from upstream + trunk. Fixes gentoo bug #376469. 25 Jul 2011; Tomáš Chvátal libreoffice-3.4.2.2.ebuild, -files/libreoffice-unfigured-options.txt, diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 520ff2ffefc5..1accbd2639fa 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -12,6 +12,8 @@ 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-2.patch 8647 RMD160 38bd07e7f8e348b588b0cc518f700a453f31566d SHA1 fe52fa439d5772d3533f807c4c3db57cf83dd5e2 SHA256 14f7050ddcbc6fa5cd10953c4c649dba2f3ce089f1435f0704d71572704bdabc +AUX libreoffice-as-needed-gtk.patch 620 RMD160 a217914d283625a03a5dba76cceaf05284bfef47 SHA1 21c062a5dc31436f025a8b1b7e59459c74853e90 SHA256 d513a4874fa12c65531505265ca8248cd839fc2535c935aa0d066a81a0ec7885 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a AUX libreoffice-solenv-build-crash.patch 492 RMD160 b5220c76d90e785a5bb38548cad8d5d9d73de7d2 SHA1 a0571d2301ce9f03ff5b58326906fe2078ea39b5 SHA256 45276cdc69444a0542bac4e949ef92bac4286db58b824198a59f797bd71c81f6 AUX libreoffice-svx.patch 1347 RMD160 91d5f142df33d119666252ecc319dc4e7ec70f6d SHA1 020db7d4e784a131acc63413ccc625715d44df70 SHA256 dbcd451e390c78102075b048e1472cb45c8d960608bef4ac0c0611c7aeaea736 @@ -207,13 +209,13 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626 EBUILD libreoffice-3.4.1.ebuild 19176 RMD160 9f22a8c93f185f56dfaa37a291f194bc8f1972c8 SHA1 91eb7e4e285643d5c8da3acf1bf952fb68916efe SHA256 0b895bc9569a3b3ca84fe8d54fb861a4570ba8ec57317c0fcd8cf3b03e010274 -EBUILD libreoffice-3.4.2.2.ebuild 17663 RMD160 18b4d67cb8da62558a824966037205d38a355b97 SHA1 01fd1d2267112edbfa93520f58d42eafdf225b49 SHA256 b1993960ed2386b0ab033e573dad6b3c4d6e438b25332edb37519c41c5cdf4b3 -MISC ChangeLog 10725 RMD160 45827f08314f01ef227601ddfe1b97a2b7b2a8aa SHA1 b92e5744b665fe98a7cfdfd11f2280ed1a7d149e SHA256 3ba25308a2745ceb4ed5a388b563bcef135bf37540ca104a217bf95c7b86b8ae +EBUILD libreoffice-3.4.2.2.ebuild 17747 RMD160 0721db7e24ccee961e8a778dcfa94713372c243e SHA1 86e7f4103e19fe3232a2afee402c703536f3f079 SHA256 9b1b14fac1dd37dd90414071563905508b7e6f01cfda8d14e868bdf7cf48939f +MISC ChangeLog 11008 RMD160 3d95ea09696204068f3f96172e5fda98ea5e159b SHA1 2c1cdf995849b679f328717d9f050ccaa1ad0e3b SHA256 0eff51d0b737800f0b59b86a945b2197b1f9f8afa2a9898f183f060bda99b532 MISC metadata.xml 968 RMD160 4c276f754c1e2f9e2ca31d8afc848c7104405071 SHA1 ffd8cf3e1260eceeca576d417138f2d8584bf0fd SHA256 8dc930d20711f541b049eefa6e2b77fe5904c26ca4a08ea40553acb787c94908 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4tsnAACgkQHB6c3gNBRYfIzQCgmtNd8DYpCKc04n6sS0FONWYf -dMkAnjwas5wQQvjsv5YypIEiUiaZ2+aj -=tjx1 +iEYEARECAAYFAk4uu2YACgkQHB6c3gNBRYfz3QCePBQ3pei2iTeU4dXufxior8Qu +uZwAoJs7GsleFMT7zOCntk+PDVQGIXf4 +=7zX5 -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/files/libreoffice-as-needed-gtk-2.patch b/app-office/libreoffice/files/libreoffice-as-needed-gtk-2.patch new file mode 100644 index 000000000000..31df1e473e42 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-as-needed-gtk-2.patch @@ -0,0 +1,66 @@ + + + +libreoffice/libs-core - Libraries shared amon applications + + + + + + +
+ + + + +
+summaryrefslogtreecommitdiff
+ + + +
+
+
+ + + + +
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-26 12:52:45 (GMT)
committer Bjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-26 12:53:55 (GMT)
commit24e5e18ccd413797f143b27945a226597a1c42b1 (patch)
tree8938832137d91ba264c3d04b1a7efb10065bc2bf
parent2829346208ebf2c6e0337e1b4d95d13716410823 (diff)
downloadlibs-core-24e5e18ccd413797f143b27945a226597a1c42b1.zip
libs-core-24e5e18ccd413797f143b27945a226597a1c42b1.tar.gz
libs-core-24e5e18ccd413797f143b27945a226597a1c42b1.tar.bz2
+
use gtk external in qstartmaster
Diffstat
+
-rwxr-xr-xsfx2/Library_qstart.mk14
1 files changed, 4 insertions, 10 deletions
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 13842f7..8819829 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,qstart_gtk,\
-I$(SRCDIR)/sfx2/inc/sfx2 \
-I$(SRCDIR)/sfx2/inc/pch \
-I$(OUTDIR)/inc \
- $(filter -I%,$(GTK_CFLAGS)) \
))
$(eval $(call gb_Library_add_api,qstart_gtk,\
@@ -53,14 +52,6 @@ $(eval $(call gb_Library_add_defs,qstart_gtk,\
))
endif
-$(eval $(call gb_Library_add_cflags,qstart_gtk,\
- $(filter-out -I%,$(GTK_CFLAGS)) \
-))
-
-$(eval $(call gb_Library_add_libs,qstart_gtk,\
- $(GTK_LIBS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
comphelper \
cppu \
@@ -81,7 +72,10 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
sfx \
))
-$(eval $(call gb_Library_use_external,qstart_gtk,libxml2))
+$(eval $(call gb_Library_use_externals,qstart_gtk,\
+ gtk \
+ libxml2 \
+))
$(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
sfx2/source/appl/shutdowniconunx \
+
generated by cgit v0.8.3.1 at 2011-07-26 12:56:40 (GMT)
+
+ + diff --git a/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch b/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch new file mode 100644 index 000000000000..9785dc2d3f2c --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch @@ -0,0 +1,27 @@ +From 7d59c9f0e6768418d1ee791b6a5bec6d7b15a4d1 Mon Sep 17 00:00:00 2001 +From: Bjoern Michaelsen +Date: Tue, 26 Jul 2011 12:51:35 +0000 +Subject: add gtk external + +--- +diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk +index ee65d9e..f30526c 100644 +--- a/RepositoryExternal.mk ++++ b/RepositoryExternal.mk +@@ -437,5 +437,14 @@ endef + + endif # SYSTEM_OPENSSL + ++define gb_LinkTarget__use_gtk ++$(call gb_LinkTarget_set_include,$(1),\ ++ $$(INCLUDE) \ ++ $(GTK_CFLAGS) \ ++) ++ ++$(call gb_LinkTarget_add_libs,$(1),$(GTK_LIBS)) ++ ++endef + + # vim: set noet sw=4 ts=4: +-- +cgit v0.8.3-6-g21f6 diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild index 30cec8cb4f9d..f7bac16a1eba 100644 --- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.12 2011/07/25 18:15:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.13 2011/07/26 13:05:05 scarabeus Exp $ EAPI=3 @@ -217,6 +217,8 @@ PATCHES=( "${FILESDIR}/${PN}-svx.patch" "${FILESDIR}/${PN}-vbaobj-visibility-fix.patch" "${FILESDIR}/${PN}-solenv-build-crash.patch" + "${FILESDIR}/${PN}-as-needed-gtk.patch" + "${FILESDIR}/${PN}-as-needed-gtk-2.patch" ) # Uncoment me when updating to eapi4 -- 2.26.2