[med-svn] [gdpc] 01/05: Do not use the build architecture pkg-config

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository gdpc.

commit 32149381bb3d7c42e5da2015f1495c48e10e4fa9
Author: Andreas Tille <tille at debian.org>
Date:   Sat Dec 9 07:51:52 2017 +0100

    Do not use the build architecture pkg-config
---
 debian/changelog           |  8 ++++++++
 debian/patches/cross.patch | 17 +++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7d5cc29..303bf41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gdpc (2.2.5-7) UNRELEASED; urgency=medium
+
+  * Do not use the build architecture pkg-config (Thanks for the patch to
+    Helmut Grohne <helmut at subdivi.de>)
+    Closes: #883892
+
+ -- Andreas Tille <tille at debian.org>  Sat, 09 Dec 2017 07:50:26 +0100
+
 gdpc (2.2.5-6) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
new file mode 100644
index 0000000..aef4453
--- /dev/null
+++ b/debian/patches/cross.patch
@@ -0,0 +1,17 @@
+Author: Helmut Grohne <helmut at subdivi.de>
+Last-Update: Fri, 8 Dec 2017 22:40:28 +0100
+Bug-Debian: https://bugs.debian.org/883892
+Description: Enable cross building by using generic $(PKG_CONFIG)
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,7 @@
+ CC = gcc
+-FLAGS=$(CFLAGS) -g -Wall `pkg-config --cflags gtk+-2.0 gthread-2.0` -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+-LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` -lm
++PKG_CONFIG ?= pkg-config
++FLAGS=$(CFLAGS) -g -Wall `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0` -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
++LIBS=`$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` -lm
+ bindir ?= /usr/bin
+ 
+ .c.o:
diff --git a/debian/patches/series b/debian/patches/series
index 3131339..4120550 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 hardening.patch
 fix_segfault.patch
 spelling.patch
+cross.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdpc.git