summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2018-03-31 12:54:55 +0200
committerAndras Timar <andras.timar@collabora.com>2018-03-31 21:13:07 +0200
commita3c9d29cdb8d83ce060b5ddc96ef1463ea32350c (patch)
tree70067801810ab56def730d5bf1605cd939a41a5f
parent34ae19b1e9ede8bdcf56e393f68a7f875e32a068 (diff)
tdf#115226 Update bundled Amiri to 0.111
Change-Id: I4f07943ccd27c1c58e32c0513befe72ae0839b93 Reviewed-on: https://gerrit.libreoffice.org/52184 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--download.lst4
-rw-r--r--external/more_fonts/ExternalPackage_amiri.mk10
-rw-r--r--solenv/flatpak-manifest.in6
3 files changed, 10 insertions, 10 deletions
diff --git a/download.lst b/download.lst
index 5225f03d7148..354c39285f43 100644
--- a/download.lst
+++ b/download.lst
@@ -76,8 +76,8 @@ export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725
export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz
export FONT_ALEF_SHA256SUM := b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
export FONT_ALEF_TARBALL := alef-1.001.tar.gz
-export FONT_AMIRI_SHA256SUM := 97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6
-export FONT_AMIRI_TARBALL := amiri-0.109.zip
+export FONT_AMIRI_SHA256SUM := 1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166
+export FONT_AMIRI_TARBALL := Amiri-0.111.zip
export FONT_KACST_SHA256SUM := dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz
export FONT_REEM_SHA256SUM := 4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b
diff --git a/external/more_fonts/ExternalPackage_amiri.mk b/external/more_fonts/ExternalPackage_amiri.mk
index ccf5f1c94c8a..d938b8cf7542 100644
--- a/external/more_fonts/ExternalPackage_amiri.mk
+++ b/external/more_fonts/ExternalPackage_amiri.mk
@@ -10,11 +10,11 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_amiri,font_amiri))
$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_amiri,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
- amiri-bold.ttf \
- amiri-boldslanted.ttf \
- amiri-quran.ttf \
- amiri-regular.ttf \
- amiri-slanted.ttf \
+ Amiri-Bold.ttf \
+ Amiri-BoldSlanted.ttf \
+ AmiriQuran.ttf \
+ Amiri-Regular.ttf \
+ Amiri-Slanted.ttf \
))
# vim: set noet sw=4 ts=4:
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index b74158a64fbf..594f99dd8646 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -433,10 +433,10 @@
"dest-filename": "external/tarballs/alef-1.001.tar.gz"
},
{
- "url": "https://dev-www.libreoffice.org/src/amiri-0.109.zip",
- "sha256": "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6",
+ "url": "https://dev-www.libreoffice.org/src/Amiri-0.111.zip",
+ "sha256": "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166",
"type": "file",
- "dest-filename": "external/tarballs/amiri-0.109.zip"
+ "dest-filename": "external/tarballs/Amiri-0.111.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz",