[SCM] Gtk+ library to display large amounts of numerical data branch, master, updated. upstream/0.9.2.0-30-g7999692

Daniele E. Domenichelli daniele.domenichelli at gmail.com
Thu May 23 18:16:43 UTC 2013


The following commit has been merged in the master branch:
commit b621224117c4bc9f0575083a4594bec49fa1fe7a
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu May 23 11:54:58 2013 +0200

    Add 05_explicitly_link_libm.patch
    
    Examples use sin and cos to generate plots.
    Using ld.gold, it is necessary to link libm explicitly, since it is no
    longer linked automatically with other dependencies.

diff --git a/debian/changelog b/debian/changelog
index e4afd53..11a9de5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libgtkdatabox (1:0.9.2.0-2) UNRELEASED; urgency=low
+
+  * Add 05_explicitly_link_libm.patch
+
+ -- Daniele E. Domenichelli <daniele.domenichelli at gmail.com>  Thu, 23 May 2013 09:08:21 +0200
+
 libgtkdatabox (1:0.9.2.0-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/05_explicit_link_libm.patch b/debian/patches/05_explicit_link_libm.patch
new file mode 100644
index 0000000..b210f32
--- /dev/null
+++ b/debian/patches/05_explicit_link_libm.patch
@@ -0,0 +1,48 @@
+Description: Explicitly link libm in examples
+ Examples use sin and cos to generate plots.
+ Using ld.gold, it is necessary to link libm explicitly, since it is no
+ longer linked automatically with other dependencies.
+Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
+Last-Update: 2013-05-23
+
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -61,14 +61,16 @@ AM_CFLAGS			=\
+ 
+ 
+ LDADD 			= $(top_builddir)/gtk/libgtkdatabox.la\
+-		 	@GTK_LIBS@
++		 	@GTK_LIBS@\
++			-lm
+ 
+ 
+ if BUILD_LIBGLADE
+ basics_libglade_LDADD	= $(top_builddir)/gtk/libgtkdatabox.la \
+ 			$(top_builddir)/glade/libdatabox.la \
+ 		 	@GTK_LIBS@ \
+-			@LIBGLADE_LIBS@
++			@LIBGLADE_LIBS@ \
++			-lm
+ else
+ basics_libglade_LDADD = $(LDADD)
+ endif
+--- a/examples/Makefile.in
++++ b/examples/Makefile.in
+@@ -311,13 +311,15 @@ AM_CFLAGS = \
+ 			`pkg-config gtk+-2.0 --cflags`
+ 
+ LDADD = $(top_builddir)/gtk/libgtkdatabox.la\
+-		 	@GTK_LIBS@
++		 	@GTK_LIBS@\
++			-lm
+ 
+ @BUILD_LIBGLADE_FALSE at basics_libglade_LDADD = $(LDADD)
+ @BUILD_LIBGLADE_TRUE at basics_libglade_LDADD = $(top_builddir)/gtk/libgtkdatabox.la \
+ @BUILD_LIBGLADE_TRUE@			$(top_builddir)/glade/libdatabox.la \
+ @BUILD_LIBGLADE_TRUE@		 	@GTK_LIBS@ \
+- at BUILD_LIBGLADE_TRUE@			@LIBGLADE_LIBS@
++ at BUILD_LIBGLADE_TRUE@			@LIBGLADE_LIBS@ \
++ at BUILD_LIBGLADE_TRUE@			-lm
+ 
+ all: all-am
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6a26855..1821f36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_libglage_example.patch
 04_missing_includes.patch
+05_explicit_link_libm.patch

-- 
Gtk+ library to display large amounts of numerical data



More information about the debian-science-commits mailing list