pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Update glib2 to 2.60.2



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a31b2c1fa28
branches:  trunk
changeset: 396549:6a31b2c1fa28
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Mon Jun 03 09:53:50 2019 +0000

description:
Update glib2 to 2.60.2

GLib's move to meson from autotools means we are effectively starting
from scratch with non-linux build fixes. Support for python 2 has
also been dropped (given that meson requires python 3). I replaced
sysutils/gio-fam with a build option.

The full lengthy list of changes is available from:

  https://gitlab.gnome.org/GNOME/glib/tags/2.60.2

Some highlights:
* Improve network status detection with NetworkManager (!781)
* Add async GIO API: g_file_query_default_handler_async(), g_app_info_launch_uris_async() (#1249, #1347)
* Add overlay support to g_resources_get_info(). (#1445)
* Add writev() and writev_all() APIs to GOutputStream and GPollableOutputStream,
  and provide implementations of them for many subclasses. (#1431)
* Hide bind mounts from GIO mount listings. (#1271)
* Automatically realign data passed to `g_variant_new_from_bytes()` or
  `g_variant_new_from_data()` if it is not correctly aligned. This prevents
  misaligned accesses on architectures which don?t support them. Callers should
  still aim to correctly align data to get higher performance. (#1342)
* Support `ld -b binary` (on platforms which support it; i.e. Linux) to provide
  large pre-compiled `GResource` resources with a fast compilation time. (#1489+* Drop Python 2 support and require Python 3.4+. See discussion on
  https://mail.gnome.org/archives/desktop-devel-list/2018-July/msg00004.html.
  (!196)
* Various fixes to eliminate thread races, found by thread sanitizer (tsan).

diffstat:

 devel/gdbus-codegen/Makefile                                     |   28 +-
 devel/gdbus-codegen/PLIST                                        |   18 +-
 devel/gdbus-codegen/distinfo                                     |    7 +
 devel/gdbus-codegen/hacks.mk                                     |    3 -
 devel/gdbus-codegen/patches/patch-meson.build                    |   26 +
 devel/glib2-tools/Makefile                                       |    7 +-
 devel/glib2/Makefile                                             |   95 +-
 devel/glib2/Makefile.common                                      |   84 +-
 devel/glib2/PLIST                                                |  971 ++-------
 devel/glib2/buildlink3.mk                                        |    8 +-
 devel/glib2/distinfo                                             |   40 +-
 devel/glib2/hacks.mk                                             |   44 -
 devel/glib2/options.mk                                           |   14 +
 devel/glib2/patches/patch-Makefile.in                            |   16 -
 devel/glib2/patches/patch-aa                                     |  182 -
 devel/glib2/patches/patch-af                                     |   23 -
 devel/glib2/patches/patch-ah                                     |   24 -
 devel/glib2/patches/patch-aha                                    |   13 -
 devel/glib2/patches/patch-ak                                     |   80 -
 devel/glib2/patches/patch-al                                     |   22 -
 devel/glib2/patches/patch-am                                     |   14 -
 devel/glib2/patches/patch-an                                     |  188 -
 devel/glib2/patches/patch-cb                                     |   13 -
 devel/glib2/patches/patch-cd                                     |   41 -
 devel/glib2/patches/patch-cl                                     |   74 -
 devel/glib2/patches/patch-cm                                     |   32 -
 devel/glib2/patches/patch-gio_gdbus-2.0_codegen_gdbus-codegen.in |   13 -
 devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build      |   33 +
 devel/glib2/patches/patch-gio_gresource-tool.c                   |   12 +-
 devel/glib2/patches/patch-gio_meson.build                        |   11 +
 devel/glib2/patches/patch-glib_gmain.c                           |    4 +-
 devel/glib2/patches/patch-glib_gthread-posix.c                   |   36 -
 devel/glib2/patches/patch-glib_gtimezone.c                       |   21 -
 devel/glib2/patches/patch-glib_meson.build                       |   39 +
 devel/glib2/patches/patch-gobject_Makefile.am                    |   14 -
 devel/glib2/patches/patch-gobject_Makefile.in                    |   14 -
 devel/glib2/patches/patch-gobject_glib-genmarshal.in             |   13 -
 devel/glib2/patches/patch-gobject_glib-mkenums.in                |   10 +-
 devel/glib2/patches/patch-gobject_meson.build                    |   15 +
 devel/glib2/patches/patch-meson.build                            |   32 +
 sysutils/Makefile                                                |    3 +-
 sysutils/gio-fam/DESCR                                           |    2 -
 sysutils/gio-fam/Makefile                                        |   28 -
 sysutils/gio-fam/PLIST                                           |    2 -
 sysutils/gio-fam/hacks.mk                                        |    3 -
 45 files changed, 553 insertions(+), 1819 deletions(-)

diffs (truncated from 2716 to 300 lines):

diff -r 6aa567241c4a -r 6a31b2c1fa28 devel/gdbus-codegen/Makefile
--- a/devel/gdbus-codegen/Makefile      Mon Jun 03 08:42:29 2019 +0000
+++ b/devel/gdbus-codegen/Makefile      Mon Jun 03 09:53:50 2019 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.19 2019/04/25 07:32:45 maya Exp $
+# $NetBSD: Makefile,v 1.20 2019/06/03 09:53:50 prlw1 Exp $
 
-PKGREVISION= 2
 .include "../../devel/glib2/Makefile.common"
 
 PKGNAME:=      ${PKGNAME:S/glib2/gdbus-codegen/}
@@ -8,18 +7,21 @@
 
 COMMENT=       Generate code and/or documentation for one or more D-Bus interfaces
 
-NOT_FOR_PLATFORM=      HPUX-*-* OSF1-*-*
-
-USE_TOOLS+=            pkg-config msgfmt perl:run
-
-BUILD_DIRS=            gio/gdbus-2.0/codegen
-INSTALL_DIRS=          ${BUILD_DIRS}
+WRKSRC=                ${WRKDIR}/${DISTNAME}/gio/gdbus-2.0/codegen
 
-REPLACE_PYTHON+=       gio/gdbus-2.0/codegen/gdbus-codegen.in
-
-DEPENDS+=              ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+SUBST_CLASSES+=                autovars
+SUBST_STAGE.autovars=  pre-configure
+SUBST_MESSAGE.autovars=        autoconf meson.build
+SUBST_FILES.autovars=  meson.build config.py.in gdbus-codegen.in
+SUBST_VARS.autovars=   PKGVERSION PYTHONBIN
+SUBST_SED.autovars=    -e 's,@VERSION@,${PKGVERSION:Q},'
+SUBST_SED.autovars+=   -e 's,@PYTHON@,${PYTHONBIN:Q},'
+SUBST_SED.autovars+=   -e 's,@DATADIR@,${PREFIX}/share,'
 
-.include "../../devel/glib2/modules.mk"
+REPLACE_PYTHON+=       gdbus-codegen.in
+
+DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
+.include "../../devel/py-meson/build.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6aa567241c4a -r 6a31b2c1fa28 devel/gdbus-codegen/PLIST
--- a/devel/gdbus-codegen/PLIST Mon Jun 03 08:42:29 2019 +0000
+++ b/devel/gdbus-codegen/PLIST Mon Jun 03 09:53:50 2019 +0000
@@ -1,26 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2013/04/19 22:21:41 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/06/03 09:53:50 prlw1 Exp $
 bin/gdbus-codegen
 share/glib-2.0/codegen/__init__.py
-share/glib-2.0/codegen/__init__.pyc
-share/glib-2.0/codegen/__init__.pyo
 share/glib-2.0/codegen/codegen.py
-share/glib-2.0/codegen/codegen.pyc
-share/glib-2.0/codegen/codegen.pyo
 share/glib-2.0/codegen/codegen_docbook.py
-share/glib-2.0/codegen/codegen_docbook.pyc
-share/glib-2.0/codegen/codegen_docbook.pyo
 share/glib-2.0/codegen/codegen_main.py
-share/glib-2.0/codegen/codegen_main.pyc
-share/glib-2.0/codegen/codegen_main.pyo
 share/glib-2.0/codegen/config.py
-share/glib-2.0/codegen/config.pyc
-share/glib-2.0/codegen/config.pyo
 share/glib-2.0/codegen/dbustypes.py
-share/glib-2.0/codegen/dbustypes.pyc
-share/glib-2.0/codegen/dbustypes.pyo
 share/glib-2.0/codegen/parser.py
-share/glib-2.0/codegen/parser.pyc
-share/glib-2.0/codegen/parser.pyo
 share/glib-2.0/codegen/utils.py
-share/glib-2.0/codegen/utils.pyc
-share/glib-2.0/codegen/utils.pyo
diff -r 6aa567241c4a -r 6a31b2c1fa28 devel/gdbus-codegen/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gdbus-codegen/distinfo      Mon Jun 03 09:53:50 2019 +0000
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+
+SHA1 (glib-2.60.2.tar.xz) = 8aa8586f0b1fd13c2717adf7ac3e6427bee651b6
+RMD160 (glib-2.60.2.tar.xz) = 8d18a8e4b43071afc35762eff3618a88a7112f57
+SHA512 (glib-2.60.2.tar.xz) = 38479c8e48fda5adaa5f7ac8e1f09c184be48adf38ab614eb69f8e11301a1b0235767abf556e09fd4d5df345822db5b3dc85d1c53d05fdba1c1b40f75b61777b
+Size (glib-2.60.2.tar.xz) = 4587388 bytes
+SHA1 (patch-meson.build) = 6877b395f02619ea93b648119373ac1b53438c59
diff -r 6aa567241c4a -r 6a31b2c1fa28 devel/gdbus-codegen/hacks.mk
--- a/devel/gdbus-codegen/hacks.mk      Mon Jun 03 08:42:29 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# $NetBSD: hacks.mk,v 1.4 2013/08/24 09:36:43 obache Exp $
-
-.sinclude "../../devel/glib2/hacks.mk"
diff -r 6aa567241c4a -r 6a31b2c1fa28 devel/gdbus-codegen/patches/patch-meson.build
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gdbus-codegen/patches/patch-meson.build     Mon Jun 03 09:53:50 2019 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-meson.build,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+
+Turn into a meson.build file which meson will accept, and
+subsitute some variables.
+
+--- meson.build.orig   2019-04-15 10:54:04.000000000 +0000
++++ meson.build
+@@ -1,3 +1,5 @@
++project('gdbus_codegen')
++
+ gdbus_codegen_files = [
+   '__init__.py',
+   'codegen.py',
+@@ -9,9 +11,9 @@ gdbus_codegen_files = [
+ ]
+ 
+ gdbus_codegen_conf = configuration_data()
+-gdbus_codegen_conf.set('VERSION', glib_version)
+-gdbus_codegen_conf.set('PYTHON', python_name)
+-gdbus_codegen_conf.set('DATADIR', glib_datadir)
++gdbus_codegen_conf.set('VERSION', '@VERSION@')
++gdbus_codegen_conf.set('PYTHON', '@PYTHON@')
++gdbus_codegen_conf.set('DATADIR', '@DATADIR@')
+ 
+ # Install gdbus-codegen executable
+ gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
diff -r 6aa567241c4a -r 6a31b2c1fa28 devel/glib2-tools/Makefile
--- a/devel/glib2-tools/Makefile        Mon Jun 03 08:42:29 2019 +0000
+++ b/devel/glib2-tools/Makefile        Mon Jun 03 09:53:50 2019 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.6 2019/04/25 07:32:45 maya Exp $
+# $NetBSD: Makefile,v 1.7 2019/06/03 09:53:50 prlw1 Exp $
 
-PKGREVISION= 1
 .include "../../devel/glib2/Makefile.common"
 
 PKGNAME:=      ${PKGNAME:S/glib2/glib2-tools/}
@@ -8,6 +7,9 @@
 
 COMMENT=       GLib2/gobject python-dependent tools
 
+DISTINFO_FILE= ${.CURDIR}/../../devel/glib2/distinfo
+PATCHDIR=      ${.CURDIR}/../../devel/glib2/patches
+
 NO_BUILD=              yes
 
 PYSCRIPTS=             glib-genmarshal glib-mkenums
@@ -17,6 +19,7 @@
 .for f in ${PYSCRIPTS}
        cd ${WRKSRC}/gobject \
        && ${SED} \
+               -e "s,/usr/bin/env ,," \
                -e "s,@PYTHON@,${PYTHONBIN}," \
                -e "s,@VERSION@,${PKGVERSION}," \
                ${f}.in > ${f}
diff -r 6aa567241c4a -r 6a31b2c1fa28 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Mon Jun 03 08:42:29 2019 +0000
+++ b/devel/glib2/Makefile      Mon Jun 03 09:53:50 2019 +0000
@@ -1,75 +1,54 @@
-# $NetBSD: Makefile,v 1.245 2019/04/25 07:32:45 maya Exp $
+# $NetBSD: Makefile,v 1.246 2019/06/03 09:53:50 prlw1 Exp $
 
-PKGREVISION= 4
 .include "Makefile.common"
 
-CATEGORIES=            devel gnome
+CATEGORIES=    devel gnome
+COMMENT=       Some useful routines for C programming (glib2)
 
-COMMENT=               Some useful routines for C programming (glib2)
-
-USE_TOOLS+=            msgfmt perl:run readlink
+DISTINFO_FILE= ${.CURDIR}/../../devel/glib2/distinfo
+PATCHDIR=      ${.CURDIR}/../../devel/glib2/patches
 
-PKGCONFIG_OVERRIDE+=   glib-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gmodule-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gmodule-export-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gmodule-no-export-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gobject-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gthread-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gio-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gio-unix-2.0.pc.in
-PKGCONFIG_OVERRIDE+=   gio-windows-2.0.pc.in
+.include "options.mk"
 
-FILES_SUBST+=          GIO_MODULES_DIR=${PREFIX}/lib/gio/modules
-FILES_SUBST+=          GIO_QUERYMODULES=${PREFIX}/bin/gio-querymodules
-FILES_SUBST+=          GLIB_COMPILE_SCHEMAS=${PREFIX}/bin/glib-compile-schemas
-FILES_SUBST+=          GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas
-
-# gtester is the glib unit testing and reporting framework
-# agc doesn't want glib2 to depend on python so we install it
-# in a broken and useless state.
-CHECK_INTERPRETER_SKIP+=       bin/gtester-report
-CHECK_WRKREF_SKIP+=            bin/gtester-report
+MESON_ARGS+=   -Dinstalled_tests=false
+# Avoid linux dependency on libmount-dev
+MESON_ARGS+=   -Dlibmount=false
 
-# need pcre utf8 + unicode-properties
-BUILDLINK_API_DEPENDS.pcre+=   pcre>=8.31
-# to avoid pkg-config dependency, explicitly specify pcre location
-CONFIGURE_ARGS+=       PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include
-CONFIGURE_ARGS+=       PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre"
-
-# needs gz_header structure
-BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.2.1
-
-LIBS.SunOS+=           -lnsl -lsocket
-CPPFLAGS.SunOS+=       -DBSD_COMP
+REPLACE_PYTHON+=       gio/gio-querymodules-wrapper.py
+REPLACE_PYTHON+=       gio/tests/gengiotypefuncs.py
+REPLACE_PYTHON+=       gio/tests/static-link.py
+REPLACE_PYTHON+=       glib/update-gtranslit.py
+REPLACE_PYTHON+=       gobject/tests/mkenums.py
+REPLACE_PYTHON+=       tests/gen-casefold-txt.py
+REPLACE_PYTHON+=       tests/gen-casemap-txt.py
 
-.if ${OBJECT_FMT} == "ELF"
-.  if ${OPSYS} == "SunOS"
-.    if empty(ABI:U:M64)
-# Solaris libelf in 32-bit mode does not support largefile.  We patch files
-# individually to force _FILE_OFFSET_BITS=32 but need to turn back on -lelf
-# after configure disabled it.
-CONFIGURE_ENV+=                LIBELF_LIBS='-lelf'
-.    endif
-.  else
-.    include "../../devel/libelf/buildlink3.mk"
-.  endif
-.endif
+BUILD_DEFS+=           VARBASE
+SUBST_CLASSES+=                dbusdb
+SUBST_MESSAGE.dbusdb=  Adjust dbus machine uuid path to dbus package
+SUBST_STAGE.dbusdb=    pre-configure
+SUBST_FILES.dbusdb=    gio/gdbusconnection.c
+SUBST_FILES.dbusdb+=   gio/gdbusprivate.c
+SUBST_FILES.dbusdb+=   po/glib20.pot
+SUBST_FILES.dbusdb+=   po/*.po
+SUBST_SED.dbusdb=      -e 's,/var/lib/dbus,${VARBASE}/db/dbus,g'
 
-# XXX: Kludge to avoid uncoditionally pick up some gtkdoc-* tools if gtk-doc
-# XXX: package is installed and then fails in the installation phase.
-CONFIGURE_ENV+=        ac_cv_prog_GTKDOC_CHECK= \
-               ac_cv_path_GTKDOC_CHECK_PATH= \
-               ac_cv_path_GTKDOC_REBASE= \
-               ac_cv_path_GTKDOC_MKPDF=
+SUBST_CLASSES+=                xdg
+SUBST_MESSAGE.xdg=     Adjust XDG_DATA_DIRS so schemas and pixbuf loaders are found
+SUBST_STAGE.xdg=       pre-configure
+SUBST_FILES.xdg=       glib/gcharset.c glib/gutils.c gio/xdgmime/xdgmime.c
+SUBST_SED.xdg=         -e 's,/usr/local/share/:/usr/share/,${PREFIX}/share,'
+SUBST_SED.xdg+=                -e 's,/etc/xdg,${PKG_SYSCONFDIR}/xdg,'
+SUBST_SED.xdg+=                -e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,'
 
 # to run gdbus-codegen to generate gdbus-daemon-generated.{h,c}
-TOOL_DEPENDS+=         ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-PYTHON_FOR_BUILD_ONLY?=        yes
-.include "../../lang/python/pyversion.mk"
+TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+PYTHON_FOR_BUILD_ONLY= yes
+.include "../../lang/python/application.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/py-meson/build.mk"
 .include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6aa567241c4a -r 6a31b2c1fa28 devel/glib2/Makefile.common
--- a/devel/glib2/Makefile.common       Mon Jun 03 08:42:29 2019 +0000
+++ b/devel/glib2/Makefile.common       Mon Jun 03 09:53:50 2019 +0000
@@ -1,93 +1,19 @@
-# $NetBSD: Makefile.common,v 1.66 2018/08/19 18:32:27 wiz Exp $
+# $NetBSD: Makefile.common,v 1.67 2019/06/03 09:53:50 prlw1 Exp $
 #
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
 # used by devel/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.56.2
+DISTNAME=      glib-2.60.2
 PKGNAME=       ${DISTNAME:S/glib/glib2/}
-CATEGORIES=    # empty; redefined in Makefile
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    prlw1%cam.ac.uk@localhost
 HOMEPAGE=      https://developer.gnome.org/glib/
-COMMENT=       # empty; redefined in Makefile
 LICENSE=       gnu-lgpl-v2.1
 
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake pkg-config
-USE_LANGUAGES=         c c++ c99
-USE_LIBTOOL=           yes
-TEST_TARGET=           check
-



Home | Main Index | Thread Index | Old Index