Repository.mk | 5 ++++-
static/Module_static.mk | 1 +
static/Package_favicon.mk | 16 ++++++++++++++++
static/emscripten/favicon.ico |binary
4 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit eb35b4293ebcd322cb13ffe19913841a8c99b3dd
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Fri Feb 23 14:07:04 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Sat Feb 24 00:06:13 2024 +0100
Add a favicon to the Wasm build
...to avoid "GET http://localhost:6931/favicon.ico 404 (File not found:
instdir/program/favicon.ico)" errors in the browser console. The checked-in
static/emscripten/favicon.ico is a copy of
<https://www.libreoffice.org/themes/libreofficenew/favicon.ico>.
Change-Id: Ib40b3f159879cc39244bd81d7fc8a36cc8c7184a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163827
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/Repository.mk b/Repository.mk
index 814ca2edb77b..c0d86f868971 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1033,7 +1033,10 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo,\
) \
resource_fonts \
cui \
- $(if $(filter EMSCRIPTEN,$(OS)),unoembind) \
+ $(if $(filter EMSCRIPTEN,$(OS)), \
+ favicon \
+ unoembind \
+ ) \
))
$(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
diff --git a/static/Module_static.mk b/static/Module_static.mk
index c91441a6b924..ff036fac3213 100644
--- a/static/Module_static.mk
+++ b/static/Module_static.mk
@@ -19,6 +19,7 @@ ifeq (EMSCRIPTEN,$(OS))
$(eval $(call gb_Module_add_targets,static,\
CustomTarget_emscripten_fs_image \
CustomTarget_unoembind \
+ Package_favicon \
Package_unoembind \
StaticLibrary_unoembind \
$(if $(ENABLE_QT5), \
diff --git a/static/Package_favicon.mk b/static/Package_favicon.mk
new file mode 100644
index 000000000000..b0ce6f69f4db
--- /dev/null
+++ b/static/Package_favicon.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column:
100 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,favicon,$(SRCDIR)/static/emscripten))
+
+$(eval $(call gb_Package_add_files,favicon,$(LIBO_BIN_FOLDER), \
+ favicon.ico \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/static/emscripten/favicon.ico b/static/emscripten/favicon.ico
new file mode 100644
index 000000000000..b890a56a8b26
Binary files /dev/null and b/static/emscripten/favicon.ico differ
