Browse Source

n/pinentry: Upgraded to pinentry-1.1.0.

slackware-14.2
Damien Goutte-Gattat 3 years ago
parent
commit
876cd78c28
6 changed files with 3 additions and 135 deletions
  1. +0
    -42
      n/pinentry/pinentry-1.0.0-gtk2-disable-tooltips.patch
  2. +0
    -34
      n/pinentry/pinentry-1.0.0-gtk2-floating-dialog-2.patch
  3. +0
    -49
      n/pinentry/pinentry-1.0.0-gtk2-floating-dialog.patch
  4. +0
    -1
      n/pinentry/pinentry-1.0.0.tar.bz2.sha256
  5. +1
    -0
      n/pinentry/pinentry-1.1.0.tar.bz2.sha256
  6. +2
    -9
      n/pinentry/pinentry.SlackBuild

+ 0
- 42
n/pinentry/pinentry-1.0.0-gtk2-disable-tooltips.patch View File

@ -1,42 +0,0 @@
commit 1590b664d88be8386a4664c2994b685187d1eb25
Author: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Date: Thu Aug 3 22:56:49 2017 +0200
gtk: Disable tooltips in keyboard-grabbing mode.
* gtk+-2:/pinentry-gtk-2.c (show_hide_button): Do not show the
tooltip if we attempt to grab the keyboard.
(create_window): Likewise.
--
For unclear reasons, those tooltips may interfere with grabbing
under some tiling window managers.
GnuPG-bug-id: 3297
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 d467ec5..f17a702 100644
--- a/gtk+-2/pinentry-gtk-2.c
+++ b/gtk+-2/pinentry-gtk-2.c
@@ -516,7 +516,10 @@ show_hide_button_toggled (GtkWidget *widget, gpointer data)
}
gtk_label_set_markup (GTK_LABEL(label), text);
- gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip);
+ if (!pinentry->grab)
+ {
+ gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip);
+ }
g_free (tooltip);
}
@@ -736,7 +739,7 @@ create_window (pinentry_t ctx)
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (qualitybar),
QUALITYBAR_EMPTY_TEXT);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (qualitybar), 0.0);
- if (pinentry->quality_bar_tt)
+ if (pinentry->quality_bar_tt && !pinentry->grab)
{
#if !GTK_CHECK_VERSION (2, 12, 0)
gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), qualitybar,

+ 0
- 34
n/pinentry/pinentry-1.0.0-gtk2-floating-dialog-2.patch View File

@ -1,34 +0,0 @@
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);

+ 0
- 49
n/pinentry/pinentry-1.0.0-gtk2-floating-dialog.patch View File

@ -1,49 +0,0 @@
commit c693cc177fe79de8d173086fb578fe525a1b2a6b
Author: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Date: Wed Jul 5 11:12:56 2017 +0200
gtk: Always set the window as transient.
* gtk+-2/pinentry-gtk-2.c (create_window): Setup the make_transient
callback whether we ask for a passphrase or not.
--
Making the window transient seems necessary for (some) tiling window
managers to make sure the dialog is floating.
GnuPG-bug-id: T3253
diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
index dee0360..d467ec5 100644
--- a/gtk+-2/pinentry-gtk-2.c
+++ b/gtk+-2/pinentry-gtk-2.c
@@ -113,9 +113,9 @@ constrain_size (GtkWidget *win, GtkRequisition *req, gpointer data)
}
-/* Realize the window as transient if we grab the keyboard. This
- makes the window a modal dialog to the root window, which helps the
- window manager. See the following quote from:
+/* Realize the window as transient. This makes the window a modal
+ dialog to the root window, which helps the window manager.
+ See the following quote from:
https://standards.freedesktop.org/wm-spec/wm-spec-1.4.html#id2512420
Implementing enhanced support for application transient windows
@@ -586,12 +586,12 @@ create_window (pinentry_t ctx)
#endif
g_signal_connect (G_OBJECT (win), "size-request",
G_CALLBACK (constrain_size), NULL);
+
+ g_signal_connect (G_OBJECT (win),
+ "realize", G_CALLBACK (make_transient), NULL);
+
if (!confirm_mode)
{
- if (pinentry->grab)
- g_signal_connect (G_OBJECT (win),
- "realize", G_CALLBACK (make_transient), NULL);
-
/* We need to grab the keyboard when its visible! not when its
mapped (there is a difference) */
g_object_set (G_OBJECT(win), "events",

+ 0
- 1
n/pinentry/pinentry-1.0.0.tar.bz2.sha256 View File

@ -1 +0,0 @@
1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a pinentry-1.0.0.tar.bz2

+ 1
- 0
n/pinentry/pinentry-1.1.0.tar.bz2.sha256 View File

@ -0,0 +1 @@
68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570 pinentry-1.1.0.tar.bz2

+ 2
- 9
n/pinentry/pinentry.SlackBuild View File

@ -26,13 +26,13 @@
# Source package infos
NAMESRC=${NAMESRC:-pinentry}
VERSION=${VERSION:-1.0.0}
VERSION=${VERSION:-1.1.0}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.bz2}
WGET=${WGET:-https://www.gnupg.org/ftp/gcrypt/pinentry/$ARCHIVE}
# Build infos
NAMEPKG=${NAMEPKG:-pinentry}
BUILD=${BUILD:-5GGD}
BUILD=${BUILD:-1GGD}
ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
JOBS=${JOBS:-1}
EXT=${EXT:-txz}
@ -83,13 +83,6 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
# 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
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
./configure \


Loading…
Cancel
Save