CVS commit: pkgsrc/fonts/fontconfig

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Mar 24 17:08:31 UTC 2018

Modified Files:
        pkgsrc/fonts/fontconfig: distinfo
        pkgsrc/fonts/fontconfig/patches: patch-configure

Log Message:
Don't detect "GNU" gettext, but any reasonable libintl implementation.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/fontconfig/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/fontconfig/distinfo
diff -u pkgsrc/fonts/fontconfig/distinfo:1.64 pkgsrc/fonts/fontconfig/distinfo:1.65
--- pkgsrc/fonts/fontconfig/distinfo:1.64       Mon Mar 12 11:28:08 2018
+++ pkgsrc/fonts/fontconfig/distinfo    Sat Mar 24 17:08:31 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2018/03/12 11:28:08 adam Exp $
+$NetBSD: distinfo,v 1.65 2018/03/24 17:08:31 joerg Exp $
 
 SHA1 (fontconfig-2.13.0.tar.bz2) = b7bcc5d47211b7bbac35bb221860407db3601f5b
 RMD160 (fontconfig-2.13.0.tar.bz2) = cbc9a9b34f10b72e09d425557b156cf46c675a05
@@ -7,7 +7,7 @@ Size (fontconfig-2.13.0.tar.bz2) = 17005
 SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12
 SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803
 SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
-SHA1 (patch-configure) = a3c85915a4f08ee32afc74467cfba22e3abbc6b4
+SHA1 (patch-configure) = 803ef86268883ea55fd08bd86710ea258e1c1488
 SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
 SHA1 (patch-src_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a
 SHA1 (patch-src_fcfreetype.c) = 42542ae666b292af700313ee103d0f295cf69e4e

Index: pkgsrc/fonts/fontconfig/patches/patch-configure
diff -u pkgsrc/fonts/fontconfig/patches/patch-configure:1.3 pkgsrc/fonts/fontconfig/patches/patch-configure:1.4
--- pkgsrc/fonts/fontconfig/patches/patch-configure:1.3 Mon Mar 12 11:28:08 2018
+++ pkgsrc/fonts/fontconfig/patches/patch-configure     Sat Mar 24 17:08:31 2018
@@ -1,7 +1,9 @@
-$NetBSD: patch-configure,v 1.3 2018/03/12 11:28:08 adam Exp $
+$NetBSD: patch-configure,v 1.4 2018/03/24 17:08:31 joerg Exp $
 
 Do not look for libuuid on Darwin, it is built-in.
 
+Patch "GNU" gettext support to not depend unnecessary on "GNU" gettext.
+
 --- configure.orig     2018-03-06 03:31:59.000000000 +0000
 +++ configure
 @@ -13295,8 +13295,12 @@ case "$host" in
@@ -17,7 +19,27 @@ Do not look for libuuid on Darwin, it is
  esac
   if test "$os_win32" = "yes"; then
    OS_WIN32_TRUE=
-@@ -15891,6 +15895,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
+@@ -15227,8 +15231,7 @@ extern
+ #ifdef __cplusplus
+ "C"
+ #endif
+-const char *_nl_expand_alias (const char *);
+-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
++#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *bindtextdomain ("", ""))
+ #else
+ #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+ #endif
+@@ -15264,8 +15267,7 @@ extern
+ #ifdef __cplusplus
+ "C"
+ #endif
+-const char *_nl_expand_alias (const char *);
+-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
++#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *bindtextdomain ("", ""))
+ #else
+ #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+ #endif
+@@ -15891,6 +15893,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
  $as_echo "$as_me: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&2;}
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -28,7 +50,7 @@ Do not look for libuuid on Darwin, it is
  fi
  CXXFLAGS="$old_CXXFLAGS"
  CPPFLAGS="$old_CPPFLAGS"
-@@ -15919,6 +15927,9 @@ if test "_$ac_cv_header_stdint_t" = "_" 
+@@ -15919,6 +15925,9 @@ if test "_$ac_cv_header_stdint_t" = "_" 
  
  inttype_headers=`echo  | sed -e 's/,/ /g'`
  
@@ -38,7 +60,7 @@ Do not look for libuuid on Darwin, it is
  ac_cv_stdint_result="(no helpful system typedefs seen)"
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5
-@@ -17187,7 +17198,7 @@ CFLAGS="$fontconfig_save_cflags"
+@@ -17187,7 +17196,7 @@ CFLAGS="$fontconfig_save_cflags"
  #
  # Check for uuid
  #