Control: tags 916129 + patch
Control: tags 916129 + pending
Dear maintainer,
I've prepared an NMU for zita-rev1 (versioned as 0.2.1-5.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru zita-rev1-0.2.1/debian/changelog zita-rev1-0.2.1/debian/changelog
--- zita-rev1-0.2.1/debian/changelog 2016-12-27 17:29:59.000000000 +0200
+++ zita-rev1-0.2.1/debian/changelog 2019-01-11 13:19:52.000000000 +0200
@@ -1,3 +1,11 @@
+zita-rev1 (0.2.1-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix build without freetype-config and add a direct
+ build dependency on libfreetype6-dev. (Closes: #916129)
+
+ -- Adrian Bunk <b...@debian.org> Fri, 11 Jan 2019 13:19:52 +0200
+
zita-rev1 (0.2.1-5) unstable; urgency=medium
* Set dh/compat 10.
diff -Nru zita-rev1-0.2.1/debian/control zita-rev1-0.2.1/debian/control
--- zita-rev1-0.2.1/debian/control 2016-12-27 17:28:43.000000000 +0200
+++ zita-rev1-0.2.1/debian/control 2019-01-11 13:19:52.000000000 +0200
@@ -8,6 +8,7 @@
Build-Depends:
debhelper (>= 10),
libcairo2-dev,
+ libfreetype6-dev,
libclthreads-dev (>= 2.4.0),
libclxclient-dev (>= 3.9.0),
libjack-dev,
diff -Nru zita-rev1-0.2.1/debian/patches/no-freetype-config.patch zita-rev1-0.2.1/debian/patches/no-freetype-config.patch
--- zita-rev1-0.2.1/debian/patches/no-freetype-config.patch 1970-01-01 02:00:00.000000000 +0200
+++ zita-rev1-0.2.1/debian/patches/no-freetype-config.patch 2019-01-11 13:19:52.000000000 +0200
@@ -0,0 +1,15 @@
+Description: freetype-config was removed, use pkg-config instead.
+Author: Adrian Bunk <b...@debian.org>
+Bug-Debian: https://bugs.debian.org/916129
+
+--- zita-rev1-0.2.1.orig/source/Makefile
++++ zita-rev1-0.2.1/source/Makefile
+@@ -30,7 +30,7 @@ CPPFLAGS += -O2 -ffast-math -Wall -MMD -
+ all: zita-rev1
+
+ ZITA-REV1_O = zita-rev1.o styles.o jclient.o mainwin.o png2img.o guiclass.o rotary.o reverb.o pareq.o
+-zita-rev1: CPPFLAGS += -I/usr/X11R6/include `freetype-config --cflags`
++zita-rev1: CPPFLAGS += -I/usr/X11R6/include `pkg-config --cflags freetype2`
+ zita-rev1: LDLIBS += -lcairo -lclxclient -lclthreads -ljack -lpng -lXft -lX11 -lrt
+ zita-rev1: LDFLAGS += -pthread
+ zita-rev1: LDFLAGS += -L/usr/X11R6/lib
diff -Nru zita-rev1-0.2.1/debian/patches/series zita-rev1-0.2.1/debian/patches/series
--- zita-rev1-0.2.1/debian/patches/series 2013-08-12 23:56:40.000000000 +0300
+++ zita-rev1-0.2.1/debian/patches/series 2019-01-11 13:19:52.000000000 +0200
@@ -1 +1,2 @@
0001-makefile.patch
+no-freetype-config.patch
