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

[Tobias Powalowski]

    Date: Friday, May 25, 2012 @ 08:43:42
  Author: tpowa
Revision: 159495

upgpkg: pinentry 0.8.1-4

fix #29998

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

------------------------------+
 PKGBUILD                     |   19 +++++++++++--------
 gtk2-pinentry-segfault.patch |   11 -----------
 qt4-pinentry-window.patch    |   28 ++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-25 03:17:36 UTC (rev 159494)
+++ PKGBUILD	2012-05-25 12:43:42 UTC (rev 159495)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=pinentry
 pkgver=0.8.1
-pkgrel=3
+pkgrel=4
 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,11 +12,13 @@
 optdepends=('gtk2: for gtk2 backend'
             'qt: for qt4 backend')  
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
-        gtk2-pinentry-segfault.patch)
+        qt4-pinentry-window.patch)
 install=pinentry.install
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
+  #fix: https://bugs.archlinux.org/task/29998
+  patch -Np1 -i ../qt4-pinentry-window.patch
   for file in qt4/*.moc; do
        /usr/bin/moc ${file/.moc/.h} > ${file}
    done
@@ -27,11 +29,12 @@
 	--enable-pinentry-gtk2 \
         --enable-pinentry-qt4 \
 	--enable-fallback-curses
-  make 
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   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=('81f99904daee5331eb6738408bb024b6'
-         'bd9888fafc56464b2c4deaad5b8edb07')
+         '450b8713fe42f1bd93311ef84767c3d8')

Deleted: gtk2-pinentry-segfault.patch
===================================================================
--- gtk2-pinentry-segfault.patch	2012-05-25 03:17:36 UTC (rev 159494)
+++ gtk2-pinentry-segfault.patch	2012-05-25 12:43:42 UTC (rev 159495)
@@ -1,11 +0,0 @@
---- 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"));
- }
- 
- 

Added: qt4-pinentry-window.patch
===================================================================
--- qt4-pinentry-window.patch	                        (rev 0)
+++ qt4-pinentry-window.patch	2012-05-25 12:43:42 UTC (rev 159495)
@@ -0,0 +1,28 @@
+From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 1 Feb 2011 14:42:27 +0100
+Subject: [PATCH] Fix qt4 pinentry window created in the background
+
+This is probably just a workaround. Proper fix is being investigated.
+See:
+https://bugzilla.redhat.com/show_bug.cgi?id=589532
+http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdialog-sends-window-to-background
+---
+ qt4/pinentrydialog.cpp |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp
+index 541baf4..d634eb6 100644
+--- a/qt4/pinentrydialog.cpp
++++ b/qt4/pinentrydialog.cpp
+@@ -69,7 +69,6 @@ void raiseWindow( QWidget* w )
+     SetForegroundWindow( w->winId() );
+ #endif
+     w->raise();
+-    w->activateWindow();
+ }
+ 
+ QPixmap icon( QStyle::StandardPixmap which )
+-- 
+1.7.3.5
+