[arch-commits] Commit in libcryptui/repos (8 files)

Jan Steffens heftig at archlinux.org
Thu Jul 28 14:00:57 UTC 2016


    Date: Thursday, July 28, 2016 @ 14:00:57
  Author: heftig
Revision: 272607

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libcryptui/repos/extra-i686/PKGBUILD
    (from rev 272606, libcryptui/trunk/PKGBUILD)
  libcryptui/repos/extra-i686/gnupg.patch
    (from rev 272606, libcryptui/trunk/gnupg.patch)
  libcryptui/repos/extra-x86_64/PKGBUILD
    (from rev 272606, libcryptui/trunk/PKGBUILD)
  libcryptui/repos/extra-x86_64/gnupg.patch
    (from rev 272606, libcryptui/trunk/gnupg.patch)
Deleted:
  libcryptui/repos/extra-i686/PKGBUILD
  libcryptui/repos/extra-i686/libcryptui.install
  libcryptui/repos/extra-x86_64/PKGBUILD
  libcryptui/repos/extra-x86_64/libcryptui.install

---------------------------------+
 /PKGBUILD                       |   70 ++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD             |   30 ----------------
 extra-i686/gnupg.patch          |   25 +++++++++++++
 extra-i686/libcryptui.install   |   11 -----
 extra-x86_64/PKGBUILD           |   30 ----------------
 extra-x86_64/gnupg.patch        |   25 +++++++++++++
 extra-x86_64/libcryptui.install |   11 -----
 7 files changed, 120 insertions(+), 82 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-07-28 14:00:37 UTC (rev 272606)
+++ extra-i686/PKGBUILD	2016-07-28 14:00:57 UTC (rev 272607)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=libcryptui
-pkgver=3.12.2
-pkgrel=1
-pkgdesc="Library for OpenPGP prompts"
-arch=('i686' 'x86_64')
-url="http://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')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}

Copied: libcryptui/repos/extra-i686/PKGBUILD (from rev 272606, libcryptui/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-07-28 14:00:57 UTC (rev 272607)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=libcryptui
+pkgver=3.12.2
+pkgrel=2
+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')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../gnupg.patch
+  autoreconf -fvi
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Copied: libcryptui/repos/extra-i686/gnupg.patch (from rev 272606, libcryptui/trunk/gnupg.patch)
===================================================================
--- extra-i686/gnupg.patch	                        (rev 0)
+++ extra-i686/gnupg.patch	2016-07-28 14:00:57 UTC (rev 272607)
@@ -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: extra-i686/libcryptui.install
===================================================================
--- extra-i686/libcryptui.install	2016-07-28 14:00:37 UTC (rev 272606)
+++ extra-i686/libcryptui.install	2016-07-28 14:00:57 UTC (rev 272607)
@@ -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
-}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-07-28 14:00:37 UTC (rev 272606)
+++ extra-x86_64/PKGBUILD	2016-07-28 14:00:57 UTC (rev 272607)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=libcryptui
-pkgver=3.12.2
-pkgrel=1
-pkgdesc="Library for OpenPGP prompts"
-arch=('i686' 'x86_64')
-url="http://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')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}

Copied: libcryptui/repos/extra-x86_64/PKGBUILD (from rev 272606, libcryptui/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-07-28 14:00:57 UTC (rev 272607)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=libcryptui
+pkgver=3.12.2
+pkgrel=2
+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')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../gnupg.patch
+  autoreconf -fvi
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Copied: libcryptui/repos/extra-x86_64/gnupg.patch (from rev 272606, libcryptui/trunk/gnupg.patch)
===================================================================
--- extra-x86_64/gnupg.patch	                        (rev 0)
+++ extra-x86_64/gnupg.patch	2016-07-28 14:00:57 UTC (rev 272607)
@@ -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: extra-x86_64/libcryptui.install
===================================================================
--- extra-x86_64/libcryptui.install	2016-07-28 14:00:37 UTC (rev 272606)
+++ extra-x86_64/libcryptui.install	2016-07-28 14:00:57 UTC (rev 272607)
@@ -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
-}



More information about the arch-commits mailing list