[Pkg-xfce-commits] r6365 - in goodies/trunk/lightdm-gtk-greeter/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2012-01-31 12:07:22 +0000 (Tue, 31 Jan 2012)
New Revision: 6365

Added:
   goodies/trunk/lightdm-gtk-greeter/debian/patches/01_fix-configure-dso-linking.patch
Modified:
   goodies/trunk/lightdm-gtk-greeter/debian/patches/series
   goodies/trunk/lightdm-gtk-greeter/debian/rules
Log:
add a patch to reorder libs in configure{,.ac} to fix FTBFS with DSO errors


Added: goodies/trunk/lightdm-gtk-greeter/debian/patches/01_fix-configure-dso-linking.patch
===================================================================
--- goodies/trunk/lightdm-gtk-greeter/debian/patches/01_fix-configure-dso-linking.patch	                        (rev 0)
+++ goodies/trunk/lightdm-gtk-greeter/debian/patches/01_fix-configure-dso-linking.patch	2012-01-31 12:07:22 UTC (rev 6365)
@@ -0,0 +1,75 @@
+Index: lightdm-gtk-greeter-1.1.2/configure.ac
+===================================================================
+--- lightdm-gtk-greeter-1.1.2.orig/configure.ac	2012-01-31 01:27:42.000000000 +0100
++++ lightdm-gtk-greeter-1.1.2/configure.ac	2012-01-31 13:00:30.971898380 +0100
+@@ -18,9 +18,9 @@
+ dnl ###########################################################################
+ 
+ PKG_CHECK_MODULES(GREETER, [
++    liblightdm-gobject-1
+     gtk+-3.0
+     x11
+-    liblightdm-gobject-1
+     gmodule-export-2.0
+ ])
+ 
+Index: lightdm-gtk-greeter-1.1.2/configure
+===================================================================
+--- lightdm-gtk-greeter-1.1.2.orig/configure	2012-01-31 01:27:56.000000000 +0100
++++ lightdm-gtk-greeter-1.1.2/configure	2012-01-31 13:01:25.228318595 +0100
+@@ -11739,24 +11739,24 @@
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
++    liblightdm-gobject-1
+     gtk+-3.0
+     x11
+-    liblightdm-gobject-1
+     gmodule-export-2.0
+ \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
++    liblightdm-gobject-1
+     gtk+-3.0
+     x11
+-    liblightdm-gobject-1
+     gmodule-export-2.0
+ ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GREETER_CFLAGS=`$PKG_CONFIG --cflags "
++    liblightdm-gobject-1
+     gtk+-3.0
+     x11
+-    liblightdm-gobject-1
+     gmodule-export-2.0
+ " 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+@@ -11771,24 +11771,24 @@
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
++    liblightdm-gobject-1
+     gtk+-3.0
+     x11
+-    liblightdm-gobject-1
+     gmodule-export-2.0
+ \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
++    liblightdm-gobject-1
+     gtk+-3.0
+     x11
+-    liblightdm-gobject-1
+     gmodule-export-2.0
+ ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GREETER_LIBS=`$PKG_CONFIG --libs "
++    liblightdm-gobject-1
+     gtk+-3.0
+     x11
+-    liblightdm-gobject-1
+     gmodule-export-2.0
+ " 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes

Modified: goodies/trunk/lightdm-gtk-greeter/debian/patches/series
===================================================================
--- goodies/trunk/lightdm-gtk-greeter/debian/patches/series	2012-01-31 06:51:04 UTC (rev 6364)
+++ goodies/trunk/lightdm-gtk-greeter/debian/patches/series	2012-01-31 12:07:22 UTC (rev 6365)
@@ -1 +1,2 @@
+01_fix-makefile-dso-linking.patch
 04_default-gtk-greeter-config.patch

Modified: goodies/trunk/lightdm-gtk-greeter/debian/rules
===================================================================
--- goodies/trunk/lightdm-gtk-greeter/debian/rules	2012-01-31 06:51:04 UTC (rev 6364)
+++ goodies/trunk/lightdm-gtk-greeter/debian/rules	2012-01-31 12:07:22 UTC (rev 6365)
@@ -5,5 +5,8 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-silent-rules
+
 %:
 	dh $@