Date: Sunday, October 23, 2022 @ 17:21:30
  Author: heftig
Revision: 458814

3.41.1-3: move gcr-ssh-agent to gcr-4

Modified:
  gcr/trunk/PKGBUILD
  gcr/trunk/gcr.install

-------------+
 PKGBUILD    |    5 +++--
 gcr.install |   16 ++++------------
 2 files changed, 7 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-23 17:20:47 UTC (rev 458813)
+++ PKGBUILD    2022-10-23 17:21:30 UTC (rev 458814)
@@ -4,7 +4,7 @@
 pkgbase=gcr
 pkgname=(gcr gcr-docs)
 pkgver=3.41.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A library for bits of crypto UI and parsing"
 url="https://gitlab.gnome.org/GNOME/gcr";
 arch=(x86_64)
@@ -26,7 +26,8 @@
 }
 
 build() {
-  arch-meson gcr build
+  # ssh-agent moved to gcr-4
+  arch-meson gcr build -D ssh_agent=false
   meson compile -C build
 }
 

Modified: gcr.install
===================================================================
--- gcr.install 2022-10-23 17:20:47 UTC (rev 458813)
+++ gcr.install 2022-10-23 17:21:30 UTC (rev 458814)
@@ -1,14 +1,6 @@
-post_install() {
-  # Enable socket by default
-  systemctl --global enable gcr-ssh-agent.socket
-}
-
-post_upgrade() {
-  if (( $(vercmp $2 3.41.0-1) < 0)); then
-    systemctl --global enable gcr-ssh-agent.socket
+pre_upgrade() {
+  if (( $(vercmp $2 3.41.0-1) >= 0 && $(vercmp $2 3.41.1-2) < 0 )); then
+    # Moved to gcr-4
+    systemctl --global disable gcr-ssh-agent.socket
   fi
 }
-
-pre_remove() {
-  systemctl --global disable gcr-ssh-agent.socket
-}

Reply via email to