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

[Kálmán „KAMI” Szalai]

Hi,

Thank you for comiting it.

I converted the files and updated the distro confs too.

http://cgit.freedesktop.org/libreoffice/build/commit/?h=libreoffice-3-3&id=06f0119fbc662320da7962a9bb048a1e55a62fa1

KAMI

2011-01-05 19:46 keltezéssel, Petr Mladek írta:
> 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
>

-- 

Best regards,

Kálmán „KAMI” Szalai | 神 | kami911 [at] gmail [dot] com


My favorite projects:

OxygenOffice Professional  - office suite - for everybody 
| Magyarul  - In Hungarian

Blog  | Support  

Follow me , if you can 



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Kálmán „KAMI” Szalai]

Thank you for the patch :o)

KAMI

On 01/05/2011 07:46 PM, Petr Mladek wrote:
> 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
>



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Petr Mladek]

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 
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-bitmapsPrefer 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-bitmapPrefer 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-bitmapsSimilarly to --with-intro-bitmaps, this allows
-  specification of bitmaps for the About box.
+AC_ARG_WITH(about-bitmap,
+[  --with-about-bitmapSimilarly 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_LOCALIZATI