CVS commit: pkgsrc/devel/glib2

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/glib2
From: Frédéric Fauberteau <triaxx%netbsd.org@localhost>
Date: Sun, 29 Dec 2019 19:40:56 +0000

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Dec 29 19:40:56 UTC 2019

Modified Files:
        pkgsrc/devel/glib2: Makefile Makefile.common PLIST distinfo
        pkgsrc/devel/glib2/patches: patch-glib_gmain.c patch-glib_gtypes.h
            patch-glib_meson.build patch-glib_tests_hash.c
Added Files:
        pkgsrc/devel/glib2/patches: patch-glib_genviron.c patch-glib_gspawn.c

Log Message:
glib2: update to 2.62.4

pkgsrc changes:
---------------
  * Fix build on FreeBSD (PR 54752)

upstream changes:
-----------------
  * Apply recursion depth limits to variants in D-Bus messages (!1290)
  * Bugs fixed:
      o #1938 GDateTime doesn't support leap seconds
      o !1240 Backport !1233 “gdatetime: Handle leap seconds in ISO8601 dates” to glib-2-62
      o !1257 Backport !1232 “kqueue: Do not return early from _kqsub_cancel” to glib-2-62
      o !1266 Backport !1265 “build: don't check for protected visibility” to glib-2-62
      o !1276 Backport !1274 “trash portal: Don't follow symlinks” to glib-2-62
      o !1290 Backport !1201 “gdbusmessage: Limit recursion of variants in D-Bus messages” to glib-2-62


To generate a diff of this commit:
cvs rdiff -u -r1.265 -r1.266 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/devel/glib2/Makefile.common
cvs rdiff -u -r1.110 -r1.111 pkgsrc/devel/glib2/PLIST
cvs rdiff -u -r1.262 -r1.263 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/glib2/patches/patch-glib_genviron.c \
    pkgsrc/devel/glib2/patches/patch-glib_gspawn.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/glib2/patches/patch-glib_gmain.c \
    pkgsrc/devel/glib2/patches/patch-glib_gtypes.h
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/glib2/patches/patch-glib_meson.build
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/glib2/patches/patch-glib_tests_hash.c

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/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.265 pkgsrc/devel/glib2/Makefile:1.266
--- pkgsrc/devel/glib2/Makefile:1.265   Thu Nov 28 09:23:32 2019
+++ pkgsrc/devel/glib2/Makefile Sun Dec 29 19:40:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.265 2019/11/28 09:23:32 bsiegert Exp $
+# $NetBSD: Makefile,v 1.266 2019/12/29 19:40:56 triaxx Exp $
 
 .include "Makefile.common"
 
@@ -15,6 +15,7 @@ MAKE_ENV+=    LD_LIBRARY_PATH=${WRKSRC}/out
 
 CPPFLAGS.SunOS+=       -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
 LDFLAGS.SunOS+=                -liconv -lintl -lnsl -lsocket
+LDFLAGS.FreeBSD+=      -liconv
 
 REPLACE_PYTHON+=       gio/gio-querymodules-wrapper.py
 REPLACE_PYTHON+=       gio/tests/gengiotypefuncs.py

Index: pkgsrc/devel/glib2/Makefile.common
diff -u pkgsrc/devel/glib2/Makefile.common:1.76 pkgsrc/devel/glib2/Makefile.common:1.77
--- pkgsrc/devel/glib2/Makefile.common:1.76     Tue Nov 26 12:58:42 2019
+++ pkgsrc/devel/glib2/Makefile.common  Sun Dec 29 19:40:56 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.76 2019/11/26 12:58:42 wiz Exp $
+# $NetBSD: Makefile.common,v 1.77 2019/12/29 19:40:56 triaxx Exp $
 # used by devel/gdbus-codegen/Makefile
 # used by devel/glib2/Makefile
 # used by devel/glib2-tools/Makefile
 
-DISTNAME=      glib-2.62.3
+DISTNAME=      glib-2.62.4
 PKGNAME=       ${DISTNAME:S/glib/glib2/}
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/glib2/PLIST
diff -u pkgsrc/devel/glib2/PLIST:1.110 pkgsrc/devel/glib2/PLIST:1.111
--- pkgsrc/devel/glib2/PLIST:1.110      Tue Nov 26 12:58:42 2019
+++ pkgsrc/devel/glib2/PLIST    Sun Dec 29 19:40:56 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.110 2019/11/26 12:58:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.111 2019/12/29 19:40:56 triaxx Exp $
 ${PLIST.nococoa}bin/gapplication
 bin/gdbus
 bin/gio
@@ -282,19 +282,19 @@ ${PLIST.fam}lib/gio/modules/libgiofam.so
 lib/glib-2.0/include/glibconfig.h
 lib/libgio-2.0.so
 lib/libgio-2.0.so.0
-lib/libgio-2.0.so.0.6200.3
+lib/libgio-2.0.so.0.6200.4
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
-lib/libglib-2.0.so.0.6200.3
+lib/libglib-2.0.so.0.6200.4
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
-lib/libgmodule-2.0.so.0.6200.3
+lib/libgmodule-2.0.so.0.6200.4
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
-lib/libgobject-2.0.so.0.6200.3
+lib/libgobject-2.0.so.0.6200.4
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
-lib/libgthread-2.0.so.0.6200.3
+lib/libgthread-2.0.so.0.6200.4
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
@@ -306,8 +306,8 @@ lib/pkgconfig/gthread-2.0.pc
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6200.3-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6200.3-gdb.py
+share/gdb/auto-load/usr/pkg/lib/libglib-2.0.so.0.6200.4-gdb.py
+share/gdb/auto-load/usr/pkg/lib/libgobject-2.0.so.0.6200.4-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.262 pkgsrc/devel/glib2/distinfo:1.263
--- pkgsrc/devel/glib2/distinfo:1.262   Fri Dec  6 14:36:58 2019
+++ pkgsrc/devel/glib2/distinfo Sun Dec 29 19:40:56 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.262 2019/12/06 14:36:58 nros Exp $
+$NetBSD: distinfo,v 1.263 2019/12/29 19:40:56 triaxx Exp $
 
-SHA1 (glib-2.62.3.tar.xz) = a8970ea4a9fbaf3050172d63f17372ead2894798
-RMD160 (glib-2.62.3.tar.xz) = 1aca0cf7e3a64e18eeea3d928e15280062a06f55
-SHA512 (glib-2.62.3.tar.xz) = 359ccbb8809443b5ad0947dccafe2c06daa8e8a0dc643611d17f46bbc388305edc21aca0b550c01fe9180bb42d7291da19814dc4e5ac8df7798cafd7203560a7
-Size (glib-2.62.3.tar.xz) = 4684460 bytes
+SHA1 (glib-2.62.4.tar.xz) = f9a493c86f98482f13c6ed742c19487e6fa8f34b
+RMD160 (glib-2.62.4.tar.xz) = 4cac1bc54a690b007c859db2e9d65c33dc97395c
+SHA512 (glib-2.62.4.tar.xz) = d54411c664281bb6770f57e58c69ac28d1eb76802cb73e9a2bca94b9d5d62441d80cf78d19d1124dadddcce385d3dff3824c019dc00ed2b10af48a69006766fa
+Size (glib-2.62.4.tar.xz) = 4684768 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
 SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed
@@ -15,12 +15,14 @@ SHA1 (patch-gio_meson.build) = c2bda4943
 SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
 SHA1 (patch-glib_gatomic.c) = 875ad9c828dcf2add356d4988d14fb4f1985aef8
 SHA1 (patch-glib_gatomic.h) = 21294cac483c3379198283c54fe6e24af3e630b1
+SHA1 (patch-glib_genviron.c) = 7182f5ef2ebc7f17d8d4fb892e946c52c8c0ad1d
 SHA1 (patch-glib_glibconfig.h.in) = 1964b5fb15317e681dad426d4862e3f48c4274f7
 SHA1 (patch-glib_gmacros.h) = 641107ccb6b285c472ed6cb337e53e4764f8d6a8
-SHA1 (patch-glib_gmain.c) = b361e4f7fa285c1d9317468c2b1be390e8190e8b
-SHA1 (patch-glib_gtypes.h) = a659b770c55a8071a6e6afd8a9fccdf723e086e6
-SHA1 (patch-glib_meson.build) = bc429f6537c6dd5fa99137c35c0627a97d48a850
-SHA1 (patch-glib_tests_hash.c) = e928b22926ad917a7a201882a5105b25533554ae
+SHA1 (patch-glib_gmain.c) = 4c834b3cb35b1e64b77dfe15f4b3aa01d4d5daa1
+SHA1 (patch-glib_gspawn.c) = 17a6f1b38660123eafd6fb66966eb240dee26db7
+SHA1 (patch-glib_gtypes.h) = ad193e4a991a9df84b0c38f5464d58d8025ee44c
+SHA1 (patch-glib_meson.build) = cafd7c607407208408be46c44ce2f238a2b56fd2
+SHA1 (patch-glib_tests_hash.c) = bb1535fbd3910d45aa2f70bd6e188692e8d02358
 SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
 SHA1 (patch-glib_tests_meson.build) = d012ede92bd3202bde4e8fab9cf4c0ee9ca8d3d4
 SHA1 (patch-gmodule_gmodule-ar.c) = e382a0ada232e083d51cbede7f689a50ebeff4d8

Index: pkgsrc/devel/glib2/patches/patch-glib_gmain.c
diff -u pkgsrc/devel/glib2/patches/patch-glib_gmain.c:1.3 pkgsrc/devel/glib2/patches/patch-glib_gmain.c:1.4
--- pkgsrc/devel/glib2/patches/patch-glib_gmain.c:1.3   Tue Nov 26 10:27:09 2019
+++ pkgsrc/devel/glib2/patches/patch-glib_gmain.c       Sun Dec 29 19:40:56 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-glib_gmain.c,v 1.3 2019/11/26 10:27:09 jperkin Exp $
+$NetBSD: patch-glib_gmain.c,v 1.4 2019/12/29 19:40:56 triaxx Exp $
 
 Imported patch from the upstream Bugzilla:
 
@@ -7,7 +7,7 @@ Imported patch from the upstream Bugzill
 
 Tested on powerpc-apple-darwin9.
 
---- glib/gmain.c.orig  2019-10-21 17:18:40.000000000 +0000
+--- glib/gmain.c.orig  2019-12-19 16:33:15.000000000 +0000
 +++ glib/gmain.c
 @@ -2758,47 +2758,31 @@ g_get_monotonic_time (void)
  gint64
@@ -18,7 +18,12 @@ Tested on powerpc-apple-darwin9.
 +  guint64 val;
  
 -  if (timebase_info.denom == 0)
--    {
++  /* we get nanoseconds from mach_absolute_time() using timebase_info */
++  mach_timebase_info (&timebase_info);
++  val = mach_absolute_time();
++
++  if (timebase_info.numer != timebase_info.denom)
+     {
 -      /* This is a fraction that we must use to scale
 -       * mach_absolute_time() by in order to reach nanoseconds.
 -       *
@@ -27,20 +32,15 @@ Tested on powerpc-apple-darwin9.
 -       * picoseconds.  Try to deal nicely with that.
 -       */
 -      mach_timebase_info (&timebase_info);
-+  /* we get nanoseconds from mach_absolute_time() using timebase_info */
-+  mach_timebase_info (&timebase_info);
-+  val = mach_absolute_time();
++      guint64 t_high, t_low;
++      guint64 result_high, result_low;
  
 -      /* We actually want microseconds... */
 -      if (timebase_info.numer % 1000 == 0)
 -        timebase_info.numer /= 1000;
 -      else
 -        timebase_info.denom *= 1000;
-+  if (timebase_info.numer != timebase_info.denom)
-+    {
-+      guint64 t_high, t_low;
-+      guint64 result_high, result_low;
- 
+-
 -      /* We want to make the numer 1 to avoid having to multiply... */
 -      if (timebase_info.denom % timebase_info.numer == 0)
 -        {
Index: pkgsrc/devel/glib2/patches/patch-glib_gtypes.h
diff -u pkgsrc/devel/glib2/patches/patch-glib_gtypes.h:1.3 pkgsrc/devel/glib2/patches/patch-glib_gtypes.h:1.4
--- pkgsrc/devel/glib2/patches/patch-glib_gtypes.h:1.3  Tue Jun 25 16:08:55 2019
+++ pkgsrc/devel/glib2/patches/patch-glib_gtypes.h      Sun Dec 29 19:40:56 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-glib_gtypes.h,v 1.3 2019/06/25 16:08:55 schmonz Exp $
+$NetBSD: patch-glib_gtypes.h,v 1.4 2019/12/29 19:40:56 triaxx Exp $
 
 We insist on C99, so size_t exists => use it.
 PR pkg/54298
 Include <sys/types.h> for ssize_t definition on at least OS X 10.14.
 
---- glib/gtypes.h.orig 2019-06-10 17:47:20.000000000 +0000
+--- glib/gtypes.h.orig 2019-12-19 16:33:15.000000000 +0000
 +++ glib/gtypes.h
 @@ -32,6 +32,7 @@
  #include <glibconfig.h>
@@ -14,13 +14,13 @@ Include <sys/types.h> for ssize_t defini
  #include <time.h>
  
  G_BEGIN_DECLS
-@@ -57,6 +58,9 @@ typedef unsigned int    guint;
+@@ -56,6 +57,9 @@ typedef unsigned int    guint;
+ 
  typedef float   gfloat;
  typedef double  gdouble;
- 
++
 +typedef size_t  gsize;
 +typedef ssize_t gssize;
-+
+ 
  /* Define min and max constants for the fixed size numerical types */
  /**
-  * G_MININT8: (value -128)

Index: pkgsrc/devel/glib2/patches/patch-glib_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.6 pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.7
--- pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.6       Tue Nov 26 10:27:09 2019
+++ pkgsrc/devel/glib2/patches/patch-glib_meson.build   Sun Dec 29 19:40:56 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-glib_meson.build,v 1.6 2019/11/26 10:27:09 jperkin Exp $
+$NetBSD: patch-glib_meson.build,v 1.7 2019/12/29 19:40:56 triaxx Exp $
 
 - On Darwin, allow building without Cocoa.
 - Don't bother with gtester as it's slated for deprecation anyway:
   https://gitlab.gnome.org/GNOME/glib/issues/1441
 
---- glib/meson.build.orig      2019-10-21 17:18:40.000000000 +0000
+--- glib/meson.build.orig      2019-12-19 16:33:15.000000000 +0000
 +++ glib/meson.build
 @@ -316,7 +316,7 @@ else
    platform_deps = []
@@ -25,7 +25,7 @@ $NetBSD: patch-glib_meson.build,v 1.6 20
 -    c_args : ['-UG_DISABLE_ASSERT'],
 -    include_directories : configinc,
 -    dependencies : [libglib_dep])
--endif
+ endif
 -
 -report_conf = configuration_data()
 -report_conf.set('GLIB_VERSION', glib_version)
@@ -37,7 +37,6 @@ $NetBSD: patch-glib_meson.build,v 1.6 20
 -  configuration: report_conf,
 -  install_mode: 'rwxr-xr-x'
 -)
-+endif
  
  install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
  

Index: pkgsrc/devel/glib2/patches/patch-glib_tests_hash.c
diff -u pkgsrc/devel/glib2/patches/patch-glib_tests_hash.c:1.1 pkgsrc/devel/glib2/patches/patch-glib_tests_hash.c:1.2
--- pkgsrc/devel/glib2/patches/patch-glib_tests_hash.c:1.1      Fri Jun 21 20:21:00 2019
+++ pkgsrc/devel/glib2/patches/patch-glib_tests_hash.c  Sun Dec 29 19:40:56 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-glib_tests_hash.c,v 1.1 2019/06/21 20:21:00 prlw1 Exp $
+$NetBSD: patch-glib_tests_hash.c,v 1.2 2019/12/29 19:40:56 triaxx Exp $
 
 Revert GHashTable improvements
 https://gitlab.gnome.org/GNOME/glib/merge_requests/208
 
 to fix PR pkg/54310
 
---- glib/tests/hash.c.orig     2019-06-10 17:47:20.000000000 +0000
+--- glib/tests/hash.c.orig     2019-12-19 16:33:15.000000000 +0000
 +++ glib/tests/hash.c
 @@ -1353,9 +1353,6 @@ struct _GHashTable
    gint             nnodes;
@@ -17,7 +17,7 @@ to fix PR pkg/54310
    gpointer        *keys;
    guint           *hashes;
    gpointer        *values;
-@@ -1390,23 +1387,6 @@ count_keys (GHashTable *h, gint *unused,
+@@ -1390,23 +1387,6 @@ count_keys (GHashTable *h, gint *unused, gint *occupie
      }
  }
  
@@ -47,13 +47,13 @@ to fix PR pkg/54310
      {
 -      if (h->hashes[i] >= 2)
 +      if (h->hashes[i] < 2)
-+        {
+         {
+-          g_assert_cmpint (h->hashes[i], ==, h->hash_func (fetch_key_or_value (h->keys, i, h->have_big_keys)));
 +          g_assert (h->keys[i] == NULL);
 +          g_assert (h->values[i] == NULL);
 +        }
 +      else
-         {
--          g_assert_cmpint (h->hashes[i], ==, h->hash_func (fetch_key_or_value (h->keys, i, h->have_big_keys)));
++        {
 +          g_assert_cmpint (h->hashes[i], ==, h->hash_func (h->keys[i]));
          }
      }

Added files:

Index: pkgsrc/devel/glib2/patches/patch-glib_genviron.c
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-glib_genviron.c:1.1
--- /dev/null   Sun Dec 29 19:40:56 2019
+++ pkgsrc/devel/glib2/patches/patch-glib_genviron.c    Sun Dec 29 19:40:56 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-glib_genviron.c,v 1.1 2019/12/29 19:40:56 triaxx Exp $
+
+Avoid the build failure with Clang on FreeBSD (see PR 54752).
+Set environ as a weak symbol (thanks to Joerg).
+
+--- glib/genviron.c.orig       2019-12-19 16:33:15.000000000 +0000
++++ glib/genviron.c
+@@ -321,7 +321,11 @@ g_setenv (const gchar *variable,
+ /* According to the Single Unix Specification, environ is not
+  * in any system header, although unistd.h often declares it.
+  */
++#if defined(__FreeBSD__)
++extern __attribute__((__weak__)) char **environ;
++#else
+ extern char **environ;
++#endif
+ #endif
+ 
+ /**
Index: pkgsrc/devel/glib2/patches/patch-glib_gspawn.c
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-glib_gspawn.c:1.1
--- /dev/null   Sun Dec 29 19:40:56 2019
+++ pkgsrc/devel/glib2/patches/patch-glib_gspawn.c      Sun Dec 29 19:40:56 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-glib_gspawn.c,v 1.1 2019/12/29 19:40:56 triaxx Exp $
+
+Avoid the build failure with Clang on FreeBSD (see PR 54752).
+Set environ as a weak symbol (thanks to Joerg).
+
+--- glib/gspawn.c.orig 2019-12-19 16:33:15.000000000 +0000
++++ glib/gspawn.c
+@@ -85,7 +85,11 @@
+ #ifdef HAVE__NSGETENVIRON
+ #define environ (*_NSGetEnviron())
+ #else
++#if defined(__FreeBSD__)
++extern __attribute__((__weak__)) char **environ;
++#else
+ extern char **environ;
++#endif
+ #endif
+ 
+ #ifndef O_CLOEXEC

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel/gdbus-codegen
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/devel/gdbus-codegen
Indexes:

Home | Main Index | Thread Index | Old Index