diff --git a/devel/gdbus-codegen/distinfo b/devel/gdbus-codegen/distinfo index 1bfa0a6b0cbf..e7d4c6e1aa29 100644 --- a/devel/gdbus-codegen/distinfo +++ b/devel/gdbus-codegen/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.43 2023/09/16 03:09:02 adam Exp $ +$NetBSD: distinfo,v 1.44 2023/11/02 13:17:27 wiz Exp $ -BLAKE2s (glib-2.76.5.tar.xz) = b2c01bf2b8fce596ef8cc8a9da820c382d9279096f47bacd22a4f054f1e0122c -SHA512 (glib-2.76.5.tar.xz) = 190a98e9a0ebb802a31b511e95725ed1fec9d750aed6bd87f14f3047d1f1d79458be3fa954fd6eb9af9f481a8deeaae73c95c990f5aa002a4b1166372ed4c4f1 -Size (glib-2.76.5.tar.xz) = 5278804 bytes +BLAKE2s (glib-2.78.0.tar.xz) = 78edc6a5a30f54ddade7508b0005fc439fe268471db4c7a1bc292721077ca608 +SHA512 (glib-2.78.0.tar.xz) = 3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765 +Size (glib-2.78.0.tar.xz) = 5327096 bytes SHA1 (patch-meson.build) = 4f9d178950414e1537b48a552d63c9e551801999 diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 3887a99050bc..92444c032828 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.296 2023/10/23 06:37:38 wiz Exp $ +# $NetBSD: Makefile,v 1.297 2023/11/02 13:17:26 wiz Exp $ .include "Makefile.common" @@ -37,15 +37,19 @@ MESON_CROSS.NetBSD.have_unix98_printf= true MESON_CROSS.hppa.growing_stack= true .endif -REPLACE_PYTHON+= gio/gio-querymodules-wrapper.py REPLACE_PYTHON+= gio/tests/gengiotypefuncs.py REPLACE_PYTHON+= gio/tests/memory-monitor-dbus.py.in REPLACE_PYTHON+= gio/tests/memory-monitor-portal.py.in REPLACE_PYTHON+= gio/tests/static-link.py +REPLACE_PYTHON+= glib/gtester-report.in 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 + +SUBST_CLASSES+= python +SUBST_STAGE.python= post-build +SUBST_FILES.python+= output/glib/gtester-report +SUBST_MESSAGE.python+= Fixing path to Python. +SUBST_SED.python+= -e "s,^\(.*\)/usr/bin/env.*,\1${PYTHONBIN}," GIO_MODULES_DIR= ${PREFIX}/lib/gio/modules OWN_DIRS= ${GIO_MODULES_DIR} diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common index 07221f52db6f..5874923e8b34 100644 --- a/devel/glib2/Makefile.common +++ b/devel/glib2/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.111 2023/09/16 03:09:01 adam Exp $ +# $NetBSD: Makefile.common,v 1.112 2023/11/02 13:17:26 wiz Exp $ # used by devel/gdbus-codegen/Makefile # used by devel/glib2/Makefile # used by devel/glib2-tools/Makefile -DISTNAME= glib-2.76.5 +DISTNAME= glib-2.78.0 PKGNAME= ${DISTNAME:S/glib/glib2/} MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST index dfdbe8c84a04..a9bf65f7ccbc 100644 --- a/devel/glib2/PLIST +++ b/devel/glib2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.150 2023/09/16 03:09:01 adam Exp $ +@comment $NetBSD: PLIST,v 1.151 2023/11/02 13:17:26 wiz Exp $ ${PLIST.nococoa}bin/gapplication bin/gdbus bin/gio @@ -9,6 +9,8 @@ bin/glib-gettextize bin/gobject-query bin/gresource bin/gsettings +bin/gtester +bin/gtester-report ${PLIST.nococoa}include/gio-unix-2.0/gio/gdesktopappinfo.h include/gio-unix-2.0/gio/gfiledescriptorbased.h include/gio-unix-2.0/gio/gunixfdmessage.h @@ -293,19 +295,19 @@ include/glib-2.0/gobject/gvaluetypes.h lib/glib-2.0/include/glibconfig.h lib/libgio-2.0.so lib/libgio-2.0.so.0 -lib/libgio-2.0.so.0.7600.5 +lib/libgio-2.0.so.0.7800.0 lib/libglib-2.0.so lib/libglib-2.0.so.0 -lib/libglib-2.0.so.0.7600.5 +lib/libglib-2.0.so.0.7800.0 lib/libgmodule-2.0.so lib/libgmodule-2.0.so.0 -lib/libgmodule-2.0.so.0.7600.5 +lib/libgmodule-2.0.so.0.7800.0 lib/libgobject-2.0.so lib/libgobject-2.0.so.0 -lib/libgobject-2.0.so.0.7600.5 +lib/libgobject-2.0.so.0.7800.0 lib/libgthread-2.0.so lib/libgthread-2.0.so.0 -lib/libgthread-2.0.so.0.7600.5 +lib/libgthread-2.0.so.0.7800.0 lib/pkgconfig/gio-2.0.pc lib/pkgconfig/gio-unix-2.0.pc lib/pkgconfig/glib-2.0.pc @@ -318,10 +320,11 @@ ${PLIST.nococoa}libexec/gio-launch-desktop 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.7600.5-gdb.py -share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.7600.5-gdb.py +share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.7800.0-gdb.py +share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.7800.0-gdb.py share/gettext/its/gschema.its share/gettext/its/gschema.loc +share/glib-2.0/dtds/gresource.dtd share/glib-2.0/gdb/glib_gdb.py share/glib-2.0/gdb/gobject_gdb.py share/glib-2.0/gettext/po/Makefile.in.in diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index efb70ed271d3..1d8bcef56f4e 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.314 2023/09/16 03:09:01 adam Exp $ +$NetBSD: distinfo,v 1.315 2023/11/02 13:17:26 wiz Exp $ -BLAKE2s (glib-2.76.5.tar.xz) = b2c01bf2b8fce596ef8cc8a9da820c382d9279096f47bacd22a4f054f1e0122c -SHA512 (glib-2.76.5.tar.xz) = 190a98e9a0ebb802a31b511e95725ed1fec9d750aed6bd87f14f3047d1f1d79458be3fa954fd6eb9af9f481a8deeaae73c95c990f5aa002a4b1166372ed4c4f1 -Size (glib-2.76.5.tar.xz) = 5278804 bytes +BLAKE2s (glib-2.78.0.tar.xz) = 78edc6a5a30f54ddade7508b0005fc439fe268471db4c7a1bc292721077ca608 +SHA512 (glib-2.78.0.tar.xz) = 3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765 +Size (glib-2.78.0.tar.xz) = 5327096 bytes SHA1 (patch-gio_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 76ed9658ac11fb33b97143938b6a60b5aa515cae SHA1 (patch-gio_giomodule.c) = 8e12ba27d0f13f43cff9a4e2301edf67aba0d1fe @@ -17,12 +17,11 @@ SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8 SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97 SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294 -SHA1 (patch-glib_meson.build) = f1685d64dea7939e1b112c362fc05e849c870711 SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0 -SHA1 (patch-glib_tests_meson.build) = b806c945ad3427858717c92eca5f3cbe1fc3effd +SHA1 (patch-glib_tests_meson.build) = 40ce43a49ae7084116facac6b3926c5e545f6721 SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d SHA1 (patch-gobject_meson.build) = a3953d33ba7e906ff1df024221ac3ab32f6c0c66 -SHA1 (patch-meson.build) = 18fb6ac870718e9950cb2f1a20ad23b6b6475463 +SHA1 (patch-meson.build) = d83c401359d96053a1959e90e29abbbfe27a024a SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54 diff --git a/devel/glib2/patches/patch-glib_tests_meson.build b/devel/glib2/patches/patch-glib_tests_meson.build index 5d44dd1707f4..8904aca77f74 100644 --- a/devel/glib2/patches/patch-glib_tests_meson.build +++ b/devel/glib2/patches/patch-glib_tests_meson.build @@ -1,10 +1,10 @@ -$NetBSD: patch-glib_tests_meson.build,v 1.4 2023/06/26 19:25:56 adam Exp $ +$NetBSD: patch-glib_tests_meson.build,v 1.5 2023/11/02 13:17:27 wiz Exp $ Fix gtester is not defined error during configure. ---- glib/tests/meson.build.orig 2023-05-23 10:55:59.000000000 +0000 +--- glib/tests/meson.build.orig 2023-09-08 13:42:18.000000000 +0000 +++ glib/tests/meson.build -@@ -475,19 +475,4 @@ endforeach +@@ -489,21 +489,6 @@ endforeach # some testing of gtester functionality # FIXME: Work around Meson not automatically using exe_wrapper around gtester # https://github.com/mesonbuild/meson/issues/11029 @@ -24,3 +24,5 @@ Fix gtester is not defined error during configure. - endif -endif + if have_bash and have_pkg_config + prefix = get_option('prefix') diff --git a/devel/glib2/patches/patch-meson.build b/devel/glib2/patches/patch-meson.build index 67d8c595235f..0936080297df 100644 --- a/devel/glib2/patches/patch-meson.build +++ b/devel/glib2/patches/patch-meson.build @@ -1,4 +1,4 @@ -$NetBSD: patch-meson.build,v 1.18 2022/11/23 10:41:41 adam Exp $ +$NetBSD: patch-meson.build,v 1.19 2023/11/02 13:17:27 wiz Exp $ - On Darwin, optionally use Cocoa (needed for X11 users). @@ -12,9 +12,9 @@ $NetBSD: patch-meson.build,v 1.18 2022/11/23 10:41:41 adam Exp $ - Define a newer POSIX, as we build this package with -std=gnu99 ---- meson.build.orig 2022-10-25 12:53:22.000000000 +0000 +--- meson.build.orig 2023-09-08 13:42:18.000000000 +0000 +++ meson.build -@@ -874,7 +874,7 @@ if host_system == 'darwin' +@@ -926,7 +926,7 @@ if host_system == 'darwin' #error "Detected GNUstep, not Cocoa" #endif''', name : 'Mac OS X Cocoa support') @@ -22,8 +22,8 @@ $NetBSD: patch-meson.build,v 1.18 2022/11/23 10:41:41 adam Exp $ + glib_have_cocoa = glib_have_cocoa and get_option('use_cocoa') if glib_have_cocoa glib_conf.set('HAVE_COCOA', true) - endif -@@ -2167,18 +2167,17 @@ if host_system != 'windows' and get_opti + osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit'] +@@ -2214,18 +2214,17 @@ if host_system != 'windows' and get_opti # try glibc if cc.has_function('getxattr') and cc.has_header('sys/xattr.h') @@ -44,7 +44,7 @@ $NetBSD: patch-meson.build,v 1.18 2022/11/23 10:41:41 adam Exp $ if cc.compiles(glib_conf_prefix + ''' #include #ifdef HAVE_SYS_TYPES_H -@@ -2281,7 +2280,7 @@ glib_conf.set('HAVE_PROC_SELF_CMDLINE', +@@ -2328,7 +2327,7 @@ glib_conf.set('HAVE_PROC_SELF_CMDLINE', python = import('python').find_installation() # used for '#!/usr/bin/env ' @@ -53,16 +53,16 @@ $NetBSD: patch-meson.build,v 1.18 2022/11/23 10:41:41 adam Exp $ python_version = python.language_version() python_version_req = '>=3.5' -@@ -2290,7 +2289,7 @@ if not python_version.version_compare(py - endif +@@ -2338,7 +2337,7 @@ endif # Determine which user environment-dependent files that we want to install --have_bash = find_program('bash', required : false).found() # For completion scripts + bash = find_program('bash', required : false) +-have_bash = bash.found() # For completion scripts +have_bash = false bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false) have_sh = find_program('sh', required : false).found() # For glib-gettextize - -@@ -2299,8 +2298,7 @@ env_program = find_program('env', requir + have_pkg_config = find_program('pkg-config', required: false).found() +@@ -2348,8 +2347,7 @@ env_program = find_program('env', requir # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578 if host_system == 'sunos'