[pkgsrc/trunk]: pkgsrc/devel/glib2 glib2: Update workaround for older Darwin ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/543a0b48b7ba
branches:  trunk
changeset: 311120:543a0b48b7ba
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Aug 01 17:43:25 2018 +0000

description:
glib2: Update workaround for older Darwin releases.

diffstat:

 devel/glib2/Makefile.common  |  23 +----------------------
 devel/glib2/distinfo         |   4 ++--
 devel/glib2/patches/patch-aa |  40 ++++++++++++++++++++++++++++++----------
 3 files changed, 33 insertions(+), 34 deletions(-)

diffs (163 lines):

diff -r 7f67dd334a6e -r 543a0b48b7ba devel/glib2/Makefile.common
--- a/devel/glib2/Makefile.common       Wed Aug 01 15:50:46 2018 +0000
+++ b/devel/glib2/Makefile.common       Wed Aug 01 17:43:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.64 2018/07/04 13:40:14 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.65 2018/08/01 17:43:25 jperkin Exp $
 #
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
@@ -65,27 +65,6 @@
 SUBST_MESSAGE.thr=     Fixing libgthread.
 .endif
 
-# glib-2.48.0 dropped support for OSX < 10.9.0 just to add notification
-# support, so we just disable that feature for older releases, and work
-# around some ObjC detection.
-.if !empty(MACHINE_PLATFORM:MDarwin-[0-9].*) || \
-    !empty(MACHINE_PLATFORM:MDarwin-1[012].*)
-SUBST_CLASSES+=                gcocoa
-SUBST_STAGE.gcocoa=    pre-configure
-SUBST_FILES.gcocoa=    configure
-SUBST_FILES.gcocoa+=   gio/Makefile.in gio/giomodule.c
-SUBST_SED.gcocoa=      -e 's,10.9.0,10.0.0,g'
-SUBST_SED.gcocoa+=     -e 's,gcocoanotificationbackend.c,,g'
-SUBST_SED.gcocoa+=     -e 's,gnextstepsettingsbackend.c,gnextstepsettingsbackend.m,g'
-SUBST_SED.gcocoa+=     -e '/gcocoanotificationbackend/d'
-SUBST_SED.gcocoa+=     -e '/g_type_ensure.*g_cocoa_notification/d'
-SUBST_SED.gcocoa+=     -e '/-xobjective-c/d'
-
-pre-configure:
-       ${MV} ${WRKSRC}/gio/gnextstepsettingsbackend.c \
-           ${WRKSRC}/gio/gnextstepsettingsbackend.m
-.endif
-
 .if !empty(MACHINE_PLATFORM:MDarwin-[56].*-*)
 CONFIGURE_ENV+=                gt_cv_c_wchar_t=no
 .endif
diff -r 7f67dd334a6e -r 543a0b48b7ba devel/glib2/distinfo
--- a/devel/glib2/distinfo      Wed Aug 01 15:50:46 2018 +0000
+++ b/devel/glib2/distinfo      Wed Aug 01 17:43:25 2018 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.233 2018/05/26 13:25:55 schmonz Exp $
+$NetBSD: distinfo,v 1.234 2018/08/01 17:43:25 jperkin Exp $
 
 SHA1 (glib-2.56.1.tar.xz) = 4db098c15b9d57c37bb504a6f58ebe717994e6f2
 RMD160 (glib-2.56.1.tar.xz) = da4e45bf52d28b610a71bed8b4331bfb0b5c8d56
 SHA512 (glib-2.56.1.tar.xz) = 7e96cc23f3fa42a41b1974ae8fa2a7b123449643f265763d464620afcb011668e2de013ed2a6e5f13b6bd1bf3ab8eab43c05bf4a8ee0d99b7808767ab4fa69f4
 Size (glib-2.56.1.tar.xz) = 8028716 bytes
 SHA1 (patch-Makefile.in) = 4d587eb9ff27ff2b3489c59388319142e2fb6ced
-SHA1 (patch-aa) = 938e6fb29a2190eaa65b929b986c2f73c46d15ae
+SHA1 (patch-aa) = 5aac049588b3f2cb63d86259cf9ebeed61081c52
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
diff -r 7f67dd334a6e -r 543a0b48b7ba devel/glib2/patches/patch-aa
--- a/devel/glib2/patches/patch-aa      Wed Aug 01 15:50:46 2018 +0000
+++ b/devel/glib2/patches/patch-aa      Wed Aug 01 17:43:25 2018 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.60 2017/10/13 15:35:10 prlw1 Exp $
+$NetBSD: patch-aa,v 1.61 2018/08/01 17:43:25 jperkin Exp $
 
 - solaris sun studio check and fix
 - use pkgsrc libtool
 - broken dlopen(NULL,0) detection and workaround
   http://bugzilla.gnome.org/show_bug.cgi?id=140329
 
---- configure.orig     2017-06-22 13:16:20.000000000 +0000
+--- configure.orig     2018-04-07 02:37:11.000000000 +0000
 +++ configure
 @@ -736,6 +736,7 @@ GIO
  GSPAWN
@@ -15,7 +15,27 @@
  G_MODULE_BROKEN_RTLD_GLOBAL
  G_MODULE_HAVE_DLERROR
  G_MODULE_LDFLAGS
-@@ -21652,6 +21653,8 @@ else
+@@ -5512,6 +5513,9 @@ $as_echo_n "checking for Mac OS X Carbon
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
++#error too old
++#endif
+ #include <Carbon/Carbon.h>
+ #include <CoreServices/CoreServices.h>
+ 
+@@ -5530,6 +5534,9 @@ $as_echo_n "checking for Mac OS X Cocoa 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
++#error too old
++#endif
+ #include <Cocoa/Cocoa.h>
+ #ifdef GNUSTEP_BASE_VERSION
+ #error "Detected GNUstep, not Cocoa"
+@@ -21597,6 +21604,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -24,7 +44,7 @@
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -22487,8 +22490,8 @@ else
+@@ -22524,8 +22533,8 @@ else
  fi
  
  
@@ -35,7 +55,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
-@@ -24302,16 +24305,48 @@ fi
+@@ -24521,16 +24530,48 @@ fi
  
  case $host in
    *-*-solaris* )
@@ -85,7 +105,7 @@
  esac
  
  if test "$ac_cv_func_statfs" = yes; then :
-@@ -25383,6 +25418,7 @@ else
+@@ -25692,6 +25733,7 @@ else
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -93,7 +113,7 @@
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -25508,9 +25544,9 @@ if  test "$G_MODULE_IMPL" = "G_MODULE_IM
+@@ -25817,9 +25859,9 @@ if  test "$G_MODULE_IMPL" = "G_MODULE_IM
        LIBS="$G_MODULE_LIBS $LIBS"
        LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
        echo "void glib_plugin_test(void) { }" > plugin.c
@@ -105,7 +125,7 @@
                ${LDFLAGS} -module -o plugin.la -export-dynamic \
                -shrext ".o" -avoid-version plugin.lo \
                -rpath /dont/care >/dev/null 2>&1
-@@ -25624,6 +25660,56 @@ fi
+@@ -25957,6 +25999,56 @@ fi
        LIBS="$LIBS_orig"
  
  fi
@@ -162,7 +182,7 @@
  if test -z "$G_MODULE_IMPL"; then
        G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -25658,6 +25744,7 @@ fi
+@@ -25989,6 +26081,7 @@ fi
  
  
  
@@ -170,7 +190,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
  $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -26727,62 +26814,8 @@ if  test x"$have_threads" = xposix; then
+@@ -27039,62 +27132,8 @@ if  test x"$have_threads" = xposix; then
        G_THREAD_LIBS="-lpthread -lthread"
        ;;
      *)