[arch-commits] Commit in ibus-table/trunk (2 files)

Felix Yan fyan at nymeria.archlinux.org
Fri Jun 6 16:57:41 UTC 2014


    Date: Friday, June 6, 2014 @ 18:57:40
  Author: fyan
Revision: 112770

upgpkg: ibus-table 1.8.1-1

Modified:
  ibus-table/trunk/PKGBUILD
Deleted:
  ibus-table/trunk/109872fdb45dc625906e0039efc0897dd9c64ca5.patch

------------------------------------------------+
 109872fdb45dc625906e0039efc0897dd9c64ca5.patch |   85 -----------------------
 PKGBUILD                                       |   13 +--
 2 files changed, 4 insertions(+), 94 deletions(-)

Deleted: 109872fdb45dc625906e0039efc0897dd9c64ca5.patch
===================================================================
--- 109872fdb45dc625906e0039efc0897dd9c64ca5.patch	2014-06-06 16:50:29 UTC (rev 112769)
+++ 109872fdb45dc625906e0039efc0897dd9c64ca5.patch	2014-06-06 16:57:40 UTC (rev 112770)
@@ -1,85 +0,0 @@
-diff --git a/engine/main.py b/engine/main.py
-index 782ad51..dff0c27 100644
---- a/engine/main.py
-+++ b/engine/main.py
-@@ -254,6 +254,9 @@ def main():
-             _symbol = SubElement (_engine, 'symbol')
-             _symbol.text = _sq_db.ime_properties.get('symbol')
- 
-+            _symbol = SubElement (_engine, 'symbol')
-+            _symbol.text = _sq_db.get_ime_property ('symbol')
-+
-             _desc = SubElement (_engine, 'description')
-             _desc.text = _sq_db.ime_properties.get('description')
- 
-diff --git a/engine/tabsqlitedb.py b/engine/tabsqlitedb.py
-index b46d63a..d690cf8 100644
---- a/engine/tabsqlitedb.py
-+++ b/engine/tabsqlitedb.py
-@@ -146,6 +146,7 @@ class tabsqlitedb:
-             print('Error while initializing database.')
-         # create IME property table
-         self.db.executescript('CREATE TABLE IF NOT EXISTS main.ime (attr TEXT, val TEXT);')
-+<<<<<<< HEAD
-         # Initalize missing attributes in the ime table with some
-         # default values, they should be updated using the attributes
-         # found in the source when creating a system database with
-@@ -208,6 +209,58 @@ class tabsqlitedb:
-             default_properties=self._default_ime_attributes)
-         # shared variables in this class:
-         self._mlen = int(self.ime_properties.get("max_key_length"))
-+=======
-+        # make sure we have values in ime table.
-+        if not self.db.execute('SELECT val FROM main.ime \
-+            WHERE attr="name";').fetchall():
-+            ime_keys={'name':'',
-+                      'name.zh_cn':'',
-+                      'name.zh_hk':'',
-+                      'name.zh_tw':'',
-+                      'author':'somebody', 
-+                      'uuid':'%s' % uuid.uuid4(),
-+                      'serial_number':'%s' % time.strftime('%Y%m%d'),
-+                      'icon':'ibus-table.svg',
-+                      'license':'LGPL',
-+                      'languages':'',
-+                      'language_filter':'',
-+                      'valid_input_chars':'abcdefghijklmnopqrstuvwxyz',
-+                      'max_key_length':'4',
-+            #          'commit_keys':'space',
-+            #          'forward_keys':'Return',
-+                      'select_keys':'1,2,3,4,5,6,7,8,9,0',
-+                      'page_up_keys':'Page_Up,minus',
-+                      'page_down_keys':'Page_Down,equal',
-+                      'status_prompt':'',
-+                      'def_full_width_punct':'TRUE',
-+                      'def_full_width_letter':'FALSE',
-+                      'user_can_define_phrase':'FALSE',
-+                      'pinyin_mode':'FALSE',
-+                      'dynamic_adjust':'FALSE',
-+                      'auto_select':'false',
-+                      'auto_commit':'false',
-+                      #'no_check_chars':u'',
-+                      'description':'A IME under IBus Table',
-+                      'layout':'us',
-+                      'symbol':'',
-+                      'rules':'',
-+                      #'rules':'ce2:p11+p12+p21+p22;ce3:p11+p21+p22+p31;ca4:p11+p21+p31+p41'}
-+                      'least_commit_length':'0',
-+                      'start_chars':'',
-+                      'orientation':'1',
-+                      'always_show_lookup':'true'
-+                      # we use this entry for those IME, which don't
-+                      # have rules to build up phrase, but still need
-+                      # auto commit to preedit
-+                      }
-+            # inital the attribute in ime table, which should be updated from mabiao
-+            for _name in ime_keys:
-+                sqlstr = 'INSERT INTO main.ime (attr,val) VALUES (?,?);'
-+                self.db.execute( sqlstr, (_name,ime_keys[_name]) )
-+        # share variables in this class:
-+        self._mlen = int ( self.get_ime_property ("max_key_length") )
-+        # for chinese
-+>>>>>>> master
-         self._is_chinese = self.is_chinese()
-         self.user_can_define_phrase = self.ime_properties.get('user_can_define_phrase')
-         if self.user_can_define_phrase:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-06 16:50:29 UTC (rev 112769)
+++ PKGBUILD	2014-06-06 16:57:40 UTC (rev 112770)
@@ -5,8 +5,8 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=ibus-table
-pkgver=1.7.0
-pkgrel=2
+pkgver=1.8.1
+pkgrel=1
 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/"
@@ -14,19 +14,14 @@
 makedepends=('git' 'docbook2x' 'docbook-sgml')
 depends=('python-pyenchant' 'ibus' 'aspell-en')
 source=("git+https://github.com/kaio/ibus-table.git#tag=$pkgver"
-        sgml_fix.patch
-        109872fdb45dc625906e0039efc0897dd9c64ca5.patch)
+        sgml_fix.patch)
 sha512sums=('SKIP'
-            '930cd45e9687295159c44d5d4133e99a2259fb8f2ed51675b55b18ca59acb410144689a2d51b052b7bbcbe061f8135ebd511898658d1c71e7004303df969c880'
-            '0f008848fcc59c91764c7b52d0e022a686c9980b317cd711d57fa1d7504b78fd1d71a1d61c18f88e045238541dfd152dd78605cd54337c511a8e0a3bf90c67c5')
+            '930cd45e9687295159c44d5d4133e99a2259fb8f2ed51675b55b18ca59acb410144689a2d51b052b7bbcbe061f8135ebd511898658d1c71e7004303df969c880')
 
 prepare() {
   cd ${pkgname}
 
   patch -p1 -i ../sgml_fix.patch
-
-  # Revert broken commit
-  patch -R -p1 -i ../109872fdb45dc625906e0039efc0897dd9c64ca5.patch
 }
 
 build() {




More information about the arch-commits mailing list