diff --git a/extra-repos/systemd/gnome-keyring/APKBUILD b/extra-repos/systemd/gnome-keyring/APKBUILD index c80765b16..e240bac96 100644 --- a/extra-repos/systemd/gnome-keyring/APKBUILD +++ b/extra-repos/systemd/gnome-keyring/APKBUILD @@ -4,9 +4,9 @@ # Co-Maintainer: Achill Gilgenast maintainer="Newbyte " pkgname=gnome-keyring -_pkgver=48.0 +_pkgver=50.0 pkgver=9999$_pkgver -pkgrel=1 +pkgrel=0 pkgdesc="GNOME keyring" url="https://gitlab.gnome.org/GNOME/gnome-keyring" # armhf: pmb#2618 @@ -42,8 +42,7 @@ subpackages=" $pkgname-pam $pkgname-systemd " -source="https://download.gnome.org/sources/gnome-keyring/${_pkgver%.*}/gnome-keyring-$_pkgver.tar.xz - libgkm-source-gkm-marshal.patch" +source="https://download.gnome.org/sources/gnome-keyring/${_pkgver%.*}/gnome-keyring-$_pkgver.tar.xz" builddir="$srcdir/gnome-keyring-$_pkgver" build() { @@ -74,6 +73,5 @@ pam() { } sha512sums=" -9eac06164c22a854a171f538467403c6764a6a6c2665959d721f5e3515bd91c8709a374c292cde93143f944b4ed7ec9b5613d28808d7e79839a9377d5aaa5daa gnome-keyring-48.0.tar.xz -7e2494f11423136856813349d4c0363b3cb11f0ea147048cfce10e383f93c8901b903bdcb02581268de7cd8f2513acf169f767de860134beb4716b5ee5323410 libgkm-source-gkm-marshal.patch +20786486655c2188d8d0eae129d1c14a61d995d55a2339b166aa914287cf5ddd29b67d6a2fbc9d4b3d73705459cd3d17c696369500e4a0f0d12087aac78a8c15 gnome-keyring-50.0.tar.xz " diff --git a/extra-repos/systemd/gnome-keyring/libgkm-source-gkm-marshal.patch b/extra-repos/systemd/gnome-keyring/libgkm-source-gkm-marshal.patch deleted file mode 100644 index b774a6f1e..000000000 --- a/extra-repos/systemd/gnome-keyring/libgkm-source-gkm-marshal.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 -