From 468898c56c4eaeafcfb5b573c27f4e910164d887 Mon Sep 17 00:00:00 2001 From: fossdd Date: Mon, 24 Mar 2025 15:31:13 +0100 Subject: [PATCH] community/gnome-keyring: upgrade to 48.0 https://gitlab.gnome.org/GNOME/gnome-keyring/-/blob/48.0/NEWS --- ...dule_configs-as-default-pkcs11-confi.patch | 57 ------------------- community/gnome-keyring/APKBUILD | 37 +++++------- .../libgkm-source-gkm-marshal.patch | 32 +++++++++++ 3 files changed, 47 insertions(+), 79 deletions(-) delete mode 100644 community/gnome-keyring/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch create mode 100644 community/gnome-keyring/libgkm-source-gkm-marshal.patch diff --git a/community/gnome-keyring/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch b/community/gnome-keyring/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch deleted file mode 100644 index b732c2b8a82..00000000000 --- a/community/gnome-keyring/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch +++ /dev/null @@ -1,57 +0,0 @@ -https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/gnome-keyring/trunk/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patc - -From: "Jan Alexander Steffens (heftig)" -Date: Sat, 21 May 2022 18:42:21 +0000 -Subject: [PATCH] build: Use p11_module_configs as default pkcs11-config dir - -When building p11-kit with meson, `p11_system_config_modules` points at -the dir for system config in `/etc. This is its proper meaning. - -When building p11-kit with autotools, `p11_system_config_modules` is a -copy of `p11_module_configs` "for compatibility", and points to the dir -for packaged configs in `/usr/share`. - -We want the dir for packaged configs, so use the right variable. ---- - configure.ac | 10 +++++----- - pkcs11/rpc-layer/Makefile.am | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1bf7c14c8ccc..98d8c01018fb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -294,15 +294,15 @@ - [directory to install PKCS#11 config]) - ]) - if test -z "$with_pkcs11_config" ; then -- P11_SYSTEM_CONFIG_MODULES=$($PKG_CONFIG p11-kit-1 --variable=p11_module_configs) -+ P11_MODULE_CONFIGS=$($PKG_CONFIG p11-kit-1 --variable=p11_module_configs) - else -- P11_SYSTEM_CONFIG_MODULES="$with_pkcs11_config" -+ P11_MODULE_CONFIGS="$with_pkcs11_config" - fi --if test "$P11_SYSTEM_CONFIG_MODULES" = ""; then -+if test "$P11_MODULE_CONFIGS" = ""; then - AC_MSG_ERROR([Could not find location for pkcs11 module config]) - fi --AC_MSG_RESULT($P11_SYSTEM_CONFIG_MODULES) --AC_SUBST(P11_SYSTEM_CONFIG_MODULES) -+AC_MSG_RESULT($P11_MODULE_CONFIGS) -+AC_SUBST(P11_MODULE_CONFIGS) - - AC_MSG_CHECKING([module path to install pkcs11 modules]) - AC_ARG_WITH(pkcs11-modules, [ -diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am -index ccdff9191ad4..d3a3b57bbc6e 100644 ---- a/pkcs11/rpc-layer/Makefile.am -+++ b/pkcs11/rpc-layer/Makefile.am -@@ -46,7 +46,7 @@ gnome_keyring_pkcs11_la_LDFLAGS = \ - -no-undefined -export-symbols-regex 'C_GetFunctionList' - - # This is the configuration file that p11-kit uses to load the module --pkcs11configdir = $(P11_SYSTEM_CONFIG_MODULES) -+pkcs11configdir = $(P11_MODULE_CONFIGS) - pkcs11config_DATA = \ - pkcs11/rpc-layer/gnome-keyring.module - diff --git a/community/gnome-keyring/APKBUILD b/community/gnome-keyring/APKBUILD index 6ef1d5325d9..fbff9ce2ce7 100644 --- a/community/gnome-keyring/APKBUILD +++ b/community/gnome-keyring/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen # Maintainer: team/gnome pkgname=gnome-keyring -pkgver=46.2 -pkgrel=3 +pkgver=48.0 +pkgrel=0 pkgdesc="GNOME keyring" url="https://wiki.gnome.org//Projects/GnomeKeyring" arch="all" @@ -10,8 +10,6 @@ license="GPL-2.0-only LGPL-2.0-only" # the gcr binaries are needed for things to open the keyring via libsecret depends="gcr" makedepends=" - autoconf - automake gcr-dev gobject-introspection-dev gtk+3.0-dev @@ -21,43 +19,38 @@ makedepends=" libgcrypt-dev libxslt linux-pam-dev + meson openssh-client " checkdepends=" - dbus-x11 + dbus python3 - xvfb-run " provides="dbus:org.freedesktop.Secrets" # Highest priority of the bunch since it has the least deps provider_priority=100 -options="!check" # Failing tests on 32-bit architectures +options="!check" # flaky subpackages="$pkgname-lang $pkgname-doc $pkgname-openrc $pkgname-pam" source="https://download.gnome.org/sources/gnome-keyring/${pkgver%.*}/gnome-keyring-$pkgver.tar.xz - 0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch gnome-keyring.confd gnome-keyring.initd + libgkm-source-gkm-marshal.patch " build() { - export LDFLAGS="$LDFLAGS -lintl" - autoreconf -vfi - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-libcap-ng=no - make + abuild-meson \ + -Dsystemd=disabled \ + . output + meson compile -C output } check() { - xvfb-run make check -j1 + dbus-run-session \ + meson test --no-rebuild --print-errorlogs -C output } package() { - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install --no-rebuild -C output # Install the OpenRC user service for gnome-keyring. install -Dm755 "$srcdir"/gnome-keyring.initd \ @@ -78,8 +71,8 @@ pam() { } sha512sums=" -4229ca0606bdd1b84a3c737288df7f1fc1f8715734e3001964babd882201c3d818deabb3a7662dbf9b67316f03b234de84da3128fb991a500ef8305c2f962ba2 gnome-keyring-46.2.tar.xz -53e04eade3579fe5d65d11d6cde6c5fdffc9f73a3a7f372b1f4dbc7437212e753123c12854d3a5a7a22f3beb1b00604eec0371615ceb0f7024cb38cf35e33065 0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch +9eac06164c22a854a171f538467403c6764a6a6c2665959d721f5e3515bd91c8709a374c292cde93143f944b4ed7ec9b5613d28808d7e79839a9377d5aaa5daa gnome-keyring-48.0.tar.xz fdd9d02daf7beda574c63d6f17e56fdbe89194c42c60802f24a090e00d83104aa126771d5bfddc2ce586488d2f512164ba610d3fb5e1a85de7f497823fa757c2 gnome-keyring.confd bbdf251fa87bbbc80d62ed72e4d1981a3f419572ded01d7bdc45c328a1043c9e673840b23b3d0bc9fa48a9b125de234e30c9531aefa71348707a0ca81b61bb91 gnome-keyring.initd +7e2494f11423136856813349d4c0363b3cb11f0ea147048cfce10e383f93c8901b903bdcb02581268de7cd8f2513acf169f767de860134beb4716b5ee5323410 libgkm-source-gkm-marshal.patch " diff --git a/community/gnome-keyring/libgkm-source-gkm-marshal.patch b/community/gnome-keyring/libgkm-source-gkm-marshal.patch new file mode 100644 index 00000000000..b774a6f1ef6 --- /dev/null +++ b/community/gnome-keyring/libgkm-source-gkm-marshal.patch @@ -0,0 +1,32 @@ +Patch-Source: https://gitlab.gnome.org/GNOME/gnome-keyring/-/commit/ce3553000066f327e452c71bf12ef14b0cfeba7b +--- +From ce3553000066f327e452c71bf12ef14b0cfeba7b Mon Sep 17 00:00:00 2001 +From: fossdd +Date: Mon, 24 Mar 2025 15:23:51 +0100 +Subject: [PATCH] build: Add gkm_marshal header to libgkm sources + +Otherwise the gkm_marshal header is sometimes not generated +while building libgkm +--- + pkcs11/gkm/meson.build | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/pkcs11/gkm/meson.build b/pkcs11/gkm/meson.build +index 9a3ab06c..23b57757 100644 +--- a/pkcs11/gkm/meson.build ++++ b/pkcs11/gkm/meson.build +@@ -68,8 +68,9 @@ libgkm_dep = declare_dependency( + link_with: libgkm, + include_directories: [ + include_directories('.'), +- include_directories('..'), # for gkm-marshal.h +- ] ++ include_directories('..'), # for gkm/gkm-{crypto,assertion}.h ++ ], ++ sources: gkm_marshal[1], + ) + + # Tests +-- +GitLab +