diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2007-12-20 20:43:13 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2007-12-20 20:43:13 +0000 |
| commit | 154bc675d770e6ae460461983b681ed379743606 (patch) | |
| tree | 5794f230ee542cf5cf5d9d5c74e7fcc41471c4f5 /app-crypt/pinentry | |
| parent | Stable on x86 wrt bug #202869 (diff) | |
| download | gentoo-2-154bc675d770e6ae460461983b681ed379743606.tar.gz gentoo-2-154bc675d770e6ae460461983b681ed379743606.tar.bz2 gentoo-2-154bc675d770e6ae460461983b681ed379743606.zip | |
Readd grab patch, bug#165493
(Portage version: 2.1.4_rc10)
Diffstat (limited to 'app-crypt/pinentry')
| -rw-r--r-- | app-crypt/pinentry/ChangeLog | 10 | ||||
| -rw-r--r-- | app-crypt/pinentry/files/pinentry-0.7.4-grab.patch | 16 | ||||
| -rw-r--r-- | app-crypt/pinentry/pinentry-0.7.4.ebuild | 10 |
3 files changed, 33 insertions, 3 deletions
diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog index e70c1659f93e..d1fba97c1126 100644 --- a/app-crypt/pinentry/ChangeLog +++ b/app-crypt/pinentry/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-crypt/pinentry # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.72 2007/12/20 19:03:53 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.73 2007/12/20 20:43:13 alonbl Exp $ + + 20 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org> + +files/pinentry-0.7.4-grab.patch, pinentry-0.7.4.ebuild: + Readd grab patch, bug#165493 + + 20 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org> + +files/pinentry-0.7.4-grab.patch, pinentry-0.7.4.ebuild: + Readd grab patch, bug#165493 *pinentry-0.7.4 (20 Dec 2007) diff --git a/app-crypt/pinentry/files/pinentry-0.7.4-grab.patch b/app-crypt/pinentry/files/pinentry-0.7.4-grab.patch new file mode 100644 index 000000000000..c96875d0afc9 --- /dev/null +++ b/app-crypt/pinentry/files/pinentry-0.7.4-grab.patch @@ -0,0 +1,16 @@ +diff -urNp pinentry-0.7.4/gtk+-2/pinentry-gtk-2.c pinentry-0.7.4.new/gtk+-2/pinentry-gtk-2.c +--- pinentry-0.7.4/gtk+-2/pinentry-gtk-2.c 2007-11-29 00:57:55.000000000 +0200 ++++ pinentry-0.7.4.new/gtk+-2/pinentry-gtk-2.c 2007-12-20 22:38:05.000000000 +0200 +@@ -261,10 +261,10 @@ create_window (int confirm_mode) + if (!confirm_mode) + { + g_signal_connect (G_OBJECT (win), +- pinentry->grab ? "map-event" : "focus-in-event", ++ pinentry->grab ? "expose-event" : "focus-in-event", + G_CALLBACK (grab_keyboard), NULL); + g_signal_connect (G_OBJECT (win), +- pinentry->grab ? "unmap-event" : "focus-out-event", ++ pinentry->grab ? "no-expose-event" : "focus-out-event", + G_CALLBACK (ungrab_keyboard), NULL); + } + gtk_window_add_accel_group (GTK_WINDOW (win), acc); diff --git a/app-crypt/pinentry/pinentry-0.7.4.ebuild b/app-crypt/pinentry/pinentry-0.7.4.ebuild index de3442634b2f..736726eae0c5 100644 --- a/app-crypt/pinentry/pinentry-0.7.4.ebuild +++ b/app-crypt/pinentry/pinentry-0.7.4.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.4.ebuild,v 1.1 2007/12/20 19:03:53 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.4.ebuild,v 1.2 2007/12/20 20:43:13 alonbl Exp $ #WANT_AUTOCONF="2.5" #WANT_AUTOMAKE="1.9" -inherit flag-o-matic qt3 multilib eutils autotools +inherit qt3 multilib eutils DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" HOMEPAGE="http://www.gnupg.org/aegypten/" @@ -22,6 +22,12 @@ DEPEND="gtk? ( =x11-libs/gtk+-2* ) !gtk? ( !qt3? ( !ncurses? ( sys-libs/ncurses ) ) ) caps? ( sys-libs/libcap )" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-grab.patch" +} + src_compile() { local myconf="" |