From cc76b07bac741ce7acfee62c79ecbbd13b1c0c10 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 17 Mar 2022 15:01:31 +0000 Subject: [PATCH] devel/glib20: update to 2.72.0 Changes: https://gitlab.gnome.org/GNOME/glib/-/blob/2.72.0/NEWS PR: 262635 Reported by: Repology Exp-run by: antoine Approved by: tcberner --- devel/glib20/Makefile | 5 +- devel/glib20/distinfo | 6 +- .../glib20/files/patch-gio_tests_meson.build | 61 ------------------- devel/glib20/files/patch-glib_meson.build | 6 +- devel/glib20/pkg-plist | 13 +++- 5 files changed, 18 insertions(+), 73 deletions(-) delete mode 100644 devel/glib20/files/patch-gio_tests_meson.build diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 0ff7ed6e50bb..2f3f5315cf8a 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,8 +1,7 @@ # Created by: Vanilla I. Shu PORTNAME= glib -DISTVERSION= 2.70.4 -PORTREVISION= 1 +DISTVERSION= 2.72.0 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= GNOME @@ -37,7 +36,7 @@ CPE_VENDOR= gnome CONFLICTS_INSTALL= p5-Giovanni -_LIBVERSION= 0.7000.4 +_LIBVERSION= 0.7200.0 PLIST_SUB= LIBVERSION=${_LIBVERSION} OPTIONS_DEFINE= DEBUG FAM_ALTBACKEND MANPAGES NLS TEST diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 5043a4596f25..cf6943fb7cf7 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644582506 -SHA256 (gnome/glib-2.70.4.tar.xz) = ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 -SIZE (gnome/glib-2.70.4.tar.xz) = 4824296 +TIMESTAMP = 1647529291 +SHA256 (gnome/glib-2.72.0.tar.xz) = d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d +SIZE (gnome/glib-2.72.0.tar.xz) = 4879172 diff --git a/devel/glib20/files/patch-gio_tests_meson.build b/devel/glib20/files/patch-gio_tests_meson.build deleted file mode 100644 index 435c5afe7f2d..000000000000 --- a/devel/glib20/files/patch-gio_tests_meson.build +++ /dev/null @@ -1,61 +0,0 @@ ---- gio/tests/meson.build.orig 2021-06-10 18:57:57 UTC -+++ gio/tests/meson.build -@@ -49,7 +49,6 @@ gio_tests = { - 'buffered-output-stream' : {}, - 'cancellable' : {}, - 'contexts' : {}, -- 'contenttype' : {}, - 'converter-stream' : {}, - 'credentials' : {}, - 'data-input-stream' : {}, -@@ -94,7 +93,6 @@ gio_tests = { - 'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']}, - 'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']}, - 'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']}, -- 'gdbus-address-get-session' : {}, - 'win32-appinfo' : {}, - } - -@@ -151,10 +149,6 @@ endif - if host_machine.system() != 'windows' - gio_tests += { - 'file' : {}, -- 'gdbus-peer' : { -- 'dependencies' : [libgdbus_example_objectmanager_dep], -- 'install_rpath' : installed_tests_execdir -- }, - 'gdbus-peer-object-manager' : {}, - 'live-g-file' : {}, - 'socket-address' : {}, -@@ -190,31 +184,14 @@ if host_machine.system() != 'windows' - } - endif - -- # Uninstalled because of the check-for-executable logic in DesktopAppInfo -- # unable to find the installed executable -- if not glib_have_cocoa -- gio_tests += { -- 'appinfo' : { -- 'install' : false, -- }, -- 'desktop-app-info' : { -- 'install' : false, -- }, -- } -- endif -- - test_extra_programs += { - 'basic-application' : {}, - 'dbus-launch' : {}, -- 'appinfo-test' : {}, - } - - if not glib_have_cocoa - test_extra_programs += { - 'apps' : {}, -- } -- gio_tests += { -- 'mimeapps' : {}, - } - endif - diff --git a/devel/glib20/files/patch-glib_meson.build b/devel/glib20/files/patch-glib_meson.build index 35d4a9fae9c3..3c5d770a633a 100644 --- a/devel/glib20/files/patch-glib_meson.build +++ b/devel/glib20/files/patch-glib_meson.build @@ -1,9 +1,9 @@ ---- glib/meson.build.orig 2021-09-17 10:17:56 UTC +--- glib/meson.build.orig 2022-03-17 15:01:31 UTC +++ glib/meson.build -@@ -367,7 +367,7 @@ libglib = library('glib-2.0', - # intl.lib is not compatible with SAFESEH +@@ -375,7 +375,7 @@ libglib = library('glib-2.0', link_args : [noseh_link_args, glib_link_flags, win32_ldflags], include_directories : configinc, + link_with: [charset_lib, gnulib_lib], - dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep], + dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep] + libutil, c_args : glib_c_args, diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 284807bb3660..48eaa57fe78a 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -15,14 +15,11 @@ bin/gtester bin/gtester-report include/gio-unix-2.0/gio/gdesktopappinfo.h include/gio-unix-2.0/gio/gfiledescriptorbased.h -include/gio-unix-2.0/gio/gunixconnection.h -include/gio-unix-2.0/gio/gunixcredentialsmessage.h include/gio-unix-2.0/gio/gunixfdlist.h include/gio-unix-2.0/gio/gunixfdmessage.h include/gio-unix-2.0/gio/gunixinputstream.h include/gio-unix-2.0/gio/gunixmounts.h include/gio-unix-2.0/gio/gunixoutputstream.h -include/gio-unix-2.0/gio/gunixsocketaddress.h include/glib-2.0/gio/gaction.h include/glib-2.0/gio/gactiongroup.h include/glib-2.0/gio/gactiongroupexporter.h @@ -67,6 +64,8 @@ include/glib-2.0/gio/gdbusobjectskeleton.h include/glib-2.0/gio/gdbusproxy.h include/glib-2.0/gio/gdbusserver.h include/glib-2.0/gio/gdbusutils.h +include/glib-2.0/gio/gdebugcontroller.h +include/glib-2.0/gio/gdebugcontrollerdbus.h include/glib-2.0/gio/gdrive.h include/glib-2.0/gio/gdtlsclientconnection.h include/glib-2.0/gio/gdtlsconnection.h @@ -169,6 +168,9 @@ include/glib-2.0/gio/gtlsfiledatabase.h include/glib-2.0/gio/gtlsinteraction.h include/glib-2.0/gio/gtlspassword.h include/glib-2.0/gio/gtlsserverconnection.h +include/glib-2.0/gio/gunixconnection.h +include/glib-2.0/gio/gunixcredentialsmessage.h +include/glib-2.0/gio/gunixsocketaddress.h include/glib-2.0/gio/gvfs.h include/glib-2.0/gio/gvolume.h include/glib-2.0/gio/gvolumemonitor.h @@ -264,6 +266,7 @@ include/glib-2.0/glib/gversionmacros.h include/glib-2.0/glib/gwin32.h include/glib-2.0/gmodule.h include/glib-2.0/gobject/gbinding.h +include/glib-2.0/gobject/gbindinggroup.h include/glib-2.0/gobject/gboxed.h include/glib-2.0/gobject/gclosure.h include/glib-2.0/gobject/genums.h @@ -276,6 +279,7 @@ include/glib-2.0/gobject/gobjectnotifyqueue.c include/glib-2.0/gobject/gparam.h include/glib-2.0/gobject/gparamspecs.h include/glib-2.0/gobject/gsignal.h +include/glib-2.0/gobject/gsignalgroup.h include/glib-2.0/gobject/gsourceclosure.h include/glib-2.0/gobject/gtype.h include/glib-2.0/gobject/gtypemodule.h @@ -352,6 +356,9 @@ share/gettext/its/gschema.loc %%DATADIR%%-2.0/codegen/codegen_main.py %%DATADIR%%-2.0/codegen/codegen_main.pyc %%DATADIR%%-2.0/codegen/codegen_main.pyo +%%DATADIR%%-2.0/codegen/codegen_rst.py +%%DATADIR%%-2.0/codegen/codegen_rst.pyc +%%DATADIR%%-2.0/codegen/codegen_rst.pyo %%DATADIR%%-2.0/codegen/config.py %%DATADIR%%-2.0/codegen/config.pyc %%DATADIR%%-2.0/codegen/config.pyo