Source: zh-autoconvert Version: 0.3.16-4 Tags: patch User: [email protected] Usertags: rebootstrap
zh-autoconvert fails to cross build from source, because it uses the build architecture pkg-config and thus fails finding the host architecture gtk. Using a triplet-prefixed pkg-config makes cross builds succeed. Please consider applying the attached patch after stretch is released. Helmut
diff --minimal -Nru zh-autoconvert-0.3.16/debian/changelog zh-autoconvert-0.3.16/debian/changelog --- zh-autoconvert-0.3.16/debian/changelog 2015-11-18 00:47:38.000000000 +0100 +++ zh-autoconvert-0.3.16/debian/changelog 2017-02-01 20:05:27.000000000 +0100 @@ -1,3 +1,10 @@ +zh-autoconvert (0.3.16-4.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: Use a triplet-prefixed pkg-config. (Closes: #-1) + + -- Helmut Grohne <[email protected]> Wed, 01 Feb 2017 20:05:27 +0100 + zh-autoconvert (0.3.16-4) unstable; urgency=high * Set Debian Chinese Team as the new Maintainer, with diff --minimal -Nru zh-autoconvert-0.3.16/debian/patches/007-migrate-xchat-plugins-to-gtk2.patch zh-autoconvert-0.3.16/debian/patches/007-migrate-xchat-plugins-to-gtk2.patch --- zh-autoconvert-0.3.16/debian/patches/007-migrate-xchat-plugins-to-gtk2.patch 2015-11-17 22:40:44.000000000 +0100 +++ zh-autoconvert-0.3.16/debian/patches/007-migrate-xchat-plugins-to-gtk2.patch 2017-02-01 20:04:35.000000000 +0100 @@ -18,9 +18,9 @@ all:xchat-autogb.so xchat-autob5.so xchat-autogb.so: xchat-autogb.c - $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autogb.so -o $@ $< -lhz -lc `gtk-config --cflags` -+ $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autogb.so -o $@ $< -lhz -lc `pkg-config --cflags gtk+-2.0` ++ $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autogb.so -o $@ $< -lhz -lc `$(PKG_CONFIG) --cflags gtk+-2.0` xchat-autob5.so: xchat-autob5.c - $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autob5.so -o $@ $< -lhz -lc `gtk-config --cflags` -+ $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autob5.so -o $@ $< -lhz -lc `pkg-config --cflags gtk+-2.0` ++ $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autob5.so -o $@ $< -lhz -lc `$(PKG_CONFIG) --cflags gtk+-2.0` clean: rm -rf *~ xchat-autogb.so xchat-autob5.so diff --minimal -Nru zh-autoconvert-0.3.16/debian/patches/012-hardening.patch zh-autoconvert-0.3.16/debian/patches/012-hardening.patch --- zh-autoconvert-0.3.16/debian/patches/012-hardening.patch 2015-11-17 22:41:35.000000000 +0100 +++ zh-autoconvert-0.3.16/debian/patches/012-hardening.patch 2017-02-01 20:04:54.000000000 +0100 @@ -87,12 +87,12 @@ -all:xchat-autogb.so xchat-autob5.so xchat-autogb.so: xchat-autogb.c -- $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autogb.so -o $@ $< -lhz -lc `pkg-config --cflags gtk+-2.0` -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autogb.so -o $@ $< -lhz -lc `pkg-config --cflags gtk+-2.0` +- $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autogb.so -o $@ $< -lhz -lc `$(PKG_CONFIG) --cflags gtk+-2.0` ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autogb.so -o $@ $< -lhz -lc `$(PKG_CONFIG) --cflags gtk+-2.0` + xchat-autob5.so: xchat-autob5.c -- $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autob5.so -o $@ $< -lhz -lc `pkg-config --cflags gtk+-2.0` -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autob5.so -o $@ $< -lhz -lc `pkg-config --cflags gtk+-2.0` +- $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autob5.so -o $@ $< -lhz -lc `$(PKG_CONFIG) --cflags gtk+-2.0` ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autob5.so -o $@ $< -lhz -lc `$(PKG_CONFIG) --cflags gtk+-2.0` + clean: rm -rf *~ xchat-autogb.so xchat-autob5.so diff --minimal -Nru zh-autoconvert-0.3.16/debian/rules zh-autoconvert-0.3.16/debian/rules --- zh-autoconvert-0.3.16/debian/rules 2015-11-18 00:40:51.000000000 +0100 +++ zh-autoconvert-0.3.16/debian/rules 2017-02-01 20:05:24.000000000 +0100 @@ -1,4 +1,7 @@ #!/usr/bin/make -f +include /usr/share/dpkg/architecture.mk +export PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config + %: dh $@
