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

[Tobias Powalowski]

    Date: Sunday, August 29, 2010 @ 07:09:04
  Author: tpowa
Revision: 89094

upgpkg: pinentry 0.8.0-2
fix #15917

Added:
  pinentry/trunk/gtk2-pinentry-segfault.patch
Modified:
  pinentry/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   19 +++++++++++--------
 gtk2-pinentry-segfault.patch |   11 +++++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-29 10:58:21 UTC (rev 89093)
+++ PKGBUILD	2010-08-29 11:09:04 UTC (rev 89094)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=pinentry
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,7 +13,8 @@
             'gtk2: for gtk2 backend'
             'qt3: for qt3 backend'
             'qt: for qt4 backend')  
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
+        gtk2-pinentry-segfault.patch)
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -21,6 +22,7 @@
   for file in qt4/*.moc; do
        /usr/bin/moc ${file/.moc/.h} > ${file}
    done
+  patch -Np0 -i ../gtk2-pinentry-segfault.patch
   ./configure --prefix=/usr \
 	--enable-pinentry-curses \
 	--enable-pinentry-gtk \
@@ -28,10 +30,11 @@
         --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
+  make 
+  make DESTDIR=${pkgdir} install 
+  rm ${pkgdir}/usr/share/info/dir 
+  rm ${pkgdir}/usr/bin/pinentry 
+  ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry 
 }
-md5sums=('590be1b00f9ab63205843c7fed8caf35')
+md5sums=('590be1b00f9ab63205843c7fed8caf35'
+         'bd9888fafc56464b2c4deaad5b8edb07')

Added: gtk2-pinentry-segfault.patch
===================================================================
--- gtk2-pinentry-segfault.patch	                        (rev 0)
+++ gtk2-pinentry-segfault.patch	2010-08-29 11:09:04 UTC (rev 89094)
@@ -0,0 +1,11 @@
+--- gtk+-2/pinentry-gtk-2.c.orig	2010-03-03 05:19:55.000000000 -0600
++++ gtk+-2/pinentry-gtk-2.c	2010-07-07 00:11:30.413572124 -0500
+@@ -145,7 +145,7 @@
+ {
+   gdk_keyboard_ungrab (gdk_event_get_time (event));
+   /* Unmake window transient for the root window.  */
+-  gdk_window_set_transient_for (win->window, NULL);
++  gdk_property_delete (win->window, gdk_atom_intern_static_string ("WM_TRANSIENT_FOR"));
+ }
+ 
+