CVS commit: pkgsrc/devel/glib2

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jun 18 13:05:14 UTC 2019

Modified Files:
        pkgsrc/devel/glib2: distinfo
        pkgsrc/devel/glib2/patches: patch-meson.build

Log Message:
glib2: Ensure libintl is pulled in on SunOS.

Fixes issue in packages that depend on glib2 where libintl was no longer an
explicit dependency as it was pre-meson.


To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/glib2/patches/patch-meson.build

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

Modified files:

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.246 pkgsrc/devel/glib2/distinfo:1.247
--- pkgsrc/devel/glib2/distinfo:1.246   Sun Jun 16 15:28:11 2019
+++ pkgsrc/devel/glib2/distinfo Tue Jun 18 13:05:14 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.246 2019/06/16 15:28:11 leot Exp $
+$NetBSD: distinfo,v 1.247 2019/06/18 13:05:14 jperkin Exp $
 
 SHA1 (glib-2.60.4.tar.xz) = f76ef7339fef5784d79520478110caa4c5054806
 RMD160 (glib-2.60.4.tar.xz) = e8520dd0da7c37e6bb18b24a3b3ec308a6fa6aa0
@@ -21,4 +21,4 @@ SHA1 (patch-gmodule_gmodule-win32.c) = 4
 SHA1 (patch-gmodule_gmodule.c) = 55c5f9d16e3517f3fdc04d40922f50d9c66b0b9a
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
 SHA1 (patch-gobject_meson.build) = 58ee162e44047bf20c66067fd3edbe98cc13af50
-SHA1 (patch-meson.build) = b2e1139f4606870b117fd6ff35d7832b35ea1126
+SHA1 (patch-meson.build) = ce24f19714f6d78d1be9ecd6802f6c25a086c8e8

Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.3 pkgsrc/devel/glib2/patches/patch-meson.build:1.4
--- pkgsrc/devel/glib2/patches/patch-meson.build:1.3    Mon Jun  3 23:09:29 2019
+++ pkgsrc/devel/glib2/patches/patch-meson.build        Tue Jun 18 13:05:14 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.3 2019/06/03 23:09:29 maya Exp $
+$NetBSD: patch-meson.build,v 1.4 2019/06/18 13:05:14 jperkin Exp $
 
 - Don't insist that python binary is called "python3".
   (Requires meson >= 0.50.0)
@@ -11,7 +11,7 @@ https://gitlab.gnome.org/GNOME/glib/merg
 - auto-detect GNU iconv, even if no arguments are passed.
   (by checking if iconv.h might in fact be a gnu one)
 
---- meson.build.orig   2019-05-03 13:43:28.000000000 +0000
+--- meson.build.orig   2019-06-10 17:47:20.000000000 +0000
 +++ meson.build
 @@ -1696,14 +1696,14 @@ else
    found_iconv = false
@@ -36,6 +36,15 @@ https://gitlab.gnome.org/GNOME/glib/merg
      endif
    elif iconv_opt == 'native'
      if cc.has_header_symbol('iconv.h', 'iconv_open')
+@@ -1785,7 +1785,7 @@ endif
+ # proxy-libintl subproject.
+ # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
+ # implementations. This could be extended if issues are found in some platforms.
+-if cc.has_function('ngettext')
++if cc.has_function('ngettext') and host_system != 'sunos'
+   libintl = []
+   have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
+ else
 @@ -1836,16 +1836,15 @@ if host_system != 'windows' and get_opti
    if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
      glib_conf.set('HAVE_SYS_XATTR_H', 1)