r46083 - in /desktop/unstable/yelp/debian: changelog patches/01_configure_libm.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Sep 23 18:07:34 2015
New Revision: 46083

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46083
Log:
Add debian/patches/01_configure_libm.patch


Added:
    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=46083&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/changelog	[utf-8] (original)
+++ desktop/unstable/yelp/debian/changelog	[utf-8] Wed Sep 23 18:07:34 2015
@@ -7,6 +7,8 @@
   * 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
+    - find and explicitly link with libm when using 'hypot'
 
  -- Andreas Henriksson <andreas at fatal.se>  Wed, 23 Sep 2015 19:27:54 +0200
 

Added: desktop/unstable/yelp/debian/patches/01_configure_libm.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/patches/01_configure_libm.patch?rev=46083&op=file
==============================================================================
--- desktop/unstable/yelp/debian/patches/01_configure_libm.patch	(added)
+++ desktop/unstable/yelp/debian/patches/01_configure_libm.patch	[utf-8] Wed Sep 23 18:07:34 2015
@@ -0,0 +1,31 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: 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
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,7 @@
+ GLIB_GSETTINGS
+ 
+ # Library dependecies
++AC_SEARCH_LIBS([hypot],[m], [MATH_LIBS=-lm AC_SUBST(MATH_LIBS)])
+ PKG_CHECK_MODULES(YELP,
+ [
+ 	gio-2.0 >= 2.38.0
+--- a/libyelp/Makefile.am
++++ b/libyelp/Makefile.am
+@@ -18,7 +18,7 @@
+ 	-DYELP_ICON_PATH=\"$(YELP_ICON_PATH)\"
+ 
+ 
+-libyelpcommon_la_LIBADD = $(YELP_LIBS)
++libyelpcommon_la_LIBADD = $(YELP_LIBS) $(MATH_LIBS)
+ libyelpcommon_la_LDFLAGS = 	\
+ 	-avoid-version		\
+ 	-no-undefined

Modified: desktop/unstable/yelp/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/patches/series?rev=46083&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/yelp/debian/patches/series	[utf-8] Wed Sep 23 18:07:34 2015
@@ -1,3 +1,4 @@
+01_configure_libm.patch
 #02_man-utf8.patch
 03_info_crasher.patch
 #04_use_doc-base.patch