[Libreoffice] [PATCH] Fix passing distro specific branding via configure

Hi,

the configure options --with-intro-bitmaps, --with-about-bitmaps did not
longer worked. I think that nobody needs more pictures. The attached
patches rename the above options to pass only one picture and fix the
stuff to work.

KAMI, could you sign it off for libreoffice-3-3 branch?


Best Regards,
Petr

From aeb812f7f576e0eb092434f9191c41ba70d71782 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Wed, 5 Jan 2011 19:27:15 +0100
Subject: [PATCH] Fix distro specific about intro hadling

I guess that nobody uses more alternative branding pictures. It was implemented
for SLED10-GM and it is not longer needed there. So I renamed:

    --with-intro-bitmaps to --with-intro-bitmap
    --with-about-bitmaps to --with-about-bitmap
and
    INTRO_BITMAPS to INTRO_BITMAPS
    ABOUT_BITMAPS to ABOUT_BITMAP

Also .png file format is requred instead of .bmp now.
---
 configure.in |   68 +++++++++++++++++++++++----------------------------------
 set_soenv.in |    4 +-
 2 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/configure.in b/configure.in
index 266f7e3..d703dde 100644
--- a/configure.in
+++ b/configure.in
@@ -1091,20 +1091,18 @@ AC_ARG_WITH(dict,
                           Usage: --with-dict=ENGB,ENUS,ITIT
 ],,)
 
-AC_ARG_WITH(intro-bitmaps,
-[  --with-intro-bitmaps    Prefer the specified intro bitmaps over the
-                          the default one.  Can be more than one (separated by
-                          commas), the order means priority of fallback if the
-                          first does not exist (in the installed tree).
+AC_ARG_WITH(intro-bitmap,
+[  --with-intro-bitmap    Prefer the specified intro bitmap over the
+                          the default one.
 
-                          Usage: --with-intro-bitmaps=/path/my_ooo_intro.bmp
+                          Usage: --with-intro-bitmap=/path/my_ooo_intro.png
 ],,)
 
-AC_ARG_WITH(about-bitmaps,
-[  --with-about-bitmaps    Similarly to --with-intro-bitmaps, this allows
-                          specification of bitmaps for the About box.
+AC_ARG_WITH(about-bitmap,
+[  --with-about-bitmap    Similarly to --with-intro-bitmap, this allows
+                          specification of bitmap for the About box.
 
-                          Usage: --with-about-bitmaps=/path/my_ooo_about.bmp
+                          Usage: --with-about-bitmap=/path/my_ooo_about.png
 ],,)
 
 AC_ARG_WITH(vendor,
@@ -7775,43 +7773,33 @@ else
 fi
 AC_SUBST(WITH_DICT)
 
-AC_MSG_CHECKING([for additional 'intro' bitmaps])
-INTRO_BITMAPS=
-if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then
-   INTRO_BITMAPS=
+AC_MSG_CHECKING([for another 'intro' bitmap])
+INTRO_BITMAP=
+if test -z "$with_intro_bitmap" -o "$with_intro_bitmap" = "no" ; then
+   INTRO_BITMAP=
    AC_MSG_RESULT([none])
 else
-   for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do
-      case "$bitmap" in
-         *.bmp) ;;
-         *)     bitmap= ; AC_MSG_WARN([Intro bitmaps should be .bmp files!]) ;;
-      esac
-      if test -n "$bitmap" ; then
-         INTRO_BITMAPS="$INTRO_BITMAPS $bitmap"
-      fi
-   done
-   AC_MSG_RESULT([$INTRO_BITMAPS])
+   case "$with_intro_bitmap" in
+      *.png) INTRO_BITMAP="$with_intro_bitmap" ;;
+      *)     AC_MSG_WARN([Intro bitmap should be a .png file!]) ;;
+   esac
+   AC_MSG_RESULT([$INTRO_BITMAP])
 fi
-AC_SUBST(INTRO_BITMAPS)
+AC_SUBST(INTRO_BITMAP)
 
-AC_MSG_CHECKING([for additional 'about' bitmaps])
-ABOUT_BITMAPS=
-if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then
-   ABOUT_BITMAPS=
+AC_MSG_CHECKING([for another 'about' bitmap])
+ABOUT_BITMAP=
+if test -z "$with_about_bitmap" -o "$with_about_bitmap" = "no" ; then
+   ABOUT_BITMAP=
    AC_MSG_RESULT([none])
 else
-   for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do
-      case "$bitmap" in
-         *.bmp) ;;
-         *)     bitmap= ; AC_MSG_WARN([About bitmaps should be .bmp files!]) ;;
-      esac
-      if test -n "$bitmap" ; then
-         ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap"
-      fi
-   done
-   AC_MSG_RESULT([$ABOUT_BITMAPS])
+   case "$with_about_bitmap" in
+      *.png) ABOUT_BITMAP="$with_about_bitmap" ;;
+      *)     AC_MSG_WARN([About bitmap should be a .png file!]) ;;
+   esac
+   AC_MSG_RESULT([$ABOUT_BITMAP])
 fi
-AC_SUBST(ABOUT_BITMAPS)
+AC_SUBST(ABOUT_BITMAP)
 
 OOO_VENDOR=
 AC_MSG_CHECKING([for vendor])
diff --git a/set_soenv.in b/set_soenv.in
index 6e51c4f..1c1e97b 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1630,8 +1630,8 @@ else
 }
 # Languages
 ToFile( "WITH_LANG",         "@WITH_LANG@",      "e" );
-ToFile( "INTRO_BITMAPS",     "@INTRO_BITMAPS@",  "e" );
-ToFile( "ABOUT_BITMAPS",     "@ABOUT_BITMAPS@",  "e" );
+ToFile( "INTRO_BITMAP",      "@INTRO_BITMAP@",   "e" );
+ToFile( "ABOUT_BITMAP",      "@ABOUT_BITMAP@",   "e" );
 ToFile( "OOO_VENDOR",        "@OOO_VENDOR@",     "e" );
 ToFile( "OOODMAKEMODE",      "YES",              "e" );
 ToFile( "WITH_POOR_HELP_LOCALIZATIONS", "@WITH_POOR_HELP_LOCALIZATIONS@", "e" );
-- 
1.7.3.4

From be382496e55755f4aeb64d3de6ac19909399fe6b Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Wed, 5 Jan 2011 19:38:22 +0100
Subject: [PATCH] Fix distro specific about intro hadling

oosplash does not longer support multiple intro pictures; it is enough
to replace intro.png and about.png with the pictures passed via
--with-intro-bitmap and --with-about-bitmap configure options
---
 desktop/zipintro/makefile.mk |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index d15f2de..cdc547f 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -33,11 +33,11 @@ TARGET=zipintro
 .INCLUDE :  settings.mk
 
 ZIP1LIST= \
-    $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS))
+    $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png \
+    $(MISC)$/$(RSCDEFIMG)$/brand$/about.png
 ZIP2LIST= \
-    $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS))
+    $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png \
+    $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png
 ZIP3LIST= \
     $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left.png \
     $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right.png \
@@ -90,3 +90,15 @@ $(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp
 $(MISC)$/%.png : $(SOLARSRC)$/%.png
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
+
+.IF "$(INTRO_BITMAP)" != ""
+$(MISC)$/$(RSCDEFIMG)$/brand$/intro.png : $(INTRO_BITMAP)
+    @@-$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
+.ENDIF
+
+.IF "$(ABOUT_BITMAP)" != ""
+$(MISC)$/$(RSCDEFIMG)$/brand$/about.png : $(ABOUT_BITMAP)
+    @@-$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
+.ENDIF
-- 
1.7.3.4