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

[Jan Steffens]

    Date: Saturday, October 22, 2016 @ 23:50:57
  Author: heftig
Revision: 279150

3.12.2+24+gd5e5bc5-1

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

-------------+
 PKGBUILD    |   35 +++++++++++++++++++----------------
 gnupg.patch |   25 -------------------------
 2 files changed, 19 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-22 23:44:32 UTC (rev 279149)
+++ PKGBUILD	2016-10-22 23:50:57 UTC (rev 279150)
@@ -3,33 +3,36 @@
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libcryptui
-pkgver=3.12.2
-pkgrel=2
+pkgver=3.12.2+24+gd5e5bc5
+pkgrel=1
 pkgdesc="Library for OpenPGP prompts"
-arch=('i686' 'x86_64')
 url="https://git.gnome.org/browse/libcryptui"
-license=('GPL')
-depends=('gtk3' 'gpgme' 'dbus-glib' 'libnotify' 'libgnome-keyring' 'dconf' 'libsm')
-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')
+arch=(i686 x86_64)
+license=(GPL)
+depends=(gtk3 gpgme dbus-glib libnotify gcr dconf libsm)
+makedepends=(intltool gobject-introspection gnome-common git)
+_commit=d5e5bc593dcbb21f5dd3b8f858368170d4947cf3  # master
+source=("git://git.gnome.org/libcryptui#commit=$_commit")
+sha256sums=('SKIP')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../gnupg.patch
-  autoreconf -fvi
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-compile
+              --disable-static --disable-schemas-compile --enable-gtk-doc
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 }

Deleted: gnupg.patch
===================================================================
--- gnupg.patch	2016-10-22 23:44:32 UTC (rev 279149)
+++ gnupg.patch	2016-10-22 23:50:57 UTC (rev 279150)
@@ -1,25 +0,0 @@
-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
-