Fixed gnome-panel issue, bug #283317.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

3 files changed, 143 insertions, 2 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 9587fe1864e8..92f067bfd5ef 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.132 2009/06/20 13:44:17 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.133 2010/02/16 15:39:29 matsuu Exp $
+
+*scim-1.4.9-r1 (16 Feb 2010)
+
+  16 Feb 2010; MATSUU Takuto <matsuu@gentoo.org> +scim-1.4.9-r1.ebuild,
+  +files/scim-fix-disappeared-status-icon.patch:
+  Fixed gnome-panel issue, bug #283317.
 
   20 Jun 2009; Jeroen Roovers <jer@gentoo.org> scim-1.4.7-r2.ebuild:
   Stable for HPPA (bug #246064).
diff --git a/app-i18n/scim/files/scim-fix-disappeared-status-icon.patch b/app-i18n/scim/files/scim-fix-disappeared-status-icon.patch
new file mode 100644
index 000000000000..8052f79472f3
--- /dev/null
+++ b/app-i18n/scim/files/scim-fix-disappeared-status-icon.patch
@@ -0,0 +1,32 @@
+diff --git a/extras/panel/scim_panel_gtk.cpp b/extras/panel/scim_panel_gtk.cpp
+index 613613f..b53ef75 100644
+--- a/extras/panel/scim_panel_gtk.cpp
++++ b/extras/panel/scim_panel_gtk.cpp
+@@ -1072,11 +1072,13 @@ ui_initialize (void)
+ #ifdef GDK_WINDOWING_X11
+     // Add an event filter function to observe X root window's properties.
+     GdkWindow *root_window = gdk_get_default_root_window ();
++    GdkEventMask event_mask;
+ #if GDK_MULTIHEAD_SAFE
+     if (_current_screen)
+         root_window = gdk_screen_get_root_window (_current_screen);
+ #endif
+-    gdk_window_set_events (root_window, (GdkEventMask)GDK_PROPERTY_NOTIFY);
++    event_mask = (GdkEventMask) (gdk_window_get_events (root_window) | GDK_PROPERTY_NOTIFY);
++    gdk_window_set_events (root_window, event_mask);
+     gdk_window_add_filter (root_window, ui_event_filter, NULL);
+ #endif
+ 
+@@ -1323,9 +1325,11 @@ ui_switch_screen (GdkScreen *screen)
+ 
+ #ifdef GDK_WINDOWING_X11
+         GdkWindow *root_window = gdk_get_default_root_window ();
++        GdkEventMask event_mask;
+         if (_current_screen)
+             root_window = gdk_screen_get_root_window (_current_screen);
+-        gdk_window_set_events (root_window, (GdkEventMask)GDK_PROPERTY_NOTIFY);
++        event_mask = (GdkEventMask) (gdk_window_get_events (root_window) | GDK_PROPERTY_NOTIFY);
++        gdk_window_set_events (root_window, event_mask);
+         gdk_window_add_filter (root_window, ui_event_filter, NULL);
+ #endif
+ 
diff --git a/app-i18n/scim/scim-1.4.9-r1.ebuild b/app-i18n/scim/scim-1.4.9-r1.ebuild
new file mode 100644
index 000000000000..1b9ed73bb026
--- /dev/null
+++ b/app-i18n/scim/scim-1.4.9-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.9-r1.ebuild,v 1.1 2010/02/16 15:39:29 matsuu Exp $
+
+EAPI="2"
+inherit autotools eutils flag-o-matic multilib
+
+DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="x11-libs/libX11
+	>=x11-libs/gtk+-2
+	>=dev-libs/atk-1
+	>=x11-libs/pango-1
+	>=dev-libs/glib-2
+	!app-i18n/scim-cvs"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	doc? ( app-doc/doxygen
+		>=app-text/docbook-xsl-stylesheets-1.73.1 )
+	dev-lang/perl
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.33
+	sys-devel/libtool"
+
+get_gtk_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_prepare() {
+	epatch "${FILESDIR}/${PN}-1.4.7-syslibltdl.patch"
+	# bug #283317
+	epatch "${FILESDIR}/${PN}-fix-disappeared-status-icon.patch"
+	rm "${S}"/src/ltdl.{cpp,h} || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	# bug #83625
+	filter-flags -fvisibility-inlines-hidden
+	filter-flags -fvisibility=hidden
+
+	# bug #191696
+	## We cannot use "use_enable"
+	#if ! use gtk ; then
+	#	myconf="${myconf} --disable-panel-gtk"
+	#	myconf="${myconf} --disable-setup-ui"
+	#	myconf="${myconf} --disable-gtk2-immodule"
+	#fi
+
+	econf \
+		$(use_with doc doxygen) \
+		--enable-ld-version-script \
+		${myconf} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg
+	use doc && dohtml -r docs/html/*
+}
+
+pkg_postinst() {
+	elog
+	elog "To use SCIM with both GTK2 and XIM, you should use the following"
+	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
+	elog
+	elog "LANG='your_language' scim -d"
+	elog "export XMODIFIERS=@im=SCIM"
+	elog "export GTK_IM_MODULE=\"scim\""
+	elog "export QT_IM_MODULE=\"scim\""
+	elog
+	elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
+	elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
+	elog
+	elog "To use Chinese input methods:"
+	elog "	# emerge app-i18n/scim-tables app-i18n/scim-pinyin"
+	elog "To use Korean input methods:"
+	elog "	# emerge app-i18n/scim-hangul"
+	elog "To use Japanese input methods:"
+	elog "	# emerge app-i18n/scim-anthy"
+	elog "To use various input methods (more than 30 languages):"
+	elog "	# emerge app-i18n/scim-m17n"
+	elog
+	ewarn
+	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
+	ewarn
+
+	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+}
+
+pkg_postrm() {
+	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+}