Repository.mk | 15 ++++++++++++-
external/more_fonts/ExternalPackage_noto_kufi_arabic.mk | 4 +--
external/more_fonts/ExternalPackage_noto_naskh_arabic.mk | 4 +--
external/more_fonts/ExternalPackage_noto_sans.mk | 4 +--
external/more_fonts/ExternalPackage_noto_sans_arabic.mk | 4 +--
external/more_fonts/ExternalPackage_noto_sans_armenian.mk | 4 +--
external/more_fonts/ExternalPackage_noto_sans_georgian.mk | 4 +--
external/more_fonts/ExternalPackage_noto_sans_hebrew.mk | 4 +--
external/more_fonts/ExternalPackage_noto_sans_lao.mk | 4 +--
external/more_fonts/ExternalPackage_noto_sans_lisu.mk | 4 +--
external/more_fonts/ExternalPackage_noto_serif.mk | 4 +--
external/more_fonts/ExternalPackage_noto_serif_armenian.mk | 4 +--
external/more_fonts/ExternalPackage_noto_serif_georgian.mk | 4 +--
external/more_fonts/ExternalPackage_noto_serif_hebrew.mk | 4 +--
external/more_fonts/ExternalPackage_noto_serif_lao.mk | 4 +--
15 files changed, 42 insertions(+), 29 deletions(-)
New commits:
commit fcff7f72611d0b389b876d772038f095350ebdfd
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Jan 17 19:39:41 2024 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Jan 17 22:34:53 2024 +0100
tdf#159243 fix packaging of Noto fonts/fix Armenian UI on macOS
different packages must not share the same package name
Packages create corresponding packagename.filelist files that are used
during
the installset creation process. When multiple packages share the same name,
it is random (depending on the order make decides to build the targets)
which
package will actually be included in the installation set. The last package
will "win" and have its file stored in the filelist and thus will be part of
the installation set, all others will not be considered.
Change-Id: Ieffd2addf6d59916c0c1fe01c64866472ff23803
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162206
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/Repository.mk b/Repository.mk
index d9361db15403..3e2e29098e66 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1053,7 +1053,20 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo_fonts,\
fonts_liberation_narrow \
fonts_libertineg \
fonts_libre_hebrew \
- fonts_noto \
+ fonts_noto_kufi_arabic \
+ fonts_noto_naskh_arabic \
+ fonts_noto_sans \
+ fonts_noto_sans_arabic \
+ fonts_noto_sans_armenian \
+ fonts_noto_sans_georgian \
+ fonts_noto_sans_hebrew \
+ fonts_noto_sans_lao \
+ fonts_noto_sans_lisu \
+ fonts_noto_serif \
+ fonts_noto_serif_armenian \
+ fonts_noto_serif_georgian \
+ fonts_noto_serif_hebrew \
+ fonts_noto_serif_lao \
fonts_reem \
fonts_scheherazade \
) \
diff --git a/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
b/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
index ed6b9fea3f85..300e0c8efb53 100644
--- a/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
+++ b/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_kufi_arabic))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_kufi_arabic,font_noto_kufi_arabic))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_kufi_arabic,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoKufiArabic-Bold.ttf \
NotoKufiArabic-Regular.ttf \
))
diff --git a/external/more_fonts/ExternalPackage_noto_naskh_arabic.mk
b/external/more_fonts/ExternalPackage_noto_naskh_arabic.mk
index 0e701739330b..a6647e7b769c 100644
--- a/external/more_fonts/ExternalPackage_noto_naskh_arabic.mk
+++ b/external/more_fonts/ExternalPackage_noto_naskh_arabic.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_naskh_arabic))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_naskh_arabic,font_noto_naskh_arabic))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_naskh_arabic,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoNaskhArabic/full/ttf/NotoNaskhArabic-Bold.ttf \
NotoNaskhArabic/full/ttf/NotoNaskhArabic-Regular.ttf \
))
diff --git a/external/more_fonts/ExternalPackage_noto_sans.mk
b/external/more_fonts/ExternalPackage_noto_sans.mk
index 57d13415e88e..7c8e6a14abbe 100644
--- a/external/more_fonts/ExternalPackage_noto_sans.mk
+++ b/external/more_fonts/ExternalPackage_noto_sans.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_sans))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_sans,font_noto_sans))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_sans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoSans/full/ttf/NotoSans-Bold.ttf \
NotoSans/full/ttf/NotoSans-BoldItalic.ttf \
NotoSans/full/ttf/NotoSans-Italic.ttf \
diff --git a/external/more_fonts/ExternalPackage_noto_sans_arabic.mk
b/external/more_fonts/ExternalPackage_noto_sans_arabic.mk
index 259167b72673..88a5b2e6d444 100644
--- a/external/more_fonts/ExternalPackage_noto_sans_arabic.mk
+++ b/external/more_fonts/ExternalPackage_noto_sans_arabic.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_sans_arabic))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_sans_arabic,font_noto_sans_arabic))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_sans_arabic,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoSansArabic/full/ttf/NotoSansArabic-Bold.ttf \
NotoSansArabic/full/ttf/NotoSansArabic-Regular.ttf \
))
diff --git a/external/more_fonts/ExternalPackage_noto_sans_armenian.mk
b/external/more_fonts/ExternalPackage_noto_sans_armenian.mk
index d6b7a12753c2..c02badc631ce 100644
--- a/external/more_fonts/ExternalPackage_noto_sans_armenian.mk
+++ b/external/more_fonts/ExternalPackage_noto_sans_armenian.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_sans_armenian))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_sans_armenian,font_noto_sans_armenian))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_sans_armenian,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoSansArmenian/full/ttf/NotoSansArmenian-Bold.ttf \
NotoSansArmenian/full/ttf/NotoSansArmenian-Regular.ttf \
))
diff --git a/external/more_fonts/ExternalPackage_noto_sans_georgian.mk
b/external/more_fonts/ExternalPackage_noto_sans_georgian.mk
index fbe526b2f88c..500fb1f8c044 100644
--- a/external/more_fonts/ExternalPackage_noto_sans_georgian.mk
+++ b/external/more_fonts/ExternalPackage_noto_sans_georgian.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_sans_georgian))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_sans_georgian,font_noto_sans_georgian))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_sans_georgian,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoSansGeorgian/full/ttf/NotoSansGeorgian-Bold.ttf \
NotoSansGeorgian/full/ttf/NotoSansGeorgian-Regular.ttf \
))
diff --git a/external/more_fonts/ExternalPackage_noto_sans_hebrew.mk
b/external/more_fonts/ExternalPackage_noto_sans_hebrew.mk
index 0a825ca2997d..9e44f4546c81 100644
--- a/external/more_fonts/ExternalPackage_noto_sans_hebrew.mk
+++ b/external/more_fonts/ExternalPackage_noto_sans_hebrew.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_sans_hebrew))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_sans_hebrew,font_noto_sans_hebrew))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_sans_hebrew,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoSansHebrew/full/ttf/NotoSansHebrew-Bold.ttf \
NotoSansHebrew/full/ttf/NotoSansHebrew-Regular.ttf \
))
diff --git a/external/more_fonts/ExternalPackage_noto_sans_lao.mk
b/external/more_fonts/ExternalPackage_noto_sans_lao.mk
index c15dd04c6869..52454e20d0f5 100644
--- a/external/more_fonts/ExternalPackage_noto_sans_lao.mk
+++ b/external/more_fonts/ExternalPackage_noto_sans_lao.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_sans_lao))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_sans_lao,font_noto_sans_lao))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_sans_lao,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoSansLao/full/ttf/NotoSansLao-Bold.ttf \
NotoSansLao/full/ttf/NotoSansLao-Regular.ttf \
))
diff --git a/external/more_fonts/ExternalPackage_noto_sans_lisu.mk
b/external/more_fonts/ExternalPackage_noto_sans_lisu.mk
index 9200e5698741..198351f1320b 100644
--- a/external/more_fonts/ExternalPackage_noto_sans_lisu.mk
+++ b/external/more_fonts/ExternalPackage_noto_sans_lisu.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_sans_lisu))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_sans_lisu,font_noto_sans_lisu))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_sans_lisu,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoSansLisu/full/ttf/NotoSansLisu-Bold.ttf \
NotoSansLisu/full/ttf/NotoSansLisu-Regular.ttf \
))
diff --git a/external/more_fonts/ExternalPackage_noto_serif.mk
b/external/more_fonts/ExternalPackage_noto_serif.mk
index 4aca936d87dd..a57db67a92ae 100644
--- a/external/more_fonts/ExternalPackage_noto_serif.mk
+++ b/external/more_fonts/ExternalPackage_noto_serif.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_serif))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_serif,font_noto_serif))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_serif,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoSerif/hinted/ttf/NotoSerif-Bold.ttf \
NotoSerif/hinted/ttf/NotoSerif-BoldItalic.ttf \
NotoSerif/hinted/ttf/NotoSerif-Italic.ttf \
diff --git a/external/more_fonts/ExternalPackage_noto_serif_armenian.mk
b/external/more_fonts/ExternalPackage_noto_serif_armenian.mk
index dbe9a8600154..77e92ddf10a4 100644
--- a/external/more_fonts/ExternalPackage_noto_serif_armenian.mk
+++ b/external/more_fonts/ExternalPackage_noto_serif_armenian.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_serif_armenian))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_serif_armenian,font_noto_serif_armenian))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_serif_armenian,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoSerifArmenian/full/ttf/NotoSerifArmenian-Bold.ttf \
NotoSerifArmenian/full/ttf/NotoSerifArmenian-Regular.ttf \
))
diff --git a/external/more_fonts/ExternalPackage_noto_serif_georgian.mk
b/external/more_fonts/ExternalPackage_noto_serif_georgian.mk
index 8210e620bbc8..b9142bc86d4d 100644
--- a/external/more_fonts/ExternalPackage_noto_serif_georgian.mk
+++ b/external/more_fonts/ExternalPackage_noto_serif_georgian.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_serif_georgian))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_serif_georgian,font_noto_serif_georgian))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_serif_georgian,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoSerifGeorgian/full/ttf/NotoSerifGeorgian-Bold.ttf \
NotoSerifGeorgian/full/ttf/NotoSerifGeorgian-Regular.ttf \
))
diff --git a/external/more_fonts/ExternalPackage_noto_serif_hebrew.mk
b/external/more_fonts/ExternalPackage_noto_serif_hebrew.mk
index 1bc159e35129..709dfdd6b274 100644
--- a/external/more_fonts/ExternalPackage_noto_serif_hebrew.mk
+++ b/external/more_fonts/ExternalPackage_noto_serif_hebrew.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_serif_hebrew))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_serif_hebrew,font_noto_serif_hebrew))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_serif_hebrew,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoSerifHebrew/full/ttf/NotoSerifHebrew-Bold.ttf \
NotoSerifHebrew/full/ttf/NotoSerifHebrew-Regular.ttf \
))
diff --git a/external/more_fonts/ExternalPackage_noto_serif_lao.mk
b/external/more_fonts/ExternalPackage_noto_serif_lao.mk
index acb3631feb59..f7243ffd1d3f 100644
--- a/external/more_fonts/ExternalPackage_noto_serif_lao.mk
+++ b/external/more_fonts/ExternalPackage_noto_serif_lao.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_serif_lao))
+$(eval $(call
gb_ExternalPackage_ExternalPackage,fonts_noto_serif_lao,font_noto_serif_lao))
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,fonts_noto_serif_lao,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoSerifLao/full/ttf/NotoSerifLao-Bold.ttf \
NotoSerifLao/full/ttf/NotoSerifLao-Regular.ttf \
))
