mirror of
https://github.com/kiwix/kiwix-build.git
synced 2025-09-25 22:13:26 -04:00
Merge pull request #494 from kiwix/icu_with_lang_info
This commit is contained in:
commit
a9f7b5887e
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -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
|
||||
|
2
.github/workflows/releaseNigthly.yml
vendored
2
.github/workflows/releaseNigthly.yml
vendored
@ -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
|
||||
|
@ -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
|
||||
|
@ -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',
|
||||
|
Loading…
x
Reference in New Issue
Block a user