GNOME.org
 

ooo-build r13976 - in branches/ooo-build-3-0: . bin bin/piece distro-configs patches/dev300 patches/gstreamer

Author: rengelhard
Date: Sun Sep 21 18:42:58 2008
New Revision: 13976
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13976&view=rev

Log:
2008-09-21  Rene Engelhard  <rene debian org>

        * bin/src-pack, bin/modules2.txt, download.in, bin/unpack, bin/setup.in,
          configure.in: update for Extensions3; general fixup
        * distro-configs/Common.conf.in: remove --disable-report-builder. Also
          remove --enable-presenter-screen as you  now need an extra tarball
          for it
        * patches/dev300/reportdesigner-no-license*.diff: rotate for m4 and m6.
          patch reportbuilder instead of reportdesign
        * configure.in: default to ooo300-m6, OOO300_m7 is rc2
        * bin/setup.-in, bin/unpack: fix $SPLIT conditionals to work with
          the split default and --without-split specified
        * bin(/localize-ooo: don't merge xy-patches/xy-gallery when xy isn't
          built
        * patches/gstreamer/gstreamer-slideshow-m6.diff,
          patches/gstreamer/gstremer-slideshow.diff,
          patches/dev300/apply: ooo300-m7


Added:
   branches/ooo-build-3-0/patches/dev300/reportdesigner-no-license-m3.diff
      - copied unchanged from r13933, /branches/ooo-build-3-0/patches/dev300/reportdesigner-no-license.diff
   branches/ooo-build-3-0/patches/dev300/reportdesigner-no-license-m5.diff
      - copied, changed from r13933, /branches/ooo-build-3-0/patches/dev300/reportdesigner-no-license.diff
   branches/ooo-build-3-0/patches/gstreamer/gstreamer-slideshow-m6.diff
      - copied unchanged from r13975, /branches/ooo-build-3-0/patches/gstreamer/gstreamer-slideshow.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/bin/applyflags
   branches/ooo-build-3-0/bin/localize-ooo
   branches/ooo-build-3-0/bin/modules2.txt
   branches/ooo-build-3-0/bin/piece/build-generic
   branches/ooo-build-3-0/bin/setup.in
   branches/ooo-build-3-0/bin/src-pack
   branches/ooo-build-3-0/bin/unpack
   branches/ooo-build-3-0/configure.in
   branches/ooo-build-3-0/distro-configs/Common.conf.in
   branches/ooo-build-3-0/download.in
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/reportdesigner-no-license.diff
   branches/ooo-build-3-0/patches/gstreamer/gstreamer-slideshow.diff

Modified: branches/ooo-build-3-0/bin/applyflags
==============================================================================
--- branches/ooo-build-3-0/bin/applyflags	(original)
+++ branches/ooo-build-3-0/bin/applyflags	Sun Sep 21 18:42:58 2008
@@ -23,8 +23,8 @@
 if test -d $OOBUILDDIR/sdk_oo; then
     echo -n " --distro=Sdk";
 fi
-if test -d $OOBUILDDIR/swext ; then
-    echo -n " --distro=swext";
+if test -d $OOBUILDDIR/swext -o -d $OOBUILDDIR/sdext -o -d $OOBUILDDIR/reportbuilder; then
+    echo -n " --distro=Extensions";
 fi
 if grep localize.sdf $OOBUILDDIR/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then
     echo -n " --distro=Localize";

Modified: branches/ooo-build-3-0/bin/localize-ooo
==============================================================================
--- branches/ooo-build-3-0/bin/localize-ooo	(original)
+++ branches/ooo-build-3-0/bin/localize-ooo	Sun Sep 21 18:42:58 2008
@@ -87,6 +87,10 @@
 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
     echo "Merging extra localization $(basename $fn) ..."
     $SOLARVERSION/$INPATH/bin/localize -m -x -l all -f $fn || exit 1;
     echo "$fn" >>$extra_trans_stamp

Modified: branches/ooo-build-3-0/bin/modules2.txt
==============================================================================
--- branches/ooo-build-3-0/bin/modules2.txt	(original)
+++ branches/ooo-build-3-0/bin/modules2.txt	Sun Sep 21 18:42:58 2008
@@ -1,17 +1,18 @@
 ure=bridges,cli_ure,codemaker,cppu,cppuhelper,cpputools,idlc,io,javaunohelper,jurt,jut,jvmaccess,jvmfwk,offapi,offuh,pyuno,rdbmaker,registry,remotebridges,ridljar,sal,salhelper,stoc,store,udkapi,unoil,ure,xml2cmp
-sdk=autodoc,cosv,odk,sdk_oo,udm,unodevtools
+sdk=autodoc,cosv,odk,udm,unodevtools
 base=dbaccess,reportdesign
 calc=sc,scaddins,sccomp,chart2
 l10n=extras,helpcontent2,readlicense_oo
 writer=sw,starmath
-impress=sd,animations,slideshow,sdext
+impress=sd,animations,slideshow
 artwork=default_images,external_images,ooo_custom_images
 filters=binfilter,filter,hwpfilter,unoxml,writerfilter,writerperfect,xmerge,oox
 testing=qadevOOo,smoketestoo_native,testshl2,testtools
 bootstrap=config_office,dmake,instsetoo_native,scp2,solenv,soltools,stlport
 libs_gui=basebmp,basegfx,canvas,comphelper,cppcanvas,dtrans,goodies,i18npool,i18nutil,o3tl,padmin,psprint,psprint_config,regexp,rsc,sax,sot,svtools,toolkit,tools,transex3,ucbhelper,unotools,vcl,vos
 libs_core=avmedia,basic,configmgr,connectivity,desktop,embeddedobj,eventattacher,fileaccess,fpicker,framework,idl,linguistic,officecfg,oovbaapi,sandbox,scripting,sfx2,shell,sj2,svx,sysui,ucb,uui,xmlhelp,xmloff,xmlscript
-libs_extern=afms,agg,beanshell,epm,external,fondu,freetype,hsqldb,jfreereport,libegg,libtextcat,libxmlsec,msfontextract,np_sdk,rhino,sane,twain,lpsolve,icc,openssl,unixODBC,vigra,x11_extensions,xpdf,hyphen,libwpd,lucene,redland,cppunit
+libs_extern=afms,agg,beanshell,epm,external,fondu,hsqldb,libegg,libtextcat,libxmlsec,msfontextract,np_sdk,rhino,sane,twain,lpsolve,icc,openssl,unixODBC,vigra,x11_extensions,hyphen,libwpd,lucene,redland,cppunit
 components=accessibility,automation,basctl,bean,crashrep,embedserv,extensions,forms,javainstaller2,lingucomponent,MathMLDTD,package,setup_native,UnoControls,wizards,xmlsecurity
 postprocess=postprocess,packimages
 libs_extern_sys=berkeleydb,bitstream_vera_fonts,expat,icu,jpeg,libxml2,libxslt,moz,neon,python,zlib,saxon,stax,boost,curl,dictionaries,cairo,hunspell
+extensions=sdext,swext,tomcat,apache-commons,jfreereport,reportbuilder,xpdf

Modified: branches/ooo-build-3-0/bin/piece/build-generic
==============================================================================
--- branches/ooo-build-3-0/bin/piece/build-generic	(original)
+++ branches/ooo-build-3-0/bin/piece/build-generic	Sun Sep 21 18:42:58 2008
@@ -24,7 +24,7 @@
 $OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces \
 	--tag=$ooo_build_tag \
 	--distro=$DISTRO --distro=Piece --distro=Binfilter \
-	--distro=System --distro=Sdk --distro=swext \
+	--distro=System --distro=Sdk --distro=Extensions \
 	 `pwd` || exit 1;
 
 dirs=`/bin/ls | grep -v -e 'applied_patches' -e 'solver'  | tr '\n' ':'`

Modified: branches/ooo-build-3-0/bin/setup.in
==============================================================================
--- branches/ooo-build-3-0/bin/setup.in	(original)
+++ branches/ooo-build-3-0/bin/setup.in	Sun Sep 21 18:42:58 2008
@@ -37,7 +37,7 @@
 ENABLE_ODK='@ENABLE_ODK@'
 USE_PREBUILD_UNOWINREG_DLL='@USE_PREBUILD_UNOWINREG_DLL@'
 ENABLE_MONO='@ENABLE_MONO@'
-ENABLE_MEDIAWIKI='@ENABLE_MEDIAWIKI@'
+ENABLE_EXTENSIONS='@ENABLE_EXTENSIONS@'
 ENABLE_SCSOLVER='@ENABLE_SCSOLVER@'
 ENABLE_GRAPHITE='@ENABLE_GRAPHITE@'
 GRAPHITE_SRC='@GRAPHITE_SRC@'
@@ -219,15 +219,17 @@
     OOO_BINFILTER_TARBALL="${UPSTREAM_NAME}_binfilter.tar.bz2"
     OOO_LANG_TARBALL="${UPSTREAM_NAME}_l10n.tar.bz2"
     OOO_SDK_OO_TARBALL="${UPSTREAM_NAME}_sdk.tar.bz2"
+    OOO_EXTENSIONS_TARBALL="${UPSTREAM_NAME}_extensions.tar.bz2"
 else
     OOO_TARBALL="$CVSTAG-core.tar.bz2"
     OOO_SYSTEM_TARBALL="$CVSTAG-system.tar.bz2"
     OOO_BINFILTER_TARBALL="$CVSTAG-binfilter.tar.bz2"
     OOO_LANG_TARBALL="$CVSTAG-lang.tar.bz2"
     OOO_SDK_OO_TARBALL="$CVSTAG-sdk_oo.tar.bz2"
+    OOO_EXTENSIONS_TARBALL="${CVSTAG}-extensions.tar.bz2"
 fi
 OOO_SPLIT_PREFIX=""
-if test "z SPLIT@" != "z"; then
+if test "z SPLIT@" = "zyes"; then
     OOO_SPLIT_PREFIX="$CVSTAG-"
     OOO_SDK_OO_TARBALL="$CVSTAG-sdk.tar.bz2"
     OOO_SYSTEM_TARBALL="$CVSTAG-libs-extern-sys.tar.bz2"

Modified: branches/ooo-build-3-0/bin/src-pack
==============================================================================
--- branches/ooo-build-3-0/bin/src-pack	(original)
+++ branches/ooo-build-3-0/bin/src-pack	Sun Sep 21 18:42:58 2008
@@ -28,6 +28,9 @@
 system_dirs="$src/python $src/bitstream_vera_fonts $src/freetype $src/jpeg";
 system_dirs="$system_dirs $src/dictionaries $src/libxml2 $src/zlib $src/moz";
 system_dirs="$system_dirs $src/curl $src/neon ";
+extension_dirs="$src/sdext $src/swext $src/tomcat $src/apache-commons";
+extension_dirs="$extension_dirs $src/jfreereport $src/reportbuilder";
+extension_dirs="$extension_dirs $src/xpdf"
 
 # future system bits:
 incomplete_modules="$src/curl $src/expat $src/icu $src/libxmlsec $src/neon";
@@ -84,7 +87,6 @@
 echo "Packing system pieces ...";
 echo "tar $tar_opts -f $dest/$src-system.tar.bz2 $system_dirs";
 tar $tar_opts -f $dest/$src-system.tar.bz2 $system_dirs || exit 1;
-echo "Cleaning system pieces...";
 rm -Rf $system_dirs || exit 1;
 
 # This saves only 1.5Mb
@@ -100,6 +102,10 @@
 cat localize.lst | xargs rm -Rf || exit 1
 rm localize.lst
 
+echo "Packaging extension bits ..."
+tar $tar_opts -f $dest/$src-extensions.tar.bz2 $extension_dirs || exit 1;
+rm -Rf $extension_dirs || exit 1;
+
 echo "Packing core source ...";
 tar $tar_opts -f $dest/$src-core.tar.bz2 $src || exit 1;
 rm -Rf $src

Modified: branches/ooo-build-3-0/bin/unpack
==============================================================================
--- branches/ooo-build-3-0/bin/unpack	(original)
+++ branches/ooo-build-3-0/bin/unpack	Sun Sep 21 18:42:58 2008
@@ -53,7 +53,7 @@
 fi
 
 # this will become the 'normal' way to do an all-through build name is misleading
-if test "z$SPLIT" != "z"; then
+if test "z$SPLIT" = "zyes" ; then
 	if test "z$PIECE" != "z"; then
 		CORE_PKGS=$PIECE
 	else
@@ -167,7 +167,7 @@
 fi
 
 echo "Unpacking OO.o build tree - [ go and have some $DRINK ] ..."
-if test "z$SPLIT" = "z"; then
+if test "z$SPLIT" != "zyes"; then
 	echo "Unpacking $OOO_TARBALL..."
 	($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_TARBALL | $GNUTAR xpf - ) || exit 1
 else # split packages
@@ -207,13 +207,17 @@
    echo "Unpacking $OOO_LANG_TARBALL..."
     ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_LANG_TARBALL | $GNUTAR xpf - )
 fi
-if test "z$SPLIT" = "z"; then
+if test "z$SPLIT" != "zyes"; then
   # -sdk_oo source
   if test -f $SRCDIR/$OOO_SDK_OO_TARBALL; then
      echo "Unpacking $OOO_SDK_OO_TARBALL"
       ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_SDK_OO_TARBALL | $GNUTAR xpf - )
   fi
 fi
+if test $SRCDIR/$OOO_EXTENSIONS_TARBALL; then
+   echo "Unpacking $OOO_EXTENSIONS_TARBALL..."
+    ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_EXTENSIONS_TARBALL | $GNUTAR xpf - )
+fi
 
 if test "$ENABLE_CCACHE" = "yes" ; then
     if test "$BUILDDIR/$CVSTAG" != "$OOBUILDDIR" ; then
@@ -617,12 +621,6 @@
   $GNUCP -a $SRCDIR/$LIBWPG_PACKAGE $OOBUILDDIR/libwpg/download/ || exit 1
 fi
 
-if test "$ENABLE_MEDIAWIKI" = "YES"; then
-  SWEXT_PACKAGE=$CVSTAG-swext.tar.bz2
-  check_tarball $SRCDIR/$SWEXT_PACKAGE
-  tar xfj $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR
-fi
-
 if test "$ENABLE_SCSOLVER" = "YES"; then
     # Unpack the scsolver package
     echo "Unpacking $SCSOLVER_PACKAGE"

Modified: branches/ooo-build-3-0/configure.in
==============================================================================
--- branches/ooo-build-3-0/configure.in	(original)
+++ branches/ooo-build-3-0/configure.in	Sun Sep 21 18:42:58 2008
@@ -3,7 +3,7 @@
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
 
-DEFAULT_TAG=ooo300-m5
+DEFAULT_TAG=ooo300-m6
 # For the upstream packages it is like:
 # DEFAULT_TAG=OOH680_m12
 
@@ -123,8 +123,8 @@
                           Usage: --with-mingwin=i586-mingw32msvc-g++
 ],,)
 
-AC_ARG_ENABLE(mediawiki,
-[  --disable-mediawiki    disables the build of the MediaWiki Editor extension
+AC_ARG_ENABLE(extensions,
+[  --enable-extensions    enables the unpacking of the extensions sources
 ],,)
 
 AC_ARG_ENABLE(scsolver,
@@ -1049,15 +1049,15 @@
 AC_MSG_RESULT([$mono_enabled])
 AC_SUBST(ENABLE_MONO)
 
-AC_MSG_CHECKING([whether to enable the mediawiki extension])
-if test "$enable_mediawiki" != "no" ; then
-    ENABLE_MEDIAWIKI=YES
+AC_MSG_CHECKING([whether to build extensions])
+if test "$enable_extensions" != "no" ; then
+    ENABLE_EXTENSIONS=YES
     AC_MSG_RESULT([yes])
 else
-    ENABLE_MEDIAWIKI=NO
+    ENABLE_EXTENSIONS=NO
     AC_MSG_RESULT([no])
 fi
-AC_SUBST(ENABLE_MEDIAWIKI)
+AC_SUBST(ENABLE_EXTENSIONS)
 
 AC_MSG_CHECKING([whether to enable the Calc Solver extension])
 if test "$enable_scsolver" != "no" ; then
@@ -1083,11 +1083,11 @@
 fi
 
 # FIXME: ugly hack to apply a Linux and Win32 specific variants of a patch for swext sources
-if test "$ENABLE_MEDIAWIKI" = "YES" ; then
+if test "$ENABLE_EXTENSIONS" = "YES" ; then
     if test "$BUILD_WIN32" = "yes" ; then
-	ext_section=Win32OnlySwextFixes
+	ext_section=Win32OnlyExtensionFixes
     else
-	ext_section=Linux32OnlySwextFixes
+	ext_section=Linux32OnlyExtensionFixes
     fi
     if test -z "$OOO_ADDITIONAL_SECTIONS" ; then
 	OOO_ADDITIONAL_SECTIONS="$ext_section"
@@ -1099,9 +1099,9 @@
 # FIXME: ugly hack to apply a Novell specific patch for swext sources
 if test "$VENDORNAME" = "Novell" -a "$ENABLE_MEDIAWIKI" = "YES" ; then
     if test -z "$OOO_ADDITIONAL_SECTIONS" ; then
-	OOO_ADDITIONAL_SECTIONS="NovellOnlySwextFixes"
+	OOO_ADDITIONAL_SECTIONS="NovellOnlyExtensionFixes"
     else
-	OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,NovellOnlySwextFixes"
+	OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,NovellOnlyExtensionFixes"
     fi
 fi
 
@@ -1248,7 +1248,7 @@
    UPSTREAM_VERSION=2.4.0
 elif test "$with_tag" = "BEB300_m3" ; then
    UPSTREAM_VERSION=3.0.0beta2
-elif test "$with_tag" = "OOO300_m4" ; then
+elif test "$with_tag" = "OOO300_m7" ; then
    UPSTREAM_VERSION=3.0.0
 fi
 if test -n "$UPSTREAM_VERSION"; then

Modified: branches/ooo-build-3-0/distro-configs/Common.conf.in
==============================================================================
--- branches/ooo-build-3-0/distro-configs/Common.conf.in	(original)
+++ branches/ooo-build-3-0/distro-configs/Common.conf.in	Sun Sep 21 18:42:58 2008
@@ -4,5 +4,3 @@
 --with-use-shell=bash
 --without-gpc
 --without-agg
---enable-presenter-screen
---disable-report-builder

Modified: branches/ooo-build-3-0/download.in
==============================================================================
--- branches/ooo-build-3-0/download.in	(original)
+++ branches/ooo-build-3-0/download.in	Sun Sep 21 18:42:58 2008
@@ -292,8 +292,8 @@
     push @files, ( source_file( "core" ) );
 }
 
-if ('@ENABLE_MEDIAWIKI@' eq 'YES') {
-   push @files, ( source_file( "swext" ) );
+if ('@ENABLE_EXTENSIONS@' eq 'YES') {
+   push @files, ( source_file( "extensions" ) );
 }
 
 push @files, ( '@OOO_CUSTOM_IMAGES@') if '@OOO_CUSTOM_IMAGES@';

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Sun Sep 21 18:42:58 2008
@@ -34,7 +34,7 @@
 DebianLooseSections: DebianBaseNoHelpContent, DebianBaseSystemJFreeReport, \
 	             DebianBaseSystemApacheCommons, DebianBaseSystemLucene
 # Optional sections
-Optional : DejaVuFonts, NovellOnlySwextFixes, Win32OnlySwextFixes, Linux32OnlySwextFixes
+Optional : DejaVuFonts, NovellOnlyExtensionFixes, Win32OnlyExtensionFixes, Linux32OnlyExtensionFixes
 # Binfilter patches: a special distro; applied only when building with binfilter
 Binfilter : BFBuildBits, BFFixes, BFShrink
 # System patches: a special distro; applied only when building with the system tarball unpacked
@@ -47,7 +47,7 @@
 Localize : LocalizeLayout, LocalizeFixes
 # patches touching swext which is not in the OpenOffice2 alias yet.
 # FIXME: Get this cleaned up
-swext : swextFixes
+Extensions : ExtensionFixes
 
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
@@ -364,15 +364,23 @@
 libwpd.diff, fridrich
 writerperfect-nocondensedparagraphs.diff, fridrich
 
+offapi-typecheck-whitelist.diff, thorsten
+
+# ensure macros are imported ( not as comments ) for calc
+vba-default-enable-calcmacros.diff
+
+[ FixesNotForUpstream ]
 # no bogus license question when registering these extensions
 #solenv-no-extension-license.diff
+[ FixesNotForUpstream < ooo300-m4 ]
+reportdesigner-no-license-m3.diff
+[ FixesNotForUpstream < ooo300-m6 ]
+reportdesigner-no-license-m5.diff
+[ ExtensionFixes >= ooo300-m6 ]
 reportdesigner-no-license.diff
+[ ExtensionFixes ]
 presentation-minimizer-no-license.diff
 presenterscreen-no-license.diff
-offapi-typecheck-whitelist.diff, thorsten
-
-# ensure macros are imported ( not as comments ) for calc
-vba-default-enable-calcmacros.diff
 
 [ FixesNotForUpstream < ooo300-m3 ]
 pdfimport-no-license-m2.diff
@@ -380,14 +388,14 @@
 [ FixesNotForUpstream >= ooo300-m3 < ooo300-m6 ]
 pdfimport-no-license-m5.diff
 
-[ FixesNotForUpstream >= ooo300-m6 ]
+[ ExtensionFixes >= ooo300-m6 ]
 pdfimport-no-license.diff
 
-[ swextFixes ]
+[ ExtensionFixes ]
 wiki-publisher-no-license.diff
 build-java-target-swext.diff, i#93115, pmladek
 
-[ NovellOnlySwextFixes ]
+[ NovellOnlyExtensionFixes ]
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6.diff
 build-ant-1.6-swext.diff, i#90830, pmladek
@@ -1941,7 +1949,11 @@
 gstreamer-sd.diff
 gstreamer-scp2.diff
 gstreamer-config-office.diff
+[ GStreamer < ooo300-m7 ]
+gstreamer-slideshow-m6.diff
+[ GStreamer >= ooo300-m7 ]
 gstreamer-slideshow.diff
+[ GStreamer ]
 gstreamer-solenv.diff
 gstreamer-svtools-content-types.diff
 gstreamer-avmedia-file-types.diff
@@ -2643,7 +2655,7 @@
 [ Fixes == dev300-m30 == ooo300-m3 ]
 pdfimport-system-poppler-m30.diff, i#92920, cmc
 pdfimport-lax-restrictions.diff, i#90468, thorsten
-[ Fixes >= dev300-m31 >= ooo300-m4 ]
+[ ExtensionFixes >= dev300-m31 >= ooo300-m4 ]
 pdfimport-system-poppler.diff, i#92920, cmc
 pdfimport-lax-restrictions.diff, i#90468, thorsten
 

Copied: branches/ooo-build-3-0/patches/dev300/reportdesigner-no-license-m5.diff (from r13933, /branches/ooo-build-3-0/patches/dev300/reportdesigner-no-license.diff)
==============================================================================
--- /branches/ooo-build-3-0/patches/dev300/reportdesigner-no-license.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/reportdesigner-no-license-m5.diff	Sun Sep 21 18:42:58 2008
@@ -3,8 +3,8 @@
 RCS file: /cvs/dba/reportdesign/util/description.xml,v
 retrieving revision 1.4
 diff -u -u -r1.4 description.xml
---- reportdesign/util/description.xml	6 Jun 2008 08:04:51 -0000	1.4
-+++ reportdesign/util/description.xml	16 Jun 2008 15:02:24 -0000
+--- reportbuilder/util/description.xml	6 Jun 2008 08:04:51 -0000	1.4
++++ reportbuilder/util/description.xml	16 Jun 2008 15:02:24 -0000
 @@ -6,11 +6,6 @@
      <name lang="en-US">Sunâ Report Builder</name>
      <!-- <name lang="en-US">Sun(TM) Report Builder</name> -->

Modified: branches/ooo-build-3-0/patches/dev300/reportdesigner-no-license.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/reportdesigner-no-license.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/reportdesigner-no-license.diff	Sun Sep 21 18:42:58 2008
@@ -3,14 +3,14 @@
 RCS file: /cvs/dba/reportdesign/util/description.xml,v
 retrieving revision 1.4
 diff -u -u -r1.4 description.xml
---- reportdesign/util/description.xml	6 Jun 2008 08:04:51 -0000	1.4
-+++ reportdesign/util/description.xml	16 Jun 2008 15:02:24 -0000
+--- reportbuilder/util/description.xml	6 Jun 2008 08:04:51 -0000	1.4
++++ reportbuilder/util/description.xml	16 Jun 2008 15:02:24 -0000
 @@ -6,11 +6,6 @@
      <name lang="en-US">Sunâ Report Builder</name>
      <!-- <name lang="en-US">Sun(TM) Report Builder</name> -->
    </display-name>
 -  <registration>
--    <simple-license accept-by="admin" default-license-id="en-US" >
+-    <simple-license accept-by="admin" default-license-id="lic-en-US" >
 -            <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
 -    </simple-license>
 -  </registration>

Modified: branches/ooo-build-3-0/patches/gstreamer/gstreamer-slideshow.diff
==============================================================================
--- branches/ooo-build-3-0/patches/gstreamer/gstreamer-slideshow.diff	(original)
+++ branches/ooo-build-3-0/patches/gstreamer/gstreamer-slideshow.diff	Sun Sep 21 18:42:58 2008
@@ -27,8 +27,8 @@
  							aDeviceParams[ 0 ] >>= aImplName;
  						
  							if( aImplName.endsWithIgnoreAsciiCaseAsciiL( 
--                                    RTL_CONSTASCII_STRINGPARAM("VCLCanvas") ))
-+                                    RTL_CONSTASCII_STRINGPARAM("VCLCanvas") ) || aImplName.endsWithIgnoreAsciiCaseAsciiL( 
+-                                    RTL_CONSTASCII_STRINGPARAM("VCL") ))
++                                    RTL_CONSTASCII_STRINGPARAM("VCL") ) || aImplName.endsWithIgnoreAsciiCaseAsciiL( 
 +                                    RTL_CONSTASCII_STRINGPARAM("CairoCanvas") ) )
                              {
  								implInitializeVCLBasedPlayerWindow( rBounds, aDeviceParams );
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]