From 0213a0e7100e7a119ffa6ade710c619b0f51e645 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:37:13 +0200 Subject: [PATCH 1/2] glib: update to 2.70.0. * patch out warning about deprecated scheme paths * fix update-check detection --- .../glib/patches/disable-broken-tests.patch | 49 ++++++++++++------- ...e-schemas-remove-deprecated-warnings.patch | 22 +++++++++ srcpkgs/glib/template | 10 ++-- srcpkgs/glib/update | 2 +- 4 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 srcpkgs/glib/patches/glib-compile-schemas-remove-deprecated-warnings.patch diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch index 9fd27bb105a5..c6bb8d96fadf 100644 --- a/srcpkgs/glib/patches/disable-broken-tests.patch +++ b/srcpkgs/glib/patches/disable-broken-tests.patch @@ -1,5 +1,3 @@ -diff --git gio/tests/meson.build gio/tests/meson.build -index a926ae01a..c2093cf4e 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -50,7 +50,6 @@ gio_tests = { @@ -15,23 +13,33 @@ index a926ae01a..c2093cf4e 100644 'network-monitor-race' : {}, 'permission' : {}, - 'pollable' : {'dependencies' : [libdl_dep]}, + 'power-profile-monitor' : {}, 'proxy-test' : {}, 'readwrite' : {}, - 'simple-async-result' : {}, -@@ -567,7 +565,7 @@ if installed_tests_enabled - endforeach +@@ -151,7 +149,6 @@ endif + # Test programs buildable on UNIX only + if host_machine.system() != 'windows' + gio_tests += { +- 'file' : {}, + 'gdbus-peer' : { + 'dependencies' : [libgdbus_example_objectmanager_dep], + 'install_rpath' : installed_tests_execdir +@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() + test_resources_binary2, + ] + endif +- +- gio_tests += { +- 'resources' : { +- 'extra_sources' : resources_extra_sources, +- }, +- } endif --if not meson.is_cross_build() or meson.has_exe_wrapper() -+if false - - plugin_resources_c = custom_target('plugin-resources.c', - input : 'test4.gresource.xml', -diff --git glib/tests/meson.build glib/tests/meson.build -index c77ccdd14..b0dab692a 100644 + foreach test_name, extra_args : gio_tests --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -11,21 +11,13 @@ glib_tests = { +@@ -11,21 +11,14 @@ glib_tests = { 'cache' : {}, 'charset' : {}, 'checksum' : {}, @@ -46,14 +54,14 @@ index c77ccdd14..b0dab692a 100644 'dir' : {}, 'environment' : {}, - 'error' : {}, -- 'fileutils' : {}, + 'fileutils' : {}, - 'gdatetime' : { - 'suite' : ['slow'], - }, 'guuid' : {}, 'gvariant' : { 'suite' : ['slow'], -@@ -57,7 +49,6 @@ glib_tests = { +@@ -57,7 +50,6 @@ glib_tests = { 'mutex' : {}, 'node' : {}, 'once' : {}, @@ -61,6 +69,11 @@ index c77ccdd14..b0dab692a 100644 'option-argv0' : {}, 'overflow' : {}, 'overflow-fallback' : { --- -2.31.0 - +@@ -102,7 +94,6 @@ glib_tests = { + 'thread' : {}, + 'thread-pool' : {}, + 'timeout' : {}, +- 'timer' : {}, + 'tree' : {}, + 'utf8-performance' : {}, + 'utf8-pointer' : {}, diff --git a/srcpkgs/glib/patches/glib-compile-schemas-remove-deprecated-warnings.patch b/srcpkgs/glib/patches/glib-compile-schemas-remove-deprecated-warnings.patch new file mode 100644 index 000000000000..8e53c977df4a --- /dev/null +++ b/srcpkgs/glib/patches/glib-compile-schemas-remove-deprecated-warnings.patch @@ -0,0 +1,22 @@ +--- a/gio/glib-compile-schemas.c ++++ b/gio/glib-compile-schemas.c +@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, + return; + } + +- if (path && (g_str_has_prefix (path, "/apps/") || +- g_str_has_prefix (path, "/desktop/") || +- g_str_has_prefix (path, "/system/"))) +- { +- gchar *message = NULL; +- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " +- "Paths starting with " +- "“/apps/”, “/desktop/” or “/system/” are deprecated."), +- id, path); +- g_printerr ("%s\n", message); +- g_free (message); +- } +- + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 666b0cc86ad3..ea4b41be9493 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,7 +1,7 @@ # Template file for 'glib' pkgname=glib -version=2.68.3 -revision=2 +version=2.70.0 +revision=1 build_style=meson # static version is necessary for qemu-user-static; # also disable LTO, otherwise there are multiple failures when linking qemu @@ -15,9 +15,9 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GLib" #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS" -changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-68/NEWS" +changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz" -checksum=e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138 +checksum=200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 build_options="gtk_doc" desc_option_gtk_doc="Build GTK API docs" @@ -31,7 +31,7 @@ do_check() { } libglib-devel_package() { - depends="${makedepends} glib>=${version}_${revision}" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" lib32files="/usr/lib/glib-2.0/include/glibconfig.h" pkg_install() { diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update index 89470583c5dc..98ff14720ccf 100644 --- a/srcpkgs/glib/update +++ b/srcpkgs/glib/update @@ -1 +1 @@ -site="https://gitlab.gnome.org/GNOME/glib/-/tags" +pattern="glib-[0-9]+\.[0-9]*[02468]\.[0-9]+" From 487736a83610cec89255344fa3df24c8d4ca1df3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 27 Sep 2021 22:08:58 +0200 Subject: [PATCH 2/2] gnome-keyring: remove CAP_IPC_LOCK due to hardening in glib 2.70, gnome-keyring is broken with CAP_IPC_LOCK https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/77 --- srcpkgs/gnome-keyring/INSTALL | 12 ------------ srcpkgs/gnome-keyring/template | 13 ++++--------- 2 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 srcpkgs/gnome-keyring/INSTALL diff --git a/srcpkgs/gnome-keyring/INSTALL b/srcpkgs/gnome-keyring/INSTALL deleted file mode 100644 index 405c7c8890ef..000000000000 --- a/srcpkgs/gnome-keyring/INSTALL +++ /dev/null @@ -1,12 +0,0 @@ -case "${ACTION}" in -post) - # Set IPC capability, exit gracefully if we cannot set the capability - # due to invalid permissions (fakeroot install). - set +e - setcap cap_ipc_lock=ep usr/bin/gnome-keyring-daemon - if [ $? -ne 0 ]; then - echo "ERROR: failed to set ipc_lock capability on gnome-keyring-daemon." - exit 0 - fi - ;; -esac diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template index b8defd1997dd..380489919d0b 100644 --- a/srcpkgs/gnome-keyring/template +++ b/srcpkgs/gnome-keyring/template @@ -1,24 +1,19 @@ # Template file for 'gnome-keyring' pkgname=gnome-keyring version=40.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile" hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt openssh pkg-config" makedepends="gcr-devel libcap-devel libcap-ng-devel libtasn1-devel pam-devel" -# For setcap(8). -depends="dconf gcr libcap-progs" +depends="dconf gcr" short_desc="GNOME password and secret manager" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" -#changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS" +changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-40/NEWS" homepage="https://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931 lib32disabled=yes - -do_check() { - # Requires X11 server - : -} +make_check=no # Requires X11 server