ooo-build r14064 - in trunk: . bin bin/piece distro-configs patches/dev300 patches/gstreamer
- From: pmladek svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14064 - in trunk: . bin bin/piece distro-configs patches/dev300 patches/gstreamer
- Date: Wed, 24 Sep 2008 18:11:39 +0000 (UTC)
Author: pmladek
Date: Wed Sep 24 18:11:38 2008
New Revision: 14064
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14064&view=rev
Log:
2008-09-24 Petr Mladek <pmladek suse cz>
* just ported the below Rene's changes from ooo-build-3-0 branch;
so all thanks should go to Rene
* 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
* patches/dev300/apply,
patches/dev300/pdfimport-no-license-m5.diff,
patches/dev300/pdfimport-no-license.diff: ooo300-m6
* patches/dev300/apply: win32-mergemodule-pm.diff not needed in
m6.
Added:
trunk/patches/dev300/pdfimport-no-license-m5.diff
trunk/patches/dev300/reportdesigner-no-license-m3.diff
trunk/patches/dev300/reportdesigner-no-license-m5.diff
trunk/patches/gstreamer/gstreamer-slideshow-m6.diff
Modified:
trunk/ChangeLog
trunk/bin/applyflags
trunk/bin/localize-ooo
trunk/bin/modules2.txt
trunk/bin/piece/build-generic
trunk/bin/setup.in
trunk/bin/src-pack
trunk/bin/unpack
trunk/configure.in
trunk/distro-configs/Common.conf.in
trunk/download.in
trunk/patches/dev300/apply
trunk/patches/dev300/reportdesigner-no-license.diff
trunk/patches/gstreamer/gstreamer-slideshow.diff
Modified: trunk/bin/applyflags
==============================================================================
--- trunk/bin/applyflags (original)
+++ trunk/bin/applyflags Wed Sep 24 18:11:38 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: trunk/bin/localize-ooo
==============================================================================
--- trunk/bin/localize-ooo (original)
+++ trunk/bin/localize-ooo Wed Sep 24 18:11:38 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: trunk/bin/modules2.txt
==============================================================================
--- trunk/bin/modules2.txt (original)
+++ trunk/bin/modules2.txt Wed Sep 24 18:11:38 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: trunk/bin/piece/build-generic
==============================================================================
--- trunk/bin/piece/build-generic (original)
+++ trunk/bin/piece/build-generic Wed Sep 24 18:11:38 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: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in (original)
+++ trunk/bin/setup.in Wed Sep 24 18:11:38 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: trunk/bin/src-pack
==============================================================================
--- trunk/bin/src-pack (original)
+++ trunk/bin/src-pack Wed Sep 24 18:11:38 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: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack (original)
+++ trunk/bin/unpack Wed Sep 24 18:11:38 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: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Wed Sep 24 18:11:38 2008
@@ -129,8 +129,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,
@@ -1082,15 +1082,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
@@ -1116,11 +1116,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"
@@ -1132,9 +1132,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
@@ -1286,7 +1286,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: trunk/distro-configs/Common.conf.in
==============================================================================
--- trunk/distro-configs/Common.conf.in (original)
+++ trunk/distro-configs/Common.conf.in Wed Sep 24 18:11:38 2008
@@ -4,5 +4,3 @@
--with-use-shell=bash
--without-gpc
--without-agg
---enable-presenter-console
---disable-report-builder
Modified: trunk/download.in
==============================================================================
--- trunk/download.in (original)
+++ trunk/download.in Wed Sep 24 18:11:38 2008
@@ -305,8 +305,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: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Wed Sep 24 18:11:38 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 : 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, \
@@ -366,11 +366,6 @@
libwpd.diff, fridrich
writerperfect-nocondensedparagraphs.diff, fridrich
-# no bogus license question when registering these extensions
-#solenv-no-extension-license.diff
-reportdesigner-no-license.diff
-presentation-minimizer-no-license.diff
-presenterscreen-no-license.diff
offapi-typecheck-whitelist.diff, thorsten
# ensure macros are imported ( not as comments ) for calc
@@ -380,18 +375,34 @@
# if the cursor is not in the macro then it should
# raise the macro chooser dialog
vba-ide-choose-macro-to-run.diff, noelpwer
+# 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
[ FixesNotForUpstream < ooo300-m3 ]
pdfimport-no-license-m2.diff
-[ FixesNotForUpstream >= ooo300-m3 ]
+[ FixesNotForUpstream >= ooo300-m3 < ooo300-m6 ]
+pdfimport-no-license-m5.diff
+
+[ 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
@@ -1946,7 +1957,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
@@ -2625,9 +2640,10 @@
[ Fixes <= dev300-m30 <= ooo300-m3 ]
win32-mergemodule-pm-m30.diff, i#93065, tml
-[ Fixes > dev300-m30 > ooo300-m3 ]
+[ Fixes > dev300-m30 > ooo300-m3 < ooo300-m6 ]
win32-mergemodule-pm.diff, tml
+
[ Fixes ]
svtools-update-ole.diff, n#411855, thorsten
vcl-logical-bmp-size.diff, i#92902, thorsten
@@ -2638,7 +2654,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
Added: trunk/patches/dev300/pdfimport-no-license-m5.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/pdfimport-no-license-m5.diff Wed Sep 24 18:11:38 2008
@@ -0,0 +1,20 @@
+Index: source/pdfimport/config/description.xml
+===================================================================
+RCS file: /cvs/framework/sdext/source/pdfimport/config/description.xml,v
+retrieving revision 1.1.4.2
+diff -u -u -r1.1.4.2 description.xml
+--- sdext/source/pdfimport/config/description.xml 23 Jan 2008 15:16:33 -0000 1.1.4.2
++++ sdext/source/pdfimport/config/description.xml 5 Apr 2008 14:26:25 -0000
+@@ -10,12 +10,6 @@
+ <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
+ </dependencies>
+
+- <registration>
+- <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>
+-
+ <version value="0.3" />
+
+ <platform value="UPDATED_SUPPORTED_PLATFORM" />
Added: trunk/patches/dev300/reportdesigner-no-license-m3.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/reportdesigner-no-license-m3.diff Wed Sep 24 18:11:38 2008
@@ -0,0 +1,19 @@
+Index: util/description.xml
+===================================================================
+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
+@@ -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" >
+- <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
+- </simple-license>
+- </registration>
+ <version value="1.0.5"/>
+ <identifier value="com.sun.reportdesigner"/>
+ <dependencies>
Added: trunk/patches/dev300/reportdesigner-no-license-m5.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/reportdesigner-no-license-m5.diff Wed Sep 24 18:11:38 2008
@@ -0,0 +1,19 @@
+Index: util/description.xml
+===================================================================
+RCS file: /cvs/dba/reportdesign/util/description.xml,v
+retrieving revision 1.4
+diff -u -u -r1.4 description.xml
+--- 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" >
+- <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
+- </simple-license>
+- </registration>
+ <version value="1.0.5"/>
+ <identifier value="com.sun.reportdesigner"/>
+ <dependencies>
Modified: trunk/patches/dev300/reportdesigner-no-license.diff
==============================================================================
--- trunk/patches/dev300/reportdesigner-no-license.diff (original)
+++ trunk/patches/dev300/reportdesigner-no-license.diff Wed Sep 24 18:11:38 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>
Added: trunk/patches/gstreamer/gstreamer-slideshow-m6.diff
==============================================================================
--- (empty file)
+++ trunk/patches/gstreamer/gstreamer-slideshow-m6.diff Wed Sep 24 18:11:38 2008
@@ -0,0 +1,115 @@
+diff -rup slideshow-orig/source/engine/viewmediashape.cxx slideshow/source/engine/viewmediashape.cxx
+--- slideshow-orig/source/engine/shapes/viewmediashape.cxx 2006-08-17 16:15:39.000000000 +0200
++++ slideshow/source/engine/shapes/viewmediashape.cxx 2006-08-17 17:26:09.000000000 +0200
+@@ -48,6 +48,9 @@
+ #include <vcl/window.hxx>
+ #include <vcl/javachild.hxx>
+ #include <vcl/salbtype.hxx>
++#ifdef GSTREAMER
++#include <vcl/sysdata.hxx>
++#endif
+
+ #include <basegfx/tools/canvastools.hxx>
+ #include <basegfx/numeric/ftools.hxx>
+@@ -182,7 +193,11 @@ namespace presentation
+ mxPlayerWindow.clear();
+ }
+
++#ifdef GSTREAMER
++ mpMediaWindow = ::std::auto_ptr< SystemChildWindow >();
++#else
+ mpMediaWindow = ::std::auto_ptr< JavaChildWindow >();
++#endif
+
+ // shutdown player
+ if( mxPlayer.is() )
+@@ -311,7 +326,8 @@ namespace presentation
+ aDeviceParams[ 0 ] >>= aImplName;
+
+ if( aImplName.endsWithIgnoreAsciiCaseAsciiL(
+- RTL_CONSTASCII_STRINGPARAM("VCLCanvas") ))
++ RTL_CONSTASCII_STRINGPARAM("VCLCanvas") ) || aImplName.endsWithIgnoreAsciiCaseAsciiL(
++ RTL_CONSTASCII_STRINGPARAM("CairoCanvas") ) )
+ {
+ implInitializeVCLBasedPlayerWindow( rBounds, aDeviceParams );
+ }
+@@ -424,6 +440,7 @@ namespace presentation
+ bool ViewMediaShape::implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds,
+ const uno::Sequence< uno::Any >& rVCLDeviceParams)
+ {
++ OSL_TRACE( "ViewMediaShape::implInitializeVCLBasedPlayerWindow" );
+ if( !mpMediaWindow.get() && !rBounds.isEmpty() )
+ {
+ try
+@@ -443,28 +460,46 @@ namespace presentation
+
+ if( !rRangePix.isEmpty() )
+ {
+- uno::Sequence< uno::Any > aArgs( 2 );
++ uno::Sequence< uno::Any > aArgs( 3 );
+ awt::Rectangle aAWTRect( rRangePix.getMinX(),
+ rRangePix.getMinY(),
+ rRangePix.getMaxX() - rRangePix.getMinX(),
+ rRangePix.getMaxY() - rRangePix.getMinY() );
+
++#ifdef GSTREAMER
++ OSL_TRACE( "created sys child window for viewmediashape" );
++ mpMediaWindow = ::std::auto_ptr< SystemChildWindow >( new SystemChildWindow( pWindow, WB_CLIPCHILDREN ) );
++#else
+ mpMediaWindow = ::std::auto_ptr< JavaChildWindow >( new JavaChildWindow( pWindow, WB_CLIPCHILDREN ) );
++#endif
+ mpMediaWindow->SetBackground( Color( COL_BLACK ) );
+ mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X,
+ aAWTRect.Y ),
+ Size( aAWTRect.Width,
+ aAWTRect.Height ));
++ mpMediaWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
++ mpMediaWindow->EnableEraseBackground( FALSE );
++ mpMediaWindow->EnablePaint( FALSE );
++ mpMediaWindow->SetForwardKey( TRUE );
++ mpMediaWindow->SetMouseTransparent( TRUE );
+ mpMediaWindow->Show();
+
+ if( mxPlayer.is() )
+ {
++#ifndef GSTREAMER
+ aArgs[ 0 ] = uno::makeAny(
+ sal::static_int_cast<sal_IntPtr>(
+ mpMediaWindow->getParentWindowHandleForJava()) );
+-
++#else
++ aArgs[ 0 ] = uno::makeAny ( (sal_Int32) 0 );
++#endif
+ aAWTRect.X = aAWTRect.Y = 0;
+ aArgs[ 1 ] = uno::makeAny( aAWTRect );
++#ifdef GSTREAMER
++ const SystemEnvData *pSystemData = mpMediaWindow->GetSystemData();
++ OSL_TRACE( "xwindow id: %ld", pSystemData->aWindow );
++ aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow );
++#endif
+
+ mxPlayerWindow.set( mxPlayer->createPlayerWindow( aArgs ) );
+
+diff -rup slideshow/source/inc-orig/viewmediashape.hxx slideshow/source/inc/viewmediashape.hxx
+--- slideshow/source/engine/shapes/viewmediashape.hxx 2006-08-18 13:45:47.000000000 +0200
++++ slideshow/source/engine/shapes/viewmediashape.hxx 2006-08-18 13:48:13.000000000 +0200
+@@ -49,6 +49,7 @@
+ #include <viewlayer.hxx>
+
+ class JavaChildWindow;
++class SystemChildWindow;
+
+ namespace com
+ {
+@@ -164,7 +165,11 @@ namespace presentation
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rDXDeviceParams );
+
+ ViewLayerSharedPtr mpViewLayer;
++#ifdef GSTREAMER
++ ::std::auto_ptr< SystemChildWindow > mpMediaWindow;
++#else
+ ::std::auto_ptr< JavaChildWindow > mpMediaWindow;
++#endif
+ mutable ::com::sun::star::awt::Point maWindowOffset;
+ mutable ::basegfx::B2DRectangle maBounds;
+
Modified: trunk/patches/gstreamer/gstreamer-slideshow.diff
==============================================================================
--- trunk/patches/gstreamer/gstreamer-slideshow.diff (original)
+++ trunk/patches/gstreamer/gstreamer-slideshow.diff Wed Sep 24 18:11:38 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]
