summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--.gitignore3
-rw-r--r--PKGBUILD32
-rw-r--r--hunspell-fr_skip-useless-steps.patch62
4 files changed, 92 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ddfa6ad8afd..59b1058b4d21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
pkgbase = hunspell-fr
pkgdesc = French Hunspell dictionary
- pkgver = 7.0
+ pkgver = 7.6
pkgrel = 1
url = https://grammalecte.net/home.php?prj=fr
arch = any
license = MPL2
+ makedepends = fossil
makedepends = qt5-webengine
provides = hunspell-fr
conflicts = hunspell-fr
- source = https://grammalecte.net/download/fr/hunspell-french-dictionaries-v7.0.zip
- sha256sums = eb7ac36dc14b9c3e3c0cabae0f90304a137da8e6ae607bcaf56d65720fbd097f
+ source = grammalecte.fossil::fossil+http://grammalecte.net:8080#tag=cc24153f418268c1
+ source = hunspell-fr_skip-useless-steps.patch
+ sha256sums = SKIP
+ sha256sums = 2c43bd9f031a7b63166d818377cedd52f7bb1589e28fe936862005f371a98837
pkgname = hunspell-fr-classical
pkgdesc = French Hunspell dictionary (classical variant)
diff --git a/.gitignore b/.gitignore
index 1c206576af0b..1af6adbd3578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
pkg/
src/
*.pkg.*
-*.zip \ No newline at end of file
+*.zip
+*.fossil
diff --git a/PKGBUILD b/PKGBUILD
index ab10f6bd8bec..e507677e505e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,25 @@
pkgbase='hunspell-fr'
pkgname=($pkgbase-{'classical','comprehensive','revised'})
-pkgver=7.0
+pkgver=7.6
pkgrel=1
pkgdesc="French Hunspell dictionary"
arch=(any)
_base_url="https://grammalecte.net"
url="${_base_url}/home.php?prj=fr"
license=('MPL2')
-makedepends=('qt5-webengine')
+makedepends=('fossil' 'qt5-webengine')
conflicts=('hunspell-fr')
provides=('hunspell-fr')
-source=("${_base_url}/download/fr/hunspell-french-dictionaries-v${pkgver}.zip")
-sha256sums=('eb7ac36dc14b9c3e3c0cabae0f90304a137da8e6ae607bcaf56d65720fbd097f')
+source=("grammalecte.fossil::fossil+http://grammalecte.net:8080#tag=cc24153f418268c1"
+ "${pkgbase}_skip-useless-steps.patch")
+sha256sums=('SKIP'
+ '2c43bd9f031a7b63166d818377cedd52f7bb1589e28fe936862005f371a98837')
+
+prepare() {
+ cd "${srcdir}/grammalecte"
+ patch -Np1 -i "../${pkgbase}_skip-useless-steps.patch"
+}
package_hunspell-fr-classical() {
pkgdesc+=" (classical variant)"
@@ -32,11 +39,18 @@ package_hunspell-fr-revised() {
_package() {
_dicname=$1
- cd "${srcdir}"
+ cd "${srcdir}/grammalecte"
+
+ pushd "gc_lang/fr/dictionnaire/"
+ python genfrdic.py --verdic ${pkgver}
+ pushd "_build/${pkgver}/hunspell-french-dictionaries-v${pkgver}/"
install -dm755 ${pkgdir}/usr/share/hunspell
install -m644 fr-${_dicname}.dic ${pkgdir}/usr/share/hunspell/fr_FR.dic
install -m644 fr-${_dicname}.aff ${pkgdir}/usr/share/hunspell/fr_FR.aff
+ install -Dm644 README_dict_fr.txt "${pkgdir}"/usr/share/doc/${pkgname}/README_dict_fr.txt
+ popd
+ popd
pushd "${pkgdir}"/usr/share/hunspell/
aliases="fr_BE fr_CA fr_CH fr_LU"
@@ -48,13 +62,11 @@ _package() {
install -dm755 ${pkgdir}/usr/share/myspell/dicts
pushd ${pkgdir}/usr/share/myspell/dicts
- for file in ${pkgdir}/usr/share/hunspell/*; do
- ln -sv /usr/share/hunspell/$(basename ${file}) .
- done
+ for file in ${pkgdir}/usr/share/hunspell/*; do
+ ln -sv /usr/share/hunspell/$(basename ${file}) .
+ done
popd
- install -Dm644 README_dict_fr.txt "${pkgdir}"/usr/share/doc/${pkgname}/README_dict_fr.txt
-
# Install webengine dictionaries
install -d "$pkgdir"/usr/share/qt/qtwebengine_dictionaries/
for _file in "$pkgdir"/usr/share/hunspell/*.dic; do
diff --git a/hunspell-fr_skip-useless-steps.patch b/hunspell-fr_skip-useless-steps.patch
new file mode 100644
index 000000000000..e51e4cae029f
--- /dev/null
+++ b/hunspell-fr_skip-useless-steps.patch
@@ -0,0 +1,62 @@
+Index: gc_lang/fr/dictionnaire/genfrdic.py
+==================================================================
+--- a/gc_lang/fr/dictionnaire/genfrdic.py
++++ b/gc_lang/fr/dictionnaire/genfrdic.py
+@@ -1454,24 +1454,24 @@
+ oFrenchDict.sortEntriesNatural()
+ oFrenchDict.checkEntries()
+
+ ### Lexique
+ oFrenchDict.generateFlexions()
+- oFrenchDict.calcMetagraphe()
+- oFrenchDict.calcMetaphone2()
++ #oFrenchDict.calcMetagraphe()
++ #oFrenchDict.calcMetaphone2()
+
+ #oFrenchDict.createNgrams(spBuild, 3)
+
+ ### Statistiques
+ spfStats = spBuild+'/'+STATS_NAME+xArgs.verdic+'.txt'
+- oStatsLex = StatsLex(oFrenchDict)
+- oStatsLex.addLexFromFile('lexique/corpus_data/stats_google_ngram_1.txt', 'G', 'Google 1-grams')
+- oStatsLex.addLexFromFile('lexique/corpus_data/stats_frwiki.txt', 'W', 'Wikipédia')
+- oStatsLex.addLexFromFile('lexique/corpus_data/stats_frwikisource.txt', 'S', 'Wikisource')
+- oStatsLex.addLexFromFile('lexique/corpus_data/stats_litterature.txt', 'L', 'Littérature')
+- oStatsLex.write(spBuild+'/test_lex.txt')
+- oFrenchDict.calculateStats(oStatsLex, spfStats)
++ #oStatsLex = StatsLex(oFrenchDict)
++ #oStatsLex.addLexFromFile('lexique/corpus_data/stats_google_ngram_1.txt', 'G', 'Google 1-grams')
++ #oStatsLex.addLexFromFile('lexique/corpus_data/stats_frwiki.txt', 'W', 'Wikipédia')
++ #oStatsLex.addLexFromFile('lexique/corpus_data/stats_frwikisource.txt', 'S', 'Wikisource')
++ #oStatsLex.addLexFromFile('lexique/corpus_data/stats_litterature.txt', 'L', 'Littérature')
++ #oStatsLex.write(spBuild+'/test_lex.txt')
++ #oFrenchDict.calculateStats(oStatsLex, spfStats)
+
+ ### Écriture des paquets
+ echo("Création des paquets...")
+
+ spLexiconDestGL = "../../../lexicons" if xArgs.grammalecte else ""
+@@ -1481,16 +1481,16 @@
+
+ ### dictionnaires
+ if not xArgs.uncompress:
+ oFrenchDict.defineAbreviatedTags(xArgs.mode, spfStats)
+ oFrenchDict.createFiles(spBuild, [dTOUTESVAR, dCLASSIQUE, dREFORME1990], xArgs.mode, xArgs.simplify)
+- oFrenchDict.createLexiconPackages(spBuild, xArgs.verdic, oStatsLex, spLexiconDestGL)
+- oFrenchDict.createFileIfqForDB(spBuild)
++ #oFrenchDict.createLexiconPackages(spBuild, xArgs.verdic, oStatsLex, spLexiconDestGL)
++ #oFrenchDict.createFileIfqForDB(spBuild)
+ createThesaurusPackage(spBuild, "2.4", spLibreOfficeExtDestGL)
+- oFrenchDict.createLibreOfficeExtension(spBuild, dMOZEXT, [dTOUTESVAR, dCLASSIQUE, dREFORME1990], "2.4", spLibreOfficeExtDestGL)
+- oFrenchDict.createMozillaExtensions(spBuild, dMOZEXT, [dTOUTESVAR, dCLASSIQUE, dREFORME1990], spMozillaExtDestGL)
+- oFrenchDict.createDictConj(spBuild, spDataDestGL)
+- oFrenchDict.createDictDecl(spBuild, spDataDestGL)
++ #oFrenchDict.createLibreOfficeExtension(spBuild, dMOZEXT, [dTOUTESVAR, dCLASSIQUE, dREFORME1990], "2.4", spLibreOfficeExtDestGL)
++ #oFrenchDict.createMozillaExtensions(spBuild, dMOZEXT, [dTOUTESVAR, dCLASSIQUE, dREFORME1990], spMozillaExtDestGL)
++ #oFrenchDict.createDictConj(spBuild, spDataDestGL)
++ #oFrenchDict.createDictDecl(spBuild, spDataDestGL)
+
+
+ if __name__ == '__main__':
+ main()
+