Browse Source

n/pinentry: Really fix floating dialogs.

slackware-14.2
Damien Goutte-Gattat 4 years ago
parent
commit
29d1cfc611
  1. 34
      n/pinentry/pinentry-1.0.0-gtk2-floating-dialog-2.patch
  2. 6
      n/pinentry/pinentry.SlackBuild

34
n/pinentry/pinentry-1.0.0-gtk2-floating-dialog-2.patch

@ -0,0 +1,34 @@
commit 2b1fb2f30a94a967dacec298e3c7d8a80b4c3194
Author: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Date: Wed Aug 23 21:46:22 2017 +0200
gtk: Really always set the window as transient.
* gtk+-2/pinentry-gtk-2.c (make_transient): Set the window as
transient even if we do not grab the keyboard.
--
In the previous commit attempting to fix issue 3253, the window
was set as transient only in grabbing mode. The window should
actually always be set as transient, independently of whether
we grab the keyboard or not. This is especially important now
that --no-grab is the default behavior of GnuPG Agent.
GnuPG-bug-id: 3253
Fixes-commit: f69dadc6ccea7672869436291ab5c1f58d545466
Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
index f17a702..89728c4 100644
--- a/gtk+-2/pinentry-gtk-2.c
+++ b/gtk+-2/pinentry-gtk-2.c
@@ -136,9 +136,6 @@ make_transient (GtkWidget *win, GdkEvent *event, gpointer data)
(void)event;
(void)data;
- if (! pinentry->grab)
- return;
-
/* Make window transient for the root window. */
screen = gdk_screen_get_default ();
root = gdk_screen_get_root_window (screen);

6
n/pinentry/pinentry.SlackBuild

@ -32,7 +32,7 @@ WGET=${WGET:-https://www.gnupg.org/ftp/gcrypt/pinentry/$ARCHIVE}
# Build infos
NAMEPKG=${NAMEPKG:-pinentry}
BUILD=${BUILD:-4GGD}
BUILD=${BUILD:-5GGD}
ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
JOBS=${JOBS:-1}
EXT=${EXT:-txz}
@ -83,9 +83,10 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
# Apply fix for not-floating dialog windows
# Apply fixes for not-floating dialog windows
# (https://dev.gnupg.org/T3253)
patch -p 1 < $CWD/pinentry-1.0.0-gtk2-floating-dialog.patch
patch -p 1 < $CWD/pinentry-1.0.0-gtk2-floating-dialog-2.patch
# Apply fix for grabbing issue with Gtk2 tooltips
# (https://dev.gnupg.org/T3297)
patch -p 1 < $CWD/pinentry-1.0.0-gtk2-disable-tooltips.patch
@ -96,6 +97,7 @@ CXXFLAGS=$CPUOPT \
--libdir=/usr/lib$LIBDIRSUFFIX \
--infodir=/usr/info \
--docdir=/usr/doc/$NAME \
--enable-pinentry-tty \
--build=$ARCH-slackware-linux
make -j $JOBS
make install-strip DESTDIR=$PKG

Loading…
Cancel
Save