summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatsuu Takuto <matsuu@gentoo.org>2008-11-16 06:16:14 +0000
committerMatsuu Takuto <matsuu@gentoo.org>2008-11-16 06:16:14 +0000
commita95ac4f689488b4c305c76b4d8e0a9c0d0611208 (patch)
treea511f4be222aed4dec36194d2e6d6c78ea37424c /app-i18n
parentAdded !app-editors/levee to RDEPEND, bug #246966. (diff)
downloadgentoo-2-a95ac4f689488b4c305c76b4d8e0a9c0d0611208.tar.gz
gentoo-2-a95ac4f689488b4c305c76b4d8e0a9c0d0611208.tar.bz2
gentoo-2-a95ac4f689488b4c305c76b4d8e0a9c0d0611208.zip
Added kde3 patch, bug #211493.
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo x86_64)
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/skim/ChangeLog8
-rw-r--r--app-i18n/skim/files/skim-1.4.5-kde3.patch33
-rw-r--r--app-i18n/skim/skim-1.4.5-r2.ebuild77
3 files changed, 117 insertions, 1 deletions
diff --git a/app-i18n/skim/ChangeLog b/app-i18n/skim/ChangeLog
index 6cd452142937..551e96007c64 100644
--- a/app-i18n/skim/ChangeLog
+++ b/app-i18n/skim/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-i18n/skim
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.58 2008/11/12 00:41:15 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.59 2008/11/16 06:16:14 matsuu Exp $
+
+*skim-1.4.5-r2 (16 Nov 2008)
+
+ 16 Nov 2008; MATSUU Takuto <matsuu@gentoo.org>
+ +files/skim-1.4.5-kde3.patch, +skim-1.4.5-r2.ebuild:
+ Added kde3 patch, bug #211493.
*skim-1.4.5-r1 (12 Nov 2008)
diff --git a/app-i18n/skim/files/skim-1.4.5-kde3.patch b/app-i18n/skim/files/skim-1.4.5-kde3.patch
new file mode 100644
index 000000000000..b3d4a7dd62b8
--- /dev/null
+++ b/app-i18n/skim/files/skim-1.4.5-kde3.patch
@@ -0,0 +1,33 @@
+diff -U3 -r skim-1.4.5.orig/bksys/kde.py skim-1.4.5.mod/bksys/kde.py
+--- skim-1.4.5.orig/bksys/kde.py 2006-06-04 04:03:36.000000000 +0200
++++ skim-1.4.5.mod/bksys/kde.py 2008-11-15 15:54:16.000000000 +0100
+@@ -368,7 +368,7 @@
+ env['BUILDERS']['Uic']=Builder(action=uic_processing,emitter=uicEmitter,suffix='.h',src_suffix='.ui')
+
+ def kcfg_buildit(target, source, env):
+- comp='kconfig_compiler -d%s %s %s' % (str(source[0].get_dir()), source[1].path, source[0].path)
++ comp=env['KDEDIR']+'/bin/kconfig_compiler -d%s %s %s' % (str(source[0].get_dir()), source[1].path, source[0].path)
+ return env.Execute(comp)
+ def kcfg_stringit(target, source, env):
+ print "processing %s to get %s and %s" % (source[0].name, target[0].name, target[1].name)
+diff -U3 -r skim-1.4.5.orig/src/skimpluginmanager.cpp skim-1.4.5.mod/src/skimpluginmanager.cpp
+--- skim-1.4.5.orig/src/skimpluginmanager.cpp 2006-06-04 04:03:36.000000000 +0200
++++ skim-1.4.5.mod/src/skimpluginmanager.cpp 2008-11-15 15:41:47.000000000 +0100
+@@ -65,7 +65,7 @@
+ f.close();
+ }
+ #endif
+- ScimKdeSettings::writeConfig();
++ ScimKdeSettings::self()->writeConfig();
+ return true;
+ }
+
+@@ -286,7 +286,7 @@
+ #endif
+ //check whether the configure is already saved when logout the session
+ if(!m_sm->dataCommitted())
+- ScimKdeSettings::writeConfig();
++ ScimKdeSettings::self()->writeConfig();
+
+ delete m_sm;
+ delete ScimKdeSettings::self();
diff --git a/app-i18n/skim/skim-1.4.5-r2.ebuild b/app-i18n/skim/skim-1.4.5-r2.ebuild
new file mode 100644
index 000000000000..a8e28b830780
--- /dev/null
+++ b/app-i18n/skim/skim-1.4.5-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2000-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.4.5-r2.ebuild,v 1.1 2008/11/16 06:16:14 matsuu Exp $
+
+inherit kde-functions multilib toolchain-funcs eutils
+
+DESCRIPTION="Smart Common Input Method (SCIM) optimized for KDE"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
+ http://freedesktop.org/~cougar/skim/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=app-i18n/scim-1.4.4"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+need-kde 3.2
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}/${P}-asneeded.patch"
+ # bug #211493
+ epatch "${FILESDIR}/${P}-kde3.patch"
+ sed -i -e "s:/opt/kde3:${KDEDIR}:g" doc/de/index.docbook || die
+}
+
+src_compile() {
+ local sconsopts=$(echo "${MAKEOPTS}" | sed -e "s/.*\(-j[0-9]\+\).*/\1/")
+ [ "${MAKEOPTS/-s/}" != "${MAKEOPTS}" ] && sconsopts="${sconsopts} -s"
+
+ ./configure prefix=/usr libdir=/usr/$(get_libdir) || die
+ sed -i -e "/^compilers/s:\[:\['$(tc-getCXX)',:" scons-local-0.96.1/SCons/Tool/g++.py || die
+ ./scons ${sconsopts} || die
+}
+
+src_install() {
+ DESTDIR="${D}" ./scons prefix=/usr install || die
+
+ # Install the .desktop file in FDO's suggested directory
+ dodir /usr/share/applications/kde
+ mv "${D}/usr/share/applnk/Utilities/skim.desktop" \
+ "${D}/usr/share/applications/kde"
+
+ dodoc ChangeLog AUTHORS NEWS README TODO
+ mv "${D}/usr/share/doc/HTML" "${D}/usr/share/doc/${PF}/html"
+}
+
+pkg_postinst() {
+ elog
+ elog "If you want to use Chinese interface, edit your startup script"
+ elog "such as .xinitrc to incorporate"
+ elog
+ elog ' export XMODIFIERS=@im=SCIM'
+ elog ' export QT_IM_MODULE=scim'
+ elog ' export GTK_IM_MODULE=scim'
+ elog ' export LANG="zh_CN.GBK"'
+ elog ' startkde'
+ elog
+ elog "or if you prefer English interface,"
+ elog
+ elog ' export XMODIFIERS=@im=SCIM'
+ elog ' export QT_IM_MODULE=scim'
+ elog ' export GTK_IM_MODULE=scim'
+ elog ' export LC_CTYPE="zh_CN.GBK"'
+ elog ' startkde'
+ elog
+ elog "and start skim and SCIM by"
+ elog
+ elog " % skim -d"
+ elog
+}