Source: gkremldk
Version: 0.9.7-3
Tags: patch
User: [email protected]
Usertags: ftcbfs
gkremldk fails to cross build from source. It hard codes the build
architecture pkg-config in Makefile.in. The best way to use pkg-config
is PKG_CHECK_MODULES as that makes missing dependencies fail early (and
uses the correct pkg-config). It also installs with -s, which uses the
wrong strip, breaks DEB_BUILD_OPTIONS=notsrip (#437043) and generation
of -dbgsym packages. The attached patch fixes all of that. Please
consider applying it.
Helmut
diff -u gkremldk-0.9.7/Makefile.in gkremldk-0.9.7/Makefile.in
--- gkremldk-0.9.7/Makefile.in
+++ gkremldk-0.9.7/Makefile.in
@@ -1,13 +1,15 @@
LFLAGS = -shared -lpthread
CC = @CC@
+GTK_CFLAGS = @GTK_CFLAGS@
+INSTALL = install
INSTALLPATH = $(DESTDIR)/usr/lib/gkrellm2/plugins
all: gkremldk.so
gkremldk.o: mldonkeytools.o gkremldk.c
- $(CC) -Wall -fPIC `pkg-config gtk+-2.0 --cflags` -c gkremldk.c
+ $(CC) -Wall -fPIC $(GTK_CFLAGS) -c gkremldk.c
gkremldk.so: gkremldk.o
$(CC) -Wall -shared -lpthread -o gkremldk.so gkremldk.o
@@ -19 +21 @@
- install -c -s -m 644 gkremldk.so $(INSTALLPATH)
+ $(INSTALL) -c -s -m 644 gkremldk.so $(INSTALLPATH)
diff -u gkremldk-0.9.7/debian/changelog gkremldk-0.9.7/debian/changelog
--- gkremldk-0.9.7/debian/changelog
+++ gkremldk-0.9.7/debian/changelog
@@ -1,3 +1,12 @@
+gkremldk (0.9.7-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Use the correct pkg-config via PKG_CHECK_MODULES.
+ + Don't strip during make install.
+
+ -- Helmut Grohne <[email protected]> Thu, 30 May 2019 08:36:34 +0200
+
gkremldk (0.9.7-3) unstable; urgency=medium
* Fix maintainer email address
diff -u gkremldk-0.9.7/debian/rules gkremldk-0.9.7/debian/rules
--- gkremldk-0.9.7/debian/rules
+++ gkremldk-0.9.7/debian/rules
@@ -4,6 +4,9 @@
%:
dh $@
+override_dh_auto_install:
+ dh_auto_install -- INSTALL='install --strip-program=true'
+
override_dh_auto_clean:
dh_auto_clean $@
rm -rf Makefile config.h config.log config.status
only in patch2:
unchanged:
--- gkremldk-0.9.7.orig/configure.ac
+++ gkremldk-0.9.7/configure.ac
@@ -21,5 +21,7 @@
AC_FUNC_MALLOC
AC_CHECK_FUNCS([bzero gethostbyname socket strdup])
+PKG_CHECK_MODULES([GTK],[gtk+-2.0])
+
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
