Fix stuck keyboard grab in pidgin and gajim (bug #427148, thanks to Christian Trefzer, Rafał Mużyło, shinydoofy).

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 308 insertions, 1 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 65f2bea27c75..4bd208414753 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.601 2012/07/16 06:38:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.602 2012/07/20 23:58:11 tetromino Exp $
+
+*gtk+-2.24.11-r1 (20 Jul 2012)
+
+  20 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gtk+-2.24.11-r1.ebuild, +files/gtk+-2.24.11-stuck-grab.patch:
+  Fix stuck keyboard grab in pidgin and gajim (bug #427148, thanks to Christian
+  Trefzer, Rafał Mużyło, shinydoofy).
 
 *gtk+-3.4.4 (16 Jul 2012)
 *gtk+-2.24.11 (16 Jul 2012)
diff --git a/x11-libs/gtk+/files/gtk+-2.24.11-stuck-grab.patch b/x11-libs/gtk+/files/gtk+-2.24.11-stuck-grab.patch
new file mode 100644
index 000000000000..21c1b851a914
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.11-stuck-grab.patch
@@ -0,0 +1,51 @@
+From f3afba6202a442d1c3381b2c0fe314814b73168b Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 16 May 2012 17:18:51 -0400
+Subject: [PATCH] Fix a case of 'stuck grab'
+
+This was showing up when using a combo box in list mode. After popping
+up the list, the keyboard grab appeared stuck. What was stuck here is
+only the client-side grab, since we forgot to clean up our grabs
+when receiving an UnmapNotify.
+
+This bug was introduced in 3f6592f60fd15fb353fc84600caefba3054dc892.
+
+[ Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.24 ]
+
+https://bugzilla.gnome.org/show_bug.cgi?id=680346
+---
+ gdk/x11/gdkevents-x11.c |   17 ++++++++---------
+ 1 files changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
+index 7cc1000..b96e9f5 100644
+--- a/gdk/x11/gdkevents-x11.c
++++ b/gdk/x11/gdkevents-x11.c
+@@ -1799,16 +1799,15 @@ gdk_event_translate (GdkDisplay *display,
+            * means we hid the window ourselves, so we will have already flipped
+            * the iconified bit off.
+            */
+-          if (window)
+-            {
+-              if (GDK_WINDOW_IS_MAPPED (window))
+-                gdk_synthesize_window_state (window,
+-                                             0,
+-                                             GDK_WINDOW_STATE_ICONIFIED);
+-
+-              _gdk_xgrab_check_unmap (window, xevent->xany.serial);
+-            }
++          if (window && GDK_WINDOW_IS_MAPPED (window))
++            gdk_synthesize_window_state (window,
++                                         0,
++                                         GDK_WINDOW_STATE_ICONIFIED);
+         }
++
++      if (window)
++        _gdk_xgrab_check_unmap (window, xevent->xany.serial);
++
+       break;
+       
+     case MapNotify:
+-- 
+1.7.8.6
+
diff --git a/x11-libs/gtk+/gtk+-2.24.11-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.11-r1.ebuild
new file mode 100644
index 000000000000..ba12c35f13c9
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.11-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.11-r1.ebuild,v 1.1 2012/07/20 23:58:11 tetromino Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic gnome.org virtualx autotools
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama"
+
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="!aqua? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.3
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		>=x11-libs/cairo-1.6[X,svg]
+		x11-libs/gdk-pixbuf:2[X,introspection?]
+	)
+	aqua? (
+		>=x11-libs/cairo-1.6[aqua,svg]
+		x11-libs/gdk-pixbuf:2[introspection?]
+	)
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.30:2
+	>=x11-libs/pango-1.20[introspection?]
+	>=dev-libs/atk-1.29.2[introspection?]
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	cups? ( net-print/cups )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	!<gnome-base/gail-1000"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.11
+	doc? (
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
+# Remove blocker after >=vte-0.28.2-r201:0 is stable
+RDEPEND="${COMMON_DEPEND}
+	!<x11-libs/vte-0.28.2-r201:0"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+}
+
+src_prepare() {
+	# gold detected underlinking
+	# Add missing libs, patch sent upstream
+	epatch "${FILESDIR}/${PN}-2.24.10-gold.patch"
+
+	# Prevent stuck grab in pidgin, bug #427148, upstream 680346
+	epatch "${FILESDIR}/${PN}-2.24.11-stuck-grab.patch"
+
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	epatch "${FILESDIR}/${PN}-2.21.3-multilib.patch"
+
+	# Don't break inclusion of gtkclist.h, upstream bug 536767
+	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
+
+	# fix building with gir #372953, upstream bug #642085
+	epatch "${FILESDIR}"/${PN}-2.24.7-darwin-quartz-introspection.patch
+
+	# marshalers code was pre-generated with glib-2.31, upstream bug #671763
+	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
+		perf/marshalers.c || die
+
+	# Stop trying to build unmaintained docs, bug #349754
+	strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
+	strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	use ppc64 && append-flags -mminimal-toc
+
+	if ! use test; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+		strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
+	else
+		# Non-working test in gentoo's env
+		sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+			-i gtk/tests/testing.c || die "sed 1 failed"
+
+		# Cannot work because glib is too clever to find real user's home
+		# gentoo bug #285687, upstream bug #639832
+		# XXX: /!\ Pay extra attention to second sed when bumping /!\
+		sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
+			|| die "failed to disable recentmanager test (1)"
+		sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
+			|| die "failed to disable recentmanager test (2)"
+		sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
+			|| die "failed to disable recentmanager test (3)"
+
+		# Skip tests known to fail
+		# https://bugzilla.gnome.org/show_bug.cgi?id=646609
+		sed -e '/g_test_add_func.*test_text_access/s:^://:' \
+			-i "${S}/gtk/tests/testing.c" || die
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
+		sed -i -e 's:pltcheck.sh:$(NULL):g' \
+			gtk/Makefile.am || die
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
+	fi
+
+	# http://bugs.gentoo.org/show_bug.cgi?id=371907
+	mkdir -p "${S}/m4" || die
+	mv "${WORKDIR}/introspection.m4" "${S}/m4macros" || die
+	AT_M4DIR=m4macros eautoreconf
+	# Use elibtoolize in place of eautoreconf when it will be dropped
+	#elibtoolize
+}
+
+src_configure() {
+	local myconf="$(use_enable doc gtk-doc)
+		$(use_enable xinerama)
+		$(use_enable cups cups auto)
+		$(use_enable introspection)
+		--disable-papi"
+	if use aqua; then
+		myconf="${myconf} --with-gdktarget=quartz"
+	else
+		myconf="${myconf} --with-gdktarget=x11 --with-xinput"
+	fi
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	econf ${myconf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	# Exporting HOME fixes tests using XDG directories spec since all defaults
+	# are based on $HOME. It is also backward compatible with functions not
+	# yet ported to this spec.
+	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+	insinto /etc/gtk-2.0
+	doins "${T}"/gtkrc
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
+	doenvd "${T}"/50gtk2
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# add -framework Carbon to the .pc files
+	use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
+		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
+	done
+
+	# dev-util/gtk-builder-convert split off into a separate package, #402905
+	rm "${ED}"usr/bin/gtk-builder-convert
+
+	find "${D}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	# gtk.immodules should be in their CHOST directories respectively.
+	gtk-query-immodules-2.0  > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" \
+		|| ewarn "Failed to run gtk-query-immodules-2.0"
+
+	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
+		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
+		elog "aware location. Removing deprecated file."
+		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
+	fi
+
+	# pixbufs are now handled by x11-libs/gdk-pixbuf
+	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
+		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+		elog "Removing deprecated file."
+		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+	fi
+
+	# two checks needed since we dropped multilib conditional
+	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
+		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+		elog "Removing deprecated file."
+		rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
+	fi
+
+	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your gtkrc."
+	fi
+}