.gitlab-ci.yml | 6 +++--
.gitlab-ci/ci.template | 4 +++
.gitlab-ci/config.yml | 1
.gitlab-ci/other.yml | 2 +
conf.d/65-nonlatin.conf | 54 ++++++++++++++++++++++++------------------------
5 files changed, 38 insertions(+), 29 deletions(-)
New commits:
commit 3902e228971ffce9a5f0fbd259f07dfb8a9d134e
Merge: 1d5113b b745eb9
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Wed Apr 30 06:28:42 2025 +0000
Merge branch 'issues/465' into 'main'
conf.d/65-nonlatin.conf: Rename Lohit Oriya to Lohit Odia
Closes #465
See merge request fontconfig/fontconfig!398
commit b745eb90edff3a771b370422d34111f8ac35474c
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Wed Apr 30 14:30:57 2025 +0900
conf.d/65-nonlatin.conf: drop the leading extra white spaces
diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
index e18f9b0..f6ecc55 100644
--- a/conf.d/65-nonlatin.conf
+++ b/conf.d/65-nonlatin.conf
@@ -44,32 +44,32 @@
<family>Kochi Mincho</family>
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
- <family>AR PL Zenkai Uni</family>
+ <family>AR PL Zenkai Uni</family>
<family>ＭＳ 明朝</family>
- <family>ZYSong18030</family>
+ <family>ZYSong18030</family>
<family>NanumMyeongjo</family> <!-- hangul (ko) -->
<family>UnBatang</family> <!-- hangul (ko) -->
<family>Baekmuk Batang</family> <!-- hangul (ko) -->
<family>AppleMyungjo</family> <!-- hangul (ko) - macOS -->
- <family>KacstQura</family>
- <family>Frank Ruehl CLM</family>
+ <family>KacstQura</family>
+ <family>Frank Ruehl CLM</family>
<family>Lohit Bengali</family>
- <family>Lohit Gujarati</family>
- <family>Lohit Hindi</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
<family>Lohit Marathi</family>
<family>Lohit Maithili</family>
<family>Lohit Kashmiri</family>
<family>Lohit Konkani</family>
<family>Lohit Nepali</family>
<family>Lohit Sindhi</family>
- <family>Lohit Punjabi</family>
- <family>Lohit Tamil</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
<family>Rachana</family>
<family>Lohit Malayalam</family>
- <family>Lohit Kannada</family>
- <family>Lohit Telugu</family>
- <family>Lohit Odia</family>
- <family>LKLUG</family>
+ <family>Lohit Kannada</family>
+ <family>Lohit Telugu</family>
+ <family>Lohit Odia</family>
+ <family>LKLUG</family>
</prefer>
</alias>
<alias>
@@ -122,35 +122,35 @@
<family>Kochi Gothic</family>
<family>AR PL KaitiM GB</family>
<family>AR PL KaitiM Big5</family>
- <family>AR PL ShanHeiSun Uni</family>
- <family>AR PL SungtiL GB</family>
- <family>AR PL Mingti2L Big5</family>
+ <family>AR PL ShanHeiSun Uni</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
<family>ＭＳ ゴシック</family>
<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
<family>TSCu_Paranar</family> <!-- tamil -->
<family>NanumGothic</family> <!-- hangul (ko) -->
<family>UnDotum</family> <!-- hangul (ko) -->
<family>Baekmuk Dotum</family> <!-- hangul (ko) -->
- <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
+ <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
<family>Apple SD Gothic Neo</family> <!-- hangul (ko) - macOS -->
- <family>KacstQura</family>
+ <family>KacstQura</family>
<family>Lohit Bengali</family>
- <family>Lohit Gujarati</family>
- <family>Lohit Hindi</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
<family>Lohit Marathi</family>
<family>Lohit Maithili</family>
<family>Lohit Kashmiri</family>
<family>Lohit Konkani</family>
<family>Lohit Nepali</family>
<family>Lohit Sindhi</family>
- <family>Lohit Punjabi</family>
- <family>Lohit Tamil</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
<family>Meera</family>
- <family>Lohit Malayalam</family>
- <family>Lohit Kannada</family>
- <family>Lohit Telugu</family>
- <family>Lohit Odia</family>
- <family>LKLUG</family>
+ <family>Lohit Malayalam</family>
+ <family>Lohit Kannada</family>
+ <family>Lohit Telugu</family>
+ <family>Lohit Odia</family>
+ <family>LKLUG</family>
</prefer>
</alias>
<alias>
commit 91b7fdf7954fbc32577c3d8fb1e4ed627cbac4da
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Wed Apr 30 14:21:28 2025 +0900
ci: disable meson static fontations build tentatively
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a783d87..1f47d14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,8 +43,8 @@ variables:
# changing these will force rebuilding the associated image
# Note: these tags have no meaning and are not tied to a particular
# fontconfig version
- FEDORA_TAG: '2025-04-23.1-36c045e261d1'
- FREEBSD_TAG: '2025-04-23.1-61a4c35ef3b2'
+ FEDORA_TAG: '2025-04-23.1-7916b3c469ca'
+ FREEBSD_TAG: '2025-04-23.1-58fbfb327c45'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
FREEBSD_EXEC: 'bash .gitlab-ci/freebsd-install.sh'
@@ -457,6 +457,8 @@ build-meson static libxml2:
needs:
- fedora:rawhide@container-prep
build-meson static fontations:
+ when: manual
+ allow_failure: true
stage: build
extends:
- .build@template
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 6f97c72..8fd8052 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -301,6 +301,10 @@ check-ci-script:
{% for build in build_patterns %}
build-{{build.name}}:
+ {% if 'disable_build' in build and build.disable_build == 1 %}
+ when: manual
+ allow_failure: true
+ {% endif %}
stage: build
extends:
- .build@template
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 6a1bc46..3d82cd9 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -42,6 +42,7 @@ build_patterns:
FC_BUILD_TYPE: static
FC_XML_BACKEND: libxml2
- name: "meson static fontations"
+ disable_build: 1
variables:
FC_BUILDSYS: meson
FC_BUILD_TYPE: static
diff --git a/.gitlab-ci/other.yml b/.gitlab-ci/other.yml
index 14af564..a126258 100644
--- a/.gitlab-ci/other.yml
+++ b/.gitlab-ci/other.yml
@@ -98,6 +98,8 @@ meson macos test:
MESON_FONTATIONS_ARG: "-Dfontations=disabled"
meson macos test fontations:
+ when: manual
+ allow_failure: true
extends: ".meson macos test"
variables:
MESON_FONTATIONS_ARG: "-Dfontations=enabled"
commit 67a5a04e4ce57d81dd2d438b136f8605dd7e89bd
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Wed Apr 30 13:52:48 2025 +0900
conf.d/65-nonlatin.conf: Rename Lohit Oriya to Lohit Odia
Lohit Oriya has been renamed to Lohit Odia about 10 years ago:
https://fedoraproject.org/wiki/Changes/Lohit_Odia_Gurmukhi
We should follow this change for our config.
Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/465
Changelog: fixed
diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
index 3e5d1c7..e18f9b0 100644
--- a/conf.d/65-nonlatin.conf
+++ b/conf.d/65-nonlatin.conf
@@ -68,7 +68,7 @@
<family>Lohit Malayalam</family>
<family>Lohit Kannada</family>
<family>Lohit Telugu</family>
- <family>Lohit Oriya</family>
+ <family>Lohit Odia</family>
<family>LKLUG</family>
</prefer>
</alias>
@@ -149,7 +149,7 @@
<family>Lohit Malayalam</family>
<family>Lohit Kannada</family>
<family>Lohit Telugu</family>
- <family>Lohit Oriya</family>
+ <family>Lohit Odia</family>
<family>LKLUG</family>
</prefer>
</alias>
@@ -200,7 +200,7 @@
<family>Lohit Malayalam</family>
<family>Lohit Kannada</family>
<family>Lohit Telugu</family>
- <family>Lohit Oriya</family>
+ <family>Lohit Odia</family>
<family>LKLUG</family>
</prefer>
</alias>
