From 41a411c667e477e6d2671bb8ca2791bcf9bd9345 Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Sun, 4 Jul 2021 15:48:48 +0400 Subject: [PATCH 1/2] Language data is packaged into ICU With language data not put into icu, `icu::Locale::getDisplayLanguage()` doesn't work correctly. --- kiwixbuild/patches/icu4c_custom_data.patch | 7 +++---- kiwixbuild/versions.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/kiwixbuild/patches/icu4c_custom_data.patch b/kiwixbuild/patches/icu4c_custom_data.patch index be07819..7968a6c 100644 --- a/kiwixbuild/patches/icu4c_custom_data.patch +++ b/kiwixbuild/patches/icu4c_custom_data.patch @@ -34,13 +34,12 @@ diff -ur icu4c/source/data/Makefile.in icu4c.patched/source/data/Makefile.in ## RES files --include $(LOCSRCDIR)/resfiles.mk --include $(CURRSRCDIR)/resfiles.mk ---include $(LANGSRCDIR)/resfiles.mk ++#-include $(LOCSRCDIR)/resfiles.mk ++#-include $(CURRSRCDIR)/resfiles.mk + -include $(LANGSRCDIR)/resfiles.mk --include $(REGIONSRCDIR)/resfiles.mk --include $(ZONESRCDIR)/resfiles.mk --include $(UNITSRCDIR)/resfiles.mk -+#-include $(LOCSRCDIR)/resfiles.mk -+#-include $(CURRSRCDIR)/resfiles.mk -+#-include $(LANGSRCDIR)/resfiles.mk +#-include $(REGIONSRCDIR)/resfiles.mk +#-include $(ZONESRCDIR)/resfiles.mk +#-include $(UNITSRCDIR)/resfiles.mk diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index 70065f5..5ecc690 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -39,7 +39,7 @@ release_versions = { # This is the "version" of the whole base_deps_versions dict. # Change this when you change base_deps_versions. -base_deps_meta_version = '73' +base_deps_meta_version = '74' base_deps_versions = { 'zlib' : '1.2.8', From 9c04df4fb2744e333ee559ee99275a8452f9202b Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 27 Jul 2021 16:15:59 +0200 Subject: [PATCH 2/2] =?UTF-8?q?[CI]=C2=A0Install=20automake=20and=20autoco?= =?UTF-8?q?nf=20on=20macos.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 +- .github/workflows/releaseNigthly.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e508340..924a794 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,7 +127,7 @@ jobs: python-version: '3.6' - name: Install packages run: - brew install pkg-config ninja + brew install pkg-config ninja automake autoconf - name: Install python modules run: | pip3 install meson==0.52.1 pytest requests distro diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml index 7aa8f0a..2af5247 100644 --- a/.github/workflows/releaseNigthly.yml +++ b/.github/workflows/releaseNigthly.yml @@ -145,7 +145,7 @@ jobs: python-version: '3.6' - name: Install packages run: - brew install pkg-config ninja + brew install pkg-config ninja automake autoconf - name: Install python modules run: | pip3 install meson==0.52.1 pytest requests distro