Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/glade/files: glade-3.16.1-underlinking.patch
Date: Tue, 11 Feb 2014 08:32:07
Message-Id: 20140211083202.7146A2004E@flycatcher.gentoo.org
1 jlec 14/02/11 08:32:02
2
3 Added: glade-3.16.1-underlinking.patch
4 Log:
5 Add fix for underlinking (https://bugzilla.gnome.org/show_bug.cgi?id=724104)
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
8
9 Revision Changes Path
10 1.1 dev-util/glade/files/glade-3.16.1-underlinking.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/glade/files/glade-3.16.1-underlinking.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/glade/files/glade-3.16.1-underlinking.patch?rev=1.1&content-type=text/plain
14
15 Index: glade-3.16.1-underlinking.patch
16 ===================================================================
17 gladeui/Makefile.am | 4 ++--
18 src/Makefile.am | 2 +-
19 tests/Makefile.am | 6 +++---
20 3 files changed, 6 insertions(+), 6 deletions(-)
21
22 diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
23 index 87d610c..8fc02a0 100644
24 --- a/gladeui/Makefile.am
25 +++ b/gladeui/Makefile.am
26 @@ -19,7 +19,7 @@ glade_previewer_CFLAGS = \
27
28 glade_previewer_LDFLAGS = $(AM_LDFLAGS)
29
30 -glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS)
31 +glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS) -lm
32
33 glade_previewer_SOURCES = \
34 glade-previewer.c \
35 @@ -263,7 +263,7 @@ introspection_sources = $(libgladeui_2_la_SOURCES) $(libgladeuiinclude_HEADERS)
36 Gladeui-2.0.gir: libgladeui-2.la
37 Gladeui_2_0_gir_INCLUDES = Gtk-3.0
38 Gladeui_2_0_gir_CFLAGS = $(INCLUDES)
39 -Gladeui_2_0_gir_LIBS = libgladeui-2.la
40 +Gladeui_2_0_gir_LIBS = libgladeui-2.la m
41 Gladeui_2_0_gir_FILES = $(introspection_sources)
42 INTROSPECTION_GIRS += Gladeui-2.0.gir
43
44 diff --git a/src/Makefile.am b/src/Makefile.am
45 index 89e597e..83dd436 100644
46 --- a/src/Makefile.am
47 +++ b/src/Makefile.am
48 @@ -18,7 +18,7 @@ glade_CFLAGS = \
49
50 glade_LDFLAGS = $(AM_LDFLAGS) $(GMODULE_EXPORT_LDFLAGS)
51
52 -glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS)
53 +glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS) -lm
54
55 BUILT_SOURCES = glade-resources.c glade-resources.h
56
57 diff --git a/tests/Makefile.am b/tests/Makefile.am
58 index fc96195..3099186 100644
59 --- a/tests/Makefile.am
60 +++ b/tests/Makefile.am
61 @@ -28,7 +28,7 @@ progs_ldadd = $(top_builddir)/gladeui/libgladeui-2.la
62 create_widgets_CPPFLAGS = $(progs_cppflags)
63 create_widgets_CFLAGS = $(progs_cflags)
64 create_widgets_LDFLAGS = $(progs_libs)
65 -create_widgets_LDADD = $(progs_ldadd)
66 +create_widgets_LDADD = $(progs_ldadd) -lm
67 create_widgets_SOURCES = create-widgets.c
68
69 # Test that various types of container widgets
70 @@ -37,7 +37,7 @@ create_widgets_SOURCES = create-widgets.c
71 add_child_CPPFLAGS = $(progs_cppflags)
72 add_child_CFLAGS = $(progs_cflags)
73 add_child_LDFLAGS = $(progs_libs)
74 -add_child_LDADD = $(progs_ldadd)
75 +add_child_LDADD = $(progs_ldadd) -lm
76 add_child_SOURCES = add-child.c
77
78 TOPLEVEL_ORDER_FILES = \
79 @@ -63,7 +63,7 @@ toplevel-order-resources.c: $(TOPLEVEL_ORDER_FILES)
80 toplevel_order_CPPFLAGS = $(progs_cppflags)
81 toplevel_order_CFLAGS = $(progs_cflags)
82 toplevel_order_LDFLAGS = $(progs_libs)
83 -toplevel_order_LDADD = $(progs_ldadd)
84 +toplevel_order_LDADD = $(progs_ldadd) -lm
85 toplevel_order_SOURCES = \
86 toplevel-order.c \
87 toplevel-order-resources.c