x11-libs/gtk+: fix broken diacritics on intl keyboards (see gnome bug #554192)

(Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r3 i686)

4 files changed, 222 insertions, 1 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 1fcc07cbb9f6..e512b3155d1e 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.400 2008/09/29 07:40:36 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.401 2008/10/01 21:49:03 remi Exp $
+
+*gtk+-2.14.3-r2 (01 Oct 2008)
+
+  01 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  +files/gtk+-2.14.3-fix-combining-broken-diacritics.patch,
+  +files/gtk+-2.14.3-reorder-compose-key-table-order.patch,
+  +gtk+-2.14.3-r2.ebuild:
+  fix broken diacritics on intl keyboards (see gnome bug #554192)
 
 *gtk+-2.14.3-r1 (29 Sep 2008)
 
diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-fix-combining-broken-diacritics.patch b/x11-libs/gtk+/files/gtk+-2.14.3-fix-combining-broken-diacritics.patch
new file mode 100644
index 000000000000..40db2ef1957d
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.14.3-fix-combining-broken-diacritics.patch
@@ -0,0 +1,26 @@
+Index: gtk/gtkimcontextsimple.c
+===================================================================
+--- gtk/gtkimcontextsimple.c	(revision 21556)
++++ gtk/gtkimcontextsimple.c	(revision 21557)
+@@ -407,11 +407,19 @@
+   return FALSE;
+ }
+ 
+-/* When updating the table of the compose sequences, also update here.
++/* Checks if a keysym is a dead key. Dead key keysym values are defined in
++ * ../gdk/gdkkeysyms.h and the first is GDK_dead_grave. As X.Org is updated,
++ * more dead keys are added and we need to update the upper limit.
++ * Also checks if the keysym belongs to the non-spacing mark Unicode category,
++ * by invoking gdk_keyval_to_unicode(). For keysyms like 0x1000000 + 0x0301,
++ * it converts them to 0x301, which makes g_unichar_type() report them as
++ * non-spacing mark. Thus, we check that the value is less then 0x1000000.
++ * check_algorithmically() does not handle keysyms > 0x1000000.
+  */
+ #define IS_DEAD_KEY(k) \
+     (((k) >= GDK_dead_grave && (k) <= (GDK_dead_dasia+1)) || \
+-     g_unichar_type (gdk_keyval_to_unicode (k)) == G_UNICODE_NON_SPACING_MARK)
++     ((g_unichar_type (gdk_keyval_to_unicode (k)) == G_UNICODE_NON_SPACING_MARK) && \
++      ((k) < 0x1000000)))
+ 
+ static gboolean
+ check_algorithmically (GtkIMContextSimple    *context_simple,
diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-reorder-compose-key-table-order.patch b/x11-libs/gtk+/files/gtk+-2.14.3-reorder-compose-key-table-order.patch
new file mode 100644
index 000000000000..dd098e9cc52b
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.14.3-reorder-compose-key-table-order.patch
@@ -0,0 +1,20 @@
+Index: gtk/gtkimcontextsimple.c
+===================================================================
+--- gtk/gtkimcontextsimple.c	(revision 21564)
++++ gtk/gtkimcontextsimple.c	(working copy)
+@@ -933,12 +933,12 @@
+             return TRUE;
+           tmp_list = tmp_list->next;
+         }
+-  
+-      if (check_algorithmically (context_simple, n_compose))
+-	return TRUE;
+ 
+       if (check_compact_table (context_simple, &gtk_compose_table_compact, n_compose))
+         return TRUE;
++ 
++      if (check_algorithmically (context_simple, n_compose))
++	return TRUE;
+     }
+   
+   /* The current compose_buffer doesn't match anything */
diff --git a/x11-libs/gtk+/gtk+-2.14.3-r2.ebuild b/x11-libs/gtk+/gtk+-2.14.3-r2.ebuild
new file mode 100644
index 000000000000..8b1f4dfe6690
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.14.3-r2.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.14.3-r2.ebuild,v 1.1 2008/10/01 21:49:03 remi Exp $
+
+WANT_AUTOMAKE="1.7"
+
+inherit gnome.org flag-o-matic eutils libtool virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cups debug doc jpeg jpeg2k tiff vim-syntax xinerama"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.17.6
+	>=x11-libs/pango-1.20
+	>=dev-libs/atk-1.13
+	>=x11-libs/cairo-1.6
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	!<gnome-base/gail-1000"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/damageproto
+	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.8
+	doc? (
+			>=dev-util/gtk-doc-1.8
+			~app-text/docbook-xml-dtd-4.1.2
+		 )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Please re-emerge x11-libs/cairo with the X USE flag set"
+		die "cairo needs the X flag set"
+	fi
+}
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
+
+	# Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11
+	epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch"
+
+	# Various fixes from upstream gtk-2-14 branch, will be part of 2.14.4
+	epatch "${FILESDIR}/${P}-fix-filesystem-double-free.patch"
+	epatch "${FILESDIR}/${P}-fix-lpr_write-double-free.patch"
+	epatch "${FILESDIR}/${P}-fix-password-dialog-on-mount.patch"
+	epatch "${FILESDIR}/${P}-notebook-tab-draw-correctness.patch"
+	epatch "${FILESDIR}/${P}-dont-unset-filechooser-filter-after-first-use.patch"
+
+	# Don't break inclusion of gtkclist.h, upstream bug 536767
+	epatch "${FILESDIR}/${P}-limit-gtksignal-includes.patch"
+
+	# broken compose keys (see fixed bug #554506 and bug #554192)
+	epatch "${FILESDIR}/${P}-fix-combining-broken-diacritics.patch"
+	epatch "${FILESDIR}/${P}-reorder-compose-key-table-order.patch"
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	use ppc64 && append-flags -mminimal-toc
+
+	elibtoolize
+}
+
+src_compile() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc) \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(use_enable xinerama) \
+		$(use_enable cups cups auto) \
+		--with-libpng \
+		--with-gdktarget=x11 \
+		--with-xinput"
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	econf ${myconf} || die "configure failed"
+	emake || die "compile failed"
+}
+
+src_test() {
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc"
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	dodir /etc/env.d
+	echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2"
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# This has to be removed, because it's multilib specific; generated in
+	# postinst
+	rm "${D}/etc/gtk-2.0/gtk.immodules"
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
+		gtk-query-immodules-2.0  > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+		gdk-pixbuf-query-loaders > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	else
+		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
+		ewarn "to complete the installation of GTK+, please create the"
+		ewarn "directory and then manually run:"
+		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
+		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
+	fi
+
+	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+
+	elog "Please install app-text/evince for print preview functionality"
+}