[Libreoffice-commits] core.git: 2 commits - configure.ac

[Mike Kaganski (via logerrit)]

 configure.ac |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 3b74fa43f537f471b1b87741d703f2696ed24510
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Nov 11 16:25:29 2023 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Nov 11 16:25:03 2023 +0100

    Simplify input theme filtering
    
    Change-Id: Iaa96feee79902f780409a19f97fed201793a66ca
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159319
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/configure.ac b/configure.ac
index 35b654abe1f7..15e7c781e993 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13498,13 +13498,12 @@ fi
 
 WITH_THEMES=""
 if test "x$with_theme" != "xno"; then
-    for theme in $with_theme; do
+    with_theme_sorted=`echo $with_theme|sed 's/\bdefault\b/colibre/g'|tr '\ ' 
'\n'|sort -u`
+    for theme in $with_theme_sorted; do
         case $theme in
-        
breeze|breeze_dark|breeze_dark_svg|breeze_svg|colibre|colibre_svg|colibre_dark|colibre_dark_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg|sifr|sifr_svg|sifr_dark|sifr_dark_svg|sukapura|sukapura_dark|sukapura_dark_svg|sukapura_svg)
 real_theme="$theme" ;;
-        default) real_theme=colibre ;;
+        
breeze|breeze_dark|breeze_dark_svg|breeze_svg|colibre|colibre_svg|colibre_dark|colibre_dark_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg|sifr|sifr_svg|sifr_dark|sifr_dark_svg|sukapura|sukapura_dark|sukapura_dark_svg|sukapura_svg)
 WITH_THEMES="${WITH_THEMES:+$WITH_THEMES }$theme" ;;
         *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
         esac
-        WITH_THEMES=`echo "$WITH_THEMES $real_theme"|tr '\ ' '\n'|sort|uniq|tr 
'\n' '\ '`
     done
 fi
 AC_MSG_RESULT([$WITH_THEMES])
commit db029c5a02880beb262165822a2e833c47569984
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Nov 11 16:22:23 2023 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Nov 11 16:24:57 2023 +0100

    When MPL subset needs to disable icon themes, suggest filtered input
    
    A suggestion like "you wanted to have a, b, c, d; you need to exclude
    b; use e" makes little sense :-)
    
    Change-Id: I0212f0197b89c3e9d281fa5b24708672b82561b8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159318
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/configure.ac b/configure.ac
index 545c3de33303..35b654abe1f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14765,15 +14765,20 @@ if test "$enable_mpl_subset" = "yes"; then
         mpl_error_string="$mpl_error_string$newline Need to disable extra 
extensions enabled using --enable-ext-XXXX."
     fi
     denied_themes=
+    filtered_themes=
     for theme in $WITH_THEMES; do
         case $theme in
         
breeze|breeze_dark|breeze_dark_svg|breeze_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg)
 #denylist of icon themes under GPL or LGPL
-            denied_themes="$denied_themes $theme" ;;
-        *) : ;;
+            denied_themes="${denied_themes:+$denied_themes }$theme" ;;
+        *)
+            filtered_themes="${filtered_themes:+$filtered_themes }$theme" ;;
         esac
     done
     if test "x$denied_themes" != "x"; then
-        mpl_error_string="$mpl_error_string$newline Need to disable icon 
themes from '$WITH_THEMES': $denied_themes present, use --with-theme=colibre."
+        if test "x$filtered_themes" == "x"; then
+            filtered_themes="colibre"
+        fi
+        mpl_error_string="$mpl_error_string$newline Need to disable icon 
themes: $denied_themes, use --with-theme=$filtered_themes."
     fi
 
     ENABLE_OPENGL_TRANSITIONS=