Date: Friday, September 6, 2019 @ 17:51:12 Author: heftig Revision: 361985
archrelease: copy trunk to testing-x86_64 Added: libsecret/repos/testing-x86_64/PKGBUILD (from rev 361984, libsecret/trunk/PKGBUILD) Deleted: libsecret/repos/testing-x86_64/0001-service-Fix-secret_service_ensure_session_finish-err.patch libsecret/repos/testing-x86_64/PKGBUILD -----------------------------------------------------------------+ 0001-service-Fix-secret_service_ensure_session_finish-err.patch | 41 ---- PKGBUILD | 85 ++++------ 2 files changed, 40 insertions(+), 86 deletions(-) Deleted: 0001-service-Fix-secret_service_ensure_session_finish-err.patch =================================================================== --- 0001-service-Fix-secret_service_ensure_session_finish-err.patch 2019-09-06 17:50:50 UTC (rev 361984) +++ 0001-service-Fix-secret_service_ensure_session_finish-err.patch 2019-09-06 17:51:12 UTC (rev 361985) @@ -1,41 +0,0 @@ -From aae0329ba3eb260e8094388b49e14b8cf42ea91e Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Thu, 5 Sep 2019 18:38:01 +0200 -Subject: [PATCH] service: Fix secret_service_ensure_session_finish error - propagation - -The condition checking g_task_is_valid was inverted, resulting in errors -being ignored. - -Move the check to a g_return_val_if_fail to be in line with all other -uses of g_task_is_valid. - -Fixes https://bugs.archlinux.org/task/63666 ---- - libsecret/secret-service.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/libsecret/secret-service.c b/libsecret/secret-service.c -index 6c89bb8..6dea0d1 100644 ---- a/libsecret/secret-service.c -+++ b/libsecret/secret-service.c -@@ -1321,12 +1321,11 @@ secret_service_ensure_session_finish (SecretService *self, - { - g_return_val_if_fail (SECRET_IS_SERVICE (self), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); -+ g_return_val_if_fail (g_task_is_valid (result, self), FALSE); - -- if (!g_task_is_valid (result, self)) { -- if (!g_task_propagate_boolean (G_TASK (result), error)) { -- _secret_util_strip_remote_error (error); -- return FALSE; -- } -+ if (!g_task_propagate_boolean (G_TASK (result), error)) { -+ _secret_util_strip_remote_error (error); -+ return FALSE; - } - - g_return_val_if_fail (self->pv->session != NULL, FALSE); --- -2.23.0 - Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-09-06 17:50:50 UTC (rev 361984) +++ PKGBUILD 2019-09-06 17:51:12 UTC (rev 361985) @@ -1,45 +0,0 @@ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=libsecret -pkgver=0.19.0 -pkgrel=2 -pkgdesc="Library for storing and retrieving passwords and other secrets" -url="https://wiki.gnome.org/Projects/Libsecret" -arch=(x86_64) -license=(LGPL) -depends=(glib2 libgcrypt) -checkdepends=(python-dbus dbus-glib python-gobject gjs) -makedepends=(docbook-xsl gobject-introspection vala git gtk-doc meson valgrind) -optdepends=('gnome-keyring: key storage service, or use any other service implementing org.freedesktop.secrets') -_commit=be541cf9d4a81b97f55794a5b1de50f92aac1fbb # tags/0.19.0^0 -source=("git+https://gitlab.gnome.org/GNOME/libsecret.git#commit=$_commit" - 0001-service-Fix-secret_service_ensure_session_finish-err.patch) -sha256sums=('SKIP' - '94de310cf02d67ad8447bebf8f55bf2e1c6d864e13fb16442b2eb09ee0b93acb') - -pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd $pkgname - - # https://bugs.archlinux.org/task/63666 - git apply -3 ../0001-service-Fix-secret_service_ensure_session_finish-err.patch -} - -build() { - arch-meson $pkgname build - ninja -C build -} - -check() { - dbus-run-session meson test -C build --print-errorlogs -} - -package() { - DESTDIR="$pkgdir" meson install -C build -} - -# vim:set sw=2 et: Copied: libsecret/repos/testing-x86_64/PKGBUILD (from rev 361984, libsecret/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-09-06 17:51:12 UTC (rev 361985) @@ -0,0 +1,40 @@ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=libsecret +pkgver=0.19.1 +pkgrel=1 +pkgdesc="Library for storing and retrieving passwords and other secrets" +url="https://wiki.gnome.org/Projects/Libsecret" +arch=(x86_64) +license=(LGPL) +depends=(glib2 libgcrypt) +checkdepends=(python-dbus dbus-glib python-gobject gjs) +makedepends=(docbook-xsl gobject-introspection vala git gtk-doc meson valgrind) +optdepends=('gnome-keyring: key storage service, or use any other service implementing org.freedesktop.secrets') +_commit=f576dfbe50f9aed22802ad0db0356d081f467d7a # tags/0.19.1^0 +source=("git+https://gitlab.gnome.org/GNOME/libsecret.git#commit=$_commit") +sha256sums=('SKIP') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd $pkgname +} + +build() { + arch-meson $pkgname build + ninja -C build +} + +check() { + dbus-run-session meson test -C build --print-errorlogs +} + +package() { + DESTDIR="$pkgdir" meson install -C build +} + +# vim:set sw=2 et: