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

[Samuel Mehrbrodt (via logerrit)]

 configure.ac          |   14 ++++++++++++++
 loleaflet/Makefile.am |    7 +++++++
 2 files changed, 21 insertions(+)

New commits:
commit 16fcd372015b3bc9a3f5d8b5abf7b76aec5c7c1f
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Fri Jun 21 10:43:53 2019 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Fri Jun 28 12:32:43 2019 +0200

    configure: Add support for custom icons
    
    Change-Id: I573b4d7e745cdea6fdbecd2c3790078d1980bdf9
    Reviewed-on: https://gerrit.libreoffice.org/74491
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/configure.ac b/configure.ac
index 7d1928b2e..c9446f35a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,6 +109,10 @@ AC_ARG_WITH([app-name],
               AS_HELP_STRING([--with-app-name=<name>],
                              [Set the user-visible name of the app you build.]))
 
+AC_ARG_WITH([icon-theme],
+              AS_HELP_STRING([--with-icon-theme=<path>],
+                             [Path to custom icon theme (similiar to loleflet/images).]))
+
 AC_ARG_WITH(vendor,
     AS_HELP_STRING([--with-vendor="John the Builder"],
         [Set vendor of the build.]),
@@ -410,6 +414,16 @@ AC_SUBST(ENABLE_IOSAPP)
 AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"])
 AC_SUBST(IOSAPP_BUNDLE_VERSION)
 
+AC_MSG_CHECKING([for custom icon theme])
+CUSTOM_ICONS_DIRECTORY=
+if test -d "$with_icon_theme"; then
+    CUSTOM_ICONS_DIRECTORY=`readlink -f $with_icon_theme`
+    AC_MSG_RESULT([$CUSTOM_ICONS_DIRECTORY])
+else
+    AC_MSG_RESULT([no])
+fi
+AC_SUBST(CUSTOM_ICONS_DIRECTORY)
+
 ENABLE_GTKAPP=
 if test "$enable_gtkapp" = "yes"; then
    ENABLE_GTKAPP=true
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 1df4350aa..456400f64 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -30,6 +30,8 @@ JQUERY_MINIFIED_DIST_IMAGES = $(patsubst $(JQUERY_MINIFIED_IMAGE_PATH)/%.png,$(b
 
 LOLEAFLET_IMAGES_SRC = $(shell find $(srcdir)/images -name '*.*')
 LOLEAFLET_IMAGES_DST = $(patsubst $(srcdir)/%,$(builddir)/dist/%,$(LOLEAFLET_IMAGES_SRC))
+LOLEAFLET_IMAGES_CUSTOM_SRC = $(shell find $(CUSTOM_ICONS_DIRECTORY) -name '*.*')
+LOLEAFLET_IMAGES_CUSTOM_DST = $(patsubst $(CUSTOM_ICONS_DIRECTORY)/%,$(builddir)/dist/images/%,$(LOLEAFLET_IMAGES_CUSTOM_SRC))
 
 LOLEAFLET_L10N_SRC = $(shell find $(srcdir)/l10n -name '*.*')
 if !ENABLE_IOSAPP
@@ -140,6 +142,7 @@ endif
 build-loleaflet: | $(LOLEAFLET_L10N_DST) \
 	$(L10N_JSON) \
 	$(LOLEAFLET_IMAGES_DST) \
+	$(LOLEAFLET_IMAGES_CUSTOM_DST) \
 	$(JQUERY_LIGHTNESS_DIST_IMAGES) \
 	$(JQUERY_MINIFIED_DIST_IMAGES) \
 	$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
@@ -245,6 +248,10 @@ $(builddir)/dist/plugins/%.js: $(srcdir)/plugins/%.js
 		`ln -sf $(abs_srcdir)/$< $@`; \
 	fi
 
+$(builddir)/dist/images/%: $(CUSTOM_ICONS_DIRECTORY)/%
+	@mkdir -p $(dir $@)
+	@cp $< $@
+
 $(builddir)/dist/images/%: $(srcdir)/images/%
 	@mkdir -p $(dir $@)
 	@cp $< $@