| 1 |
scarabeus 11/07/27 19:27:24 |
| 2 |
|
| 3 |
Modified: libreoffice-as-needed-gtk.patch |
| 4 |
Log: |
| 5 |
Use proper gb call to add GTK_LIBS, this should fix bug #376609. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 app-office/libreoffice/files/libreoffice-as-needed-gtk.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: libreoffice-as-needed-gtk.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- libreoffice-as-needed-gtk.patch 26 Jul 2011 16:20:59 -0000 1.2 |
| 23 |
+++ libreoffice-as-needed-gtk.patch 27 Jul 2011 19:27:24 -0000 1.3 |
| 24 |
@@ -1,19 +1,13 @@ |
| 25 |
-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 |
| 26 |
---- libreoffice-libs-core-3.4.2.2.old//sfx2/Library_qstart.mk 2011-07-26 14:28:50.000000000 +0200 |
| 27 |
-+++ libreoffice-libs-core-3.4.2.2/sfx2/Library_qstart.mk 2011-07-26 14:31:09.000000000 +0200 |
| 28 |
-@@ -58,7 +58,6 @@ |
| 29 |
- |
| 30 |
- $(eval $(call gb_Library_set_ldflags,qstart_gtk,\ |
| 31 |
- $$(LDFLAGS) \ |
| 32 |
-- $(GTK_LIBS) \ |
| 33 |
+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 |
| 34 |
+--- libreoffice-libs-core-3.4.2.3.old/sfx2/Library_qstart.mk 2011-07-27 21:22:27.879153559 +0200 |
| 35 |
++++ libreoffice-libs-core-3.4.2.3/sfx2/Library_qstart.mk 2011-07-27 21:24:26.450155394 +0200 |
| 36 |
+@@ -56,8 +56,7 @@ |
| 37 |
+ $(filter-out -I%,$(GTK_CFLAGS)) \ |
| 38 |
)) |
| 39 |
|
| 40 |
- $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\ |
| 41 |
-@@ -80,6 +79,7 @@ |
| 42 |
- vcl \ |
| 43 |
- xml2 \ |
| 44 |
- sfx \ |
| 45 |
-+ $(GTK_LIBS) \ |
| 46 |
+-$(eval $(call gb_Library_set_ldflags,qstart_gtk,\ |
| 47 |
+- $$(LDFLAGS) \ |
| 48 |
++$(eval $(call gb_Library_add_libs,qstart_gtk,\ |
| 49 |
+ $(GTK_LIBS) \ |
| 50 |
)) |
| 51 |
|
| 52 |
- $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\ |
| 53 |
\ No newline at end of file |
Archives