neon: fix i18n detection on newer Xcode

See notroj/neon#66
fink · Sep 30, 2021 · 62f4b73 · 62f4b73
1 parent ee0bffa
commit 62f4b73
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/10.9-libcxx/stable/main/finkinfo/libs/neon27.info b/10.9-libcxx/stable/main/finkinfo/libs/neon27.info
@@ -30,7 +30,7 @@ Source-Checksum: SHA256(05c54bc115030c89e463a4fb28d3a3f8215879528ba5ca70d676d3d2
 
 # Patch Phase:
 PatchFile: %n.patch
-PatchFile-MD5: a0e0e829e13e43aae2b740696321efa4
+PatchFile-MD5: d760f0234ceecb65969857df15e4bffb
 PatchScript: <<
   patch -p1 < %{PatchFile}
   perl -pi -e 's/neon.mo/%n.mo/' Makefile.in

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/neon27.patch b/10.9-libcxx/stable/main/finkinfo/libs/neon27.patch
@@ -19,9 +19,20 @@ diff -ruN neon-0.32.1-orig/configure.ac neon-0.32.1/configure.ac
    ALLOW_INSTALL=memleak
  fi
 diff -ruN neon-0.32.1-orig/macros/neon.m4 neon-0.32.1/macros/neon.m4
---- neon-0.32.1-orig/macros/neon.m4	2021-09-20 14:17:44.000000000 -0500
-+++ neon-0.32.1/macros/neon.m4	2021-09-23 06:24:36.000000000 -0500
-@@ -460,7 +460,7 @@
+--- neon-0.32.1-orig/macros/neon.m4	2021-09-20 15:17:44.000000000 -0400
++++ neon-0.32.1/macros/neon.m4	2021-09-30 03:57:28.000000000 -0400
+@@ -376,6 +376,10 @@
+       ne__prologue="#include <sys/socket.h>"
+       ne__code="socket(0,0,0);"
+       ;;
++    bindtextdomain)
++      ne__prologue="#include <libintl.h>"
++      ne__code="bindtextdomain(\"\",\"\");"
++      ;;
+     *)
+       ne__prologue=""
+       ne__code="$1();"
+@@ -460,7 +464,7 @@
 
  if test "$ne_cv_os_uname" = "Darwin"; then
    CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
@@ -30,7 +41,7 @@ diff -ruN neon-0.32.1-orig/macros/neon.m4 neon-0.32.1/macros/neon.m4
    # poll has various issues in various Darwin releases
    if test x${ac_cv_func_poll+set} != xset; then
      ac_cv_func_poll=no
-@@ -1113,8 +1113,8 @@
+@@ -1113,8 +1117,8 @@
       KRB5_CONF_TOOL=pkgconf],
      [AC_PATH_PROG([KRB5_CONF_TOOL], krb5-config, none, $PATH:/usr/kerberos/bin)
       if test "x$KRB5_CONF_TOOL" != "xnone"; then