diff --git a/etc/defaults.virtual b/etc/defaults.virtual index c79863e81be..dcd1d35ee51 100644 --- a/etc/defaults.virtual +++ b/etc/defaults.virtual @@ -40,4 +40,3 @@ libGL libglvnd libEGL libglvnd libGLES libglvnd hunspell-en_GB hunspell-en_GB-all -hunspell-fr_FR hunspell-fr-libreoffice diff --git a/srcpkgs/hunspell-fr-libreoffice b/srcpkgs/hunspell-fr-libreoffice deleted file mode 120000 index 1f52cad0bdc..00000000000 --- a/srcpkgs/hunspell-fr-libreoffice +++ /dev/null @@ -1 +0,0 @@ -libreoffice-dictionaries \ No newline at end of file diff --git a/srcpkgs/libreoffice-dictionaries/template b/srcpkgs/libreoffice-dictionaries/template index 022f6b8ad69..69b757d0d28 100644 --- a/srcpkgs/libreoffice-dictionaries/template +++ b/srcpkgs/libreoffice-dictionaries/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice-dictionaries' pkgname=libreoffice-dictionaries version=24.2.2.2 -revision=2 +revision=3 build_style=meta hostmakedepends="mythes perl" short_desc="Libre Office Dictionaries" @@ -303,9 +303,7 @@ hunspell-be_package() { depends="hunspell-qtwebengine-dict" license="LGPL-3.0-only, CC-BY-SA-4.0" pkg_install() { - set -x _vhunspell be_BY - set +x } } @@ -616,7 +614,7 @@ hyphen-es_package() { short_desc="Spanish hyphenation rules" license="GPL-3.0-or-later, LGPL-3.0-or-later, MPL-1.1" pkg_install() { - _vhyphen es $ls + _vhyphen es $_es_lang } } @@ -624,7 +622,7 @@ mythes-es_package() { short_desc="Spanish thesaurus for LibreOffice" license="GPL-3.0-or-later, LGPL-3.0-or-later, MPL-1.1" pkg_install() { - _vmythes -v 2 es $ls + _vmythes -v 2 es $_es_lang } } @@ -653,15 +651,16 @@ hunspell-fa_package() { } } -hunspell-fr-libreoffice_package() { - short_desc="Modern French dictionary for hunspell by LibreOffice" - license="MPL-1.1" - provides="hunspell-fr_FR-${version}_${revision}" - replaces="hunspell-fr_FR>=0" - pkg_install() { - _vhunspell -d fr_FR fr fr_FR fr_BE fr_CA fr_CH fr_LU fr_MC - } -} +# This is simplified version of hunspell-fr_FR +# hunspell-fr-libreoffice_package() { +# short_desc="Modern French dictionary for hunspell by LibreOffice" +# license="MPL-1.1" +# provides="hunspell-fr_FR-${version}_${revision}" +# replaces="hunspell-fr_FR>=0" +# pkg_install() { +# _vhunspell -d fr_FR fr fr_FR fr_BE fr_CA fr_CH fr_LU fr_MC +# } +# } hyphen-fr_package() { short_desc="French hyphenation rules" @@ -1053,8 +1052,6 @@ hunspell-pl_package() { hyphen-pl_package() { short_desc="Polish hyphenation rules" 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() { _vhyphen pl_PL } @@ -1063,8 +1060,6 @@ hyphen-pl_package() { mythes-pl_package() { short_desc="Polish thesaurus for LibreOffice" 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() { _vmythes -v 2 pl_PL }