ooo-build r14067 - in trunk: . bin patches/gstreamer

[pmladek svn gnome org]

Author: pmladek
Date: Wed Sep 24 18:53:08 2008
New Revision: 14067
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14067&view=rev

Log:
2008-09-24  Petr Mladek  <pmladek suse cz>

	* another Rene's fix from ooo-build-3-0 branch

	* bin/localize-ooo: skip also hu-fix2.diff for builds not enabling hu
	  and some generic fixup for breakage I introduced

2008-09-24  Petr Mladek  <pmladek suse cz>

	* Thorsten's fix from ooo-build-3-0 branch

	* patches/gstreamer/gstremer-slideshow.diff: also adapted check
	for cairo canvas to the new Canvas naming scheme (breaks video
	support on that otherwise).




Modified:
   trunk/ChangeLog
   trunk/bin/localize-ooo
   trunk/patches/gstreamer/gstreamer-slideshow.diff

Modified: trunk/bin/localize-ooo
==============================================================================
--- trunk/bin/localize-ooo	(original)
+++ trunk/bin/localize-ooo	Wed Sep 24 18:53:08 2008
@@ -87,10 +87,9 @@
 for fn in $SRCDIR/sdf/*.sdf; do
     [ -f "$fn" ] || continue
     grep -q "^$fn$" $extra_trans_stamp 2>/dev/null && continue;
-    if echo "$fn" | grep -q patches && ! grep -q "`echo $fn | cut -d"-" -f1`"  \
-	$OOO_LANGS; then continue; fi
-    if echo "$fn" | grep -q gallery && ! grep -q "`echo $fn | cut -d"-" -f1`"  \
-	$OOO_LANGS; then continue; fi
+    if echo "$fn" | grep -q patches && ! echo $OOO_LANGS | grep -q "$(echo $(basename $fn) | cut -d'-' -f1)"; then continue; fi
+    if echo "$fn" | grep -q gallery && ! echo $OOO_LANGS | grep -q "$(echo $(basename $fn) | cut -d'-' -f1)"; then continue; fi
+    if echo "$fn" | grep -q hu-fix && ! echo $OOO_LANGS | grep -q hu; then continue; fi
     echo "Merging extra localization $(basename $fn) ..."
     $SOLARVERSION/$INPATH/bin/localize -m -x -l all -f $fn || exit 1;
     echo "$fn" >>$extra_trans_stamp

Modified: trunk/patches/gstreamer/gstreamer-slideshow.diff
==============================================================================
--- trunk/patches/gstreamer/gstreamer-slideshow.diff	(original)
+++ trunk/patches/gstreamer/gstreamer-slideshow.diff	Wed Sep 24 18:53:08 2008
@@ -29,7 +29,7 @@
  							if( aImplName.endsWithIgnoreAsciiCaseAsciiL( 
 -                                    RTL_CONSTASCII_STRINGPARAM("VCL") ))
 +                                    RTL_CONSTASCII_STRINGPARAM("VCL") ) || aImplName.endsWithIgnoreAsciiCaseAsciiL( 
-+                                    RTL_CONSTASCII_STRINGPARAM("CairoCanvas") ) )
++                                    RTL_CONSTASCII_STRINGPARAM("Cairo") ) )
                              {
  								implInitializeVCLBasedPlayerWindow( rBounds, aDeviceParams );
                              }