jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

seahorse-nautilus: fix desktop files

Browse source 
While we're at it, prepare for upgrading gnupg to v2
This commit is contained in:
Đoàn Trần Công Danh 2021-07-10 23:43:50 +07:00 committed by Đoàn Trần Công Danh
parent 042c75acd4
commit 67ee1068f5
5 changed files with 105 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch Normal file
View file

@ -0,0 +1,56 @@
From: Carlos Maddela <e7appew@gmail.com>
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 <e7appew@gmail.com>
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

25
srcpkgs/seahorse-nautilus/patches/locale.patch
View file

@ -1,15 +1,12 @@
Index: configure
Index: seahorse-nautilus-3.10.1/configure.ac
===================================================================
--- a/configure
+++ b/configure
@@ -14606,8 +14606,8 @@ fi
DATADIRNAME=share
;;
*)
- CATOBJEXT=.mo
- DATADIRNAME=lib
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
;;
esac
fi
--- 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)

13
srcpkgs/seahorse-nautilus/patches/new-gnupg.patch Normal file
View file

@ -0,0 +1,13 @@
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"
AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
ok="no"
if test "$GNUPG" != "no"; then

18
srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch Normal file
View file

@ -0,0 +1,18 @@
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

9
srcpkgs/seahorse-nautilus/template
View file

@ -1,10 +1,11 @@
# Template file for 'seahorse-nautilus'
pkgname=seahorse-nautilus
version=3.10.1
revision=5
revision=6
build_style=gnu-configure
configure_args="--disable-schemas-compile"
hostmakedepends="pkg-config intltool gpgme-devel gnupg glib"
hostmakedepends="automake libtool pkg-config intltool gpgme-devel gnupg
glib-devel gettext-devel-tools"
makedepends="gtk+3-devel nautilus-devel libnotify-devel
gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel"
depends="gnupg desktop-file-utils"
@ -15,3 +16,7 @@ homepage="http://www.gnome.org/projects/seahorse/"
distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz"
checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a
lib32disabled=yes
pre_configure() {
autoreconf -fi
}