fixed Qt related issue, bug #280887.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

3 files changed, 267 insertions, 1 deletions

diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog
index 883568ec7206..2448f5fd5327 100644
--- a/app-i18n/scim-bridge/ChangeLog
+++ b/app-i18n/scim-bridge/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/scim-bridge
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.31 2010/01/02 22:40:39 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.32 2010/02/24 16:38:47 matsuu Exp $
+
+*scim-bridge-0.4.16-r2 (24 Feb 2010)
+
+  24 Feb 2010; MATSUU Takuto <matsuu@gentoo.org>
+  +scim-bridge-0.4.16-r2.ebuild,
+  +files/scim-bridge-0.4.16-configure.ac.patch:
+  fixed Qt related issue, bug #280887.
 
   02 Jan 2010; Ben de Groot <yngwin@gentoo.org> -scim-bridge-0.4.9.ebuild,
   -scim-bridge-0.4.16.ebuild, scim-bridge-0.4.16-r1.ebuild:
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch
new file mode 100644
index 000000000000..ee6543c7dd6a
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch
@@ -0,0 +1,164 @@
+--- configure.ac.orig	2009-11-27 21:07:46.000000000 +0800
++++ configure.ac	2009-11-27 21:33:17.000000000 +0800
+@@ -55,63 +55,6 @@
+ AM_CONDITIONAL(HAVE_DOCBOOK, test x$DOCBOOK_XSL != xno)
+ AM_CONDITIONAL(BUILD_MANUAL, test x$XSLTPROC != xno -a x$DOCBOOK_XSL != xno)
+ 
+-# Check if we should build scim-bridge-gtk-immodule
+-PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.4.0 pango >= 1.1.0 gdk-pixbuf-2.0 >= 2.4.0],
+-			[SCIM_BRIDGE_HAS_GTK2=yes],
+-			[SCIM_BRIDGE_HAS_GTK2=no])
+-
+-SCIM_BRIDGE_HAS_GTK2_2=no
+-if test "$SCIM_BRIDGE_HAS_GTK2" = "yes"; then
+-  if $PKG_CONFIG --exists "gtk+-2.0 >= 2.2" ; then
+-    SCIM_BRIDGE_HAS_GTK2_2=yes
+-    GTK_VERSION=2.2.0
+-    AC_DEFINE(GDK_MULTIHEAD_SAFE,1,[Force use of GDK's multihead-safe APIs.])
+-  fi
+-  if $PKG_CONFIG --exists "gtk+-2.0 >= 2.3.5" ; then
+-    SCIM_BRIDGE_HAS_GTK2_4=yes
+-    GTK_VERSION=2.3.5
+-    AC_DEFINE(HAVE_GTK_DRAW_INSERTION_CURSOR,1,[Have gtk_draw_insertion_cursor ().])
+-  fi
+-  GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+-  GTK_LIBDIR=`$PKG_CONFIG --variable=libdir gtk+-2.0`
+-  if test -z "$GTK_LIBDIR)"; then
+-    GTK_LIBDIR="$libdir"
+-  fi
+-  AC_SUBST(GTK_LIBDIR)
+-  AC_SUBST(GTK_VERSION)
+-  AC_SUBST(GTK_BINARY_VERSION)
+-  enable_gtk2_immodule="yes";
+-fi
+-
+-# Check if we should build scim-bridge-qt-immodule
+-PKG_CHECK_MODULES(QT3, [qt-mt >= 3.3],
+-			[SCIM_BRIDGE_HAS_QT3=yes],
+-			[SCIM_BRIDGE_HAS_QT3=no])
+-
+-if test "$SCIM_BRIDGE_HAS_QT3" = "yes"; then
+-  if test -z "$QT3_PREFIX"; then
+-    QT3_PREFIX=`$PKG_CONFIG --variable=prefix qt-mt`
+-  fi
+-  AC_SUBST(QT3_PREFIX)
+-  enable_qt3_immodule="yes";
+-fi
+-
+-PKG_CHECK_MODULES(QT4, [QtGui >= 4.0, QtCore >= 4.0],
+-			[SCIM_BRIDGE_HAS_QT4=yes],
+-			[SCIM_BRIDGE_HAS_QT4=no])
+-
+-if test "$SCIM_BRIDGE_HAS_QT4" = "yes"; then
+-  if test -z "$QT4_PREFIX"; then
+-    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
+-
+ ###########################################################
+ ##             Definiation of compile args.              ##
+ ###########################################################
+@@ -132,13 +75,16 @@
+        	      enable_agent=yes)
+ 
+ AC_ARG_ENABLE(gtk2-immodule,
+-	      [AS_HELP_STRING([--enable-gtk2-immodule], [build GTK2 IM module])], , )
++	      [AS_HELP_STRING([--enable-gtk2-immodule], [build GTK2 IM module [default=yes]])], ,
++	      enable_gtk2_immodule=yes)
+ 
+ AC_ARG_ENABLE(qt3-immodule,
+-	      [AS_HELP_STRING([--enable-qt3-immodule], [build Qt3 IM module])], , )
++	      [AS_HELP_STRING([--enable-qt3-immodule], [build Qt3 IM module [default=yes]])], ,
++	      enable_qt3_immodule=yes)
+ 
+ AC_ARG_ENABLE(qt4-immodule,
+-	      [AS_HELP_STRING([--enable-qt4-immodule], [build Qt4 IM module])], , )
++	      [AS_HELP_STRING([--enable-qt4-immodule], [build Qt4 IM module [default=yes]])], ,
++	      enable_qt4_immodule=yes)
+ 
+ if test "$enable_debug" = "yes"; then
+   AC_DEFINE(ENABLE_DEBUG,1,[Define this to enable the debug facility in libscim])
+@@ -175,7 +121,33 @@
+ if test "$enable_gtk2_immodule" = "yes"; then
+   SCIM_BRIDGE_BUILD_GTK2_IMMODULE=1
+   SCIM_BRIDGE_BUILD_IMMODULE=1
+-  if test "$SCIM_BRIDGE_HAS_GTK2" = "no" ; then
++
++  # Check if we should build scim-bridge-gtk-immodule
++  PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.4.0 pango >= 1.1.0 gdk-pixbuf-2.0 >= 2.4.0],
++  			[SCIM_BRIDGE_HAS_GTK2=yes],
++  			[SCIM_BRIDGE_HAS_GTK2=no])
++  
++  SCIM_BRIDGE_HAS_GTK2_2=no
++  if test "$SCIM_BRIDGE_HAS_GTK2" = "yes"; then
++    if $PKG_CONFIG --exists "gtk+-2.0 >= 2.2" ; then
++      SCIM_BRIDGE_HAS_GTK2_2=yes
++      GTK_VERSION=2.2.0
++      AC_DEFINE(GDK_MULTIHEAD_SAFE,1,[Force use of GDK's multihead-safe APIs.])
++    fi
++    if $PKG_CONFIG --exists "gtk+-2.0 >= 2.3.5" ; then
++      SCIM_BRIDGE_HAS_GTK2_4=yes
++      GTK_VERSION=2.3.5
++      AC_DEFINE(HAVE_GTK_DRAW_INSERTION_CURSOR,1,[Have gtk_draw_insertion_cursor ().])
++    fi
++    GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
++    GTK_LIBDIR=`$PKG_CONFIG --variable=libdir gtk+-2.0`
++    if test -z "$GTK_LIBDIR)"; then
++      GTK_LIBDIR="$libdir"
++    fi
++    AC_SUBST(GTK_LIBDIR)
++    AC_SUBST(GTK_VERSION)
++    AC_SUBST(GTK_BINARY_VERSION)
++  else
+      AC_MSG_ERROR([Gtk >= 2.2 can not be found!])
+   fi
+   enable_immodule=yes
+@@ -187,7 +159,18 @@
+ if test "$enable_qt3_immodule" = "yes"; then
+   SCIM_BRIDGE_BUILD_QT3_IMMODULE=1
+   SCIM_BRIDGE_BUILD_IMMODULE=1
+-  if test "$SCIM_BRIDGE_HAS_QT3" = "no"; then
++
++  # Check if we should build scim-bridge-qt-immodule
++  PKG_CHECK_MODULES(QT3, [qt-mt >= 3.3],
++  			[SCIM_BRIDGE_HAS_QT3=yes],
++  			[SCIM_BRIDGE_HAS_QT3=no])
++  
++  if test "$SCIM_BRIDGE_HAS_QT3" = "yes"; then
++    if test -z "$QT3_PREFIX"; then
++      QT3_PREFIX=`$PKG_CONFIG --variable=prefix qt-mt`
++    fi
++    AC_SUBST(QT3_PREFIX)
++  else
+     AC_MSG_ERROR([qt >= 3.3 can not be found!])
+   fi
+   enable_immodule=yes
+@@ -199,7 +182,21 @@
+ if test "$enable_qt4_immodule" = "yes"; then
+   SCIM_BRIDGE_BUILD_QT4_IMMODULE=1
+   SCIM_BRIDGE_BUILD_IMMODULE=1
+-  if test "$SCIM_BRIDGE_HAS_QT4" = "no"; then
++
++  PKG_CHECK_MODULES(QT4, [QtGui >= 4.0, QtCore >= 4.0],
++  			[SCIM_BRIDGE_HAS_QT4=yes],
++  			[SCIM_BRIDGE_HAS_QT4=no])
++  
++  if test "$SCIM_BRIDGE_HAS_QT4" = "yes"; then
++    if test -z "$QT4_PREFIX"; then
++      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)
++  else
+     AC_MSG_ERROR([qt >= 4.0 can not be found!])
+   fi
+   enable_immodule=yes
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild
new file mode 100644
index 000000000000..71af8fe1b92f
--- /dev/null
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2010 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.16-r2.ebuild,v 1.1 2010/02/24 16:38:47 matsuu Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib
+
+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 qt4"
+
+RESTRICT="test"
+
+RDEPEND=">=app-i18n/scim-1.4.6
+	gtk? (
+		>=x11-libs/gtk+-2.2
+		>=x11-libs/pango-1.1
+	)
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-core:4
+		>=x11-libs/pango-1.1
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	doc? ( app-doc/doxygen )"
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
+		/usr/bin/gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.4.15.2-qt4.patch"
+	epatch "${FILESDIR}/${PN}-0.4.15.2-gcc43.patch"
+	epatch "${FILESDIR}/${P}+gcc-4.4.patch"
+	# bug #280887
+	epatch "${FILESDIR}/${P}-configure.ac.patch"
+
+	# bug #241954
+	intltoolize --force
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="$(use_enable doc documents)"
+	# '--disable-*-immodule' are b0rked, bug #280887
+
+	if use gtk ; then
+		myconf="${myconf} --enable-gtk2-immodule=yes"
+	else
+		myconf="${myconf} --enable-gtk2-immodule=no"
+	fi
+
+	# Qt3 is no longer supported, bug 283429
+	myconf="${myconf} --enable-qt3-immodule=no"
+
+	if use qt4 ; then
+		myconf="${myconf} --enable-qt4-immodule=yes"
+	else
+		myconf="${myconf} --enable-qt4-immodule=no"
+	fi
+
+	econf ${myconf} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
+
+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
+	use gtk && update_gtk_immodules
+}
+
+pkg_postrm() {
+	use gtk && update_gtk_immodules
+}