Source: kwalletcli
Version: 3.02-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
kwalletcli fails to cross build from source, because it hard codes build
architecture build tools in a number of places. The attached patch fixes
all of them and makes kwalletcli cross buildable. Please consider
applying it.
Helmut
diff --minimal -Nru kwalletcli-3.02/debian/changelog
kwalletcli-3.02/debian/changelog
--- kwalletcli-3.02/debian/changelog 2019-01-05 11:48:02.000000000 +0100
+++ kwalletcli-3.02/debian/changelog 2019-02-12 21:22:46.000000000 +0100
@@ -1,3 +1,10 @@
+kwalletcli (3.02-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Seed tools from dpkg's buildtools.mk. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 12 Feb 2019 21:22:46 +0100
+
kwalletcli (3.02-1) unstable; urgency=medium
* New upstream release, compatible with recent GNU groff in sid
diff --minimal -Nru kwalletcli-3.02/debian/patches/cross.patch
kwalletcli-3.02/debian/patches/cross.patch
--- kwalletcli-3.02/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ kwalletcli-3.02/debian/patches/cross.patch 2019-02-12 21:22:46.000000000
+0100
@@ -0,0 +1,19 @@
+--- kwalletcli-3.02.orig/GNUmakefile
++++ kwalletcli-3.02/GNUmakefile
+@@ -47,7 +47,7 @@
+ LDADD+= -lkdeui -lkdecore -lQtCore
+ else
+ ifeq (${KDE_VER},5)
+-KDE_INCS?= $(shell pkg-config --cflags Qt5Gui) -I/usr/include/KF5/KI18n \
++KDE_INCS?= $(shell $(PKG_CONFIG) --cflags Qt5Gui) -I/usr/include/KF5/KI18n
\
+ -I/usr/include/KF5/KCoreAddons -I/usr/include/KF5/KWallet
+ SRCS+= kwif5.cc
+ OBJS+= kwif5.o
+@@ -62,6 +62,7 @@
+
+ CC?= gcc
+ CXX?= g++
++PKG_CONFIG?= pkg-config
+
+ CFLAGS?= -O2
+ CXXFLAGS?= ${CFLAGS}
diff --minimal -Nru kwalletcli-3.02/debian/patches/series
kwalletcli-3.02/debian/patches/series
--- kwalletcli-3.02/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ kwalletcli-3.02/debian/patches/series 2019-02-12 21:22:46.000000000
+0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru kwalletcli-3.02/debian/rules kwalletcli-3.02/debian/rules
--- kwalletcli-3.02/debian/rules 2019-01-05 11:39:09.000000000 +0100
+++ kwalletcli-3.02/debian/rules 2019-02-12 21:22:46.000000000 +0100
@@ -14,8 +14,10 @@
shellescape='$(subst ','\'',$(1))'
shellexport=$(1)=$(call shellescape,${$(1)})
+-include /usr/share/dpkg/buildtools.mk
CC?= gcc
CXX?= g++
+PKG_CONFIG?= pkg-config
EXTRA_CFLAGS= -Wall
EXTRA_CXXFLAGS= -Wall
EXTRA_LDFLAGS= -Wl,--as-needed
@@ -52,8 +54,8 @@
.build_done:
dh_testdir
- $(foreach i,CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS,$(call
shellexport,$i)); \
- export CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS; \
+ $(foreach i,CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS PKG_CONFIG,$(call
shellexport,$i)); \
+ export CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS PKG_CONFIG; \
exec ${MAKE_INVOCATION}
@:>$@
