From deecd97e0e4dc4f3fac4070ccf528a7ee450a836 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 Jan 2023 22:09:52 +0100 Subject: [PATCH] seahorse-nautilus: update to 3.11.92.2022.10.9. --- .../patches/fix-desktop-files.patch | 56 ------------------- .../seahorse-nautilus/patches/locale.patch | 12 ---- .../seahorse-nautilus/patches/new-gnupg.patch | 13 ----- .../patches/remove-unused-gnome-keyring.patch | 18 ------ srcpkgs/seahorse-nautilus/template | 21 +++---- 5 files changed, 8 insertions(+), 112 deletions(-) delete mode 100644 srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch delete mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch delete mode 100644 srcpkgs/seahorse-nautilus/patches/new-gnupg.patch delete mode 100644 srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch diff --git a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch b/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch deleted file mode 100644 index 89c2313aa98..00000000000 --- a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Carlos Maddela -Date: Sun, 8 Jan 2017 23:27:27 +1100 -Subject: Fix desktop files to use valid field code with Exec key. - -Description: Fix desktop files to use valid field code with Exec key. -Author: Carlos Maddela -Origin: vendor -Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=790254 -Last-Update: 2017-11-12 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- - tool/seahorse-pgp-encrypted.desktop.in.in | 2 +- - tool/seahorse-pgp-keys.desktop.in.in | 2 +- - tool/seahorse-pgp-signature.desktop.in.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tool/seahorse-pgp-encrypted.desktop.in.in b/tool/seahorse-pgp-encrypted.desktop.in.in -index 2d631e8..0897aa0 100644 ---- a/tool/seahorse-pgp-encrypted.desktop.in.in -+++ b/tool/seahorse-pgp-encrypted.desktop.in.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - _Name=Decrypt File - MimeType=application/pgp-encrypted; --Exec=seahorse-tool --decrypt -+Exec=seahorse-tool --decrypt %U - Type=Application - Terminal=false - NoDisplay=true -diff --git a/tool/seahorse-pgp-keys.desktop.in.in b/tool/seahorse-pgp-keys.desktop.in.in -index 36cb153..5b4bd73 100644 ---- a/tool/seahorse-pgp-keys.desktop.in.in -+++ b/tool/seahorse-pgp-keys.desktop.in.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - _Name=Import Key - MimeType=application/pgp-keys; --Exec=seahorse-tool --import -+Exec=seahorse-tool --import %U - Type=Application - Terminal=false - NoDisplay=true -diff --git a/tool/seahorse-pgp-signature.desktop.in.in b/tool/seahorse-pgp-signature.desktop.in.in -index 00b9562..77820f7 100644 ---- a/tool/seahorse-pgp-signature.desktop.in.in -+++ b/tool/seahorse-pgp-signature.desktop.in.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - _Name=Verify Signature - MimeType=application/pgp-signature; --Exec=seahorse-tool --verify -+Exec=seahorse-tool --verify %U - Type=Application - Terminal=false - NoDisplay=true diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch deleted file mode 100644 index 06867e0432e..00000000000 --- a/srcpkgs/seahorse-nautilus/patches/locale.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: seahorse-nautilus-3.10.1/configure.ac -=================================================================== ---- seahorse-nautilus-3.10.1.orig/configure.ac -+++ seahorse-nautilus-3.10.1/configure.ac -@@ -41,6 +41,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE - - GLIB_GSETTINGS - AM_GLIB_GNU_GETTEXT -+DATADIRNAME=share - - PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gio-2.0) - diff --git a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch deleted file mode 100644 index 01d944a3cac..00000000000 --- a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: seahorse-nautilus-3.10.1/configure.ac -=================================================================== ---- seahorse-nautilus-3.10.1.orig/configure.ac -+++ seahorse-nautilus-3.10.1/configure.ac -@@ -58,7 +58,7 @@ AC_ARG_ENABLE(gpg-check, - DO_CHECK=$enableval, DO_CHECK=yes) - - if test "$DO_CHECK" = "yes"; then -- accepted_versions="1.2 1.4 2.0" -+ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3" - AC_PATH_PROGS(GNUPG, [gpg gpg2], no) - ok="no" - if test "$GNUPG" != "no"; then diff --git a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch b/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch deleted file mode 100644 index befc0d669ec..00000000000 --- a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: seahorse-nautilus-3.10.1/configure.ac -=================================================================== ---- seahorse-nautilus-3.10.1.orig/configure.ac -+++ seahorse-nautilus-3.10.1/configure.ac -@@ -148,13 +148,6 @@ fi - AC_SUBST(NAUTILUS_EXTENSION_DIR) - - # ----------------------------------------------------------------------------- --# Keyring -- --PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1]) --SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS" --SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS" -- --# ----------------------------------------------------------------------------- - # DBus - - DBUS_GLIB_REQUIRED=0.35 diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template index d80a1258aea..fa20d613456 100644 --- a/srcpkgs/seahorse-nautilus/template +++ b/srcpkgs/seahorse-nautilus/template @@ -1,22 +1,17 @@ # Template file for 'seahorse-nautilus' pkgname=seahorse-nautilus -version=3.10.1 -revision=6 -build_style=gnu-configure -configure_args="--disable-schemas-compile" -hostmakedepends="automake libtool pkg-config intltool gpgme-devel gnupg - glib-devel gettext-devel-tools" +version=3.11.92.2022.10.9 +revision=1 +_commit=0fd324c191565bff76ca45a01b2da14b4ab7b3bd +build_style=meson +hostmakedepends="pkg-config gettext gnupg glib-devel" makedepends="gtk+3-devel nautilus-devel libnotify-devel - gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel" + gpgme-devel libcryptui-devel gcr-devel" depends="gnupg desktop-file-utils" short_desc="Nautilus plugin for OpenPGP file encryption/decryption" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.gnome.org/projects/seahorse/" -distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz" -checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a +distfiles="https://gitlab.gnome.org/GNOME/seahorse-nautilus/-/archive/${_commit}/seahorse-nautilus-${_commit}.tar.gz" +checksum=8f82b1ffef1a38e1b6d40fb463428037e881ff1e5c88292b24afd436ba6740af lib32disabled=yes - -pre_configure() { - autoreconf -fi -}