Source: fltk1.1
Version: 1.1.10-24
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
After fixing #892341, fltk1.1 uses the wrong pkg-config. The attached
patch fixes that up, but it still doesn't make fltk1.1 cross buildable.
It'll continue to fail running the fluid tool. Please consider applying
it nonetheless.
Helmut
diff --minimal -Nru fltk1.1-1.1.10/debian/changelog
fltk1.1-1.1.10/debian/changelog
--- fltk1.1-1.1.10/debian/changelog 2018-03-13 01:59:37.000000000 +0100
+++ fltk1.1-1.1.10/debian/changelog 2018-11-23 20:02:37.000000000 +0100
@@ -1,3 +1,10 @@
+fltk1.1 (1.1.10-25.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix usage of wrong pkg-config. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 23 Nov 2018 20:02:37 +0100
+
fltk1.1 (1.1.10-25) unstable; urgency=medium
* debian/rules (override_dh_auto_build-indep): Cover more subdirectories
diff --minimal -Nru fltk1.1-1.1.10/debian/rules fltk1.1-1.1.10/debian/rules
--- fltk1.1-1.1.10/debian/rules 2018-03-13 01:28:48.000000000 +0100
+++ fltk1.1-1.1.10/debian/rules 2018-11-23 20:02:35.000000000 +0100
@@ -10,8 +10,7 @@
XCFLAGS = -Wall -Wunused -Wno-format-y2k -fPIE -fno-strict-aliasing
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
libdir = /usr/lib/$(DEB_HOST_MULTIARCH)
GAMES = blocks checkers sudoku
EXTRA_MFLAGS = OPTIM="$(CFLAGS) $(XCFLAGS)" STRIP=@:
@@ -21,7 +20,7 @@
override_dh_auto_configure:
mv fltk.spec fltk.spec.saved
- dh_auto_configure -- FTCONFIG="/usr/bin/pkg-config freetype2" \
+ dh_auto_configure -- FTCONFIG="/usr/bin/$(DEB_HOST_GNU_TYPE)-pkg-config
freetype2" \
DSOFLAGS="$(filter-out -fPIE -pie,$(LDFLAGS))" \
--enable-shared --enable-threads --enable-xft \
--enable-xinerama --without-links --libdir=$(libdir) \
