diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
commit | c6e5d0d788ee2654a67bac4429d92f1f1df64c69 (patch) | |
tree | 84d3087e9c9f9aab24d69f83c8e7d1d7bde8dd17 /core/pinentry | |
parent | 89bffd8b9efae5fd29ca78a4741839ca68eb108f (diff) | |
parent | bc83221d3c667b70e51dfff6ed212aada3906ee6 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kid3/kid3.install
community/cherokee/PKGBUILD
community/supercollider/supercollider.install
core/libusb/PKGBUILD
core/systemd/PKGBUILD
core/udev/PKGBUILD
extra/gimp-devel/PKGBUILD
extra/maxima/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
staging/kdebase-workspace/kdm
staging/kdebindings-perlkde/PKGBUILD
staging/kdebindings-perlqt/PKGBUILD
staging/kdemultimedia/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdeplasma-addons/kdeplasma-addons-applets.install
Diffstat (limited to 'core/pinentry')
-rw-r--r-- | core/pinentry/gtk2-pinentry-segfault.patch | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/core/pinentry/gtk2-pinentry-segfault.patch b/core/pinentry/gtk2-pinentry-segfault.patch deleted file mode 100644 index c0b9fb4ca..000000000 --- a/core/pinentry/gtk2-pinentry-segfault.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2/pinentry-gtk-2.c.orig 2010-03-03 05:19:55.000000000 -0600 -+++ gtk+-2/pinentry-gtk-2.c 2010-07-07 00:11:30.413572124 -0500 -@@ -145,7 +145,7 @@ - { - gdk_keyboard_ungrab (gdk_event_get_time (event)); - /* Unmake window transient for the root window. */ -- gdk_window_set_transient_for (win->window, NULL); -+ gdk_property_delete (win->window, gdk_atom_intern_static_string ("WM_TRANSIENT_FOR")); - } - - |