From 19d2ff9cd34ce13601c2681d6bcd6397fb591ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 9 Jul 2024 21:25:08 +0700 Subject: [PATCH] libreoffice: fix hunspell-en_GB virtual dependencies declaration --- srcpkgs/libreoffice-dictionaries/template | 4 ++-- srcpkgs/libreoffice/template | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libreoffice-dictionaries/template b/srcpkgs/libreoffice-dictionaries/template index b166bdf4d4a..d7d283238b2 100644 --- a/srcpkgs/libreoffice-dictionaries/template +++ b/srcpkgs/libreoffice-dictionaries/template @@ -27,7 +27,7 @@ depends="hunspell-af hyphen-af hunspell-da_DK hyphen-da mythes-da hunspell-de hyphen-de mythes-de hunspell-el_GR hyphen-el - hunspell-en hunspell-en_GB hyphen-en mythes-en + hunspell-en virtual?hunspell-en_GB hyphen-en mythes-en hunspell-eo hyphen-eo mythes-eo hunspell-es hyphen-es mythes-es hunspell-et hyphen-et @@ -515,7 +515,7 @@ hyphen-el_package() { hunspell-en_package() { short_desc="English dictionary for hunspell" - depends="hunspell-en_GB hunspell-qtwebengine-dict" + depends="virtual?hunspell-en_GB hunspell-qtwebengine-dict" license="custom:SCOWL, LGPL-2.1-or-later" provides="hunspell-en_AU-2024_1 hunspell-en_CA-2024_1 diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 82cac502c4b..d17dac7323a 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -222,6 +222,7 @@ _add_lang() { -H*) tmp=${1#-H}; deps="$deps hyphen-${tmp:-$pkg}" ;; -m*) tmp=${1#-m}; deps="$deps mythes-${tmp:-$pkg}" ;; -l*) pkglang=${1#-l} ;; + -vh=*) deps="$deps virtual?hunspell-${1#-vh=}" ;; *) false ;; esac; do shift; done _languages="$_languages ${pkglang//_/-}" @@ -261,9 +262,9 @@ _add_lang dgo "Dogri proper" _add_lang dsb "Lower Sorbian" _add_lang dz "Dzongkha" _add_lang el "Greek" -hel_GR -H -_add_lang en-GB "English (UK)" -len_GB -hen -hen_GB -Hen -men +_add_lang en-GB "English (UK)" -len_GB -hen -vh=en_GB -Hen -men _add_lang en-US "English (US)" -len_US -hen -Hen -men -_add_lang en-ZA "English (South Africa)" -len_ZA -hen -hen_GB -Hen -men +_add_lang en-ZA "English (South Africa)" -len_ZA -hen -vhen_GB -Hen -men _add_lang eo "Esperanto" -h -H -m _add_lang es "Spanish" -h -H -m _add_lang et "Estonian" -h -H