From e0dd9c009c02f92afa38adb76ed69962bc5a8479 Mon Sep 17 00:00:00 2001
From: 4fury-c3440d8 <uglyside@yandex.ru>
Date: Fri, 2 Dec 2022 15:35:39 +0300
Subject: [PATCH] enchant2.

---
 office/spellcheck/enchant2/actions.py       | 38 +++++-----
 office/spellcheck/enchant2/pspec.xml        | 79 +++++++++++++++++----
 office/spellcheck/enchant2/translations.xml |  8 +--
 3 files changed, 89 insertions(+), 36 deletions(-)

diff --git a/office/spellcheck/enchant2/actions.py b/office/spellcheck/enchant2/actions.py
index 92e190f29a..c83a7a8fe3 100644
--- a/office/spellcheck/enchant2/actions.py
+++ b/office/spellcheck/enchant2/actions.py
@@ -2,26 +2,25 @@
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
+# See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
-from pisi.actionsapi import shelltools
-from pisi.actionsapi import autotools
-from pisi.actionsapi import pisitools
-from pisi.actionsapi import get
+from pisi.actionsapi import autotools, pisitools, get
+
+j = ''.join([
+    ' --with-aspell',
+    ' --with-hunspell',
+    ' --with-nuspell',
+    ' --with-hspell',
+    ' --with-voikko',
+    ' --with-zemberek',
+    ' --with-hunspell-dir=/usr/share/hunspell',
+    ' --with-hspell-dir=/usr/share/hspell',
+    ' --with-voikko-dir=/usr/share/voikko',
+    ' --disable-static '
+    ])
 
 def setup():
-    shelltools.system("./bootstrap")
-    
-    #suppress g++ warnings
-    pisitools.cxxflags.add("-Wno-useless-cast -Wno-old-style-cast -Wno-deprecated-declarations\
-							-Wno-effc++ -Wno-abi")
-    #suppress gcc warnings
-    pisitools.cflags.add("-fno-stack-protector -Wno-suggest-attribute=malloc")
-    autotools.configure("--disable-static \
-                         --with-zemberek \
-                         --with-aspell \
-                         --with-myspell \
-                         --with-myspell-dir=/usr/share/hunspell")
+    autotools.configure(j)
 
     #fix unused direct dependency analysis
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
@@ -31,7 +30,6 @@ def build():
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    
+
     pisitools.rename("/usr/share/enchant/enchant.ordering", "enchant.ordering-2")
-    
-    pisitools.dodoc("AUTHORS", "NEWS", "README", "HACKING")
\ No newline at end of file
+    pisitools.dodoc("AUTHORS", "NEWS")
diff --git a/office/spellcheck/enchant2/pspec.xml b/office/spellcheck/enchant2/pspec.xml
index 3c40e2d3be..d8e5042b7e 100644
--- a/office/spellcheck/enchant2/pspec.xml
+++ b/office/spellcheck/enchant2/pspec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>enchant2</Name>
@@ -8,27 +8,32 @@
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
         </Packager>
-		<PartOf>office.spellcheck</PartOf>
+        <PartOf>office.spellcheck</PartOf>
         <License>LGPLv2.1</License>
         <IsA>library</IsA>
         <Summary>Spellchecker wrapping library</Summary>
         <Description>enchant is a library that wraps other spell checking backends.</Description>
-        <Archive sha1sum="b0863f70c9972c1abcfac7ce0a486afa364fbb46" type="targz">https://github.com/AbiWord/enchant/archive/v2.3.0.tar.gz</Archive>
+        <Archive sha1sum="1f0f0cb4862a76157dfeb7f966909aa6ea2d7811" type="targz">
+            https://github.com/AbiWord/enchant/releases/download/v2.3.3/enchant-2.3.3.tar.gz
+        </Archive>
         <BuildDependencies>
-            <Dependency>dbus-glib-devel</Dependency>
-            <Dependency>hunspell-devel</Dependency>
-            <Dependency>aspell-devel</Dependency>
-            <Dependency>glib2-devel</Dependency>
             <Dependency>gnupg</Dependency>
-            <Dependency>git</Dependency>
+            <Dependency>hspell</Dependency>
+            <Dependency>glib2-devel</Dependency>
+            <Dependency>aspell-devel</Dependency>
+            <Dependency>nuspell-devel</Dependency>
+            <Dependency>hunspell-devel</Dependency>
+            <Dependency>dbus-glib-devel</Dependency>
+            <Dependency>libvoikko-devel</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>enchant2</Name>
-		<Summary>Spellchecker wrapping library</Summary>
+        <Summary>Spellchecker wrapping library</Summary>
         <RuntimeDependencies>
             <Dependency>glib2</Dependency>
+            <Dependency>libgcc</Dependency>
             <Dependency>hunspell</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -36,15 +41,16 @@
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="man">/usr/share/man</Path>
             <Path fileType="doc">/usr/share/doc</Path>
-            <Path fileType="data">/usr/share/enchant</Path>
+            <Path fileType="data">/usr/share/enchant/enchant.ordering-2</Path>
         </Files>
     </Package>
 
     <Package>
         <Name>enchant2-aspell</Name>
-        <Summary>aspell backend for Enchant</Summary>
+        <Summary>aspell backend for enchant</Summary>
         <RuntimeDependencies>
             <Dependency>enchant2</Dependency>
+            <Dependency>glib2</Dependency>
             <Dependency>aspell</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -54,9 +60,12 @@
 
     <Package>
         <Name>enchant2-zemberek</Name>
-        <Summary>zemberek backend for Enchant</Summary>
+        <Summary>zemberek backend for enchant</Summary>
         <RuntimeDependencies>
+            <Dependency>glib2</Dependency>
+            <Dependency>libgcc</Dependency>
             <Dependency>enchant2</Dependency>
+            <Dependency>dbus-glib</Dependency>
             <Dependency>zemberek-office</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -64,6 +73,45 @@
         </Files>
     </Package>
 
+    <Package>
+        <Name>enchant2-nuspell</Name>
+        <RuntimeDependencies>
+            <Dependency>glib2</Dependency>
+            <Dependency>icu4c</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>nuspell</Dependency>
+            <!-- <Dependency>enchant2</Dependency> -->
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib/enchant-2/enchant_nuspell.so</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>enchant2-hspell</Name>
+        <RuntimeDependencies>
+            <Dependency>glib2</Dependency>
+            <Dependency>hspell</Dependency>
+            <Dependency>enchant2</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib/enchant-2/enchant_hspell.so</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>enchant2-voikko</Name>
+        <RuntimeDependencies>
+            <Dependency>glib2</Dependency>
+            <Dependency>enchant2</Dependency>
+            <Dependency>voikko-fi</Dependency>
+            <Dependency>libvoikko</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib/enchant-2/enchant_voikko.so</Path>
+        </Files>
+    </Package>
+
     <Package>
         <Name>enchant2-devel</Name>
         <Summary>Development files for enchant2</Summary>
@@ -78,6 +126,13 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2022-12-02</Date>
+            <Version>2.3.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>fury</Name>
+            <Email>uglyside@yandex.ru</Email>
+        </Update>
         <Update release="3">
             <Date>2021-06-30</Date>
             <Version>2.3.0</Version>
diff --git a/office/spellcheck/enchant2/translations.xml b/office/spellcheck/enchant2/translations.xml
index bf4d4518c1..7e9ac84342 100644
--- a/office/spellcheck/enchant2/translations.xml
+++ b/office/spellcheck/enchant2/translations.xml
@@ -9,18 +9,18 @@
     <Package>
         <Name>enchant2-aspell</Name>
         <Summary xml:lang="tr">Enchant2 için aspell arkaucu</Summary>
-		<Description xml:lang="tr">enchant2-aspell, enchant2 için aspell arkaucu sağlar.</Description>
+        <Description xml:lang="tr">enchant2-aspell, enchant2 için aspell arkaucu sağlar.</Description>
     </Package>
 
     <Package>
         <Name>enchant2-zemberek</Name>
         <Summary xml:lang="tr">Enchant2 için zemberek arkaucu</Summary>
-		<Description xml:lang="tr">enchant2-zemberek, enchant2 için zemberek arkaucu sağlar.</Description>
+        <Description xml:lang="tr">enchant2-zemberek, enchant2 için zemberek arkaucu sağlar.</Description>
     </Package>
 
     <Package>
         <Name>enchant2-devel</Name>
         <Summary xml:lang="tr">enchant2 için geliştirme dosyaları</Summary>
-		<Description xml:lang="tr">enchant2-devel, enchant2 için geliştirme dosyaları sağlar.</Description>
+        <Description xml:lang="tr">enchant2-devel, enchant2 için geliştirme dosyaları sağlar.</Description>
     </Package>
-</PISI>
\ No newline at end of file
+</PISI>