download.lst | 4 ++--
external/more_fonts/ExternalPackage_karla.mk | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 4e98bcfcac839ad21585c8954363bb56985a2de7
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Sep 19 12:41:14 2024 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Sep 19 14:20:51 2024 +0200
upgrade to current Karla font that contains the 'fi' ligature
Change-Id: I4577b3250b8d1366b03d080c49643ef15eeff2fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173665
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
(cherry picked from commit ca7af7bef0968478ea42d78da42b205bdf6f432d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173636
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/download.lst b/download.lst
index c21eaa4bd7ee..2371b618d4ef 100644
--- a/download.lst
+++ b/download.lst
@@ -150,8 +150,8 @@ FONT_GENTIUM_TARBALL :=
1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
-FONT_KARLA_SHA256SUM :=
0cba83e7d555ae792d98a657b847cff1ccb198ecf740117a610f76d66e48eaba
-FONT_KARLA_TARBALL := 506757f768adb2331881d5186f7286bd-karla.zip
+FONT_KARLA_SHA256SUM :=
c64cdbc55389c1bfb320dcef41a19f156bad271a99bc9253be118564dbb738b5
+FONT_KARLA_TARBALL := 2024-09-19-karla-main.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/more_fonts/ExternalPackage_karla.mk
b/external/more_fonts/ExternalPackage_karla.mk
index 580777e50a0c..651ea18a1bbf 100644
--- a/external/more_fonts/ExternalPackage_karla.mk
+++ b/external/more_fonts/ExternalPackage_karla.mk
@@ -10,10 +10,10 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_karla,font_karla))
$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_karla,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
- Karla-Italic.ttf \
- Karla-Regular.ttf \
- Karla-BoldItalic.ttf \
- Karla-Bold.ttf \
+ fonts/ttf/Karla-Italic.ttf \
+ fonts/ttf/Karla-Regular.ttf \
+ fonts/ttf/Karla-BoldItalic.ttf \
+ fonts/ttf/Karla-Bold.ttf \
))
# vim: set noet sw=4 ts=4:
