summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-i18n/scim-bridge
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-i18n/scim-bridge')
-rw-r--r--app-i18n/scim-bridge/Manifest1
-rw-r--r--app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-gcc43.patch10
-rw-r--r--app-i18n/scim-bridge/files/scim-bridge-0.4.15.2-qt4.patch58
-rw-r--r--app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.4.patch12
-rw-r--r--app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch24
-rw-r--r--app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch164
-rw-r--r--app-i18n/scim-bridge/metadata.xml8
-rw-r--r--app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild87
8 files changed, 364 insertions, 0 deletions
diff --git a/app-i18n/scim-bridge/Manifest b/app-i18n/scim-bridge/Manifest
new file mode 100644
index 000000000000..234eb1e2eb8a
--- /dev/null
+++ b/app-i18n/scim-bridge/Manifest
@@ -0,0 +1 @@
+DIST scim-bridge-0.4.16.tar.gz 508870 SHA256 50d9da4a2842ab31cd3b27b1baacb14c458614bdb35855c6ecd09ab855ac702c SHA512 8d40a931738f6130ab2fdc4e8dec70143874c53d5720a0403603b57c9f80d7c0a4802609e0446684fa5cba1758e78e5f333d01787527934ed7a19c9727fd66a6 WHIRLPOOL 5edfd01b5143fe3a900947ea7b0e848b318cf25b14295c319c1593d0235cefd68dc128a46fde01631223eef14a16a9d82ecc289475527f52dbb80376a0c36116
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/files/scim-bridge-0.4.16+gcc-4.4.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.4.patch
new file mode 100644
index 000000000000..11415931fdbc
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.4.patch
@@ -0,0 +1,12 @@
+Index: scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp
+===================================================================
+--- scim-bridge-0.4.16.orig/agent/scim-bridge-agent-application.cpp
++++ scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp
+@@ -24,6 +24,7 @@
+ #include <unistd.h>
+
+ #include <iostream>
++#include <cstdio>
+
+ #include "scim-bridge-agent.h"
+
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch
new file mode 100644
index 000000000000..99899d8c4b37
--- /dev/null
+++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch
@@ -0,0 +1,24 @@
+diff --git a/agent/utils/scim-bridge-agent-panel-client.cpp b/agent/utils/scim-bridge-agent-panel-client.cpp
+index 07cb14b..62fd3b3 100644
+--- a/agent/utils/scim-bridge-agent-panel-client.cpp
++++ b/agent/utils/scim-bridge-agent-panel-client.cpp
+@@ -24,6 +24,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <unistd.h>
+
+ #define Uses_SCIM_CONFIG_PATH
+
+diff --git a/agent/scim-bridge-agent-signal-listener.cpp b/agent/scim-bridge-agent-signal-listener.cpp
+index 433dc15..c9eff47 100644
+--- a/agent/scim-bridge-agent-signal-listener.cpp
++++ b/agent/scim-bridge-agent-signal-listener.cpp
+@@ -22,6 +22,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <unistd.h>
+
+ #include <sys/socket.h>
+ #include <sys/types.h>
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/metadata.xml b/app-i18n/scim-bridge/metadata.xml
new file mode 100644
index 000000000000..24424e8cb6de
--- /dev/null
+++ b/app-i18n/scim-bridge/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>cjk</herd>
+ <upstream>
+ <remote-id type="sourceforge">scim</remote-id>
+ </upstream>
+</pkgmetadata>
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..0bd7fc3e3a89
--- /dev/null
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit autotools eutils gnome2-utils 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 ~x86"
+IUSE="doc gtk qt4"
+
+RESTRICT="test"
+
+RDEPEND=">=app-i18n/scim-1.4.6
+ gtk? (
+ >=x11-libs/gtk+-2.2:2
+ >=x11-libs/pango-1.1
+ )
+ qt4? (
+ dev-qt/qtgui:4
+ dev-qt/qtcore:4
+ >=x11-libs/pango-1.1
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-util/intltool
+ doc? ( app-doc/doxygen )"
+
+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"
+ epatch "${FILESDIR}/${P}+gcc-4.7.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 && gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+ use gtk && gnome2_query_immodules_gtk2
+}