[arch-commits] Commit in retext/trunk (PKGBUILD enchant.patch)

[Jiachen Yang]

    Date: Tuesday, February 23, 2016 @ 16:16:10
  Author: farseerfc
Revision: 163219

backport a fix to enchant

Added:
  retext/trunk/enchant.patch
Modified:
  retext/trunk/PKGBUILD

---------------+
 PKGBUILD      |   15 +++++++++++++--
 enchant.patch |   13 +++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-23 12:40:08 UTC (rev 163218)
+++ PKGBUILD	2016-02-23 15:16:10 UTC (rev 163219)
@@ -7,7 +7,7 @@
 
 pkgname=retext
 pkgver=5.3.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A simple editor for Markdown and ReStructuredText markup languages"
 arch=('any')
 url="https://github.com/retext-project/retext"
@@ -20,16 +20,27 @@
             'python-docutils: for reStructuredText language support'
             'python-pyenchant: for spell checking support')
 source=("https://github.com/retext-project/${pkgname}/archive/${pkgver}.tar.gz"
+        "enchant.patch"
         "x-retext-markdown.xml"
         "x-retext-rst.xml")
 install="${pkgname}".install
 sha256sums=('dcb39f0e53b02f8ad599b3091c1af096ca474a2ccaeb1321da38deeb982187c1'
+            '4c324cd3afa0dadb150d2722704e91342c0684d42223f2a07de260bee22436c0'
             'b51611479d3224eec2b58264ed91ace3eccb502b7b806dae3e7a3ab4aab8c4b8'
             '6fef80cccb14813d9cc74810c397a6cd7831d1ca243536759a47c6e8b6cc977a')
 
+prepare () {
+    cd "$srcdir/retext-${pkgver}"
+    sed -i "s/, env={'QT_SELECT': 'qt5'}//g" setup.py
+
+    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=812149
+    # https://github.com/retext-project/retext/issues/193
+    # https://github.com/retext-project/retext/commit/39603255072313423a17d9207c6b1ec613d9825b
+    patch -p1 --verbose <"${srcdir}/enchant.patch"
+}
+
 build () {
     cd "$srcdir/retext-${pkgver}"
-    sed -i "s/, env={'QT_SELECT': 'qt5'}//g" setup.py
     python3 setup.py build
 }
 

Added: enchant.patch
===================================================================
--- enchant.patch	                        (rev 0)
+++ enchant.patch	2016-02-23 15:16:10 UTC (rev 163219)
@@ -0,0 +1,13 @@
+diff --git a/ReText/tab.py b/ReText/tab.py
+index 42e080a..eb8aa11 100644
+--- a/ReText/tab.py
++++ b/ReText/tab.py
+@@ -48,7 +48,7 @@ class ReTextTab(QObject):
+ 		textDocument = self.editBox.document()
+ 		self.highlighter = ReTextHighlighter(textDocument)
+ 		if enchant_available and parent.actionEnableSC.isChecked():
+-			self.highlighter.dictionary = enchant.Dict(parent.sl)
++			self.highlighter.dictionary = enchant.Dict(parent.sl or None)
+ 			self.highlighter.rehighlight()
+ 		self.highlighter.docType = self.markup.name
+