Source: surf Version: 2.0-2 Tags: upstream patch User: [email protected] Usertags: rebootstrap
surf fails to cross build from source, because it hard codes usage of the build architecture pkg-config. After making it substitutable, debhelper's passing of the right PKG_CONFIG works and makes cross builds succeed. Please consider applying the attached patch. Helmut
diff --minimal -Nru surf-2.0/debian/changelog surf-2.0/debian/changelog --- surf-2.0/debian/changelog 2017-06-18 13:53:10.000000000 +0200 +++ surf-2.0/debian/changelog 2017-08-02 22:46:10.000000000 +0200 @@ -1,3 +1,10 @@ +surf (2.0-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: Add cross.patch (Closes: #-1). + + -- Helmut Grohne <[email protected]> Wed, 02 Aug 2017 22:46:10 +0200 + surf (2.0-2) unstable; urgency=low * Upload to unstable. diff --minimal -Nru surf-2.0/debian/patches/cross.patch surf-2.0/debian/patches/cross.patch --- surf-2.0/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100 +++ surf-2.0/debian/patches/cross.patch 2017-08-02 22:46:07.000000000 +0200 @@ -0,0 +1,20 @@ +From: Helmut Grohne <[email protected]> +Subject: make pkg-config substitutable for cross compilation + +Index: surf-2.0/config.mk +=================================================================== +--- surf-2.0.orig/config.mk ++++ surf-2.0/config.mk +@@ -11,8 +11,10 @@ + X11INC = /usr/X11R6/include + X11LIB = /usr/X11R6/lib + +-GTKINC = $(shell pkg-config --cflags gtk+-3.0 webkit2gtk-4.0) +-GTKLIB = $(shell pkg-config --libs gtk+-3.0 webkit2gtk-4.0) ++PKG_CONFIG ?= pkg-config ++ ++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 webkit2gtk-4.0) ++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 webkit2gtk-4.0) + + # includes and libs + INCS = -I. -I/usr/include -I${X11INC} ${GTKINC} diff --minimal -Nru surf-2.0/debian/patches/series surf-2.0/debian/patches/series --- surf-2.0/debian/patches/series 2017-04-14 20:23:45.000000000 +0200 +++ surf-2.0/debian/patches/series 2017-08-02 22:45:27.000000000 +0200 @@ -2,3 +2,4 @@ 2002_hardening_portability_fix.patch 2003_replace_st_with_stterm.patch strict_ssl.patch +cross.patch
