packages: pinentry/pinentry.spec, pinentry/0001-Fix-qt4-pinentry-window-cre...

[arekm]

Author: arekm                        Date: Fri Dec 16 22:42:09 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; activate properly

---- Files affected:
packages/pinentry:
   pinentry.spec (1.36 -> 1.37) , 0001-Fix-qt4-pinentry-window-created-in-the-background.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pinentry/pinentry.spec
diff -u packages/pinentry/pinentry.spec:1.36 packages/pinentry/pinentry.spec:1.37
--- packages/pinentry/pinentry.spec:1.36	Thu Sep  1 09:43:24 2011
+++ packages/pinentry/pinentry.spec	Fri Dec 16 23:42:04 2011
@@ -11,13 +11,14 @@
 Summary(pl.UTF-8):	Proste kontrolki dialogowe do wpisywania PIN-ów lub haseł
 Name:		pinentry
 Version:	0.8.1
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Applications
 Source0:	ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz
 # Source0-md5:	81f99904daee5331eb6738408bb024b6
 Patch0:		%{name}-system-assuan.patch
 Patch1:		%{name}-info.patch
+Patch2:		0001-Fix-qt4-pinentry-window-created-in-the-background.patch
 URL:		http://www.gnupg.org/
 %{?with_qt4:BuildRequires:	QtGui-devel}
 BuildRequires:	autoconf >= 2.57
@@ -97,6 +98,7 @@
 %setup -q
 #patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %if %{with qt4}
 cd qt4
@@ -199,6 +201,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2011/12/16 22:42:04  arekm
+- rel 3; activate properly
+
 Revision 1.36  2011/09/01 07:43:24  arekm
 - release 2
 

================================================================
Index: packages/pinentry/0001-Fix-qt4-pinentry-window-created-in-the-background.patch
diff -u /dev/null packages/pinentry/0001-Fix-qt4-pinentry-window-created-in-the-background.patch:1.1
--- /dev/null	Fri Dec 16 23:42:09 2011
+++ packages/pinentry/0001-Fix-qt4-pinentry-window-created-in-the-background.patch	Fri Dec 16 23:42:04 2011
@@ -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
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pinentry/pinentry.spec?r1=1.36&r2=1.37&f=u