[arch-commits] Commit in pinentry/repos (3 files)

[Tobias Powalowski]

    Date: Saturday, August 1, 2009 @ 09:22:08
  Author: tpowa
Revision: 48309

Merged revisions 48307 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/pinentry/trunk

........
  r48307 | tpowa | 2009-08-01 13:19:58 +0000 (Sa, 01 Aug 2009) | 1 line
  
  upgpkg: pinentry 0.7.6-1
........

Modified:
  pinentry/repos/extra-i686/	(properties)
  pinentry/repos/extra-i686/PKGBUILD
Deleted:
  pinentry/repos/extra-i686/glib2.patch

-------------+
 PKGBUILD    |   25 ++++++++++++++-----------
 glib2.patch |   38 --------------------------------------
 2 files changed, 14 insertions(+), 49 deletions(-)


Property changes on: pinentry/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /pinentry/trunk:1-30622
   + /pinentry/trunk:1-48308

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-01 13:20:36 UTC (rev 48308)
+++ extra-i686/PKGBUILD	2009-08-01 13:22:08 UTC (rev 48309)
@@ -1,34 +1,37 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=pinentry
-pkgver=0.7.5
-pkgrel=5
+pkgver=0.7.6
+pkgrel=1
 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>=2.16')
-makedepends=('gtk' 'qt3' 'gtk2')
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
-        glib2.patch)
-md5sums=('ca492afbbb59cd19f1c875533f18b269'
-         'df553f478e7f9e943367967998bb0d43')
+makedepends=('gtk' 'qt3' 'gtk2' 'qt')
+optdepends=('gtk: for gtk backend'
+            'gtk2: for gtk2 backend'
+            'qt3: for qt3 backend'
+            'qt: for qt4 backend')  
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz)
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/glib2.patch || return 1
   [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh
+  for file in qt4/*.moc; do
+       /usr/bin/moc ${file/.moc/.h} > ${file}
+   done
   ./configure --prefix=/usr \
 	--enable-pinentry-curses \
 	--enable-pinentry-gtk \
 	--enable-pinentry-gtk2 \
-	--enable-pinentry-qt \
+        --enable-pinentry-qt \
+        --enable-pinentry-qt4 \
 	--enable-fallback-curses
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
   rm ${pkgdir}/usr/share/info/dir || return 1
   rm ${pkgdir}/usr/bin/pinentry || return 1
   ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry || return 1
-
-  
 }
+md5sums=('5a4f676375fa882009da02013d77210f')

Deleted: extra-i686/glib2.patch
===================================================================
--- extra-i686/glib2.patch	2009-08-01 13:20:36 UTC (rev 48308)
+++ extra-i686/glib2.patch	2009-08-01 13:22:08 UTC (rev 48309)
@@ -1,38 +0,0 @@
---- 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;
-