Source: ipe-tools
Version: 1:7.2.7.2-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
ipe-tools fails to cross build from source, because it does not pass
cross tools to make. The easiest way of doing so - using dh_auto_build -
almost makes ipe-tools cross buildable except for some hard coded
pkg-config invocations that need to be made substitutable. Please
consider applying the attached patch.
Helmut
diff --minimal -Nru ipe-tools-7.2.7.2/debian/changelog
ipe-tools-7.2.7.2/debian/changelog
--- ipe-tools-7.2.7.2/debian/changelog 2020-01-17 21:39:38.000000000 +0100
+++ ipe-tools-7.2.7.2/debian/changelog 2020-01-19 16:29:55.000000000 +0100
@@ -1,3 +1,12 @@
+ipe-tools (1:7.2.7.2-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Let dh_auto_build pass cross tools to make.
+ + cross.patch: Make pkg-config substitutable.
+
+ -- Helmut Grohne <hel...@subdivi.de> Sun, 19 Jan 2020 16:29:55 +0100
+
ipe-tools (1:7.2.7.2-2) unstable; urgency=medium
[ Steve Robbins ]
diff --minimal -Nru ipe-tools-7.2.7.2/debian/patches/cross.patch
ipe-tools-7.2.7.2/debian/patches/cross.patch
--- ipe-tools-7.2.7.2/debian/patches/cross.patch 1970-01-01
01:00:00.000000000 +0100
+++ ipe-tools-7.2.7.2/debian/patches/cross.patch 2020-01-19
16:29:55.000000000 +0100
@@ -0,0 +1,14 @@
+--- ipe-tools-7.2.7.2.orig/pdftoipe/Makefile
++++ ipe-tools-7.2.7.2/pdftoipe/Makefile
+@@ -16,8 +16,9 @@
+ LDFLAGS += -static
+ TARGET = pdftoipe.exe
+ else
+- POPPLER_CFLAGS ?= $(shell pkg-config --cflags poppler)
+- POPPLER_LIBS ?= $(shell pkg-config --libs poppler)
++ PKG_CONFIG ?= pkg-config
++ POPPLER_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags poppler)
++ POPPLER_LIBS ?= $(shell $(PKG_CONFIG) --libs poppler)
+ CPPFLAGS += $(POPPLER_CFLAGS)
+ LIBS += $(POPPLER_LIBS)
+ TARGET = pdftoipe
diff --minimal -Nru ipe-tools-7.2.7.2/debian/patches/series
ipe-tools-7.2.7.2/debian/patches/series
--- ipe-tools-7.2.7.2/debian/patches/series 2020-01-17 21:39:38.000000000
+0100
+++ ipe-tools-7.2.7.2/debian/patches/series 2020-01-19 16:29:55.000000000
+0100
@@ -1 +1,2 @@
0001-Upgrade-svgtoipe-for-python3.patch
+cross.patch
diff --minimal -Nru ipe-tools-7.2.7.2/debian/rules
ipe-tools-7.2.7.2/debian/rules
--- ipe-tools-7.2.7.2/debian/rules 2020-01-17 21:39:38.000000000 +0100
+++ ipe-tools-7.2.7.2/debian/rules 2020-01-19 16:29:52.000000000 +0100
@@ -6,9 +6,9 @@
dh $@ --with python3
override_dh_auto_build:
- $(MAKE) -C figtoipe
- $(MAKE) -C ipe5toxml
- $(MAKE) -C pdftoipe
+ dh_auto_build --sourcedirectory=figtoipe
+ dh_auto_build --sourcedirectory=ipe5toxml
+ dh_auto_build --sourcedirectory=pdftoipe
override_dh_install:
# svgtoipe has no Makefile and the script is called svgtoipe.py
