Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-as-needed-gtk.patch
Date: Thu, 28 Jul 2011 16:02:19
Message-Id: 20110728153029.77D982004B@flycatcher.gentoo.org
1 scarabeus 11/07/28 15:30:29
2
3 Modified: libreoffice-as-needed-gtk.patch
4 Log:
5 Fix building with gtk by appending no-as-needed on quickstarter. Fixes bug #376609.
6
7 (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.4 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.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch?rev=1.4&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.3&r2=1.4
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.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- libreoffice-as-needed-gtk.patch 27 Jul 2011 19:27:24 -0000 1.3
23 +++ libreoffice-as-needed-gtk.patch 28 Jul 2011 15:30:29 -0000 1.4
24 @@ -1,13 +1,14 @@
25 -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
26 ---- libreoffice-libs-core-3.4.2.3.old/sfx2/Library_qstart.mk 2011-07-27 21:22:27.879153559 +0200
27 -+++ libreoffice-libs-core-3.4.2.3/sfx2/Library_qstart.mk 2011-07-27 21:24:26.450155394 +0200
28 -@@ -56,8 +56,7 @@
29 +--- libreoffice-libs-core-3.4.2.3.old/sfx2/Library_qstart.mk 2011-07-27 23:18:49.001531376 +0000
30 ++++ libreoffice-libs-core-3.4.2.3/sfx2/Library_qstart.mk 2011-07-28 15:23:32.752723654 +0000
31 +@@ -56,8 +56,11 @@
32 $(filter-out -I%,$(GTK_CFLAGS)) \
33 ))
34
35 --$(eval $(call gb_Library_set_ldflags,qstart_gtk,\
36 -- $$(LDFLAGS) \
37 -+$(eval $(call gb_Library_add_libs,qstart_gtk,\
38 ++NO_AS_NEEDED=-Wl,--no-as-needed
39 ++
40 + $(eval $(call gb_Library_set_ldflags,qstart_gtk,\
41 + $$(LDFLAGS) \
42 ++ $(NO_AS_NEEDED) \
43 $(GTK_LIBS) \
44 ))
45 -
46 +
47 \ No newline at end of file