diff options
author | 2011-07-27 19:27:24 +0000 | |
---|---|---|
committer | 2011-07-27 19:27:24 +0000 | |
commit | 136723c4df02be65ddb4f0c64e192b947fee9a77 (patch) | |
tree | 68cf7443727a9438a6bfee9a3e12576c206a2d68 /app-office/libreoffice/files | |
parent | Version bump. (diff) | |
download | gentoo-2-136723c4df02be65ddb4f0c64e192b947fee9a77.tar.gz gentoo-2-136723c4df02be65ddb4f0c64e192b947fee9a77.tar.bz2 gentoo-2-136723c4df02be65ddb4f0c64e192b947fee9a77.zip |
Use proper gb call to add GTK_LIBS, this should fix bug #376609.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice/files')
-rw-r--r-- | app-office/libreoffice/files/libreoffice-as-needed-gtk.patch | 24 |
1 files changed, 9 insertions, 15 deletions
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 |