[Pkg-xfce-commits] r6080 - in desktop/trunk/xfce4-session/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-09-29 12:31:25 +0000 (Thu, 29 Sep 2011)
New Revision: 6080

Modified:
   desktop/trunk/xfce4-session/debian/changelog
   desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch
Log:
* debian/patches:
  - 04_fix-missing-lm refreshed (cherry-pick the upstream one).

Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog	2011-09-29 11:57:06 UTC (rev 6079)
+++ desktop/trunk/xfce4-session/debian/changelog	2011-09-29 12:31:25 UTC (rev 6080)
@@ -1,3 +1,10 @@
+xfce4-session (4.8.2-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 04_fix-missing-lm refreshed (cherry-pick the upstream one).
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 29 Sep 2011 14:31:07 +0200
+
 xfce4-session (4.8.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch	2011-09-29 11:57:06 UTC (rev 6079)
+++ desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch	2011-09-29 12:31:25 UTC (rev 6080)
@@ -1,12 +1,39 @@
-Index: xfce4-session-4.8.2/engines/balou/Makefile.am
-===================================================================
---- xfce4-session-4.8.2.orig/engines/balou/Makefile.am	2011-09-13 18:17:10.000000000 +0200
-+++ xfce4-session-4.8.2/engines/balou/Makefile.am	2011-09-13 23:21:51.910831369 +0200
-@@ -29,6 +29,7 @@
- 	-module
+commit eeaea26d3b777afb98c21317ad83170e3f725fd0
+Author: Brian J. Tarricone <brian at tarricone.org>
+Date:   Mon Sep 26 01:18:48 2011 -0700
+
+    explicitly link to libm where needed (bug #7953)
+    
+    we use rint() but aren't linking to libm; probably getting picked up
+    implicitly by a dependency like libpng, which recently dropped that flag
+    from its .pc file.
+
+diff --git a/configure.in.in b/configure.in.in
+index 141d427..8eff947 100644
+--- a/configure.in.in
++++ b/configure.in.in
+@@ -63,6 +63,10 @@ AC_CHECK_HEADERS([asm/unistd.h errno.h fcntl.h limits.h \
+ AC_CHECK_FUNCS([getaddrinfo gethostbyname gethostname getpwuid setsid \
+                 sigaction strdup sync vfork])
  
++dnl Check for required libraries
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ dnl Check for X11 installed
+ XDT_CHECK_LIBX11_REQUIRE()
+ 
+diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am
+index 96ae5c5..d049a35 100644
+--- a/engines/balou/Makefile.am
++++ b/engines/balou/Makefile.am
+@@ -31,7 +31,8 @@ libbalou_la_LDFLAGS =							\
  libbalou_la_LIBADD =							\
-+	-lm															\
  	$(top_builddir)/libxfsm/libxfsm-4.6.la				\
  	$(LIBXFCE4UI_LIBS)						\
- 	$(XFCONF_LIBS)
+-	$(XFCONF_LIBS)
++	$(XFCONF_LIBS)							\
++	$(LIBM)
+ 
+ 
+ libbalou_la_DEPENDENCIES =						\