pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/glib2 Update glib2 to 2.54.1

details:   https://anonhg.NetBSD.org/pkgsrc/rev/68c647bda668
branches:  trunk
changeset: 370205:68c647bda668
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Fri Oct 13 15:35:10 2017 +0000

description:
Update glib2 to 2.54.1

glib-genmarshal and glib-menums have been ported to python. To keep
glib2 a python-free zone, these have been moved with gdbus-codegen
to py-glib2-tools.

Packages needing one of those tools to build can include
devel/glib2/buildtools.mk

The licence has been changed from LGPLv2+ to LGPLv2.1+.

A full changelog is available at:
https://git.gnome.org/browse/glib/tree/NEWS?h=2.54.1

diffstat:

 devel/glib2/Makefile                          |   3 +-
 devel/glib2/Makefile.common                   |   7 ++-
 devel/glib2/PLIST                             |   8 +---
 devel/glib2/distinfo                          |  19 +++++++-----
 devel/glib2/patches/patch-Makefile.in         |  16 ++++++++++
 devel/glib2/patches/patch-aa                  |  42 +++++++-------------------
 devel/glib2/patches/patch-ah                  |  18 ++++++-----
 devel/glib2/patches/patch-ak                  |  39 +++++-------------------
 devel/glib2/patches/patch-gobject_Makefile.am |  14 +++++++++
 devel/glib2/patches/patch-gobject_Makefile.in |  14 +++++++++
 10 files changed, 93 insertions(+), 87 deletions(-)

diffs (truncated from 402 to 300 lines):

diff -r 80d92acbafd5 -r 68c647bda668 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Fri Oct 13 14:58:22 2017 +0000
+++ b/devel/glib2/Makefile      Fri Oct 13 15:35:10 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.235 2017/07/11 11:52:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.236 2017/10/13 15:35:10 prlw1 Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=           1
 CATEGORIES=            devel gnome
 
 COMMENT=               Some useful routines for C programming (glib2)
diff -r 80d92acbafd5 -r 68c647bda668 devel/glib2/Makefile.common
--- a/devel/glib2/Makefile.common       Fri Oct 13 14:58:22 2017 +0000
+++ b/devel/glib2/Makefile.common       Fri Oct 13 15:35:10 2017 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.common,v 1.56 2017/08/16 20:21:06 wiz Exp $
+# $NetBSD: Makefile.common,v 1.57 2017/10/13 15:35:10 prlw1 Exp $
 #
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
+# used by devel/py-glib2-tools/Makefile
 # used by sysutils/gio-fam/Makefile
 
 # When updating this package, please apply patch-ak to configure.in and
 # then run a matching version of autoconf to regen patch-aa.
-DISTNAME=      glib-2.52.3
+DISTNAME=      glib-2.54.1
 PKGNAME=       ${DISTNAME:S/glib/glib2/}
 CATEGORIES=    # empty; redefined in Makefile
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
@@ -15,7 +16,7 @@
 MAINTAINER=    prlw1%cam.ac.uk@localhost
 HOMEPAGE=      https://developer.gnome.org/glib/
 COMMENT=       # empty; redefined in Makefile
-LICENSE=       gnu-lgpl-v2
+LICENSE=       gnu-lgpl-v2.1
 
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake pkg-config
diff -r 80d92acbafd5 -r 68c647bda668 devel/glib2/PLIST
--- a/devel/glib2/PLIST Fri Oct 13 14:58:22 2017 +0000
+++ b/devel/glib2/PLIST Fri Oct 13 15:35:10 2017 +0000
@@ -1,13 +1,11 @@
-@comment $NetBSD: PLIST,v 1.93 2017/07/11 11:52:42 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.94 2017/10/13 15:35:10 prlw1 Exp $
 bin/gapplication
 bin/gdbus
 bin/gio
 bin/gio-querymodules
 bin/glib-compile-resources
 bin/glib-compile-schemas
-bin/glib-genmarshal
 bin/glib-gettextize
-bin/glib-mkenums
 bin/gobject-query
 bin/gresource
 bin/gsettings
@@ -292,8 +290,8 @@
 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.5200.3-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.5200.3-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.5400.1-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.5400.1-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py
diff -r 80d92acbafd5 -r 68c647bda668 devel/glib2/distinfo
--- a/devel/glib2/distinfo      Fri Oct 13 14:58:22 2017 +0000
+++ b/devel/glib2/distinfo      Fri Oct 13 15:35:10 2017 +0000
@@ -1,17 +1,18 @@
-$NetBSD: distinfo,v 1.222 2017/07/11 11:52:42 jperkin Exp $
+$NetBSD: distinfo,v 1.223 2017/10/13 15:35:10 prlw1 Exp $
 
-SHA1 (glib-2.52.3.tar.xz) = 9e31cce788d018894e6e0b1350263bc11b41cff8
-RMD160 (glib-2.52.3.tar.xz) = 367e119f257be876718ce135d768705f9f8a56b6
-SHA512 (glib-2.52.3.tar.xz) = a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
-Size (glib-2.52.3.tar.xz) = 7679972 bytes
-SHA1 (patch-aa) = d197ded7ca05c2e37396e6c6b185797bd9bb2821
+SHA1 (glib-2.54.1.tar.xz) = 3be679369c7134e05b188285154b00940370b109
+RMD160 (glib-2.54.1.tar.xz) = c14a2ab435e47d706a88d4d1efb1008216107abc
+SHA512 (glib-2.54.1.tar.xz) = 2971feede03540f5cd2b4bd60b0c3fcbd5ad95ba96d07f6e6d3f4a6b90c31555e52f3480b51976574642fd5ab99dd557061ee5db1a1855fc601297cd74a8f1a8
+Size (glib-2.54.1.tar.xz) = 7829104 bytes
+SHA1 (patch-Makefile.in) = 4d587eb9ff27ff2b3489c59388319142e2fb6ced
+SHA1 (patch-aa) = 938e6fb29a2190eaa65b929b986c2f73c46d15ae
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = 6da2f31b5052a9b1d02b9a87f47896be238a88bd
-SHA1 (patch-ah) = 2e23c228047d07769ef5b03b0ff636daa0435ee5
+SHA1 (patch-ah) = d523967c88fc06f46de1d7f2eb04be65db04ada2
 SHA1 (patch-aha) = ade66edd87a5e76a1256bd8bcdc9bc3dd614885c
-SHA1 (patch-ak) = edf116968bd3c787fea77787add7e0164b6f1ffb
+SHA1 (patch-ak) = a7dd9b100b05424a76476754c2ee9896b5ae6d26
 SHA1 (patch-al) = 4eb4e241488dabe254973f5ada92898af57cd0f5
 SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
 SHA1 (patch-an) = a1308a37f60c4bbbe4e8bc43ea9ae4a50bc09ce4
@@ -30,3 +31,5 @@
 SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511
 SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
 SHA1 (patch-glib_gtimezone.c) = d9686da52f171a073d80cfd9f80aa490088a00a3
+SHA1 (patch-gobject_Makefile.am) = 6eed6b57f5ff0aa0dfb623110b23a3ff78aa4e75
+SHA1 (patch-gobject_Makefile.in) = a4768ff7b0607a8a4dfbb2cff087a987b451fd18
diff -r 80d92acbafd5 -r 68c647bda668 devel/glib2/patches/patch-Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glib2/patches/patch-Makefile.in     Fri Oct 13 15:35:10 2017 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile.in,v 1.1 2017/10/13 15:35:10 prlw1 Exp $
+
+tests/gobject requires python to generate testmarshal.h so avoid
+tests directory.
+
+--- Makefile.in.orig   2017-10-13 13:38:33.856486834 +0000
++++ Makefile.in
+@@ -835,7 +835,7 @@ all_test_ltlibs = $(test_ltlibraries) $(
+ 
+ @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
+ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
++SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
+ DIST_SUBDIRS = $(SUBDIRS) build win32
+ bin_SCRIPTS = glib-gettextize
+ AM_CPPFLAGS = \
diff -r 80d92acbafd5 -r 68c647bda668 devel/glib2/patches/patch-aa
--- a/devel/glib2/patches/patch-aa      Fri Oct 13 14:58:22 2017 +0000
+++ b/devel/glib2/patches/patch-aa      Fri Oct 13 15:35:10 2017 +0000
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.59 2016/02/23 11:27:55 wiz Exp $
+$NetBSD: patch-aa,v 1.60 2017/10/13 15:35:10 prlw1 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
-- remove unnecessary executions of libtool from configure
-  https://bugzilla.gnome.org/show_bug.cgi?id=736710
 
---- configure.orig     2015-05-13 02:50:37.000000000 +0000
+--- configure.orig     2017-06-22 13:16:20.000000000 +0000
 +++ configure
-@@ -734,6 +734,7 @@ GIO
+@@ -736,6 +736,7 @@ GIO
  GSPAWN
  GLIB_DEBUG_FLAGS
  G_MODULE_NEED_USCORE
@@ -17,7 +15,7 @@
  G_MODULE_BROKEN_RTLD_GLOBAL
  G_MODULE_HAVE_DLERROR
  G_MODULE_LDFLAGS
-@@ -21012,6 +21013,8 @@ else
+@@ -21652,6 +21653,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -26,7 +24,7 @@
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -21979,8 +21982,8 @@ else
+@@ -22487,8 +22490,8 @@ else
  fi
  
  
@@ -37,7 +35,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
-@@ -23747,16 +23750,48 @@ fi
+@@ -24302,16 +24305,48 @@ fi
  
  case $host in
    *-*-solaris* )
@@ -87,12 +85,7 @@
  esac
  
  if test "$ac_cv_func_statfs" = yes; then :
-@@ -24824,10 +24859,11 @@ if test x"$glib_native_win32" = xyes; th
-     G_MODULE_LDFLAGS=
- else
-   export SED
--  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+  eval G_MODULE_LDFLAGS=$export_dynamic_flag_spec
+@@ -25383,6 +25418,7 @@ else
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -100,7 +93,7 @@
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -24953,13 +24989,12 @@ if  test "$G_MODULE_IMPL" = "G_MODULE_IM
+@@ -25508,9 +25544,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
@@ -112,11 +105,7 @@
                ${LDFLAGS} -module -o plugin.la -export-dynamic \
                -shrext ".o" -avoid-version plugin.lo \
                -rpath /dont/care >/dev/null 2>&1
--      eval `./libtool --config | grep ^objdir`
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTLD_GLOBAL brokenness" >&5
- $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; }
- if ${glib_cv_rtldglobal_broken+:} false; then :
-@@ -25069,6 +25104,56 @@ fi
+@@ -25624,6 +25660,56 @@ fi
        LIBS="$LIBS_orig"
  
  fi
@@ -173,16 +162,7 @@
  if test -z "$G_MODULE_IMPL"; then
        G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -25079,8 +25164,6 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the suffix of module shared libraries" >&5
- $as_echo_n "checking for the suffix of module shared libraries... " >&6; }
- export SED
--shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
--eval $shrext_cmds
- module=yes eval std_shrext=$shrext_cmds
- # chop the initial dot
- glib_gmodule_suffix=`echo $std_shrext | sed 's/^\.//'`
-@@ -25103,6 +25186,7 @@ fi
+@@ -25658,6 +25744,7 @@ fi
  
  
  
@@ -190,7 +170,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
  $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -26077,62 +26161,8 @@ if  test x"$have_threads" = xposix; then
+@@ -26727,62 +26814,8 @@ if  test x"$have_threads" = xposix; then
        G_THREAD_LIBS="-lpthread -lthread"
        ;;
      *)
diff -r 80d92acbafd5 -r 68c647bda668 devel/glib2/patches/patch-ah
--- a/devel/glib2/patches/patch-ah      Fri Oct 13 14:58:22 2017 +0000
+++ b/devel/glib2/patches/patch-ah      Fri Oct 13 15:35:10 2017 +0000
@@ -1,19 +1,21 @@
-$NetBSD: patch-ah,v 1.12 2013/12/08 13:08:59 prlw1 Exp $
+$NetBSD: patch-ah,v 1.13 2017/10/13 15:35:10 prlw1 Exp $
 
---- glib/gutils.c.orig 2013-04-15 21:27:24.000000000 +0000
+Set default search paths for pkgsrc.
+
+--- glib/gutils.c.orig 2017-08-15 20:27:00.000000000 +0000
 +++ glib/gutils.c
-@@ -2008,7 +2008,7 @@ g_get_system_data_dirs (void)
-       gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
+@@ -2017,7 +2017,7 @@ g_get_system_data_dirs (void)
  
+ #ifndef G_OS_WIN32
        if (!data_dirs || !data_dirs[0])
 -          data_dirs = "/usr/local/share/:/usr/share/";
 +          data_dirs = PREFIX "/share/";
  
        data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
- #endif
-@@ -2070,7 +2070,7 @@ g_get_system_config_dirs (void)
-       conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
- 
+ #else
+@@ -2093,7 +2093,7 @@ g_get_system_config_dirs (void)
+       }
+ #else
        if (!conf_dirs || !conf_dirs[0])
 -          conf_dirs = "/etc/xdg";
 +          conf_dirs = PKG_SYSCONFDIR "/xdg";
diff -r 80d92acbafd5 -r 68c647bda668 devel/glib2/patches/patch-ak
--- a/devel/glib2/patches/patch-ak      Fri Oct 13 14:58:22 2017 +0000
+++ b/devel/glib2/patches/patch-ak      Fri Oct 13 15:35:10 2017 +0000
@@ -1,15 +1,13 @@
-$NetBSD: patch-ak,v 1.19 2016/02/23 11:27:55 wiz Exp $
+$NetBSD: patch-ak,v 1.20 2017/10/13 15:35:10 prlw1 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
-- remove unnecessary executions of libtool from configure
-  https://bugzilla.gnome.org/show_bug.cgi?id=736710
 
---- configure.ac.orig  2015-05-13 02:45:52.000000000 +0000
+--- configure.ac.orig  2017-06-22 13:15:19.000000000 +0000
 +++ configure.ac
-@@ -750,7 +750,7 @@ int main (void)
+@@ -687,7 +687,7 @@ int main (void)
  AC_MSG_RESULT($g_have_gnuc_visibility)
  AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes])
  
@@ -18,7 +16,7 @@
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
  #else
  # include "error: this is not Sun Studio."
-@@ -1102,10 +1102,22 @@ AC_CHECK_TYPE([struct ip_mreqn], [
+@@ -1040,10 +1040,22 @@ AC_CHECK_TYPE([struct ip_mreqn], [
Home | Main Index | Thread Index | Old Index