Fix build errors, gpgme-config is not available anymore

Use archived seahorse-nautilus

2 files changed, 50 insertions, 3 deletions

diff --git a/0001-gpgme-config-is-not-available-anymore.patch b/0001-gpgme-config-is-not-available-anymore.patch
new file mode 100644
index 000000000000..8bdcb25a58a8
--- /dev/null
+++ b/0001-gpgme-config-is-not-available-anymore.patch
@@ -0,0 +1,46 @@
+From f167d7d61e58376aa0c0454a210a082495c705ce Mon Sep 17 00:00:00 2001
+From: Ralph Plawetzki <ralph@purejava.org>
+Date: Sun, 17 Mar 2024 16:23:07 +0100
+Subject: [PATCH 1/1] gpgme-config is not available anymore
+
+---
+ meson.build | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index c1efbfb..6a5d529 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ config_h_dir = include_directories('.')
+ # Dependencies
+ min_glib_version = '2.44'
+ min_gtk_version = '3.18'
+-accepted_gpg_versions= ['1.2.0', '1.4.0', '2.0.0', '2.1.0', '2.2.0', '2.3.0']
++accepted_gpg_versions= ['1.2.0', '1.4.0', '2.0.0', '2.1.0', '2.2.0', '2.3.0', '2.4.5']
+ min_gpgme_version = '1.0.0'
+ 
+ libnautilus_extension = dependency('libnautilus-extension-4', version: '>= 43.rc', required: false)
+@@ -51,7 +51,6 @@ endif
+ gpg_check_version = find_program(join_paths('meson', 'gpg_check_version.py'))
+ gpg_bin = find_program('gpg2', 'gpg')
+ gpgme = cc.find_library('gpgme')
+-gpgme_config = find_program('gpgme-config')
+ if check_compatible_gpg
+   gpg_version_check = run_command([gpg_check_version, gpg_bin.path(), 'false', accepted_gpg_versions ])
+   gpg_version = gpg_version_check.stdout()
+@@ -60,12 +59,6 @@ if check_compatible_gpg
+     error('Incompatible version of GnuPG. Accepted versions are: @0@'.format(accepted_gpg_versions))
+   endif
+ 
+-  gpgme_version_check = run_command([gpg_check_version, gpgme_config.path(), 'true', min_gpgme_version ])
+-  gpgme_version = gpgme_version_check.stdout()
+-  message('GPGME version: @0@'.format(gpgme_version))
+-  if gpgme_version_check.returncode() != 0
+-    error('Incompatible version of GPGME. Minimal version required is @0@'.format(min_gpgme_version))
+-  endif
+ endif
+ 
+ # Configuration
+-- 
+2.44.0
+
diff --git a/PKGBUILD b/PKGBUILD
index c64a91be5aa0..4eb5ccc005af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Ralph Plawetzki <ralph@purejava.org>
 
 pkgname=seahorse-nautilus-ext
-pkgver=3.11.92+r96+g0fd324c
+pkgver=3.11.92+r96+gbd57374
 pkgrel=1
 epoch=1
 pkgdesc="PGP encryption and signing for nautilus with configurable extension for encrypted files"
-url="https://gitlab.gnome.org/GNOME/seahorse-nautilus"
+url="https://gitlab.gnome.org/Archive/seahorse-nautilus"
 arch=(x86_64)
 license=(GPL)
 depends=(libnautilus-extension gtk3 gcr libcryptui libnotify)
@@ -13,7 +13,7 @@ makedepends=(meson git)
 provides=(seahorse-nautilus)
 conflicts=(seahorse-nautilus)
 options=(debug)
-_commit=0fd324c191565bff76ca45a01b2da14b4ab7b3bd  # master
+_commit=bd573742e4272e72cd2150ccb82a514c69f20f44  # master
 source=("git+$url.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -25,6 +25,7 @@ pkgver() {
 prepare() {
   cd seahorse-nautilus
 	git apply ../../0001-Make-file-extension-for-encrypted-files-configurable.patch
+  git apply ../../0001-gpgme-config-is-not-available-anymore.patch
 }
 
 build() {