Fix pinentry which broke due to upstream patch change #34780
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Any idea what's different in the patch to require a new hash? |
|
Doesn't look like anything meaningful. Annoying that so many things are affected by it: --- old.patch 2018-02-09 17:18:08.000000000 -0500
+++ /nix/store/a45agg4g16j6y7yca4dk39k81bfiqafi-0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch 1969-12-31 19:00:01.000000000 -0500
@@ -1,6 +1,6 @@
--- a/gtk+-2/pinentry-gtk-2.c
+++ b/gtk+-2/pinentry-gtk-2.c
-@@ -166,7 +166,7 @@
+@@ -164,7 +164,7 @@
grab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
{
GdkGrabStatus err;
@@ -9,7 +9,7 @@
(void)data;
if (! pinentry->grab)
-@@ -175,7 +175,8 @@
+@@ -173,7 +173,8 @@
do
err = gdk_keyboard_grab (gtk_widget_get_window (win),
FALSE, gdk_event_get_time (event));
@@ -19,7 +19,7 @@
if (err)
{
-@@ -199,7 +200,7 @@
+@@ -197,7 +198,7 @@
{
GdkGrabStatus err;
GdkCursor *cursor;
@@ -28,7 +28,7 @@
(void)data;
/* Change the cursor for the duration of the grab to indicate that
-@@ -221,7 +222,8 @@
+@@ -219,7 +220,8 @@
cursor,
gdk_event_get_time (event));
while (tries++ < max_tries && (err == GDK_GRAB_NOT_VIEWABLE |
|
Pushed your second commit directly in 20e23ce since you accidentally included an old commit in this PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Fix pinentry package, broke due to upstream patch change.
Things done
Updated hash for patch for pinentry.
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)