[arch-commits] Commit in nemo-extensions/trunk (PKGBUILD nemo-seahorse-gnupg.patch)

[Eli Schwartz]

    Date: Sunday, June 23, 2019 @ 18:26:25
  Author: eschwartz
Revision: 483290

upgpkg: nemo-extensions 4.2.0-1

upstream release

Modified:
  nemo-extensions/trunk/PKGBUILD
Deleted:
  nemo-extensions/trunk/nemo-seahorse-gnupg.patch

---------------------------+
 PKGBUILD                  |   14 +++++---------
 nemo-seahorse-gnupg.patch |   13 -------------
 2 files changed, 5 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-23 17:54:30 UTC (rev 483289)
+++ PKGBUILD	2019-06-23 18:26:25 UTC (rev 483290)
@@ -17,8 +17,8 @@
         #'nemo-media-columns'
         #'nemo-pastebin'
         #'nemo-repairer'
-pkgver=4.0.0
-pkgrel=2
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="Various extensions for Nemo"
 arch=('x86_64')
 license=('GPL2')
@@ -30,10 +30,9 @@
 makedepends=('intltool' 'gobject-introspection' 'meson')
 makedepends+=("${_preview_deps[@]}" "${_python_deps[@]}" "${_seahorse_deps[@]}")
 options=('!emptydirs')
-source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
-        "nemo-seahorse-gnupg.patch")
-sha256sums=('4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de'
-            'ba6ae77a7d6727088e49aae2dc2c89c77c44f1ea19ee48956481d673d97caa36')
+source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
+sha256sums=('8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5')
+b2sums=('95181563fa7fce7d20e93e97150473a5b704ef0ee103b6e4c1e7d3b949e771ef74c939e765238d217943c5e9c6b4b261e74035639df8e99316be129fa99f042d')
 
 prepare() {
     cd "${srcdir}"/${pkgbase}-${pkgver}
@@ -42,9 +41,6 @@
     # annoying to people who actually set $C(XX)?FLAGS. This drops the unneeded dependency on gnome-common
     sed -i '/^GNOME_/d' nemo-image-converter/configure.ac
 
-    # Support GnuPG 2.2
-    patch -p1 -i ../nemo-seahorse-gnupg.patch
-
     for _dir in "${pkgname[@]}"; do
         if ! [[ -f ${_dir}/configure.ac || -f ${_dir}/configure.in ]]; then
             continue

Deleted: nemo-seahorse-gnupg.patch
===================================================================
--- nemo-seahorse-gnupg.patch	2019-06-23 17:54:30 UTC (rev 483289)
+++ nemo-seahorse-gnupg.patch	2019-06-23 18:26:25 UTC (rev 483290)
@@ -1,13 +0,0 @@
-diff --git a/nemo-extensions-3.6.0/nemo-seahorse/configure.ac.orig b/nemo-extensions-3.6.0/nemo-seahorse/configure.ac
-index acea698..9aa06c2 100644
---- a/nemo-seahorse/configure.ac.orig
-+++ b/nemo-seahorse/configure.ac
-@@ -57,7 +57,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 2.1"
-+	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