r46086 - in /desktop/unstable/yelp/debian: changelog patches/0001-Fix-linking-error-for-undefined-reference-to-hypot.patch patches/01_configure_libm.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Thu Sep 24 08:31:23 2015
New Revision: 46086

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46086
Log:
Add d/p/0001-Fix-linking-error-for-undefined-reference-to-hypot.patch

Added:
    desktop/unstable/yelp/debian/patches/0001-Fix-linking-error-for-undefined-reference-to-hypot.patch
Removed:
    desktop/unstable/yelp/debian/patches/01_configure_libm.patch
Modified:
    desktop/unstable/yelp/debian/changelog
    desktop/unstable/yelp/debian/patches/series

Modified: desktop/unstable/yelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/changelog?rev=46086&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/changelog	[utf-8] (original)
+++ desktop/unstable/yelp/debian/changelog	[utf-8] Thu Sep 24 08:31:23 2015
@@ -7,7 +7,7 @@
   * New upstream release.
   * Update (build-)dependencies according to configure.ac changes:
     - switch from libwebkitgtk-3.0-dev to libwebkit2gtk-4.0-dev (>= 2.7.1)
-  * Add debian/patches/01_configure_libm.patch
+  * Add d/p/0001-Fix-linking-error-for-undefined-reference-to-hypot.patch
     - find and explicitly link with libm when using 'hypot'
   * Use dh-autoreconf for the above patch to take effect.
 

Added: desktop/unstable/yelp/debian/patches/0001-Fix-linking-error-for-undefined-reference-to-hypot.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/patches/0001-Fix-linking-error-for-undefined-reference-to-hypot.patch?rev=46086&op=file
==============================================================================
--- desktop/unstable/yelp/debian/patches/0001-Fix-linking-error-for-undefined-reference-to-hypot.patch	(added)
+++ desktop/unstable/yelp/debian/patches/0001-Fix-linking-error-for-undefined-reference-to-hypot.patch	[utf-8] Thu Sep 24 08:31:23 2015
@@ -0,0 +1,45 @@
+From 36fa6136cc4fa03e0c50b821e0614ec6013b027f Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Thu, 24 Sep 2015 10:04:39 +0200
+Subject: [PATCH] Fix linking error for undefined reference to hypot
+
+libtool: link: gcc -shared  -fPIC -DPIC  .libs/libyelp_la-yelp-bookmarks.o .libs/libyelp_la-yelp-debug.o .libs/libyelp_la-yelp-error.o .libs/libyelp_la-yelp-docbook-document.o .libs/libyelp_la-yelp-document.o .libs/libyelp_la-yelp-help-list.o .libs/libyelp_la-yelp-info-document.o .libs/libyelp_la-yelp-info-parser.o .libs/libyelp_la-yelp-magic-decompressor.o .libs/libyelp_la-yelp-mallard-document.o .libs/libyelp_la-yelp-man-document.o .libs/libyelp_la-yelp-man-parser.o .libs/libyelp_la-yelp-marshal.o .libs/libyelp_la-yelp-search-entry.o .libs/libyelp_la-yelp-simple-document.o .libs/libyelp_la-yelp-sqlite-storage.o .libs/libyelp_la-yelp-storage.o .libs/libyelp_la-yelp-transform.o .libs/libyelp_la-yelp-types.o .libs/libyelp_la-yelp-view.o .libs/libyelp_la-yelp-lzma-decompressor.o .libs/libyelp_la-yelp-bz2-decompressor.o   -Wl,-rpath -Wl,/build/yelp-3.18.0/libyelp/.libs -Wl,-rpath -Wl,/usr/lib/yelp ./.libs/libyelpcommon.so -L/usr/lib/x86_64-linux-gnu -lbz2 -llzma -lexslt -lxslt -lxml2 /usr/lib/x86_64-linux-gnu/libsqlite3.so -lwebkit2gtk-4.0 -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -ljavascriptcoregtk-4.0 -lglib-2.0  -pthread -O2 -Wl,-z -Wl,relro -Wl,-z -Wl,defs -Wl,-O1 -Wl,--as-needed   -pthread -Wl,-soname -Wl,libyelp.so.0 -o .libs/libyelp.so.0.0.0
+.libs/libyelp_la-yelp-view.o: In function `get_screen_dpi':
+/build/yelp-3.18.0/libyelp/yelp-view.c:2098: undefined reference to `hypot'
+/build/yelp-3.18.0/libyelp/yelp-view.c:2099: undefined reference to `hypot'
+collect2: error: ld returned 1 exit status
+Makefile:608: recipe for target 'libyelp.la' failed
+
+https://bugzilla.gnome.org/show_bug.cgi?id=755489
+---
+ configure.ac        | 1 +
+ libyelp/Makefile.am | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index dba08f6..8869f9b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,7 @@ AM_PATH_GLIB_2_0
+ GLIB_GSETTINGS
+ 
+ # Library dependecies
++LT_LIB_M
+ PKG_CHECK_MODULES(YELP,
+ [
+ 	gio-2.0 >= 2.38.0
+diff --git a/libyelp/Makefile.am b/libyelp/Makefile.am
+index 73efd41..5f31461 100644
+--- a/libyelp/Makefile.am
++++ b/libyelp/Makefile.am
+@@ -121,6 +121,7 @@ libyelp_la_CPPFLAGS = \
+ 	-DYELP_WEB_EXTENSIONS_DIR=\""$(pkglibdir)/"web-extensions\"
+ 
+ libyelp_la_LIBADD =  \
++	$(LIBM) \
+ 	$(YELP_LIBS)     \
+ 	libyelpcommon.la
+ 
+-- 
+2.1.4
+

Modified: desktop/unstable/yelp/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/patches/series?rev=46086&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/yelp/debian/patches/series	[utf-8] Thu Sep 24 08:31:23 2015
@@ -1,4 +1,4 @@
-01_configure_libm.patch
+0001-Fix-linking-error-for-undefined-reference-to-hypot.patch
 #02_man-utf8.patch
 03_info_crasher.patch
 #04_use_doc-base.patch