configure.ac | 4 ++-- postprocess/CustomTarget_images.mk | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 34f2c4c603514185c695f1fbfff81546214c45d4 Author: Jan Holesovsky <[email protected]> Date: Fri Nov 28 20:23:21 2014 +0100 icons: Hide the Industrial theme again, fallback to it during Tango creation. Change-Id: I37c2126d8b9170334042c7bf380d04c5885c4cb1 diff --git a/configure.ac b/configure.ac index 3eddaf4..70c2529 100644 --- a/configure.ac +++ b/configure.ac @@ -1474,7 +1474,7 @@ AC_ARG_WITH(galleries, AC_ARG_WITH(theme, AS_HELP_STRING([--with-theme="theme1 theme2..."], [Choose which themes to include. By default those themes with an '*' are included. - Possible choices: *breeze, *crystal, *galaxy, *hicontrast, human, *industrial, *oxygen, *sifr, *tango, *tango_testing.]), + Possible choices: *breeze, *crystal, *galaxy, *hicontrast, human, industrial, *oxygen, *sifr, *tango, *tango_testing.]), ,) AC_ARG_WITH(helppack-integration, @@ -11376,7 +11376,7 @@ dnl =================================================================== AC_MSG_CHECKING([which themes to include]) # if none given use default subset of available themes if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then - with_theme="breeze crystal galaxy hicontrast industrial oxygen sifr tango" + with_theme="breeze crystal galaxy hicontrast oxygen sifr tango" test -z "$ENABLE_RELEASE_BUILD" && with_theme="$with_theme tango_testing" fi diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 5d995b7..aba5afc 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -21,6 +21,8 @@ $(eval $(call gb_CustomTarget_register_targets,postprocess/images,\ $(packimages_DIR)/images.zip : DEFAULT_THEME := $(true) $(packimages_DIR)/images_%.zip : DEFAULT_THEME := +$(packimages_DIR)/images_tango.zip : INDUSTRIAL_FALLBACK := -c $(SRCDIR)/icon-themes/industrial +$(packimages_DIR)/images%.zip : INDUSTRIAL_FALLBACK := $(packimages_DIR)/%.zip : \ $(packimages_DIR)/sorted.lst \ @@ -36,6 +38,7 @@ $(packimages_DIR)/%.zip : \ -g $(packimages_DIR) -m $(packimages_DIR) -c $(packimages_DIR),\ -g $(SRCDIR)/icon-themes/$(subst images_,,$*) -m $(SRCDIR)/icon-themes/$(subst images_,,$*) -c $(SRCDIR)/icon-themes/$(subst images_,,$*) \ ) \ + $(INDUSTRIAL_FALLBACK) \ $(call gb_Helper_optional,HELP,-l $(helpimages_DIR) ) \ -l $(packimages_DIR) \ -l $(dir $(call gb_ResTarget_get_imagelist_target)) \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
