sysui/Package_share.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c8d2595a1bf9908e46a7b780a4117ea0bd082983
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue Oct 22 20:39:55 2024 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Oct 23 08:25:33 2024 +0200
Branding-related build fix
...after 5ce7a548004c9e5cdcd8ee7eb5424f234219d180 "Branding for ZetaOffice
without any branding image" caused some Linux builds to fail
Package_sysui_share
with
> /usr/bin/perl /home/me/lo/core/sysui/desktop/share/brand.pl -p
'${PRODUCTNAME} ${PRODUCTVERSION}' -u \
> \
> --iconprefix '${UNIXBASISROOTNAME}-'
/home/me/lo/core/sysui/desktop/menus/writer.desktop
/home/me/lo/core/sysui/desktop/menus/calc.desktop
/home/me/lo/core/sysui/desktop/menus/draw.desktop
/home/me/lo/core/sysui/desktop/menus/impress.desktop
/home/me/lo/core/sysui/desktop/menus/math.desktop
/home/me/lo/core/sysui/desktop/menus/base.desktop
/home/me/lo/core/sysui/desktop/menus/startcenter.desktop
/home/me/lo/core/sysui/desktop/menus/xsltfilter.desktop
/home/me/lo/core/workdir/CustomTarget/sysui/share/libreoffice
> Can't open input file ${UNIXBASISROOTNAME}-: No such file or directory
> make[1]: *** [/home/me/lo/core/sysui/CustomTarget_share.mk:208:
/home/me/lo/core/workdir/CustomTarget/sysui/share/libreoffice/build.flag] Error
1
(because the argument $(UNIXFILENAME.$*) for -u expanded to nothing in the
recipe for $(share_WORKDIR)/%/build.flag in sysui/CustomTarget_share.mk,
due to
the changes to sysui/productlist.mk, so it mistakenly took --iconprefix as
the
argument for -u; other Linux builds happened to not cause a failure, but
rather
do something nonsensical, when $(brand_URIPARAM) expands to --urls, so that
was
mistakenly taken as the argument for -u)
Change-Id: I9d957a94776a7d1b8e66121078e76e9df0be14ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175447
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
Tested-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/sysui/Package_share.mk b/sysui/Package_share.mk
index 25ae39bdf1b4..600b12029d84 100644
--- a/sysui/Package_share.mk
+++ b/sysui/Package_share.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,sysui_share,$(share_WORKDIR)/libreoffice))
+$(eval $(call gb_Package_Package,sysui_share,$(share_WORKDIR)/zetaoffice))
$(eval $(call gb_Package_add_files,sysui_share,share/xdg,\
$(addsuffix .desktop,$(LAUNCHERLIST)) \
