[Pkg-xfce-commits] r6569 - in desktop/trunk/thunar/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-04-01 11:59:35 +0000 (Sun, 01 Apr 2012)
New Revision: 6569

Added:
   desktop/trunk/thunar/debian/patches/02_fix-link-gmodule.patch
Modified:
   desktop/trunk/thunar/debian/changelog
   desktop/trunk/thunar/debian/control
   desktop/trunk/thunar/debian/patches/series
   desktop/trunk/thunar/debian/rules
Log:
* debian/patches/02_fix-link-gmodule.patch: added, explicitly link with
  gmodule, fix FTBFS.
* debian/control: b-dep on xfce4-dev-tools, libtool, automake, autoconf and
  gtk-doc-tools, needed by xdt-autogen.
* debian/rules: run xdt-autogen before configure, needed by the patch.

Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2012-04-01 11:44:53 UTC (rev 6568)
+++ desktop/trunk/thunar/debian/changelog	2012-04-01 11:59:35 UTC (rev 6569)
@@ -1,6 +1,11 @@
 thunar (1.2.3-4) UNRELEASED; urgency=low
 
   * debian/patches: add missing DEP3 headers.
+  * debian/patches/02_fix-link-gmodule.patch: added, explicitly link with
+    gmodule, fix FTBFS.
+  * debian/control: b-dep on xfce4-dev-tools, libtool, automake, autoconf and
+    gtk-doc-tools, needed by xdt-autogen.
+  * debian/rules: run xdt-autogen before configure, needed by the patch.
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 20 Feb 2012 21:43:03 +0100
 

Modified: desktop/trunk/thunar/debian/control
===================================================================
--- desktop/trunk/thunar/debian/control	2012-04-01 11:44:53 UTC (rev 6568)
+++ desktop/trunk/thunar/debian/control	2012-04-01 11:59:35 UTC (rev 6569)
@@ -8,7 +8,8 @@
  libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1), chrpath,
  libpcre3-dev, libjpeg-dev, libstartup-notification0-dev (>= 0.4), intltool,
  libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0), libnotify-dev, 
- libgudev-1.0-dev [linux-any], xfce4-panel-dev (>= 4.8.0), libtdb-dev
+ libgudev-1.0-dev [linux-any], xfce4-panel-dev (>= 4.8.0), libtdb-dev,
+ xfce4-dev-tools, libtool, automake, autoconf, gtk-doc-tools
 Standards-Version: 3.9.2
 Homepage: http://thunar.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/

Added: desktop/trunk/thunar/debian/patches/02_fix-link-gmodule.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/02_fix-link-gmodule.patch	                        (rev 0)
+++ desktop/trunk/thunar/debian/patches/02_fix-link-gmodule.patch	2012-04-01 11:59:35 UTC (rev 6569)
@@ -0,0 +1,32 @@
+Description: Explicitly link with gmodule
+Author; Lionel Le Folgoc <mrpouit at ubuntu.com>
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8467
+
+--- thunar-1.2.3.orig/configure.in
++++ thunar-1.2.3/configure.in
+@@ -150,6 +150,7 @@ dnl ***********************************
+ XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
+ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0])
+ XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0])
++XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.10.0])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
+ XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.14.0])
+--- thunar-1.2.3.orig/thunarx/Makefile.am
++++ thunar-1.2.3/thunarx/Makefile.am
+@@ -49,6 +49,7 @@ libthunarx_2_la_SOURCES =						\
+ libthunarx_2_la_CFLAGS =						\
+ 	$(GLIB_CFLAGS)							\
+ 	$(GIO_CFLAGS)							\
++	$(GMODULE_CFLAGS)						\
+ 	$(GTK_CFLAGS)							\
+ 	$(PLATFORM_CFLAGS)
+ 
+@@ -61,6 +62,7 @@ libthunarx_2_la_LDFLAGS =						\
+ libthunarx_2_la_LIBADD =						\
+ 	$(GLIB_LIBS)							\
+ 	$(GIO_LIBS)							\
++	$(GMODULE_LIBS)							\
+ 	$(GTK_LIBS)
+ 
+ pkgconfigdir = $(libdir)/pkgconfig

Modified: desktop/trunk/thunar/debian/patches/series
===================================================================
--- desktop/trunk/thunar/debian/patches/series	2012-04-01 11:44:53 UTC (rev 6568)
+++ desktop/trunk/thunar/debian/patches/series	2012-04-01 11:59:35 UTC (rev 6569)
@@ -1 +1,2 @@
 01_support-non-multiarch-modules.patch
+02_fix-link-gmodule.patch

Modified: desktop/trunk/thunar/debian/rules
===================================================================
--- desktop/trunk/thunar/debian/rules	2012-04-01 11:44:53 UTC (rev 6568)
+++ desktop/trunk/thunar/debian/rules	2012-04-01 11:59:35 UTC (rev 6569)
@@ -9,6 +9,7 @@
 	dh $@
 
 override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
 	dh_auto_configure -- --enable-dbus --enable-startup-notification --enable-apr-plugin \
     --enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin --enable-uca-plugin \
     --docdir=\$${prefix}/share/doc/thunar-data