configure.ac | 10 ++++++++++ docker/Dockerfile | 2 +- docker/scripts/run-lool.sh | 4 ++-- loleaflet/Makefile.am | 7 +++++++ 4 files changed, 20 insertions(+), 3 deletions(-)
New commits: commit 392c11de21cd540f0450910ebedecf18159a88fa Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> AuthorDate: Tue Jun 25 09:11:06 2019 +0200 Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> CommitDate: Tue Jun 25 10:30:29 2019 +0200 Use pkill to kill process instead of killall Using killall does not work, it gives 'no process found'. Change-Id: I0e528ab8c0f6f0c4cb06ea5e6c436aecf2274688 diff --git a/docker/Dockerfile b/docker/Dockerfile index 164a6f6af..d8109f1ea 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update && apt-get upgrade -y # install LibreOffice run-time dependencies # install adduser, findutils, openssl and cpio that we need later # install an editor -RUN apt-get -y install locales-all libpng16-16 libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 libxcb-shm0 libxcb-render0 adduser cpio findutils nano libpoco*50 libcap2-bin openssl inotify-tools psmisc +RUN apt-get -y install locales-all libpng16-16 libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 libxcb-shm0 libxcb-render0 adduser cpio findutils nano libpoco*50 libcap2-bin openssl inotify-tools procps # tdf#117557 - Add CJK Fonts to LibreOffice Online Docker Image RUN apt-get -y install fonts-wqy-zenhei fonts-wqy-microhei fonts-droid-fallback fonts-noto-cjk diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh index 662828ec7..a5671f222 100755 --- a/docker/scripts/run-lool.sh +++ b/docker/scripts/run-lool.sh @@ -35,10 +35,10 @@ perl -pi -e "s/<password (.*)>.*<\/password>/<password \1>${password}<\/password # Restart when /etc/loolwsd/loolwsd.xml changes -[ -x /usr/bin/inotifywait -a /usr/bin/killall ] && ( +[ -x /usr/bin/inotifywait -a /usr/bin/pkill ] && ( /usr/bin/inotifywait -e modify /etc/loolwsd/loolwsd.xml echo "$(ls -l /etc/loolwsd/loolwsd.xml) modified --> restarting" - /usr/bin/killall -1 loolwsd + pkill -f --signal 1 loolwsd ) & # Start loolwsd commit c358ddc227038f55f4cff854ba73c95558a375bc Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> AuthorDate: Fri Jun 21 10:43:53 2019 +0200 Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> CommitDate: Tue Jun 25 10:30:07 2019 +0200 configure: Add support for custom icons Add changes from master patch Change-Id: I573b4d7e745cdea6fdbecd2c3790078d1980bdf9 diff --git a/configure.ac b/configure.ac index 7d70a3635..a6dd3ef5a 100644 --- a/configure.ac +++ b/configure.ac @@ -287,6 +287,16 @@ else fi AC_SUBST(CUSTOM_ICONS_DIRECTORY) +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 ba5cc2e3c..3c76d5294 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -30,6 +30,8 @@ JQUERY_UI_DIST_IMAGES = $(patsubst $(JQUERY_UI_IMAGE_PATH)/%.png,$(builddir)/dis 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 @@ -150,6 +152,7 @@ build-loleaflet: | $(LOLEAFLET_L10N_DST) \ $(L10N_JSON) \ $(LOLEAFLET_IMAGES_DST) \ $(JQUERY_UI_DIST_IMAGES) \ + $(LOLEAFLET_IMAGES_CUSTOM_DST) \ $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \ $(ADMIN_BUNDLE) \ $(builddir)/dist/bundle.css \ @@ -239,6 +242,10 @@ $(builddir)/dist/plugins/%.js: $(srcdir)/plugins/%.js @mkdir -p $(dir $@) @cp $< $@ +$(builddir)/dist/images/%: $(CUSTOM_ICONS_DIRECTORY)/% + @mkdir -p $(dir $@) + @cp $< $@ + $(builddir)/dist/images/%: $(srcdir)/images/% @mkdir -p $(dir $@) @cp $< $@ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits