[arch-commits] Commit in pinentry/trunk (PKGBUILD glib2.patch)

[Allan McRae]

    Date: Sunday, August 17, 2008 @ 02:24:46
  Author: allan
Revision: 9346

upgpkg: pinentry 0.7.5-3
    ncurses rebuild

Added:
  pinentry/trunk/glib2.patch
Modified:
  pinentry/trunk/PKGBUILD

-------------+
 PKGBUILD    |   10 +++++++---
 glib2.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-08-17 06:24:00 UTC (rev 9345)
+++ PKGBUILD	2008-08-17 06:24:46 UTC (rev 9346)
@@ -2,18 +2,21 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=pinentry
 pkgver=0.7.5
-pkgrel=1
+pkgrel=3
 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.gnupg.org/aegypten2"
 depends=('ncurses' 'libcap')
 makedepends=('gtk' 'qt3' 'gtk2')
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('ca492afbbb59cd19f1c875533f18b269')
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
+        glib2.patch)
+md5sums=('ca492afbbb59cd19f1c875533f18b269'
+         'df553f478e7f9e943367967998bb0d43')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -Np1 -i ${srcdir}/glib2.patch
   [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh
   ./configure --prefix=/usr \
 	--enable-pinentry-curses \
@@ -23,4 +26,5 @@
 	--enable-fallback-curses
   make || return 1
   make DESTDIR=$startdir/pkg install
+  rm ${pkgdir}/usr/share/info/dir
 }

Added: glib2.patch
===================================================================
--- glib2.patch	                        (rev 0)
+++ glib2.patch	2008-08-17 06:24:46 UTC (rev 9346)
@@ -0,0 +1,38 @@
+--- pinentry/gtk+-2/gtksecentry.c	(revision 181)
++++ pinentry/gtk+-2/gtksecentry.c	(working copy)
+@@ -270,7 +270,11 @@
+ 
+ 
+ gpointer
++#if GLIB_CHECK_VERSION(2, 16, 1)
++g_malloc(gsize size)
++#else
+ g_malloc(gulong size)
++#endif
+ {
+     gpointer p;
+ 
+@@ -288,7 +292,11 @@
+ }
+ 
+ gpointer
++#if GLIB_CHECK_VERSION(2, 16, 1)
++g_malloc0(gsize size)
++#else
+ g_malloc0(gulong size)
++#endif
+ {
+     gpointer p;
+ 
+@@ -308,7 +316,11 @@
+ }
+ 
+ gpointer
++#if GLIB_CHECK_VERSION(2, 16, 1)
++g_realloc(gpointer mem, gsize size)
++#else
+ g_realloc(gpointer mem, gulong size)
++#endif
+ {
+     gpointer p;
+