Fixed gnome-panel issue, bug #283317.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

4 files changed, 166 insertions, 3 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/Manifest b/app-i18n/scim/Manifest
index 5d8fa4f7a517..7c2fe48af92e 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bug-248159_remove_unload.patch 595 RMD160 68c90879b422d9dffb5fd360f3f55dee76007915 SHA1 f2f2fd73ddd8a1172640352f52ef0ec6a724c597 SHA256 a096aab3c40183da071e6884d43b5fb635c5ec77877f7513504a01d48eb84fa8
 AUX scim-1.4.5-fbsd.patch 395 RMD160 1ce0f0cc90a8981bcc89ed0d59056e1ae17a528c SHA1 bcb1871085a2788d69ae32dff01cc1f38b51136d SHA256 a02290b079a131c393366400fdc9adf3b65c6b3a9523bd419e16e8e21ea4d7a6
 AUX scim-1.4.5-imengine.patch 869 RMD160 609baff78ef99ab6895e17a18a20dfc9a4c21a08 SHA1 ecedf7b09467829d63d905a950cebeddd3cab40c SHA256 bb4eb7e0e0a06dc2ed9d99703b5d7f63b1356a2ffd59a4736caa3c6a75bf11b6
 AUX scim-1.4.7-syslibltdl.patch 1676 RMD160 a6ad514f5beb1bbcbaa7a07083eecba44866ee70 SHA1 f1c485ab9c47251322fa8686d63aaeb931a5f364 SHA256 ee807b34d95df48af40abc1a4d285d7929548481be44aba1bab407e22f406d88
+AUX scim-fix-disappeared-status-icon.patch 1458 RMD160 97e989cea36b07c1d4f44d2c4585615b467891ad SHA1 7697b1058660ba777941f2cd59dc4f76386f82c1 SHA256 f6ce00bfe8046c21b1509146d9d90ae919ed577c25fbaa9d9bff68cd776a064e
 DIST scim-1.4.5.tar.gz 3157124 RMD160 c4ea3c3bb06cdedb29ec32f8cabb0d32330dd6f6 SHA1 b9dd07a49abdba6d86385c92f8103ebf6df7f341 SHA256 3565ecbe7f093254179d8fd216e6a54644859b59a5e5daf48a6c9cff3d5be481
 DIST scim-1.4.7.tar.gz 3075769 RMD160 0b24e24f547ce39469811076420bfcd41d1e906c SHA1 54ab2ab0ef28a84c24fbc32d37e996ecae416d50 SHA256 a0883bc5938476b33247194fe61ab5ce224eb4fb68bd7f8befc4baa8aaa8160b
 DIST scim-1.4.8.tar.gz 2907528 RMD160 d8f407e0d960f7f790cbdf76f85d1db56c6eb967 SHA1 7dc7f04e27c1bc4b06e952123656d220140708a0 SHA256 280bd605b7b4ca6d0347f7fc2d355881216eb1f748da00a9ceeb31afe23aeee0
@@ -9,6 +13,24 @@ DIST scim-1.4.9.tar.gz 2928091 RMD160 f84d51aad96fe8c2b32ef1b922ebfe9499f70c90 S
 EBUILD scim-1.4.5-r1.ebuild 3116 RMD160 4d041a05e0b27c40513284e1880b2b087aaab01b SHA1 0e56d13a989d85252c5221e066bde8cc51176b82 SHA256 e1ce0d3644bce3a8ee6b5674958a6f745ba331d9cf0a18074bd2c72559bbd38e
 EBUILD scim-1.4.7-r2.ebuild 3020 RMD160 6aab52c5fc82fcbfbc78ed290e2f5a2808008ad7 SHA1 dd43b947b636456351fef045abc2695fb8999e3a SHA256 c1590ab8adf31f3a37090a76a8f75f135ffbb28401b25d72279627be26243226
 EBUILD scim-1.4.8.ebuild 2966 RMD160 710fb4e9a4e222fc8c2da355cc168e72442d9d45 SHA1 2f2aa3161580732744970e32ab0e72dcbb2365ce SHA256 9f503f05e47251823d216ee739e33a837d77f1db1d14affa0be9f93fc2ebd9b2
+EBUILD scim-1.4.9-r1.ebuild 2984 RMD160 0ee038abde4befdaad4738a26e957764be9c9587 SHA1 7c7e72ea46dc175c596d8b4aea80c617a72144ba SHA256 112620c2c3453ce7df3888d3eb836eb3cbf27d4981b2c50fb20ca72fa6f9a753
 EBUILD scim-1.4.9.ebuild 2897 RMD160 b515589e078e183150279fe8fb500efc586d5934 SHA1 7d732edc392d84711a4d93efb22b589f824095f7 SHA256 1b62036a0bc1a15da7a506b0ff708b53c6509c9100b74c426b9866b6070aed1d
-MISC ChangeLog 17856 RMD160 65998d43d74ab24b4e34c8fc3c48253dd1960058 SHA1 c5d1c9875914540fa366e008547f0df0e6427ddf SHA256 c7883a5829810d2e779adab05532cf1757535904ec8afc7d2a7d75e3132e0f71
+MISC ChangeLog 18051 RMD160 5c50f0d17c4f1b5c9a7edce9e527487c5368d380 SHA1 1d4169c6997fa86d3bf8dafeb4dda263d96ce81f SHA256 d883f55cc0c271b5292e5f4fd88e676e7e6387f9719a9fdbb29eca3bbc587f73
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBAgAGBQJLerw2AAoJECaGw+YFKA1pYKEQAINgw1TtH6Jeb1R9W7BCrI+Q
+RzFfQx4koxiC8liu1gYtjutqbaFdH0EUwlF4U+l/RhDBrLK6QfFPrW3GEqzcaEtZ
+C5Nw8g/iFvOelNN7C+yzwU2HbUSuPN46FmlYISrkx1AZQghYFEu1LueecTJ4dp9b
+eipiHzlf1KlMPmj891ICaqjChRjMbuwHnFgWmYEMpU+f5SFofKCopEReNcaXQ+cm
+o+ovvul/byOwbGTCUhTtj3szYWbwY71t3Yiluudz1w82y81iWOZJIlT7spuOf7gB
+DiVzCVbfYXZVGL/IyC+CxnVnxBC7jRG+mrTeg4KHNGgUYmBxBzdbraGvxRqr6uL8
+q2K+u/+/9/Ekuin9P9/uOa679EN2iJ3adQ9L5aRadiwwSKg85jsJ+P+QxCooIEad
+zZhlZi4g1WEwoe7uF2Aq5KnDKTmSblqybaDS8ONfV2nr4DIKwDLhGmMJUKAk/Sf2
+S37D1lTJe/29X8RYc+lKRMAP7bzMGOejr5b3rtmbSam+OIHSzFi0ZP41IzRB2zaU
+IaU6a8XGf0qxTbtXF++TiJnWDk6rYaQsUvJ2e4f0DYdCErIPE6MaHfoucPA1WsUD
+Ul49Q15AZgENjeV1TFeUv7od7l4h+rGsl+BrK9qLqdt7kgZ88koUcrI10y78O+ry
+Io2SQ0VOTYy3Ixz43Nse
+=kTqm
+-----END PGP SIGNATURE-----
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"
+}