Use atomic gtk-query-immodules #413525; Add patch to fix build error with >=glib-2.32

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

3 files changed, 58 insertions, 9 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 82bb30eb0da6..fa067258a086 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/uim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.242 2012/05/03 19:24:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.243 2012/05/13 23:26:34 naota Exp $
+
+  13 May 2012; Naohiro Aota <naota@gentoo.org> +files/uim-1.7.3-glib-2.32.patch,
+  uim-1.7.3.ebuild:
+  Use atomic gtk-query-immodules #413525; Add patch to fix build error with
+  >=glib-2.32
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> uim-1.5.7.ebuild,
   uim-1.6.1.ebuild, uim-1.7.1.ebuild, uim-1.7.1-r1.ebuild, uim-1.7.3.ebuild,
diff --git a/app-i18n/uim/files/uim-1.7.3-glib-2.32.patch b/app-i18n/uim/files/uim-1.7.3-glib-2.32.patch
new file mode 100644
index 000000000000..7290240a8a9d
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.7.3-glib-2.32.patch
@@ -0,0 +1,21 @@
+commit d9c316e49a03dcd5736eb04396657cc369eb6215
+Author: Muneyuki Noguchi <nogu.dev@gmail.com>
+Date:   Sat Apr 21 14:49:18 2012 +0900
+
+    Fix compile error with glib 2.32.
+    
+    * notify/uim-libnotify.c
+      - Don't include glib/gconvert.h directly.
+
+diff --git a/notify/uim-libnotify.c b/notify/uim-libnotify.c
+index 414e74c..a6578a1 100644
+--- a/notify/uim-libnotify.c
++++ b/notify/uim-libnotify.c
+@@ -37,7 +37,6 @@
+ #include <stdarg.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gconvert.h>
+ #include <libnotify/notify.h>
+ 
+ #include "uim.h"  /* for uim_bool */
diff --git a/app-i18n/uim/uim-1.7.3.ebuild b/app-i18n/uim/uim-1.7.3.ebuild
index 0bfdddfcfaea..8c0e95e65673 100644
--- a/app-i18n/uim/uim-1.7.3.ebuild
+++ b/app-i18n/uim/uim-1.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.3.ebuild,v 1.2 2012/05/03 19:24:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.3.ebuild,v 1.3 2012/05/13 23:26:34 naota Exp $
 
 EAPI="4"
 inherit autotools eutils multilib elisp-common flag-o-matic
@@ -92,16 +92,35 @@ RDEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+gnome2_query_immodules_gtk2() {
+	local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
+
+	local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
+	local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+	local gtk_conf_dir=$(dirname "${gtk_conf}")
+
+	einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
+	einfo "-> ${gtk_conf}"
+
+	mkdir -p "${gtk_conf_dir}"
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
+	if [ -z "${tmp_file}" ]; then
+		ewarn "gtk_query_immodules: cannot create temporary file"
+		return 1
+	fi
+
+	if ${query_exec} > "${tmp_file}"; then
+		cat "${tmp_file}" > "${gtk_conf}" || \
+			ewarn "Failed to write to ${gtk_conf}"
+	else
+		ewarn "Cannot update gtk.immodules, file generation failed"
 	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+	rm "${tmp_file}"
+}
 
+update_gtk_immodules() {
 	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+		gnome2_query_immodules_gtk2
 	fi
 }
 
@@ -115,6 +134,10 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
 		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch
+	
+	if has_version ">=dev-libs/glib-2.32"; then
+		epatch "${FILESDIR}"/${P}-glib-2.32.patch
+	fi
 
 	# bug 275420
 	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die