[Libreoffice-commits] online.git: loleaflet/html loleaflet/Makefile.am

Tue Oct 29 12:24:57 UTC 2019

loleaflet/Makefile.am            |    1 +
 loleaflet/html/loleaflet.html.m4 |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit b813ed61b6dbad3f9244d78978f8bf3bafc57594
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Apr 3 16:26:51 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Oct 29 13:24:33 2019 +0100

    add copyright notice to About Box
    
    Change-Id: I51c2c5e7c2b0cf232b8a2f2dbcb3b9f3f04737ea
    Reviewed-on: https://gerrit.libreoffice.org/70205
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 2a937dea9..15760e5b4 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -245,6 +245,7 @@ $(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
 		-DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(NODE_MODULES_JS) \
 		$(LOLEAFLET_LIBS_JS) \
 		$(call LOLEAFLET_JS,$(srcdir)/build/build.js))" \
+		-DVENDOR="$(VENDOR)" \
 		$(srcdir)/html/loleaflet.html.m4 > $@
 
 node_modules: npm-shrinkwrap.json
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index d61974170..0946f9b47 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -4,6 +4,7 @@ dnl# foreachq(x, `item_1, item_2, ..., item_n', stmt)
 dnl# quoted list, alternate improved version
 define([foreachq],[ifelse([$2],[],[],[pushdef([$1])_$0([$1],[$3],[],$2)popdef([$1])])])dnl
 define([_foreachq],[ifelse([$#],[3],[],[define([$1],[$4])$2[]$0([$1],[$2],shift(shift(shift($@))))])])dnl
+define(_YEAR_,esyscmd(date +%Y|tr -d '\n'))
 <!DOCTYPE html>
 <!-- saved from url=(0054)http://leafletjs.com/examples/quick-start-example.html -->
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -208,6 +209,7 @@ ifelse(MOBILEAPP,[true],
       <div id="loolwsd-id"></div>
       <h3>LOKit</h3>
       <div id="lokit-version"></div>
+      <p>Copyright © _YEAR_, VENDOR.</p>
     </div>
 
     <script defer>
