[arch-commits] Commit in libcryptui/trunk (PKGBUILD gnupg.patch libcryptui.install)

[Jan Steffens]

    Date: Thursday, July 28, 2016 @ 13:54:45
  Author: heftig
Revision: 272603

3.12.2-2

Added:
  libcryptui/trunk/gnupg.patch
Modified:
  libcryptui/trunk/PKGBUILD
Deleted:
  libcryptui/trunk/libcryptui.install

--------------------+
 PKGBUILD           |   27 ++++++++++++++++-----------
 gnupg.patch        |   25 +++++++++++++++++++++++++
 libcryptui.install |   11 -----------
 3 files changed, 41 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-28 13:52:40 UTC (rev 272602)
+++ PKGBUILD	2016-07-28 13:54:45 UTC (rev 272603)
@@ -4,20 +4,26 @@
 
 pkgname=libcryptui
 pkgver=3.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for OpenPGP prompts"
 arch=('i686' 'x86_64')
-url="http://git.gnome.org/browse/libcryptui/"
+url="https://git.gnome.org/browse/libcryptui"
 license=('GPL')
 depends=('gtk3' 'gpgme' 'dbus-glib' 'libnotify' 'libgnome-keyring' 'dconf' 'libsm')
-makedepends=('intltool' 'gobject-introspection')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866')
+makedepends=('intltool' 'gobject-introspection' 'gnome-common')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        gnupg.patch)
+sha256sums=('71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866'
+            '468e8d7730c50e6ba8da7a3deb948ab1244fb06fbce9acd2c983a93beb2b0f38')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../gnupg.patch
+  autoreconf -fvi
+}
+
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --disable-schemas-compile
   make
@@ -24,7 +30,6 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }

Added: gnupg.patch
===================================================================
--- gnupg.patch	                        (rev 0)
+++ gnupg.patch	2016-07-28 13:54:45 UTC (rev 272603)
@@ -0,0 +1,25 @@
+From 183d7619c29482a5d4ae8019692899f87f198171 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot at gnome.org>
+Date: Sat, 17 Oct 2015 08:52:35 +0200
+Subject: Allow building with gnupg 2.1.
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 406b9f3..b621b23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,7 +95,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"
+ 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ 	AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
+ 	ok="no"
+-- 
+cgit v0.12
+

Deleted: libcryptui.install
===================================================================
--- libcryptui.install	2016-07-28 13:52:40 UTC (rev 272602)
+++ libcryptui.install	2016-07-28 13:54:45 UTC (rev 272603)
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}