Control: tags 892444 + pending

Dear maintainer,

I've prepared an NMU for ttfautohint (versioned as 1.8.1-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.


-- 
 .''`.  https://info.comodo.priv.at -- Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
   `-   
diff -Nru ttfautohint-1.8.1/debian/changelog ttfautohint-1.8.1/debian/changelog
--- ttfautohint-1.8.1/debian/changelog	2018-01-14 16:47:21.000000000 +0100
+++ ttfautohint-1.8.1/debian/changelog	2018-12-01 16:17:20.000000000 +0100
@@ -1,3 +1,12 @@
+ttfautohint (1.8.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "Please use 'pkg-config' to find FreeType 2":
+    add patch from Hilko Bengen to use pkg-config in confiure.ac.
+    (Closes: #892444)
+
+ -- gregor herrmann <gre...@debian.org>  Sat, 01 Dec 2018 16:17:20 +0100
+
 ttfautohint (1.8.1-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru ttfautohint-1.8.1/debian/patches/series ttfautohint-1.8.1/debian/patches/series
--- ttfautohint-1.8.1/debian/patches/series	2018-01-14 13:50:30.000000000 +0100
+++ ttfautohint-1.8.1/debian/patches/series	2018-12-01 16:17:11.000000000 +0100
@@ -1 +1,2 @@
 fix-silent-compilation.patch
+use-pkg-config-for-freetype.patch
diff -Nru ttfautohint-1.8.1/debian/patches/use-pkg-config-for-freetype.patch ttfautohint-1.8.1/debian/patches/use-pkg-config-for-freetype.patch
--- ttfautohint-1.8.1/debian/patches/use-pkg-config-for-freetype.patch	1970-01-01 01:00:00.000000000 +0100
+++ ttfautohint-1.8.1/debian/patches/use-pkg-config-for-freetype.patch	2018-12-01 16:17:11.000000000 +0100
@@ -0,0 +1,106 @@
+Index: ttfautohint/configure.ac
+===================================================================
+--- ttfautohint.orig/configure.ac
++++ ttfautohint/configure.ac
+@@ -123,96 +123,16 @@ AC_ARG_WITH([doc],
+             [],
+             [with_doc=yes])
+ 
+-AC_ARG_WITH([freetype-config],
+-            [AS_HELP_STRING([--with-freetype-config=PROG],
+-                            [use FreeType configuration program PROG])],
+-            [freetype_config=$withval],
+-            [freetype_config=yes])
+-
+-if test "$freetype_config" = "yes"; then
+-  AC_PATH_TOOL(ft_config,
+-               freetype-config,
+-               no)
+-  if test "$ft_config" = "no"; then
+-    AC_MSG_ERROR([FreeType library is missing; see http://www.freetype.org/])
+-  fi
+-else
+-  ft_config="$freetype_config"
+-fi
+-
+-FREETYPE_CPPFLAGS="`$ft_config --cflags`"
+-FREETYPE_LIBS="`$ft_config --libtool`"
+-
+-# many platforms no longer install .la files for system libraries
+-if test ! -f "$FREETYPE_LIBS"; then
+-  FREETYPE_LIBS="`$ft_config --libs`"
+-fi
++PKG_CHECK_MODULES(
++        [FREETYPE],
++        [freetype2 >= 2.4.5],
++        [FREETYPE_CPPFLAGS="$FREETYPE_CFLAGS"],
++        [AC_MSG_ERROR([Can't find Freetype library])])
+ 
+ AC_SUBST([FREETYPE_CPPFLAGS])
+ AC_SUBST([FREETYPE_LIBS])
+ 
+ 
+-AC_MSG_CHECKING([whether FreeType header files are version 2.4.5 or higher])
+-old_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS=$FREETYPE_CPPFLAGS
+-AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
+-
+-#include <ft2build.h>
+-#include FT_FREETYPE_H
+-#if (FREETYPE_MAJOR*1000 + FREETYPE_MINOR)*1000 + FREETYPE_PATCH < 2004005
+-#error Freetype version too low.
+-#endif
+-
+-]])],
+-[AC_MSG_RESULT(yes)
+- CPPFLAGS="$old_CPPFLAGS"],
+-[AC_MSG_ERROR([Need FreeType version 2.4.5 or higher])])
+-
+-
+-AC_MSG_CHECKING([whether FreeType library is version 2.4.5 or higher])
+-old_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS=$FREETYPE_CPPFLAGS
+-old_LIBS="$LIBS"
+-LIBS=$FREETYPE_LIBS
+-AC_LANG_PUSH([LTLIZED C])
+-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-
+-#include <stdlib.h>
+-#include <ft2build.h>
+-#include FT_FREETYPE_H
+-
+-int
+-main()
+-{
+-  FT_Error error;
+-  FT_Library library;
+-  FT_Int major, minor, patch;
+-
+-  error = FT_Init_FreeType(&library);
+-  if (error)
+-  {
+-    printf("(test program reports error code %d)... ", error);
+-    exit(EXIT_FAILURE);
+-  }
+-
+-  FT_Library_Version(library, &major, &minor, &patch);
+-
+-  printf("(found %d.%d.%d)... ", major, minor, patch);
+-
+-  if (((major*1000 + minor)*1000 + patch) >= 2004005)
+-    exit(EXIT_SUCCESS);
+-  exit(EXIT_FAILURE);
+-}
+-
+-]])],
+-[AC_MSG_RESULT(yes)
+- CPPFLAGS="$old_CPPFLAGS"
+- LIBS="$old_LIBS"],
+-[AC_MSG_ERROR([Need FreeType version 2.4.5 or higher])],
+-[AC_MSG_RESULT([skipped due to cross-compilation])])
+-AC_LANG_POP
+-
+-
+ if test $cross_compiling = no; then
+   AM_MISSING_PROG(HELP2MAN, help2man)
+ else

Attachment: signature.asc
Description: Digital Signature

Reply via email to