Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Mar 2017 20:41:18 +0000 (UTC)
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r436174 - in head/textproc/ibus-typing-booster: . files
Message-ID:  <201703142041.v2EKfITq035716@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: thierry
Date: Tue Mar 14 20:41:18 2017
New Revision: 436174
URL: https://svnweb.freebsd.org/changeset/ports/436174

Log:
  Upgrade to 1.5.25.
  
  Release notes at
  https://github.com/mike-fabian/ibus-typing-booster/releases/tag/1.5.25

Added:
  head/textproc/ibus-typing-booster/files/patch-engine_hunspell__suggest.py   (contents, props changed)
  head/textproc/ibus-typing-booster/files/patch-engine_itb__util.py   (contents, props changed)
Modified:
  head/textproc/ibus-typing-booster/Makefile
  head/textproc/ibus-typing-booster/distinfo
  head/textproc/ibus-typing-booster/pkg-message
  head/textproc/ibus-typing-booster/pkg-plist

Modified: head/textproc/ibus-typing-booster/Makefile
==============================================================================
--- head/textproc/ibus-typing-booster/Makefile	Tue Mar 14 20:40:35 2017	(r436173)
+++ head/textproc/ibus-typing-booster/Makefile	Tue Mar 14 20:41:18 2017	(r436174)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ibus-typing-booster
-PORTVERSION=	1.5.24
+PORTVERSION=	1.5.25
 CATEGORIES=	textproc
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -21,6 +21,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/Me
 		${PYTHON_SITELIBDIR}/hunspell.so:textproc/py3-hunspell	\
 		${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py3-gobject3	\
 		${LOCALBASE}/share/unicode/ucd/Index.txt:textproc/UCD	\
+		${LOCALBASE}/share/unicode/cldr/readme.html:textproc/CLDR\
 		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py35-sqlite3
 TEST_DEPENDS=	${LOCALBASE}/share/hunspell/de_DE.dic:german/hunspell	\
 		${LOCALBASE}/share/hunspell/ko_KR.aff:korean/hunspell	\
@@ -42,7 +43,7 @@ HUNSPELL_RUN_DEPENDS=	hunspell:textproc/
 SPELL2FIX=	engine/hunspell_suggest.py setup/user_transliteration.py	\
 		setup/user_transliteration.py
 DATA2FIX=	setup/main.py engine/tabsqlitedb.py engine/main.py
-PY2FIX=		engine/emoji-picker setup/user_transliteration.py
+PY2FIX=		setup/user_transliteration.py
 M17N2FIX=	setup/main.py
 SHR2FIX=	engine/tabsqlitedb.py engine/itb_util.py engine/itb_emoji.py	\
 		engine/hunspell_table.py engine/main.py setup/user_transliteration.py
@@ -58,7 +59,6 @@ pre-configure:
 .for f in ${DATA2FIX}
 	${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/${f}
 .endfor
-	${REINPLACE_CMD} -e 's|prefix=/usr|prefix=${PREFIX}|' ${WRKSRC}/engine/emoji-picker
 .for f in ${M17N2FIX}
 	${REINPLACE_CMD} -e 's|/usr/share/m17n|${LOCALBASE}/share/m17n|'	\
 		${WRKSRC}/${f}

Modified: head/textproc/ibus-typing-booster/distinfo
==============================================================================
--- head/textproc/ibus-typing-booster/distinfo	Tue Mar 14 20:40:35 2017	(r436173)
+++ head/textproc/ibus-typing-booster/distinfo	Tue Mar 14 20:41:18 2017	(r436174)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488917388
-SHA256 (mike-fabian-ibus-typing-booster-1.5.24_GH0.tar.gz) = b36294bbee44d710a25cffe6187ab78df789b8ae9d34db97ef72bfa29e62fe9a
-SIZE (mike-fabian-ibus-typing-booster-1.5.24_GH0.tar.gz) = 4793954
+TIMESTAMP = 1489430261
+SHA256 (mike-fabian-ibus-typing-booster-1.5.25_GH0.tar.gz) = e32acf6d757e82bd94bc18db49d36184d72f82f99f79cc7eb517e6ad5e429312
+SIZE (mike-fabian-ibus-typing-booster-1.5.25_GH0.tar.gz) = 4799666

Added: head/textproc/ibus-typing-booster/files/patch-engine_hunspell__suggest.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/ibus-typing-booster/files/patch-engine_hunspell__suggest.py	Tue Mar 14 20:41:18 2017	(r436174)
@@ -0,0 +1,40 @@
+--- engine/hunspell_suggest.py.orig	2017-03-13 08:42:29 UTC
++++ engine/hunspell_suggest.py
+@@ -76,8 +76,9 @@ class Dictionary:
+         '''
+         if DEBUG_LEVEL > 0:
+             sys.stderr.write("load_dictionary() ...\n")
+-        (dic_path, self.words) = itb_util.get_hunspell_dictionary_wordlist(
+-            self.name)
++        (dic_path,
++         self.encoding,
++         self.words) = itb_util.get_hunspell_dictionary_wordlist(self.name)
+         if self.words:
+             # List of languages where accent insensitive matching makes sense:
+             accent_languages = (
+@@ -183,6 +184,9 @@ class Hunspell:
+         >>> h.suggest('Glühwürmchen')[0]
+         ('Glühwürmchen', 0)
+ 
++        >>> h.suggest('Alpengluhen')[0]
++        ('Alpenglühen', 0)
++
+         >>> h.suggest('filosofictejsi')
+         [('filosofičtější', 0), ('filosofičtěji', -1)]
+ 
+@@ -291,7 +295,9 @@ class Hunspell:
+                         # the result back to the internal
+                         # normalization form (NFD) (hunspell does the
+                         # right thing for Korean if the input is NFC).
+-                        if dictionary.pyhunspell_object.spell(input_phrase_nfc):
++                        if dictionary.pyhunspell_object.spell(
++                                input_phrase_nfc.encode(
++                                    dictionary.encoding, 'replace')):
+                             # This is a valid word in this dictionary.
+                             # It might have been missed by the matching
+                             # above because the dictionary might not
+@@ -380,3 +386,4 @@ def main():
+ 
+ if __name__ == "__main__":
+     main()
++

Added: head/textproc/ibus-typing-booster/files/patch-engine_itb__util.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/ibus-typing-booster/files/patch-engine_itb__util.py	Tue Mar 14 20:41:18 2017	(r436174)
@@ -0,0 +1,67 @@
+--- engine/itb_util.py.orig	2017-03-13 08:42:29 UTC
++++ engine/itb_util.py
+@@ -348,11 +348,12 @@ def get_hunspell_dictionary_wordlist(lan
+ 
+     :param language: The language of the dictionary to open
+     :type language: String
+-    :rtype: tuple of the form (dic_path, wordlist) where
+-            dic_path is the full path of the dictionary file found
++    :rtype: tuple of the form (dic_path, dictionary_encoding, wordlist) where
++            dic_path is the full path of the dictionary file found,
++            dictionary_encoding is the encoding of that dictionary file,
+             and wordlist is a list of words found in that file.
+             If no dictionary can be found for the requested language,
+-            the return value is ('', []).
++            the return value is ('', '', []).
+     '''
+     dirnames = [
+         '/usr/share/hunspell',
+@@ -374,7 +375,7 @@ def get_hunspell_dictionary_wordlist(lan
+             'get_hunspell_dictionary_wordlist(): '
+             + 'No file %s.dic found in %s\n'
+             %(language, dirnames))
+-        return ('', [])
++        return ('', '', [])
+     sys.stderr.write(
+         'get_hunspell_dictionary_wordlist(): '
+         + '%s file found.\n'
+@@ -439,21 +440,21 @@ def get_hunspell_dictionary_wordlist(lan
+                 %(dic_path, dictionary_encoding)
+                 + 'giving up.\n')
+             traceback.print_exc()
+-            return ('', [])
++            return ('', '', [])
+         except:
+             sys.stderr.write(
+                 'get_hunspell_dictionary_wordlist(): '
+                 + 'Unexpected error loading .dic File: %s\n' %dic_path)
+             traceback.print_exc()
+-            return ('', [])
++            return ('', '', [])
+     except:
+         sys.stderr.write(
+             'get_hunspell_dictionary_wordlist(): '
+             + 'Unexpected error loading .dic File: %s\n' %dic_path)
+         traceback.print_exc()
+-        return ('', [])
++        return ('', '', [])
+     if not dic_buffer:
+-        return ('', [])
++        return ('', '', [])
+     sys.stderr.write(
+         'get_hunspell_dictionary_wordlist(): '
+         + 'Successfully loaded %s using %s encoding.\n'
+@@ -488,7 +489,7 @@ def get_hunspell_dictionary_wordlist(lan
+             re.sub(r'[/\t].*', '', x.replace('\n', '')))
+         for x in dic_buffer
+     ]
+-    return (dic_path, word_list)
++    return (dic_path, dictionary_encoding, word_list)
+ 
+ if __name__ == "__main__":
+     import doctest
+@@ -497,3 +498,4 @@ if __name__ == "__main__":
+         sys.exit(1)
+     else:
+         sys.exit(0)
++

Modified: head/textproc/ibus-typing-booster/pkg-message
==============================================================================
--- head/textproc/ibus-typing-booster/pkg-message	Tue Mar 14 20:40:35 2017	(r436173)
+++ head/textproc/ibus-typing-booster/pkg-message	Tue Mar 14 20:41:18 2017	(r436174)
@@ -1,2 +1,4 @@
 
 It is recommanded to install a font with emoji, e.g. x11-fonts/emojione-color-font-ttf .
+
+And do not forget to run `ibus restart' after an upgrade.

Modified: head/textproc/ibus-typing-booster/pkg-plist
==============================================================================
--- head/textproc/ibus-typing-booster/pkg-plist	Tue Mar 14 20:40:35 2017	(r436173)
+++ head/textproc/ibus-typing-booster/pkg-plist	Tue Mar 14 20:41:18 2017	(r436174)
@@ -294,3 +294,4 @@ share/locale/ja/LC_MESSAGES/ibus-typing-
 share/locale/pl/LC_MESSAGES/ibus-typing-booster.mo
 share/locale/pt_BR/LC_MESSAGES/ibus-typing-booster.mo
 share/locale/uk/LC_MESSAGES/ibus-typing-booster.mo
+share/locale/zh_CN/LC_MESSAGES/ibus-typing-booster.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703142041.v2EKfITq035716>