summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-02-11 08:32:02 +0000
committerJustin Lecher <jlec@gentoo.org>2014-02-11 08:32:02 +0000
commit3516ef9557bfbfc3d56c3d247cdcf975a77134a7 (patch)
tree8873ef5ab18975849e23ea7190b45e9245fcdd9a /dev-util/glade/files
parentVersion bump. Change to GNU ELPA as upstream. (diff)
downloadgentoo-2-3516ef9557bfbfc3d56c3d247cdcf975a77134a7.tar.gz
gentoo-2-3516ef9557bfbfc3d56c3d247cdcf975a77134a7.tar.bz2
gentoo-2-3516ef9557bfbfc3d56c3d247cdcf975a77134a7.zip
Add fix for underlinking (https://bugzilla.gnome.org/show_bug.cgi?id=724104)
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'dev-util/glade/files')
-rw-r--r--dev-util/glade/files/glade-3.16.1-underlinking.patch71
1 files changed, 71 insertions, 0 deletions
diff --git a/dev-util/glade/files/glade-3.16.1-underlinking.patch b/dev-util/glade/files/glade-3.16.1-underlinking.patch
new file mode 100644
index 000000000000..b97426c2a6dc
--- /dev/null
+++ b/dev-util/glade/files/glade-3.16.1-underlinking.patch
@@ -0,0 +1,71 @@
+ gladeui/Makefile.am | 4 ++--
+ src/Makefile.am | 2 +-
+ tests/Makefile.am | 6 +++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
+index 87d610c..8fc02a0 100644
+--- a/gladeui/Makefile.am
++++ b/gladeui/Makefile.am
+@@ -19,7 +19,7 @@ glade_previewer_CFLAGS = \
+
+ glade_previewer_LDFLAGS = $(AM_LDFLAGS)
+
+-glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS)
++glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS) -lm
+
+ glade_previewer_SOURCES = \
+ glade-previewer.c \
+@@ -263,7 +263,7 @@ introspection_sources = $(libgladeui_2_la_SOURCES) $(libgladeuiinclude_HEADERS)
+ Gladeui-2.0.gir: libgladeui-2.la
+ Gladeui_2_0_gir_INCLUDES = Gtk-3.0
+ Gladeui_2_0_gir_CFLAGS = $(INCLUDES)
+-Gladeui_2_0_gir_LIBS = libgladeui-2.la
++Gladeui_2_0_gir_LIBS = libgladeui-2.la m
+ Gladeui_2_0_gir_FILES = $(introspection_sources)
+ INTROSPECTION_GIRS += Gladeui-2.0.gir
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 89e597e..83dd436 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -18,7 +18,7 @@ glade_CFLAGS = \
+
+ glade_LDFLAGS = $(AM_LDFLAGS) $(GMODULE_EXPORT_LDFLAGS)
+
+-glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS)
++glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS) -lm
+
+ BUILT_SOURCES = glade-resources.c glade-resources.h
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index fc96195..3099186 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -28,7 +28,7 @@ progs_ldadd = $(top_builddir)/gladeui/libgladeui-2.la
+ create_widgets_CPPFLAGS = $(progs_cppflags)
+ create_widgets_CFLAGS = $(progs_cflags)
+ create_widgets_LDFLAGS = $(progs_libs)
+-create_widgets_LDADD = $(progs_ldadd)
++create_widgets_LDADD = $(progs_ldadd) -lm
+ create_widgets_SOURCES = create-widgets.c
+
+ # Test that various types of container widgets
+@@ -37,7 +37,7 @@ create_widgets_SOURCES = create-widgets.c
+ add_child_CPPFLAGS = $(progs_cppflags)
+ add_child_CFLAGS = $(progs_cflags)
+ add_child_LDFLAGS = $(progs_libs)
+-add_child_LDADD = $(progs_ldadd)
++add_child_LDADD = $(progs_ldadd) -lm
+ add_child_SOURCES = add-child.c
+
+ TOPLEVEL_ORDER_FILES = \
+@@ -63,7 +63,7 @@ toplevel-order-resources.c: $(TOPLEVEL_ORDER_FILES)
+ toplevel_order_CPPFLAGS = $(progs_cppflags)
+ toplevel_order_CFLAGS = $(progs_cflags)
+ toplevel_order_LDFLAGS = $(progs_libs)
+-toplevel_order_LDADD = $(progs_ldadd)
++toplevel_order_LDADD = $(progs_ldadd) -lm
+ toplevel_order_SOURCES = \
+ toplevel-order.c \
+ toplevel-order-resources.c