Package: liblangtag
Version: 0.4.0-5
Severity: serious
Tags: patch
Justification: fails to build from source (but built successfully in the past)

Building with experimental gobject-introspection results in the following build
errors:
  cc: error: unrecognized command line option '--symbol-prefix=lt'
  cc: error: unrecognized command line option '--identifier-prefix=Lt'

Passing the flags meant for the g-ir-scanner using SCANNERFLAGS instead of
CFLAG fixes this.

Debdiff attached which solves the issue (note the root Makefile.am change was
done to make autoreconf work..)

-- System Information:
Debian Release: 7.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (101, 
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru liblangtag-0.4.0/debian/changelog liblangtag-0.4.0/debian/changelog
--- liblangtag-0.4.0/debian/changelog	2013-01-09 19:40:58.000000000 +0100
+++ liblangtag-0.4.0/debian/changelog	2013-04-02 10:47:27.000000000 +0200
@@ -1,3 +1,9 @@
+liblangtag (0.4.0-6) UNRELEASED; urgency=low
+
+  * Fix build with new gobject-introspection
+
+ -- Sjoerd Simons <sjoerd.sim...@collabora.co.uk>  Tue, 02 Apr 2013 10:47:07 +0200
+
 liblangtag (0.4.0-5) experimental; urgency=low
 
   * make doc build into override_dh_auto_build-indep target
diff -Nru liblangtag-0.4.0/debian/control liblangtag-0.4.0/debian/control
--- liblangtag-0.4.0/debian/control	2013-01-09 19:37:08.000000000 +0100
+++ liblangtag-0.4.0/debian/control	2013-04-02 10:47:38.000000000 +0200
@@ -1,7 +1,7 @@
 Source: liblangtag
 Priority: optional
 Maintainer: Rene Engelhard <r...@debian.org>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, pkg-config, libxml2-dev, libglib2.0-dev, check, libgirepository1.0-dev, gobject-introspection, libtool, locales
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, pkg-config, libxml2-dev, libglib2.0-dev, check, libgirepository1.0-dev, gobject-introspection, libtool, locales, dh-autoreconf
 Build-Depends-Indep: gtk-doc-tools
 Build-Conflicts: locales-all
 Standards-Version: 3.9.2
diff -Nru liblangtag-0.4.0/debian/patches/fix-build-with-g-i-1.36.patch liblangtag-0.4.0/debian/patches/fix-build-with-g-i-1.36.patch
--- liblangtag-0.4.0/debian/patches/fix-build-with-g-i-1.36.patch	1970-01-01 01:00:00.000000000 +0100
+++ liblangtag-0.4.0/debian/patches/fix-build-with-g-i-1.36.patch	2013-04-02 10:48:57.000000000 +0200
@@ -0,0 +1,24 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,9 +8,7 @@
+ #SUBDIRS += docs tests
+ SUBDIRS += tests
+ 
+-ACLOCAL_AMFLAGS =			\
+-	-I m4macros			\
+-	$(NULL)
++ACLOCAL_AMFLAGS = -I m4macros
+ 
+ CONFIGURE_DEPENDENCIES =		\
+ 	requires			\
+--- a/liblangtag-gobject/Makefile.am
++++ b/liblangtag-gobject/Makefile.am
+@@ -171,6 +171,8 @@
+ 	$(NULL)
+ LangTag_0_4_gir_CFLAGS =		\
+ 	$(INCLUDES)			\
++	$(NULL)
++LangTag_0_4_gir_SCANNERFLAGS =		\
+ 	--symbol-prefix=lt		\
+ 	--identifier-prefix=Lt		\
+ 	-v				\
diff -Nru liblangtag-0.4.0/debian/patches/series liblangtag-0.4.0/debian/patches/series
--- liblangtag-0.4.0/debian/patches/series	2012-11-21 22:56:00.000000000 +0100
+++ liblangtag-0.4.0/debian/patches/series	2013-04-02 10:47:57.000000000 +0200
@@ -1,2 +1,3 @@
 no_encoding.diff
 liblangtag-ppc.diff
+fix-build-with-g-i-1.36.patch
diff -Nru liblangtag-0.4.0/debian/rules liblangtag-0.4.0/debian/rules
--- liblangtag-0.4.0/debian/rules	2013-01-09 19:38:14.000000000 +0100
+++ liblangtag-0.4.0/debian/rules	2013-04-02 10:49:42.000000000 +0200
@@ -24,7 +24,7 @@
 	dh_auto_clean
 
 %:
-	dh $@  --with autotools-dev --with gir
+	dh $@  --with autotools-dev --with gir --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CONFIGURE_FLAGS)

Reply via email to