Non-maintainer commit - this has been affecting me for a long time and it's quite...

Added upstream patch to ensure pinentry is displayed in the foreground with qt - https://bugs.g10code.com/gnupg/issue1162
Thanks to rubik's cube <daniel.hornung@gmx.de> - fixes bug 328189.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 26800d942560718ace9dfd01d8ec1dc49366a662..f04fcaf3ffee9d16eaaacc0ed6b52ff2400c2334 100644 (file)
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.106 2010/07/11 10:30:28 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.107 2010/07/18 22:14:21 jmbsvicetto Exp $
+
+  18 Jul 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  pinentry-0.8.0.ebuild, +files/pinentry-0.8.0-qt-fix.patch:
+  Non-maintainer commit - this has been affecting me for a long time and
+  it's quite upsetting.
+  Added upstream patch to ensure pinentry is displayed in the foreground
+  with qt - https://bugs.g10code.com/gnupg/issue1162
+  Thanks to rubik's cube <daniel.hornung@gmx.de> - fixes bug 328189.
 
   11 Jul 2010; Tobias Klausmann <klausman@gentoo.org> pinentry-0.8.0.ebuild:
   Stable on alpha, bug #299388

diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index c1f7516511c87a5fbc6be729baf8cc6d7473f523..d006940d04487edfd3b20fd9834b89ce261a95ed 100644 (file)
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,4 +1,5 @@
 AUX pinentry-0.7.5-grab.patch 536 RMD160 66f86ff0c8c208ec62de1dea2b2c3edeca41d0fb SHA1 cbb4a01242ce73ebb18c38d9541f03017691a265 SHA256 149fadfa505e55fa4f4e1fb5536066b87290566df4d890e6f4087d86f213188a
+AUX pinentry-0.8.0-qt-fix.patch 1104 RMD160 6fdd963869c237a08447a85d219c51125d17262f SHA1 49741480980c0e16d47ea8fa91df4e8dfecc9db2 SHA256 1375d5675f9c1ba050a0bcf9853df01b73110fffa8580cb90a2095db522c7dbc
 AUX pinentry-gmem.patch 880 RMD160 82c41513e47be43a801ec0d2e6cf89857b5e373f SHA1 34abb7caa0aecbd4d8f592695c30e40311425688 SHA256 484dafa00a7fe6e04380d32f3a468082d68923c11f8e3fb007e09018b4b617f5
 DIST pinentry-0.7.5.tar.gz 422801 RMD160 4ed9d06981b647f9fd39b9d30651a36307869c2d SHA1 6699a1ff94c649e8905199d480c6412cc43bad3d SHA256 cb269ac058793b2df343a12a65e3402abc4b68503e105b12e4ca903d8d8e3172
 DIST pinentry-0.7.6.tar.gz 475101 RMD160 6e69eee88b5cbb919ced79971cd4794f5e659023 SHA1 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 SHA256 14670c18f4a042ffcbd7a937aa3f15de392816c56b472588383d8378f65b42ab
@@ -6,6 +7,6 @@ DIST pinentry-0.8.0.tar.gz 487629 RMD160 966e830fb86c1820057979f581ca71f82a4fc9e
 EBUILD pinentry-0.7.5-r1.ebuild 2390 RMD160 730747a0c9ab73215be997a763280d3105e684d6 SHA1 23b6815ed2d97958534e142ec8b81ea884273ecd SHA256 1dd5feb0db92c0492e5375a9cd87373b0d17bf9b33a84e4b6a34d9ad8451f8b9
 EBUILD pinentry-0.7.5.ebuild 1965 RMD160 c4a3b0d9f7d1d1f4838f36108d6ba812519a5239 SHA1 3886110c38eede87e81440d8231913a766401c51 SHA256 cc7dcc4ab69d7cb53c8d62d640bb9f9fc4d590ddfa5c23fdc9ea20455358c17e
 EBUILD pinentry-0.7.6.ebuild 2787 RMD160 7c6d452834d52a99c29dea21a3ba55104641a696 SHA1 3c45c5e1fdb1aaeb2646f6aa3c459ae638f5dfc5 SHA256 cdaa62b83bda5f36fba3d396366e34ce530f8cbe89ca14fab46f7248b8f493ea
-EBUILD pinentry-0.8.0.ebuild 2788 RMD160 8ae2915fd3a46cd201d0e94dbce5dda31305813f SHA1 cd271c06b7d0a693425fcd0cd26122307ca83225 SHA256 dadb2f354025c0b9801a9a26adbb7705570ccf1987a9567ba210cb9126f09e27
-MISC ChangeLog 14024 RMD160 27aa9bbf5f44c928369bd9d541eff58dcc49db4d SHA1 d02131542929a440ff2f3ba6e4701e35d8da17f8 SHA256 30cd158d92a6336e49b2528bd0596c30fa202385f43ad7b15ea5cec96cf2c8a3
+EBUILD pinentry-0.8.0.ebuild 2876 RMD160 34f99eb105c179e186d4a2d9085cb4adc06685dd SHA1 b75dd329ba1dfe3341891646b75435d1dfacd075 SHA256 0b3aba0d0fbef020e2c3a6d4496b683a4322261306685b100530ebaafeda6c09
+MISC ChangeLog 14448 RMD160 a807a02f5df432ee2eb7457f89f051d822e708fa SHA1 b647eb4f05794bc10df8a4ca44149ee68afa9a21 SHA256 112d2cc3f6024c269a562bfa9d85327db4a0e21c429bc191aeeedbe74adf324f
 MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548

diff --git a/app-crypt/pinentry/files/pinentry-0.8.0-qt-fix.patch b/app-crypt/pinentry/files/pinentry-0.8.0-qt-fix.patch
new file mode 100644 (file)
index 0000000..42cef76
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.8.0-qt-fix.patch
@@ -0,0 +1,26 @@
+Index: qt/pinentrydialog.cpp
+===================================================================
+--- qt/pinentrydialog.cpp      (revision 233)
++++ qt/pinentrydialog.cpp      (working copy)
+@@ -33,7 +33,7 @@
+ 
+ PinEntryDialog::PinEntryDialog( QWidget* parent, const char* name, 
+                                 bool modal, bool enable_quality_bar )
+-  : QDialog( parent, name, modal ), _grabbed( false )
++  : QDialog( parent, name, modal, Qt::WStyle_StaysOnTop ), _grabbed( false )
+ {
+   QBoxLayout* top = new QVBoxLayout( this, 6 );
+   QBoxLayout* upperLayout = new QHBoxLayout( top );
+Index: qt4/pinentrydialog.cpp
+===================================================================
+--- qt4/pinentrydialog.cpp     (revision 233)
++++ qt4/pinentrydialog.cpp     (working copy)
+@@ -83,7 +83,7 @@
+ 
+ PinEntryDialog::PinEntryDialog( QWidget* parent, const char* name, bool modal,
+                                 bool enable_quality_bar )
+-  : QDialog( parent ), _grabbed( false )
++  : QDialog( parent, Qt::WindowStaysOnTopHint ), _grabbed( false )
+ {
+   setWindowFlags( windowFlags() & ~Qt::WindowContextHelpButtonHint );
+ 

diff --git a/app-crypt/pinentry/pinentry-0.8.0.ebuild b/app-crypt/pinentry/pinentry-0.8.0.ebuild
index f9c735539cc4477a1375fb7d809964a9264887da..a45baf655bb354f16a81fe607ee247802ac94806 100644 (file)
--- a/app-crypt/pinentry/pinentry-0.8.0.ebuild
+++ b/app-crypt/pinentry/pinentry-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.0.ebuild,v 1.8 2010/07/11 10:30:28 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.0.ebuild,v 1.9 2010/07/18 22:14:21 jmbsvicetto Exp $
 
 EAPI=3
 
@@ -38,6 +38,9 @@ pkg_setup() {
 src_prepare() {
        epatch "${FILESDIR}/${PN}-0.7.5-grab.patch"
 
+       # https://bugs.g10code.com/gnupg/issue1162
+       epatch "${FILESDIR}/${P}-qt-fix.patch"
+
        if use qt4; then
                local file
                for file in qt4/*.moc; do