Date: Monday, March 17, 2014 @ 09:38:37 Author: fyan Revision: 107366
archrelease: copy trunk to community-any Added: ibus-table/repos/community-any/PKGBUILD (from rev 107365, ibus-table/trunk/PKGBUILD) ibus-table/repos/community-any/fix-self-update_property.patch (from rev 107365, ibus-table/trunk/fix-self-update_property.patch) Deleted: ibus-table/repos/community-any/PKGBUILD --------------------------------+ PKGBUILD | 80 +++++++++++++++++++-------------------- fix-self-update_property.patch | 53 +++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 39 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-03-17 08:37:55 UTC (rev 107365) +++ PKGBUILD 2014-03-17 08:38:37 UTC (rev 107366) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@gmail.com> -# Contributor: coderoar <coder...@gmail.com> -# Contributor: leemars <leem...@gmail.com> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> - -pkgname=ibus-table -pkgver=1.5.0 -pkgrel=2 -pkgdesc='IM Engine framework for table-based input methods, such as ZhengMa, WuBi, ErBi, CangJie and so on' -arch=('any') -url="http://code.google.com/p/ibus/" -license=('LGPL') -depends=('python2-pyenchant' 'ibus' 'aspell-en') -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" - https://github.com/mike-fabian/ibus-table/commit/573da2ededdb96dc4f6ef6b515a43f416b183e7a.patch) - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../573da2ededdb96dc4f6ef6b515a43f416b183e7a.patch - - # python2 fix - find -type f -exec sed -i -e 's_exec python_exec python2_' -e 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' -e 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' {} \; - - PYTHON=/usr/bin/python2 ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ibus - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} -sha512sums=('2c52da1b4d6ae8aec29e97a8a413b388912cfcfd15860ba0e65c97b139b14f8a7d4087eb196d516abe731df03a2e4904666194414242da8cf1f3f0b54696248e' - 'ecb1f89ff946309314789aee4b5eb0749a18e881700482df64d1da30ddd438bb115c814fbd67c6c063c6cfdd28a3882aaf6dfdd291e651315ff6f7b58ce5f3ad') Copied: ibus-table/repos/community-any/PKGBUILD (from rev 107365, ibus-table/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-03-17 08:38:37 UTC (rev 107366) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@gmail.com> +# Contributor: coderoar <coder...@gmail.com> +# Contributor: leemars <leem...@gmail.com> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> + +pkgname=ibus-table +pkgver=1.5.0 +pkgrel=3 +pkgdesc='IM Engine framework for table-based input methods, such as ZhengMa, WuBi, ErBi, CangJie and so on' +arch=('any') +url="http://code.google.com/p/ibus/" +license=('LGPL') +makedepends=('git') +depends=('python2-pyenchant' 'ibus' 'aspell-en') +source=("git+https://github.com/kaio/ibus-table.git#tag=$pkgver" + fix-self-update_property.patch) +sha512sums=('SKIP' + 'ecb1f89ff946309314789aee4b5eb0749a18e881700482df64d1da30ddd438bb115c814fbd67c6c063c6cfdd28a3882aaf6dfdd291e651315ff6f7b58ce5f3ad') + +build() { + cd ${pkgname} + + # python2 fix + find -type f -exec sed -i -e 's_exec python_exec python2_' -e 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' -e 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' {} \; + + patch -p1 -i "$srcdir/fix-self-update_property.patch" + + PYTHON=/usr/bin/python2 ./autogen.sh \ + --prefix=/usr \ + --libexecdir=/usr/lib/ibus + + make +} + +package() { + cd ${pkgname} + + make DESTDIR="${pkgdir}" install +} + Copied: ibus-table/repos/community-any/fix-self-update_property.patch (from rev 107365, ibus-table/trunk/fix-self-update_property.patch) =================================================================== --- fix-self-update_property.patch (rev 0) +++ fix-self-update_property.patch 2014-03-17 08:38:37 UTC (rev 107366) @@ -0,0 +1,53 @@ +From 573da2ededdb96dc4f6ef6b515a43f416b183e7a Mon Sep 17 00:00:00 2001 +From: Mike FABIAN <mfab...@redhat.com> +Date: Mon, 4 Feb 2013 19:00:08 +0100 +Subject: [PATCH] Call self.update_property(self._cmode_property) only when the + table is Chinese +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +If self.update_property(self._cmode_property) is called for tables +which are not Chinese, like translit.txt (LANGUAGES = ru_RU) +or ipa-x-sampa.txt (LANGUAGES=other), these input methods don’t work +because then there is no _cmode_property. Fails then with the error: + +fail to create engine ipa-x-sampa +Traceback (most recent call last): + File "/usr/share/ibus-table/engine/factory.py", line 90, in do_create_engine + + str(self.engine_id), self.dbdict[name]) + File "/usr/share/ibus-table/engine/table.py", line 1165, in __init__ + + File "/usr/share/ibus-table/engine/table.py", line 1173, in reset + self._update_ui () + File "/usr/share/ibus-table/engine/table.py", line 1235, in _init_properties + + File "/usr/share/ibus-table/engine/table.py", line 1291, in _refresh_properties + +AttributeError: 'tabengine' object has no attribute '_cmode_property' +Traceback (most recent call last): + File "/usr/share/ibus-table/engine/factory.py", line 98, in do_create_engine + raise Exception("Can not create engine %s" % engine_name) +Exception: Can not create engine ipa-x-sampa + +I caused this problem when porting to GObjectIntrospection. +--- + engine/table.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/engine/table.py b/engine/table.py +index e171949..6c2ef98 100644 +--- a/engine/table.py ++++ b/engine/table.py +@@ -1287,7 +1287,7 @@ def _refresh_properties (self): + self._set_property(self._cmode_property, 'tcb-mode.svg', _('Traditional Chinese First Big Charset Mode'), _('Switch to Big Charset Mode')) + elif self._editor._chinese_mode == 4: + self._set_property(self._cmode_property, 'cb-mode.svg', _('Big Chinese Mode'), _('Switch to Simplified Chinese Mode')) +- self.update_property(self._cmode_property) ++ self.update_property(self._cmode_property) + + def _set_property (self, property, icon, label, tooltip): + property.set_icon ( u'%s%s' % (self._icon_dir, icon ) ) +-- +1.8.1.6 +