Version bumped.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

5 files changed, 84 insertions, 90 deletions

diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog
index 84e7c02cb12b..5b749da19322 100644
--- a/app-i18n/scim-bridge/ChangeLog
+++ b/app-i18n/scim-bridge/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/scim-bridge
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.23 2008/11/02 09:31:21 matsuu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.24 2009/01/25 06:19:07 matsuu Exp $
+
+*scim-bridge-0.4.15.2 (25 Jan 2009)
+
+  25 Jan 2009; MATSUU Takuto <matsuu@gentoo.org>
+  +files/scim-bridge-0.4.15.2-gcc43.patch,
+  +files/scim-bridge-0.4.15.2-qt4.patch, -scim-bridge-0.4.15-r1.ebuild,
+  -scim-bridge-0.4.15-r2.ebuild, +scim-bridge-0.4.15.2.ebuild:
+  Version bumped. Removed old versions.
 
 *scim-bridge-0.4.15-r3 (02 Nov 2008)
 
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch
new file mode 100644
index 000000000000..1db7769424f5
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch
@@ -0,0 +1,10 @@
+--- scim-bridge-0.4.15.orig/client-common/scim-bridge-client-output.c	2008-11-02 15:44:34.000000000 +0900
++++ scim-bridge-0.4.15/client-common/scim-bridge-client-output.c	2009-01-25 15:10:22.000000000 +0900
+@@ -20,6 +20,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <alloca.h>
+ 
+ #include "scim-bridge-debug.h"
+ #include "scim-bridge-output.h"
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch
new file mode 100644
index 000000000000..606117cfbf01
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch
@@ -0,0 +1,58 @@
+diff -Naur scim-bridge-0.4.15.orig/client-qt/qt4/Makefile.am scim-bridge-0.4.15/client-qt/qt4/Makefile.am
+--- scim-bridge-0.4.15.orig/client-qt/qt4/Makefile.am	2009-01-18 01:57:40.000000000 +0900
++++ scim-bridge-0.4.15/client-qt/qt4/Makefile.am	2009-01-25 14:58:09.000000000 +0900
+@@ -24,7 +24,7 @@
+ 
+ noinst_HEADERS = ../scim-bridge-client-qt.h ../scim-bridge-client-imcontext-qt.h ../scim-bridge-client-key-event-utility-qt.h ../scim-bridge-client-common-qt.h
+ 
+-moduledir = @QT4_PREFIX@/plugins/inputmethods
++moduledir = @QT4_LIBDIR@/plugins/inputmethods
+ module_LTLIBRARIES = im-scim-bridge.la
+ 
+ im_scim_bridge_la_SOURCES = ../im-scim-bridge-qt.cpp \
+diff -Naur scim-bridge-0.4.15.orig/client-qt/scim-bridge-client-imcontext-qt.cpp scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp
+--- scim-bridge-0.4.15.orig/client-qt/scim-bridge-client-imcontext-qt.cpp	2008-11-02 15:44:46.000000000 +0900
++++ scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp	2009-01-25 15:04:34.000000000 +0900
+@@ -219,6 +219,12 @@
+ void ScimBridgeClientIMContextImpl::setFocusWidget (QWidget *widget)
+ {
+     scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()");
++
++    if (focused_imcontext != NULL) {
++        focused_imcontext->focus_out ();
++        focused_imcontext = NULL;
++    }
++
+     QInputContext::setFocusWidget (widget);
+     focus_in ();
+     update ();
+@@ -442,8 +448,15 @@
+         }
+     }
+ 
++#ifdef QT4
++    if (preedit_shown) {
++        set_preedit_shown (false);
++        update_preedit ();
++    }
++#else
+     set_preedit_shown (false);
+     update_preedit ();
++#endif
+ 
+     focused_imcontext = NULL;
+ }
+diff -Naur scim-bridge-0.4.15.orig/configure.ac scim-bridge-0.4.15/configure.ac
+--- scim-bridge-0.4.15.orig/configure.ac	2009-01-18 02:24:32.000000000 +0900
++++ scim-bridge-0.4.15/configure.ac	2009-01-25 14:58:06.000000000 +0900
+@@ -105,6 +105,10 @@
+     QT4_PREFIX=`$PKG_CONFIG --variable=prefix QtCore`
+   fi
+   AC_SUBST(QT4_PREFIX)
++  if test -z "$QT4_LIBDIR"; then
++    QT4_LIBDIR=`$PKG_CONFIG --variable=libdir QtCore`
++  fi
++  AC_SUBST(QT4_LIBDIR)
+   enable_qt4_immodule="yes";
+ fi
+ 
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.15-r1.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.15-r1.ebuild
deleted file mode 100644
index 8d4f114f1aa0..000000000000
--- a/app-i18n/scim-bridge/scim-bridge-0.4.15-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.15-r1.ebuild,v 1.3 2008/07/27 19:51:51 carlo Exp $
-
-EAPI="1"
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit autotools eutils qt3
-
-DESCRIPTION="Yet another IM-client of SCIM"
-HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="doc gtk qt3 qt4"
-
-RDEPEND=">=app-i18n/scim-1.4.6
-	gtk? (
-		>=x11-libs/gtk+-2.2
-		>=x11-libs/pango-1.1
-	)
-	qt3? (
-		x11-libs/qt:3
-		>=x11-libs/pango-1.1
-	)
-	qt4? (
-		|| ( ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
-			=x11-libs/qt-4.3*:4 )
-		>=x11-libs/pango-1.1
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-get_gtk_confdir() {
-	if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then
-		echo "/etc/gtk-2.0/${CHOST}"
-	else
-		echo "/etc/gtk-2.0"
-	fi
-}
-
-pkg_setup() {
-	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
-		die "You need to rebuild >=x11-libs/qt-3.3.4 with immqt-bc(recommended) or immqt USE flag enabled."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.4.14-qt4.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable gtk gtk2-immodule) \
-		$(use_enable qt3 qt3-immodule) \
-		$(use_enable qt4 qt4-immodule) \
-		$(use_enable doc documents) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	elog
-	elog "If you would like to use ${PN} as default instead of scim, set"
-	elog " $ export GTK_IM_MODULE=scim-bridge"
-	elog " $ export QT_IM_MODULE=scim-bridge"
-	elog
-	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
-}
-
-pkg_postrm() {
-	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
-}
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.15-r2.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.15.2.ebuild
index dcb0699105ef..bc0177e38809 100644
--- a/app-i18n/scim-bridge/scim-bridge-0.4.15-r2.ebuild
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.15.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.15-r2.ebuild,v 1.1 2008/10/18 16:54:10 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.15.2.ebuild,v 1.1 2009/01/25 06:19:07 matsuu Exp $
 
 EAPI="1"
 WANT_AUTOMAKE="latest"
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	doc? ( app-doc/doxygen )"
 
+S="${WORKDIR}/${P%.*}"
+
 get_gtk_confdir() {
 	if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then
 		echo "/etc/gtk-2.0/${CHOST}"
@@ -55,7 +57,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.4.14-qt4.patch
+	epatch "${FILESDIR}/${P}-qt4.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 	# bug #241954
 	intltoolize --force
 	eautoreconf