[packages/pinentry] - rel 2; activate patch is back

arekm arekm at pld-linux.org
Sat Sep 20 20:51:37 CEST 2014


commit 57d1a0c0eff7158e117cf30c72ce65200a985d6f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Sep 20 20:51:35 2014 +0200

    - rel 2; activate patch is back

 pinentry-activate.patch | 12 ++++++++++++
 pinentry.spec           |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/pinentry.spec b/pinentry.spec
index b42e148..dbef885 100644
--- a/pinentry.spec
+++ b/pinentry.spec
@@ -10,7 +10,7 @@ Summary:	Simple PIN or passphrase entry dialogs
 Summary(pl.UTF-8):	Proste kontrolki dialogowe do wpisywania PIN-ów lub haseł
 Name:		pinentry
 Version:	0.8.4
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications
 Source0:	ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2
@@ -19,6 +19,7 @@ Patch0:		%{name}-system-assuan.patch
 Patch1:		%{name}-info.patch
 Patch2:		%{name}-am.patch
 Patch3:		%{name}-doc.patch
+Patch4:		%{name}-activate.patch
 URL:		http://www.gnupg.org/
 %{?with_qt4:BuildRequires:	QtGui-devel}
 BuildRequires:	autoconf >= 2.57
@@ -100,6 +101,7 @@ Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Qt4.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %if %{with qt4}
 cd qt4
diff --git a/pinentry-activate.patch b/pinentry-activate.patch
new file mode 100644
index 0000000..c2fbed7
--- /dev/null
+++ b/pinentry-activate.patch
@@ -0,0 +1,12 @@
+; https://bugzilla.redhat.com/show_bug.cgi?id=589532
+; http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdialog-sends-window-to-background  
+--- pinentry-0.8.4/qt4/pinentrydialog.cpp~	2014-08-06 15:11:41.000000000 +0200
++++ pinentry-0.8.4/qt4/pinentrydialog.cpp	2014-09-20 20:50:00.806724935 +0200
+@@ -76,7 +76,6 @@
+     /* Maybe Qt will become agressive enough one day that
+      * this is enough on windows too*/
+     w->raise();
+-    w->activateWindow();
+ #ifdef Q_WS_WIN
+     /* In the meantime we do our own attention grabbing */
+     if (!SetForegroundWindow (w->winId()) &&
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pinentry.git/commitdiff/57d1a0c0eff7158e117cf30c72ce65200a985d6f



More information about the pld-cvs-commit mailing list