Hi,

On Wed, Oct 08, 2014 at 12:22:11PM +0200, Svante Signell wrote:
> The attached patch configure.in.patch
> solves the build problem, at least for linux, kfreebsd and hurd.
> Attached is a patch for debian/rules too. autoconf works (with
> warnings), putting dh_autoreconf there (or running autoreconf manually)
> does not work. Some work is needed to make autoreconf working if needed.

I can confirm Svante's patch is working; as far as I can tell from
http://sourceforge.net/p/xchat/svn/189/ this doesn't seem relevant on
GNU/*. The attached patch incorporates Svante's into quilt and calls
autoconf from debian/rules.

HTH,
  Sebastian
diff -urN xchat-2.8.8.old/debian/control xchat-2.8.8/debian/control
--- xchat-2.8.8.old/debian/control	2014-10-08 20:22:21.609183656 +0200
+++ xchat-2.8.8/debian/control	2014-10-08 20:35:45.460998064 +0200
@@ -4,7 +4,7 @@
 Maintainer: Davide Puricelli (evo) <e...@debian.org>
 Uploaders: Bart Martens <ba...@debian.org>
 Standards-Version: 3.8.4.0
-Build-Depends: debhelper (>= 5), bison, libssl-dev, libglib2.0-dev, libgtk2.0-dev (>= 2.0.6), libperl-dev, gettext (>= 0.10.37), libtool, zlib1g-dev, perl (>= 5.8), python-dev, tcl-dev, autotools-dev, libdbus-glib-1-dev, libgtkspell-dev, gconf2, dpkg-dev (>= 1.13.19), libsexy-dev, chrpath, imagemagick
+Build-Depends: debhelper (>= 5), bison, libssl-dev, libglib2.0-dev, libgtk2.0-dev (>= 2.0.6), libperl-dev, gettext (>= 0.10.37), libtool, zlib1g-dev, perl (>= 5.8), python-dev, tcl-dev, autotools-dev, libdbus-glib-1-dev, libgtkspell-dev, gconf2, dpkg-dev (>= 1.13.19), libsexy-dev, chrpath, imagemagick, autoconf
 Homepage: http://www.xchat.org/
 
 Package: xchat
diff -urN xchat-2.8.8.old/debian/patches/67_configure_with_gmodule.patch xchat-2.8.8/debian/patches/67_configure_with_gmodule.patch
--- xchat-2.8.8.old/debian/patches/67_configure_with_gmodule.patch	1970-01-01 01:00:00.000000000 +0100
+++ xchat-2.8.8/debian/patches/67_configure_with_gmodule.patch	2014-10-08 20:28:02.961012570 +0200
@@ -0,0 +1,17 @@
+Description: Don't strip -lgmodule-2.0 from RDYNAMIC_LIBS
+Author: Svante Signell <svante.sign...@gmail.com>
+Bug: 763855
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/configure.in
++++ b/configure.in
+@@ -445,8 +445,7 @@
+ 	if test "$have_dl" = yes; then
+ 		AC_DEFINE(USE_PLUGIN)
+ 		AC_PATH_PROG(pkgconfigpath, pkg-config)
+-		dnl we just need the -Wl,--export-dynamic, but not -lgmodule-2.0
+-		RDYNAMIC_FLAGS="`$pkgconfigpath gmodule-2.0 --libs | $sedpath 's/ -lgmodule-2.0//'`"
++		RDYNAMIC_FLAGS="`$pkgconfigpath gmodule-2.0 --libs`"
+ 		LIBS="$LIBS $RDYNAMIC_FLAGS"
+ 		if test "$LD" = ""; then
+ 			VS="`ld --help | grep version-script 2> /dev/null`"
diff -urN xchat-2.8.8.old/debian/patches/series xchat-2.8.8/debian/patches/series
--- xchat-2.8.8.old/debian/patches/series	2014-10-08 20:22:21.609183656 +0200
+++ xchat-2.8.8/debian/patches/series	2014-10-08 20:23:17.914135890 +0200
@@ -24,3 +24,4 @@
 64_save_pevents.patch
 65_save_sound.patch
 66_load_libnotify4.patch
+67_configure_with_gmodule.patch
diff -urN xchat-2.8.8.old/debian/rules xchat-2.8.8/debian/rules
--- xchat-2.8.8.old/debian/rules	2014-10-08 20:22:21.609183656 +0200
+++ xchat-2.8.8/debian/rules	2014-10-08 20:30:42.249007574 +0200
@@ -12,8 +12,10 @@
 configure-stamp:
 	[ -f config.sub.d-r-orig ] || cp -p config.sub config.sub.d-r-orig
 	[ -f config.guess.d-r-orig ] || cp -p config.guess config.guess.d-r-orig
+	[ -f configure.d-r-orig ] || cp -p configure configure.d-r-orig
 	cp -f /usr/share/misc/config.sub .
 	cp -f /usr/share/misc/config.guess .
+	autoconf
 	[ -f xchat.xpm ] || convert -resize 32x32 xchat.png xchat.xpm
 	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --datadir=/usr/share --sysconfdir=/etc --enable-python --enable-ipv6  \
 	--disable-mmx --enable-openssl --enable-tcl=/usr/lib \
@@ -36,6 +38,7 @@
 	[ ! -f Makefile ] || $(MAKE) distclean
 	[ ! -f config.sub.d-r-orig ] || mv config.sub.d-r-orig config.sub
 	[ ! -f config.guess.d-r-orig ] || mv config.guess.d-r-orig config.guess
+	[ ! -f configure.d-r-orig ] || mv configure.d-r-orig configure
 	rm -f xchat.xpm
 	rm -f config.log
 	rm -f xchat xchat-gnome

Attachment: signature.asc
Description: Digital signature

Reply via email to