diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2008-03-23 13:08:33 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2008-03-23 13:08:33 +0000 |
| commit | c61cbb979e4f59678e028ef33ee005164475d7fb (patch) | |
| tree | 97cc60e581a52a34bbb79cc1e550f5ba7dd98835 /app-crypt/pinentry/files | |
| parent | Fix multilib issue, ruby bindings now doing site installation, bug #214051, t... (diff) | |
| download | gentoo-2-c61cbb979e4f59678e028ef33ee005164475d7fb.tar.gz gentoo-2-c61cbb979e4f59678e028ef33ee005164475d7fb.tar.bz2 gentoo-2-c61cbb979e4f59678e028ef33ee005164475d7fb.zip | |
Version bump, bug #213383. Drop bindnow-flags, bug #213669. Workaround for API change in >=glib-2.16.1, bug #213382.
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-crypt/pinentry/files')
| -rw-r--r-- | app-crypt/pinentry/files/pinentry-0.7.5-grab.patch | 15 | ||||
| -rw-r--r-- | app-crypt/pinentry/files/pinentry-gmem.patch | 45 |
2 files changed, 60 insertions, 0 deletions
diff --git a/app-crypt/pinentry/files/pinentry-0.7.5-grab.patch b/app-crypt/pinentry/files/pinentry-0.7.5-grab.patch new file mode 100644 index 000000000000..7cd3d96cdc9e --- /dev/null +++ b/app-crypt/pinentry/files/pinentry-0.7.5-grab.patch @@ -0,0 +1,15 @@ +--- pinentry/gtk+-2/pinentry-gtk-2.c ++++ pinentry/gtk+-2/pinentry-gtk-2.c +@@ -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", ++ "focus-in-event", + G_CALLBACK (grab_keyboard), NULL); + g_signal_connect (G_OBJECT (win), +- pinentry->grab ? "unmap-event" : "focus-out-event", ++ "focus-out-event", + G_CALLBACK (ungrab_keyboard), NULL); + } + gtk_window_add_accel_group (GTK_WINDOW (win), acc); diff --git a/app-crypt/pinentry/files/pinentry-gmem.patch b/app-crypt/pinentry/files/pinentry-gmem.patch new file mode 100644 index 000000000000..78121e6b3dbe --- /dev/null +++ b/app-crypt/pinentry/files/pinentry-gmem.patch @@ -0,0 +1,45 @@ +Workaround for API change in >=glib-2.16.1, bug #213382 + +This is not the final solution, but the patches posted on the mailing-list +cause more breakage than they help to solve the problem. + +Index: pinentry/gtk+-2/gtksecentry.c +=================================================================== +--- pinentry/gtk+-2/gtksecentry.c (revision 181) ++++ pinentry/gtk+-2/gtksecentry.c (working copy) +@@ -270,7 +270,11 @@ + + + gpointer ++#if GLIB_CHECK_VERSION(2, 16, 1) ++g_malloc(gsize size) ++#else + g_malloc(gulong size) ++#endif + { + gpointer p; + +@@ -288,7 +292,11 @@ + } + + gpointer ++#if GLIB_CHECK_VERSION(2, 16, 1) ++g_malloc0(gsize size) ++#else + g_malloc0(gulong size) ++#endif + { + gpointer p; + +@@ -308,7 +316,11 @@ + } + + gpointer ++#if GLIB_CHECK_VERSION(2, 16, 1) ++g_realloc(gpointer mem, gsize size) ++#else + g_realloc(gpointer mem, gulong size) ++#endif + { + gpointer p; + |