Browse Source

n/pinentry: Applied patch for gtk2 grabbing bug.

slackware-14.2
Damien Goutte-Gattat 5 years ago
parent
commit
3fda77fac3
  1. 41
      n/pinentry/pinentry-1.0.0-gtk2-grab.patch
  2. 7
      n/pinentry/pinentry.SlackBuild

41
n/pinentry/pinentry-1.0.0-gtk2-grab.patch

@ -0,0 +1,41 @@
diff -Naur pinentry-1.0.0.orig/gtk+-2/pinentry-gtk-2.c pinentry-1.0.0/gtk+-2/pinentry-gtk-2.c
--- pinentry-1.0.0.orig/gtk+-2/pinentry-gtk-2.c 2016-11-07 10:55:43.000000000 +0100
+++ pinentry-1.0.0/gtk+-2/pinentry-gtk-2.c 2017-02-18 15:45:40.468599077 +0100
@@ -478,28 +478,17 @@
GtkToggleButton *button = GTK_TOGGLE_BUTTON (widget);
GtkWidget *label = data;
const char *text;
- char *tooltip;
gboolean reveal;
if (!gtk_toggle_button_get_active (button) || !confirm_unhiding ())
{
text = "<span font=\"Monospace\" size=\"xx-small\">abc</span>";
- tooltip = pinentry_utf8_validate (pinentry->default_tt_visi);
- if (!tooltip)
- {
- tooltip = g_strdup ("Make the passphrase visible");
- }
gtk_toggle_button_set_active (button, FALSE);
reveal = FALSE;
}
else
{
text = "<span font=\"Monospace\" size=\"xx-small\">***</span>";
- tooltip = pinentry_utf8_validate (pinentry->default_tt_hide);
- if (!tooltip)
- {
- tooltip = g_strdup ("Hide the passphrase");
- }
reveal = TRUE;
}
@@ -510,8 +499,6 @@
}
gtk_label_set_markup (GTK_LABEL(label), text);
- gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip);
- g_free (tooltip);
}

7
n/pinentry/pinentry.SlackBuild

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2016 Damien Goutte-Gattat
# Copyright (C) 2016,2017 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -34,7 +34,7 @@ WGET=${WGET:-https://www.gnupg.org/ftp/gcrypt/pinentry/$ARCHIVE}
# Build infos
NAMEPKG=${NAMEPKG:-pinentry}
BUILD=${BUILD:-1GGD}
BUILD=${BUILD:-2GGD}
ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
JOBS=${JOBS:-1}
EXT=${EXT:-txz}
@ -85,6 +85,9 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
# Apply suggested fix for Gtk2 grabbing problem
# (https://lists.gnupg.org/pipermail/gnupg-devel/2017-February/032608.html)
patch -p 1 < $CWD/pinentry-1.0.0-gtk2-grab.patch
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
./configure \

Loading…
Cancel
Save