control: user debian-rele...@lists.debian.org control: usertags -1 + bsp-2018-10-de-karlsruhe control: tag -1 patch
Dear maintainer, greetings from the BSP in Karlsruhe. Here's a a patch that teaches the autoconf-based buildsystem to detect freetype2 through pkg-config. I have NMU'd a fixed package to DELAYED/15; feel free to reschedule or cancel my upload as you see fit. Cheers, -Hilko
>From b3573dbdc0a153c29d130df53845572196282a5e Mon Sep 17 00:00:00 2001 From: Hilko Bengen <ben...@debian.org> Date: Sat, 27 Oct 2018 12:11:03 +0200 Subject: [PATCH 1/2] Add patch to detect freetype2 via pkg-config (Closes: #892353) --- ...012-Use-pkg-config-to-find-freetype2.patch | 36 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 37 insertions(+) create mode 100644 debian/patches/0012-Use-pkg-config-to-find-freetype2.patch diff --git a/debian/patches/0012-Use-pkg-config-to-find-freetype2.patch b/debian/patches/0012-Use-pkg-config-to-find-freetype2.patch new file mode 100644 index 0000000..2cd1b1b --- /dev/null +++ b/debian/patches/0012-Use-pkg-config-to-find-freetype2.patch @@ -0,0 +1,36 @@ +From: Hilko Bengen <ben...@debian.org> +Date: Sat, 27 Oct 2018 12:10:03 +0200 +Subject: Use pkg-config to find freetype2 + +--- + m4/kpse-freetype2-flags.m4 | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/m4/kpse-freetype2-flags.m4 b/m4/kpse-freetype2-flags.m4 +index c00b24a..bf9b01b 100644 +--- a/m4/kpse-freetype2-flags.m4 ++++ b/m4/kpse-freetype2-flags.m4 +@@ -27,11 +27,16 @@ AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freety + # --------------------------- + AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl + AC_REQUIRE([AC_CANONICAL_HOST])[]dnl +-AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +- AC_MSG_ERROR([did not find freetype-config required for system freetype2 library]) +-fi ++PKG_CHECK_MODULES([FREETYPE2], [freetype2], ++ [FREETYPE2_INCLUDES="$FREETYPE2_CFLAGS"], ++ [ ++ AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl ++ AS_IF([$FT2_CONFIG --ftversion >/dev/null 2>&1], ++ [ ++ FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` ++ FREETYPE2_LIBS=`$FT2_CONFIG --libs` ++ ], ++ [test "x$need_freetype2:$with_system_freetype2" = xyes:yes], ++ [AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])]) ++ ]) + ]) # KPSE_FREETYPE2_SYSTEM_FLAGS diff --git a/debian/patches/series b/debian/patches/series index 9b12276..c64c5fa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ 0009-Typo-fixed.patch 0010-Remove-FSSTND-dir-in-manual-page.patch 0011-Suppress-hyperref-warning.patch +0012-Use-pkg-config-to-find-freetype2.patch -- 2.19.1
>From 98078f048917ffd5d005d70a9cf56ccd2bb601de Mon Sep 17 00:00:00 2001 From: Hilko Bengen <ben...@debian.org> Date: Sat, 27 Oct 2018 10:11:58 +0000 Subject: [PATCH 2/2] Debian release --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2c714e1..b1ca490 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xdvik-ja (22.87.03+j1.42-1.1) unstable; urgency=medium + + * Non-maintainer upload + * Add patch to detect freetype2 via pkg-config (Closes: #892353) + + -- Hilko Bengen <ben...@debian.org> Sat, 27 Oct 2018 12:11:38 +0200 + xdvik-ja (22.87.03+j1.42-1) unstable; urgency=medium * Add debian/watch: use SourceForge as upstream -- 2.19.1
