From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] glib: update to 2.70.0, patch out warning about deprecated scheme paths
Date: Tue, 28 Sep 2021 00:10:21 +0200 [thread overview]
Message-ID: <20210927221021.Kbr_htK8jyTaUhuHy819qAeBiSq8aL5u147XrQiP8sw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33017@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1044 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages glib-2.70
https://github.com/void-linux/void-packages/pull/33017
glib: update to 2.70.0, patch out warning about deprecated scheme paths
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
Adds a patch to remove the annoying warnings about deprecated paths on each glib-compile-schemas call (for example xbps updates). Other distributions also have this patch.
This PR needs a bit more testing especially on musl before it can be merged.
A patch file from https://github.com/void-linux/void-packages/pull/33017.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-2.70-33017.patch --]
[-- Type: text/x-diff, Size: 8424 bytes --]
From 48cdc71cbfec9c7de8ba61ee97e29451ba99e9e9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
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 3c89b684aa00c8ec1238ff45c61229ded3e80ee5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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
* run tests
---
srcpkgs/gnome-keyring/INSTALL | 12 ------------
srcpkgs/gnome-keyring/template | 12 ++++++------
2 files changed, 6 insertions(+), 18 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..12f1e8d2df64 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -1,24 +1,24 @@
# 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"
+checkdepends="dbus xvfb-run"
short_desc="GNOME password and secret manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
-#changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS"
homepage="https://www.gnome.org"
+changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-40/NEWS"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931
+make_check=ci-skip
lib32disabled=yes
do_check() {
- # Requires X11 server
- :
+ xvfb-run make check
}
next prev parent reply other threads:[~2021-09-27 22:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 22:37 [PR PATCH] " paper42
2021-09-18 22:37 ` [PR PATCH] [Updated] " paper42
2021-09-20 10:54 ` paper42
2021-09-20 16:04 ` paper42
2021-09-20 16:04 ` paper42
2021-09-27 20:18 ` [PR PATCH] [Updated] " paper42
2021-09-27 20:46 ` paper42
2021-09-27 20:50 ` paper42
2021-09-27 22:10 ` paper42 [this message]
2021-09-29 7:47 ` [PR PATCH] [Updated] " paper42
2021-09-29 20:34 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210927221021.Kbr_htK8jyTaUhuHy819qAeBiSq8aL5u147XrQiP8sw@z \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).