Re: CVS commit: pkgsrc/fonts/harfbuzz

[Leonardo Taccari <iamleot%gmail.com@localhost>]

Leonardo Taccari writes:
> Can you reproduce it?
After giving a look to the ChangeLog it seems that these two commits can
affect this problem:

 commit 9a3b74884b2e41c7040611030f4336f13d18fd3e
 Author: Behdad Esfahbod <behdad%behdad.org@localhost>
 Date:   Sun Dec 28 17:27:39 2014 -0800
 
     Remove redundant check for FT_Face_GetCharVariantIndex
 
     We require FreeType >= 2.8.3.  This symbol was introduced earlier
     than that.
 
  configure.ac | 9 +--------
  src/hb-ft.cc | 2 --
  2 files changed, 1 insertion(+), 10 deletions(-)
 
 commit 1226b2e930aa456cc05bbe621c96f4286a95cff6
 Author: Behdad Esfahbod <behdad%behdad.org@localhost>
 Date:   Sun Dec 28 17:04:23 2014 -0800
 
     Fix FreeType version check
 
  configure.ac | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

FreeType >= 2.8.3 probably is an error (maybe 2.3.8?). However, the
configure.ac has changed and now it requests freetype2 >= 12.0.6... On
NetBSD-current we have:

 $ pkg-config --modversion freetype2
 9.20.3

In harfbuzz-0.37 the configure script looked for a freetype2 >= 2.3.8
and so everything worked.

Attached in this email there is a patch that fixes the harfbuzz-0.9.38
problem. It's a quick work-around and needs to be reviewed.


Ciao,
L.

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/harfbuzz/distinfo,v
retrieving revision 1.34
diff -u -r1.34 distinfo
--- distinfo    25 Jan 2015 18:50:15 -0000      1.34
+++ distinfo    26 Jan 2015 02:35:57 -0000
@@ -3,3 +3,4 @@
 SHA1 (harfbuzz-0.9.38.tar.bz2) = 00c24a228206a5646166630e02b542d7d3fb4544
 RMD160 (harfbuzz-0.9.38.tar.bz2) = 8c7dbb6836f8a529858f926366a63cd72a944c45
 Size (harfbuzz-0.9.38.tar.bz2) = 1177106 bytes
+SHA1 (patch-configure) = 2bb525b2ae1a95c1effe0f22f9a780b7f7db5089
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure     26 Jan 2015 02:35:57 -0000
@@ -0,0 +1,48 @@
+$NetBSD$
+
+--- configure.orig     2015-01-23 20:37:05.000000000 +0000
++++ configure
+@@ -18629,12 +18629,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 12.0.6\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "freetype2 >= 12.0.6") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 2.4.2\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "freetype2 >= 2.4.2") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 12.0.6" 2>/dev/null`
++  pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.4.2" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -18647,12 +18647,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 12.0.6\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "freetype2 >= 12.0.6") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 2.4.2\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "freetype2 >= 2.4.2") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 12.0.6" 2>/dev/null`
++  pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.4.2" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -18671,9 +18671,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-              FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "freetype2 >= 12.0.6"`
++              FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "freetype2 >= 2.4.2"`
+         else
+-              FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2 >= 12.0.6"`
++              FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2 >= 2.4.2"`
+         fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$FREETYPE_PKG_ERRORS" >&5