rpms/langpacks
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix broken deps in core-sans

Browse Source
This commit is contained in:
Akira TAGOH 2023-07-07 18:07:55 +09:00
parent 5327b9cf8c
commit cfe98f441d
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
langpacks.spec
View File

@ -1,6 +1,6 @@
Name: langpacks
Version: 4.0
Release: 0.11%{?dist}
Release: 0.12%{?dist}
Summary: Langpacks meta-package
License: GPL-2.0-or-later
@ -1253,10 +1253,10 @@ local function is_nonlatin(lang)
for i = 1, #latinlang do
n, _ = string.find(lang, latinlang[i] .. "[_%a]*")
if n == 1 then
return true
return false
end
end
return false
return true
end
local function is_cjk(lang)
@ -1394,6 +1394,7 @@ local corefonts = { sans ="default-fonts-core-sans = %{version}-%{release}",
serif="default-fonts-core-serif = %{version}-%{release}",
mono ="default-fonts-core-mono = %{version}-%{release}"
}
local sans_deps = {}
for i = 1, #langpacks_package_list do
local default_deps = {}
@ -1438,10 +1439,14 @@ for i = 1, #langpacks_package_list do
-- Provide font(:lang=) deps for default face only
prov = append_fontprov("", lowerorth)
if is_cjk(lang) then
table.insert(cjk_deps[face[j]], "default-fonts-" .. string.gsub(fclang, "-", "_") .. " = %{version}-%{release}")
if is_nonlatin(lang) then
if is_cjk(lang) then
table.insert(cjk_deps[face[j]], "default-fonts-" .. string.gsub(fclang, "-", "_") .. " = %{version}-%{release}")
else
table.insert(other_deps[face[j]], "default-fonts-" .. string.gsub(fclang, "-", "_") .. " = %{version}-%{release}")
end
else
table.insert(other_deps[face[j]], "default-fonts-" .. string.gsub(fclang, "-", "_") .. " = %{version}-%{release}")
table.insert(sans_deps, "default-fonts-" .. string.gsub(fclang, "-", "_") .. " = %{version}-%{release}")
end
else
for k = 1, #current do
@ -1484,11 +1489,7 @@ for i = 1, #face do
end
--core font packages except sans - core-sans may want to have special deps to default-fonts-<language code>
local sans_deps = {}
for i = 1, #latinlang do
table.insert(sans_deps, "default-fonts-" .. latinlang[i])
end
deffontpkg("core-sans", "", "default sans-serif fonts", "Western characters", build_deps("", "Requires", sans_deps))
deffontpkg("core-sans", "", "default sans-serif fonts", "Western characters", build_deps("", "Requires", drop_duplicate(sans_deps)))
local coreface = { "serif", "mono", "emoji", "math" }
for i = 1, #coreface do