dictionaries: fix es and pl languages

Drop fr subpackage, fr_FR provides exact same contents.
This commit is contained in:
Đoàn Trần Công Danh 2024-04-18 13:36:41 +07:00
parent 27f936e608
commit cbc4de9b63
3 changed files with 13 additions and 20 deletions

View File

@ -40,4 +40,3 @@ libGL libglvnd
libEGL libglvnd libEGL libglvnd
libGLES libglvnd libGLES libglvnd
hunspell-en_GB hunspell-en_GB-all hunspell-en_GB hunspell-en_GB-all
hunspell-fr_FR hunspell-fr-libreoffice

View File

@ -1 +0,0 @@
libreoffice-dictionaries

View File

@ -1,7 +1,7 @@
# Template file for 'libreoffice-dictionaries' # Template file for 'libreoffice-dictionaries'
pkgname=libreoffice-dictionaries pkgname=libreoffice-dictionaries
version=24.2.2.2 version=24.2.2.2
revision=2 revision=3
build_style=meta build_style=meta
hostmakedepends="mythes perl" hostmakedepends="mythes perl"
short_desc="Libre Office Dictionaries" short_desc="Libre Office Dictionaries"
@ -303,9 +303,7 @@ hunspell-be_package() {
depends="hunspell-qtwebengine-dict" depends="hunspell-qtwebengine-dict"
license="LGPL-3.0-only, CC-BY-SA-4.0" license="LGPL-3.0-only, CC-BY-SA-4.0"
pkg_install() { pkg_install() {
set -x
_vhunspell be_BY _vhunspell be_BY
set +x
} }
} }
@ -616,7 +614,7 @@ hyphen-es_package() {
short_desc="Spanish hyphenation rules" short_desc="Spanish hyphenation rules"
license="GPL-3.0-or-later, LGPL-3.0-or-later, MPL-1.1" license="GPL-3.0-or-later, LGPL-3.0-or-later, MPL-1.1"
pkg_install() { pkg_install() {
_vhyphen es $ls _vhyphen es $_es_lang
} }
} }
@ -624,7 +622,7 @@ mythes-es_package() {
short_desc="Spanish thesaurus for LibreOffice" short_desc="Spanish thesaurus for LibreOffice"
license="GPL-3.0-or-later, LGPL-3.0-or-later, MPL-1.1" license="GPL-3.0-or-later, LGPL-3.0-or-later, MPL-1.1"
pkg_install() { pkg_install() {
_vmythes -v 2 es $ls _vmythes -v 2 es $_es_lang
} }
} }
@ -653,15 +651,16 @@ hunspell-fa_package() {
} }
} }
hunspell-fr-libreoffice_package() { # This is simplified version of hunspell-fr_FR
short_desc="Modern French dictionary for hunspell by LibreOffice" # hunspell-fr-libreoffice_package() {
license="MPL-1.1" # short_desc="Modern French dictionary for hunspell by LibreOffice"
provides="hunspell-fr_FR-${version}_${revision}" # license="MPL-1.1"
replaces="hunspell-fr_FR>=0" # provides="hunspell-fr_FR-${version}_${revision}"
pkg_install() { # replaces="hunspell-fr_FR>=0"
_vhunspell -d fr_FR fr fr_FR fr_BE fr_CA fr_CH fr_LU fr_MC # pkg_install() {
} # _vhunspell -d fr_FR fr fr_FR fr_BE fr_CA fr_CH fr_LU fr_MC
} # }
# }
hyphen-fr_package() { hyphen-fr_package() {
short_desc="French hyphenation rules" short_desc="French hyphenation rules"
@ -1053,8 +1052,6 @@ hunspell-pl_package() {
hyphen-pl_package() { hyphen-pl_package() {
short_desc="Polish hyphenation rules" short_desc="Polish hyphenation rules"
license="LGPL-2.1-or-later, GPL-2.0-or-later, MPL-1.1" license="LGPL-2.1-or-later, GPL-2.0-or-later, MPL-1.1"
provides="hunspell-pl_PL-20240301_1"
replaces="hunspell-pl_PL>=0"
pkg_install() { pkg_install() {
_vhyphen pl_PL _vhyphen pl_PL
} }
@ -1063,8 +1060,6 @@ hyphen-pl_package() {
mythes-pl_package() { mythes-pl_package() {
short_desc="Polish thesaurus for LibreOffice" short_desc="Polish thesaurus for LibreOffice"
license="LGPL-2.1-or-later, GPL-2.0-or-later, MPL-1.1" license="LGPL-2.1-or-later, GPL-2.0-or-later, MPL-1.1"
provides="hunspell-pl_PL-20240301_1"
replaces="hunspell-pl_PL>=0"
pkg_install() { pkg_install() {
_vmythes -v 2 pl_PL _vmythes -v 2 pl_PL
} }