smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #494 from kiwix/icu_with_lang_info

This commit is contained in:
Matthieu Gautier 2021-07-27 18:00:28 +02:00 committed by GitHub
parent ee093b4dfa 9c04df4fb2
commit a9f7b5887e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -127,7 +127,7 @@ jobs:
python-version: '3.6' python-version: '3.6'
- name: Install packages - name: Install packages
run: run:
brew install pkg-config ninja brew install pkg-config ninja automake autoconf
- name: Install python modules - name: Install python modules
run: | run: |
pip3 install meson==0.52.1 pytest requests distro pip3 install meson==0.52.1 pytest requests distro

2
.github/workflows/releaseNigthly.yml vendored
View File

@ -145,7 +145,7 @@ jobs:
python-version: '3.6' python-version: '3.6'
- name: Install packages - name: Install packages
run: run:
brew install pkg-config ninja brew install pkg-config ninja automake autoconf
- name: Install python modules - name: Install python modules
run: | run: |
pip3 install meson==0.52.1 pytest requests distro pip3 install meson==0.52.1 pytest requests distro

7
kiwixbuild/patches/icu4c_custom_data.patch
View File

@ -34,13 +34,12 @@ diff -ur icu4c/source/data/Makefile.in icu4c.patched/source/data/Makefile.in
## RES files ## RES files
--include $(LOCSRCDIR)/resfiles.mk --include $(LOCSRCDIR)/resfiles.mk
--include $(CURRSRCDIR)/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 $(REGIONSRCDIR)/resfiles.mk
--include $(ZONESRCDIR)/resfiles.mk --include $(ZONESRCDIR)/resfiles.mk
--include $(UNITSRCDIR)/resfiles.mk --include $(UNITSRCDIR)/resfiles.mk
+#-include $(LOCSRCDIR)/resfiles.mk
+#-include $(CURRSRCDIR)/resfiles.mk
+#-include $(LANGSRCDIR)/resfiles.mk
+#-include $(REGIONSRCDIR)/resfiles.mk +#-include $(REGIONSRCDIR)/resfiles.mk
+#-include $(ZONESRCDIR)/resfiles.mk +#-include $(ZONESRCDIR)/resfiles.mk
+#-include $(UNITSRCDIR)/resfiles.mk +#-include $(UNITSRCDIR)/resfiles.mk

2
kiwixbuild/versions.py
View File

@ -39,7 +39,7 @@ release_versions = {
# This is the "version" of the whole base_deps_versions dict. # This is the "version" of the whole base_deps_versions dict.
# Change this when you change base_deps_versions. # Change this when you change base_deps_versions.
base_deps_meta_version = '73' base_deps_meta_version = '74'
base_deps_versions = { base_deps_versions = {
'zlib' : '1.2.8', 'zlib' : '1.2.8',