GNOME.org
 

ooo-build r14579 - in trunk: . bin distro-configs patches/dev300 src

Author: rengelhard
Date: Sun Nov 23 22:02:08 2008
New Revision: 14579
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14579&view=rev

Log:
2008-11-23  Rene Engelhard  <rene debian org>

   * patches/dev300/xmlhelp-system-lucene-fix.diff,
     patches/dev300/reportdesign-mention-package.diff
     patches/dev300/unxsplash-rework.diff
     patches/dev300/soffice-detect-mozilla-certificates.diff
     patches/dev300/apply
     patches/dev300/sensible-browser.diff
     patches/dev300/extensions-system-java.diff
     patches/dev300/Makefile.am
     patches/dev300/no-latex-filter-without-writer2latex.diff
     patches/dev300/cwscheckapi-envset.diff
     patches/dev300/system-python-ure-bootstrap.diff.in
     patches/dev300/pyuno-rpath-ooodir.diff.in
     src/Makefile.am, bin/oosmoketest.in, bin/src-pack
     bin/setup.in, bin/unpack, bin/ootestapi.in, configure.in
     ChangeLog, distro-configs/Debian*in, distro-configs/Ubuntu*in: merge my
     and hmths system-java changes from ooo-build-3-0 branch


Added:
   trunk/patches/dev300/cwscheckapi-envset.diff
   trunk/patches/dev300/extensions-system-java.diff
   trunk/patches/dev300/no-latex-filter-without-writer2latex.diff
   trunk/patches/dev300/pyuno-rpath-ooodir.diff.in
   trunk/patches/dev300/system-python-ure-bootstrap.diff.in
   trunk/patches/dev300/xmlhelp-system-lucene-fix.diff
Modified:
   trunk/ChangeLog
   trunk/bin/oosmoketest.in
   trunk/bin/ootestapi.in
   trunk/bin/setup.in
   trunk/bin/src-pack
   trunk/bin/unpack
   trunk/configure.in
   trunk/distro-configs/Debian.conf.in
   trunk/distro-configs/DebianEtch.conf.in
   trunk/distro-configs/DebianSarge.conf.in
   trunk/distro-configs/Ubuntu.conf.in
   trunk/distro-configs/Ubuntu64.conf.in
   trunk/distro-configs/UbuntuDapper.conf.in
   trunk/distro-configs/UbuntuDapper64.conf.in
   trunk/distro-configs/UbuntuGutsy.conf.in
   trunk/distro-configs/UbuntuGutsy64.conf.in
   trunk/distro-configs/UbuntuHardy.conf.in
   trunk/distro-configs/UbuntuHardy64.conf.in
   trunk/distro-configs/UbuntuIntrepid.conf.in
   trunk/distro-configs/UbuntuIntrepid64.conf.in
   trunk/distro-configs/UbuntuJaunty.conf.in
   trunk/distro-configs/UbuntuJaunty64.conf.in
   trunk/distro-configs/UbuntuL10n.conf.in
   trunk/patches/dev300/Makefile.am
   trunk/patches/dev300/apply
   trunk/patches/dev300/reportdesign-mention-package.diff
   trunk/patches/dev300/sensible-browser.diff
   trunk/patches/dev300/soffice-detect-mozilla-certificates.diff
   trunk/patches/dev300/unxsplash-rework.diff
   trunk/src/Makefile.am

Modified: trunk/bin/oosmoketest.in
==============================================================================
--- trunk/bin/oosmoketest.in	(original)
+++ trunk/bin/oosmoketest.in	Sun Nov 23 22:02:08 2008
@@ -1,14 +1,16 @@
 #!/bin/sh
 
 GUI="UNX"
-TEMP="/tmp"
+TEMP="`mktemp -q -d`"
 PERL="/usr/bin/perl"
 OOINSTBASE="@OOINSTBASE@"
-OOUSERDIR="$HOME/.openoffice.org2"
+OOUSERDIR="$HOME/.openoffice.org/3"
 
 export GUI TEMP PERL OOINSTBASE OOUSERDIR
 
-test -d "$OOUSERDIR/user/basic" && cp -r "$OOINSTBASE/presets/basic/Standard" "$OOUSERDIR/user/basic"
+test -d "$OOUSERDIR/user/basic" && cp -r "$OOINSTBASE/basis-link/presets/basic/Standard" "$OOUSERDIR/user/basic"
 
-cd "$OOINSTBASE/smoketest"
+cd "$OOINSTBASE/basis-link/smoketest"
 $PERL smoketest.pl
+rm -rf $TEMP
+

Modified: trunk/bin/ootestapi.in
==============================================================================
--- trunk/bin/ootestapi.in	(original)
+++ trunk/bin/ootestapi.in	Sun Nov 23 22:02:08 2008
@@ -1,8 +1,10 @@
 #!/bin/sh
 
-JARS= OOINSTBASE@/program/classes
-LD_LIBRARY_PATH="@OOINSTBASE@/program:$LD_LIBRARY_PATH"
-CLASSPATH= OOINSTBASE@/program/classes/OOoRunnerLight.jar:$JARS/ridl.jar:$JARS/unoil.jar:$JARS/sandbox.jar:$JARS/jurt.jar:$JARS/juh.jar:%JARS/java_uno.jar:@LIBDIRBASE@/openoffice/qadevOOo/tests/java
+JARS= OOINSTBASE@/basis-link/program/classes
+LD_LIBRARY_PATH="@OOINSTBASE@/basis-link/program:$LD_LIBRARY_PATH"
+CLASSPATH= OOINSTBASE@/basis-link/program/classes/OOoRunnerLight.jar:$JARS/ridl
+.jar:$JARS/unoil.jar:$JARS/sandbox.jar:$JARS/jurt.jar:$JARS/juh.jar:%JARS/java_u
+no.jar:@LIBDIRBASE@/basis-link/openoffice/qadevOOo/tests/java
 
 export LD_LIBRARY_PATH
 java -Xmx120m -cp $CLASSPATH org.openoffice.Runner "$@"

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Sun Nov 23 22:02:08 2008
@@ -227,14 +227,12 @@
     OOO_SYSTEM_TARBALL="${UPSTREAM_NAME}_system.tar.bz2"
     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=""

Modified: trunk/bin/src-pack
==============================================================================
--- trunk/bin/src-pack	(original)
+++ trunk/bin/src-pack	Sun Nov 23 22:02:08 2008
@@ -80,10 +80,6 @@
 tar $tar_opts -f $dest/$src-binfilter.tar.bz2 $src/binfilter || exit 1;
 rm -Rf $src/binfilter || exit 1;
 
-echo "Packing sdk_oo ...";
-tar $tar_opts -f $dest/$src-sdk_oo.tar.bz2 $src/sdk_oo || exit 1;
-rm -Rf $src/sdk_oo || exit 1;
-
 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;

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Sun Nov 23 22:02:08 2008
@@ -208,11 +208,6 @@
     ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_LANG_TARBALL | $GNUTAR xpf - )
 fi
 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
   if test -f $SRCDIR/$OOO_EXTENSIONS_TARBALL; then
      echo "Unpacking $OOO_EXTENSIONS_TARBALL..."
       ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_EXTENSIONS_TARBALL | $GNUTAR xpf - )

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Nov 23 22:02:08 2008
@@ -1302,7 +1302,7 @@
    UPSTREAM_VERSION=2.4.0
 elif test "$with_tag" = "BEB300_m3" ; then
    UPSTREAM_VERSION=3.0.0beta2
-elif test "$with_tag" = "OOO300_m7" ; then
+elif test "$with_tag" = "OOO300_m9" ; then
    UPSTREAM_VERSION=3.0.0
 fi
 if test -n "$UPSTREAM_VERSION"; then
@@ -1352,6 +1352,8 @@
 Makefile
 bin/setup
 bin/Makefile
+patches/dev300/pyuno-rpath-ooodir.diff
+patches/dev300/system-python-ure-bootstrap.diff
 bin/piece/sys-setup
 bin/piece/Makefile
 desktop/Makefile

Modified: trunk/distro-configs/Debian.conf.in
==============================================================================
--- trunk/distro-configs/Debian.conf.in	(original)
+++ trunk/distro-configs/Debian.conf.in	Sun Nov 23 22:02:08 2008
@@ -14,3 +14,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/DebianEtch.conf.in
==============================================================================
--- trunk/distro-configs/DebianEtch.conf.in	(original)
+++ trunk/distro-configs/DebianEtch.conf.in	Sun Nov 23 22:02:08 2008
@@ -17,3 +17,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/DebianSarge.conf.in
==============================================================================
--- trunk/distro-configs/DebianSarge.conf.in	(original)
+++ trunk/distro-configs/DebianSarge.conf.in	Sun Nov 23 22:02:08 2008
@@ -17,3 +17,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/Ubuntu.conf.in
==============================================================================
--- trunk/distro-configs/Ubuntu.conf.in	(original)
+++ trunk/distro-configs/Ubuntu.conf.in	Sun Nov 23 22:02:08 2008
@@ -18,3 +18,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/Ubuntu64.conf.in
==============================================================================
--- trunk/distro-configs/Ubuntu64.conf.in	(original)
+++ trunk/distro-configs/Ubuntu64.conf.in	Sun Nov 23 22:02:08 2008
@@ -18,3 +18,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/UbuntuDapper.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuDapper.conf.in	(original)
+++ trunk/distro-configs/UbuntuDapper.conf.in	Sun Nov 23 22:02:08 2008
@@ -18,3 +18,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/UbuntuDapper64.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuDapper64.conf.in	(original)
+++ trunk/distro-configs/UbuntuDapper64.conf.in	Sun Nov 23 22:02:08 2008
@@ -18,3 +18,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/UbuntuGutsy.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuGutsy.conf.in	(original)
+++ trunk/distro-configs/UbuntuGutsy.conf.in	Sun Nov 23 22:02:08 2008
@@ -17,3 +17,4 @@
 --enable-pam-link
 --with-dynamic-xinerama
 --enable-xsltproc
+--with-linker-hash-style=both

Modified: trunk/distro-configs/UbuntuGutsy64.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuGutsy64.conf.in	(original)
+++ trunk/distro-configs/UbuntuGutsy64.conf.in	Sun Nov 23 22:02:08 2008
@@ -17,3 +17,4 @@
 --enable-pam-link
 --with-dynamic-xinerama
 --enable-xsltproc
+--with-linker-hash-style=both

Modified: trunk/distro-configs/UbuntuHardy.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuHardy.conf.in	(original)
+++ trunk/distro-configs/UbuntuHardy.conf.in	Sun Nov 23 22:02:08 2008
@@ -15,3 +15,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/UbuntuHardy64.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuHardy64.conf.in	(original)
+++ trunk/distro-configs/UbuntuHardy64.conf.in	Sun Nov 23 22:02:08 2008
@@ -15,3 +15,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/UbuntuIntrepid.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuIntrepid.conf.in	(original)
+++ trunk/distro-configs/UbuntuIntrepid.conf.in	Sun Nov 23 22:02:08 2008
@@ -15,3 +15,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/UbuntuIntrepid64.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuIntrepid64.conf.in	(original)
+++ trunk/distro-configs/UbuntuIntrepid64.conf.in	Sun Nov 23 22:02:08 2008
@@ -15,3 +15,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/UbuntuJaunty.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuJaunty.conf.in	(original)
+++ trunk/distro-configs/UbuntuJaunty.conf.in	Sun Nov 23 22:02:08 2008
@@ -15,3 +15,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/UbuntuJaunty64.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuJaunty64.conf.in	(original)
+++ trunk/distro-configs/UbuntuJaunty64.conf.in	Sun Nov 23 22:02:08 2008
@@ -15,3 +15,4 @@
 --with-dynamic-xinerama
 --enable-xsltproc
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/distro-configs/UbuntuL10n.conf.in
==============================================================================
--- trunk/distro-configs/UbuntuL10n.conf.in	(original)
+++ trunk/distro-configs/UbuntuL10n.conf.in	Sun Nov 23 22:02:08 2008
@@ -19,3 +19,4 @@
 --enable-xsltproc
 --disable-qadevooo
 --disable-access
+--with-linker-hash-style=both

Modified: trunk/patches/dev300/Makefile.am
==============================================================================
--- trunk/patches/dev300/Makefile.am	(original)
+++ trunk/patches/dev300/Makefile.am	Sun Nov 23 22:02:08 2008
@@ -1,4 +1,4 @@
-EXTRA_DIST = apply ${wildcard *.diff}
+EXTRA_DIST = apply ${wildcard *.diff*}
 
 patch.apply:
 	cd ../.. ; make patch.apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun Nov 23 22:02:08 2008
@@ -400,6 +400,8 @@
 [ ExtensionFixes ]
 presentation-minimizer-no-license.diff
 presenterscreen-no-license.diff
+# extensions: fix & unbundle system java
+extensions-system-java.diff, hmth
 
 [ FixesNotForUpstream < ooo300-m3 ]
 pdfimport-no-license-m2.diff
@@ -655,6 +657,8 @@
 # fix bitmap reading; the lines are aliased to 4 bytes
 unxsplash-bmp-alias.diff, i#60696, jholesov
 
+[ Fixes ]
+cwscheckapi-envset.diff, i#95204
 
 [ WriterFixes ]
 # Allows to copy/paste html text which is between 2 unknown tags.
@@ -994,7 +998,6 @@
 
 sensible-ooomua.diff
 sensible-browser.diff
-pyuno-rpath-ooodir.diff
 default-cairo-disable.diff
 gcj-32bit-runtime-path.diff, i#64888, mklose
 # remove mozilla plug-in option completely since we enable it per default
@@ -1301,6 +1304,10 @@
 # FIXME: is anybody using this feature?
 #FIXME src680: separate-helpcontent.diff, jholesov
 
+# use --hash-style=gnu linking when supported
+# disabled for Debian as Debian policy (for now) is to use=both
+speed-hash-style.diff, pmladek
+
 # bind all those function / named relocations locally
 speed-symbolic-functions.diff, i#85679, pmladek
 
@@ -1365,6 +1372,9 @@
 # Mozilla build-bits to not break on Solaris 11
 moz-solaris11-makefiles.diff, fridrich
 
+pyuno-rpath-ooodir.diff
+system-python-ure-bootstrap.diff, deb#501028, i#90701
+
 [ DejaVuFonts ]
 
 # Following the changed names of DejaVu fonts
@@ -1403,6 +1413,7 @@
 # use getopt() and readdir_r() from system glibc
 #FIXME src680: system-libc.diff, i#69033, rengelha
 
+xmlhelp-system-lucene-fix.diff
 
 [ TangoIcons ]
 # default to large icons in the toolbar
@@ -2788,6 +2799,9 @@
 [ NovellOnlyWin32 ]
 i92372.diff, i#92372, n#353143, tml
 
+[ SystemBuildBits < dev300-m36 ]
+no-latex-filter-without-writer2latex.diff, i#93520
+
 [ Fixes ]
 #sw-import-TOC.diff ,n#404254, Amelia Wang
 gnome-fpicker-transient-win.diff, i#92878, cmc

Added: trunk/patches/dev300/cwscheckapi-envset.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/cwscheckapi-envset.diff	Sun Nov 23 22:02:08 2008
@@ -0,0 +1,16 @@
+Index: cwscheckapi
+===================================================================
+RCS file: /cvs/tools/solenv/bin/cwscheckapi,v
+retrieving revision 1.3.36.1
+diff -u -r1.3.36.1 cwscheckapi
+--- solenv/bin/cwscheckapi     14 Aug 2008 12:52:20 -0000      1.3.36.1
++++ solenv/bincwscheckapi      20 Oct 2008 11:53:11 -0000
+@@ -163,7 +163,7 @@
+ PARAM="$PARAM -cmd '$OFFICEBIN  -nofirststartwizard -no-oosplash -norestore -nocrashreport -nolockcheck -accept=pipe,name=$USER;urp;'"
+ PARAM="$PARAM -cs pipe,name=$USER"
+ PARAM="$PARAM -NoOffice true"
+-PARAM="$PARAM -OOO_EnvSet setsolar"
++PARAM="$PARAM -OOO_EnvSet $SRC_ROOT/*Env.Set"
+ PARAM="$PARAM -SRC_ROOT $SRC_ROOT"
+ PARAM="$PARAM -COMP_ENV $INPATH"
+ PARAM="$PARAM -Shell /usr/bin/tcsh"

Added: trunk/patches/dev300/extensions-system-java.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/extensions-system-java.diff	Sun Nov 23 22:02:08 2008
@@ -0,0 +1,107 @@
+--- reportbuilder/java/com/sun/star/report/pentaho/makefile.mk.orig	2008-10-03 11:07:32.000000000 +0200
++++ reportbuilder/java/com/sun/star/report/pentaho/makefile.mk	2008-10-03 11:39:11.000000000 +0200
+@@ -41,7 +41,8 @@
+ #----- compile .java files -----------------------------------------
+ JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar
+ .IF "$(SYSTEM_JFREEREPORT)" == "YES"
+-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(JCOMMON_SERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)librepository-0.1.4.jar
++XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(FLUTE_JAR)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(JCOMMON_SERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)$(LIBREPOSITORY_JAR)
++COMP=fix_system_jfreereport
+ .ELSE
+ JARFILES += flute-1.3-jfree-20061107.jar jcommon-1.0.10.jar	jcommon-serializer-0.2.0.jar libfonts-0.3.3.jar libformula-0.1.14.jar liblayout-0.2.8.jar libloader-0.3.6.jar librepository-0.1.4.jar libxml-0.9.9.jar pentaho-reporting-flow-engine-0.9.2.jar sac.jar
+ .ENDIF
+@@ -90,9 +91,17 @@
+ .INCLUDE :  target.mk
+ 
+ .IF "$(JARTARGETN)"!=""
+-$(JARTARGETN) : $(PROPERTYFILES) $(CSSFILES) $(XSDFILES) $(TXTFILES) $(XMLFILES)
++$(JARTARGETN) : $(COMP) $(PROPERTYFILES) $(CSSFILES) $(XSDFILES) $(TXTFILES) $(XMLFILES)
+ .ENDIF          # "$(JARTARGETN)"!=""
+ 
++fix_system_jfreereport:
++	@echo "Fix Java Class-Path entry for JFree JFreeReport libraries from system."
++	@$(SED) '/flute/,/sac/d' -i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
++	@$(SED) -r -e "s#^Class-Path.*#\0\n  file://$(JCOMMON_JAR)\n  file://$(SAC_JAR)\n  file://$(LIBXML_JAR)\n\
++  file://$(FLUTE_JAR)\n  file://$(JFREEREPORT_JAR)\n  file://$(LIBLAYOUT_JAR)\n  file://$(LIBLOADER_JAR)\n  file://$(LIBFORMULA_JAR)\n\
++  file://$(LIBREPOSITORY_JAR)\n  file://$(LIBFONTS_JAR)\n  file://$(JCOMMON_SERIALIZER_JAR)#" \
++	-i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
++
+ $(CLASSDIR)$/$(PACKAGE)$/%.properties : %.properties
+ 	@@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+--- reportbuilder/util/makefile.mk.orig	2008-10-02 17:04:12.000000000 +0200
++++ reportbuilder/util/makefile.mk	2008-10-02 17:24:05.000000000 +0200
+@@ -68,6 +68,10 @@
+ 
+ # .jar files from solver
+ COMPONENT_EXTJARFILES = \
++	$(EXTENSIONDIR)$/sun-report-builder.jar \
++	$(EXTENSIONDIR)$/reportbuilderwizard.jar
++.IF "$(SYSTEM_JFREEREPORT)" != "YES"
++COMPONENT_EXTJARFILES+= \
+ 	$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar							\
+ 	$(EXTENSIONDIR)$/jcommon-1.0.10.jar										\
+ 	$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar							\
+@@ -78,9 +82,8 @@
+ 	$(EXTENSIONDIR)$/librepository-0.1.4.jar									\
+ 	$(EXTENSIONDIR)$/libxml-0.9.9.jar										\
+ 	$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar					\
+-	$(EXTENSIONDIR)$/sac.jar                                                \
+-	$(EXTENSIONDIR)$/sun-report-builder.jar \
+-	$(EXTENSIONDIR)$/reportbuilderwizard.jar
++	$(EXTENSIONDIR)$/sac.jar                                                
++.ENDIF
+ 
+ COMPONENT_MANIFEST_GENERIC:=TRUE
+ COMPONENT_MANIFEST_SEARCHDIR:=registry
+@@ -94,15 +97,9 @@
+ .INCLUDE : target.mk
+ .INCLUDE : extension_post.mk
+ 
+-.IF "$(SYSTEM_JFREEREPORT)" == "YES"
+-$(EXTENSIONDIR)$/%.jar : $(JFREEREPORT_JAR:d:d)$/%.jar
+-	@@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-.ELSE
+ $(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
+ 	@@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+-.ENDIF
+ 
+ $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
+ 	@@-$(MKDIRHIER) $(@:d)
+@@ -116,7 +113,7 @@
+ 	@@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ 
+-    .ELSE			# "$(SOLAR_JAVA)"!=""
++.ELSE			# "$(SOLAR_JAVA)"!=""
+ .INCLUDE : target.mk
+ .ENDIF			# "$(SOLAR_JAVA)"!=""
+-#
++
+--- swext/mediawiki/makefile.mk.orig	2008-10-03 01:15:51.000000000 +0200
++++ swext/mediawiki/makefile.mk	2008-10-03 01:22:34.000000000 +0200
+@@ -41,12 +41,21 @@
+ COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.3.jar
+ COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-httpclient-3.1.jar
+ COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.1.jar
++.ELSE
++COMP=fix_system_commons
+ .ENDIF
+ 
+ ANT_FLAGS+=-Dcommons-codec-jar=$(COMMONS_CODEC_JAR) -Dcommons-lang-jar=$(COMMONS_LANG_JAR) -Dcommons-httpclient-jar=$(COMMONS_HTTPCLIENT_JAR) -Dcommons-logging-jar=$(COMMONS_LOGGING_JAR)
+ 
+ # creates two files wiki-publisher.oxt and mediawiki_develop.zip, the second one might be used in further build process
+-ALLTAR: ANTBUILD
++ALLTAR: $(COMP) ANTBUILD
++
++fix_system_commons:
++	@echo "Fix Java Class-Path entry for Apache Commons libraries from system."
++	@$(SED) -r -e "s#(name=\"Class-Path\" value=\").*\"#\1file://$(COMMONS_CODEC_JAR) file://$(COMMONS_LANG_JAR) \
++file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" -i build.xml
++	@echo "Unbundle Apache Commons libraries from Mediawiki Presentation extension."
++	@$(SED) '/file="..commons/d' -i build.xml
+ 
+ .ELSE
+ @all:

Added: trunk/patches/dev300/no-latex-filter-without-writer2latex.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/no-latex-filter-without-writer2latex.diff	Sun Nov 23 22:02:08 2008
@@ -0,0 +1,32 @@
+--- filter/source/config/fragments/fcfg_writer.mk-old	2008-11-23 22:43:26.000000000 +0100
++++ filter/source/config/fragments/fcfg_writer.mk	2008-11-23 22:46:45.000000000 +0100
+@@ -31,9 +31,13 @@
+     writer_MS_Word_2003_XML \
+ 	writer_MS_Word_2007_XML \
+ 	writer_MS_Word_2007_XML_Template \
+-    MediaWiki_File \
++    MediaWiki_File
++
++.IF "$(WITH_WRITER2LATEX)" != "NO"
++T4_WRITER += \
+ 	LaTeX \
+ 	BibTeX
++.ENDIF
+ 
+ # -----------------------------------------------
+ # count = 39
+@@ -67,9 +71,13 @@
+     writer_web_MediaWiki_File \
+     MS_Word_2003_XML \
+ 	MS_Word_2007_XML \
+-	MS_Word_2007_XML_Template \
++	MS_Word_2007_XML_Template
++
++.IF "$(WITH_WRITER2LATEX)" != "NO"
++F4_WRITER += \
+ 	LaTeX_Writer \
+ 	BibTeX_Writer
++.ENDIF
+ 
+ # -----------------------------------------------
+ # count = 14

Added: trunk/patches/dev300/pyuno-rpath-ooodir.diff.in
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/pyuno-rpath-ooodir.diff.in	Sun Nov 23 22:02:08 2008
@@ -0,0 +1,16 @@
+Index: makefile.mk
+===================================================================
+RCS file: /cvs/udk/pyuno/source/module/makefile.mk,v
+retrieving revision 1.15
+diff -u -u -r1.15 makefile.mk
+--- pyuno/source/module/makefile.mk	15 Oct 2007 13:03:49 -0000	1.15
++++ pyuno/source/module/makefile.mk	24 Nov 2007 13:22:23 -0000
+@@ -121,7 +121,7 @@
+ .IF "$(GUI)" == "UNX"
+ $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
+ .IF "$(OS)" == "LINUX"
+-	@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
++	@echo $(LINK) -Wl,-z,combreloc $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) -Wl,-rpath,@libdir@/@OOOINSTALLDIRNAME@/basis-link/program $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
+ .ELIF "$(OS)" == "SOLARIS"
+ 	@echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
+ .ELIF "$(OS)" == "FREEBSD"

Modified: trunk/patches/dev300/reportdesign-mention-package.diff
==============================================================================
--- trunk/patches/dev300/reportdesign-mention-package.diff	(original)
+++ trunk/patches/dev300/reportdesign-mention-package.diff	Sun Nov 23 22:02:08 2008
@@ -32,7 +32,7 @@
                 Pos = MAP_APPFONT ( DLG_WIDTH / 2 + (CELL_PADDING/2), ACTION_LINE_START) ;
 --- dbaccess/source/ui/dlg/localize.sdf-old	2008-04-29 12:45:07.000000000 +0200
 +++ dbaccess/source/ui/dlg/localize.sdf	2008-04-29 12:47:49.000000000 +0200
-@@ -7279,50 +7279,8 @@
+@@ -7279,50 +7279,9 @@
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	vi	Tái ~vá...				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	zh-CN	äè(~D)...				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	zh-TW	äè(~D)...				2002-02-02 02:02:02
@@ -80,6 +80,7 @@
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	vi	Khá nÄng má bÃo cÃo nhá phán má ráng %RPT_EXTENSION_NAME.\n\nNhán vÃo  Tái vá...  Äá tái vá và cÃi Äát phán má ráng nÃy.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	zh-CN	äæåæèæéè %RPT_EXTENSION_NAME æåã\n\nèååâäè...âæäèååèèæåã				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	zh-TW	æéèææåèé %RPT_EXTENSION_NAME æèéååèã\n\nèæää [äè...] ääèååèæåèéã				2002-02-02 02:02:02
++dbaccess      source\ui\dlg\ExtensionNotPresent.src   0       string RID_STR_EXTENSION_NOT_PRESENT                           13691   cs      ProotevÅenà sestavy je potÅeba rozÅÃÅenà %RPT_EXTENSION_NAME.\n\nProsÃm nainstalujte si balÃk 'openoffice.org-report-builder'.							2002-02-02 02:02:02
 +dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	de	Zum Ãffnen eines Berichts wird die Erweiterung %RPT_EXTENSION_NAME benÃtigt.\n\nInstallieren Sie dafÃr das Paket 'openoffice.org-report-builder'.				2002-02-02 02:02:02
 +dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	fr	L'ouverture d'un rapport requiert l'extension %RPT_EXTENSION_NAME.\n\nPour cela, installez le package 'openoffice.org-report-builder'.				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\RelationDlg.src	0	fixedline	DLG_REL_PROPERTIES	FL_CASC_DEL			84	af	Skrapopsies				2002-02-02 02:02:02

Modified: trunk/patches/dev300/sensible-browser.diff
==============================================================================
--- trunk/patches/dev300/sensible-browser.diff	(original)
+++ trunk/patches/dev300/sensible-browser.diff	Sun Nov 23 22:02:08 2008
@@ -25,12 +25,16 @@
 diff -u -u -r1.2 kde-open-url.sh
 --- shell/source/unix/misc/kde-open-url.sh	10 May 2004 13:08:06 -0000	1.2
 +++ shell/source/unix/misc/kde-open-url.sh	6 Jun 2005 09:43:06 -0000
-@@ -51,9 +51,9 @@
+@@ -51,9 +51,13 @@
  
  # special handling for mailto: uris
  if echo $1 | grep '^mailto:' > /dev/null; then
 -  kmailservice "$1" &
-+  sensible-ooomua "$1" &
++  if which kde-open; then
++    kde-open "$1" &
++  else
++    mailservice "$1" &
++  fi
  else
 -  kfmclient openURL "$1" &
 +  sensible-browser "$1" &

Modified: trunk/patches/dev300/soffice-detect-mozilla-certificates.diff
==============================================================================
--- trunk/patches/dev300/soffice-detect-mozilla-certificates.diff	(original)
+++ trunk/patches/dev300/soffice-detect-mozilla-certificates.diff	Sun Nov 23 22:02:08 2008
@@ -5,7 +5,7 @@
 diff -u -u -r1.25 soffice.sh
 --- desktop/scripts/soffice.sh	5 Jul 2006 22:33:58 -0000	1.25
 +++ desktop/scripts/soffice.sh	9 Sep 2006 11:07:33 -0000
-@@ -189,6 +189,24 @@
+@@ -189,6 +189,29 @@
  OPENOFFICE_MOZILLA_FIVE_HOME="$sd_inst/program"
  export OPENOFFICE_MOZILLA_FIVE_HOME
  
@@ -18,7 +18,12 @@
 +		fi;
 +	done
 +	if [ -n "$dir" ]; then
-+		cert8=`find $dir -name "cert8.db" | head -n 1`
++		# In most case cert8.db will be in $dir/*/cert8.db.
++		# Test this first. Do a full search otherwise.
++		cert8=`find $dir -maxdepth 2 -name "cert8.db" | head -n 1`
++		if [ ! -n "$cert8" ]; then
++			cert8=`find $dir -name "cert8.db" | head -n 1`
++		fi
 +		if [ -n "$cert8" ]; then
 +			profiledir=`dirname "$cert8"`
 +			MOZILLA_CERTIFICATE_FOLDER=$profiledir

Added: trunk/patches/dev300/system-python-ure-bootstrap.diff.in
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/system-python-ure-bootstrap.diff.in	Sun Nov 23 22:02:08 2008
@@ -0,0 +1,13 @@
+--- pyuno/source/module/uno.py 2008-10-07 11:49:54 +0000
++++ pyuno/source/module/uno.py 2008-10-07 11:57:11 +0000
+@@ -28,6 +28,10 @@
+ # for a copy of the LGPLv3 License.
+ #
+ #*************************************************************************
++import os
+ import sys
+ 
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++    os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@libdir@/@OOOINSTALLDIRNAME@/program/fundamentalrc"
++
+ import pyuno

Modified: trunk/patches/dev300/unxsplash-rework.diff
==============================================================================
--- trunk/patches/dev300/unxsplash-rework.diff	(original)
+++ trunk/patches/dev300/unxsplash-rework.diff	Sun Nov 23 22:02:08 2008
@@ -46,12 +46,17 @@
 index 7fd1393..20936bd 100644
 --- desktop/scripts/soffice.sh
 +++ desktop/scripts/soffice.sh
-@@ -147,6 +147,11 @@ else
+@@ -147,6 +147,16 @@ else
  PATH=$sd_prog${PATH+:$PATH}
  export PATH
  
 +# test for availability of the fast external splash
-+if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] ; then
++for arg in $@; do
++	if [ "$arg" = "-nologo" -o "$arg" = "-no-oosplash" ]; then
++		no_oosplash=y
++	fi
++done
++if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] && [ "$no_oosplash" != "y" ] ; then
 +    sd_binary="oosplash.bin"
 +fi
 +
@@ -2337,3 +2342,36 @@
  
              //DBG_ASSERT( !mpWindowImpl->mbSuppressAccessibilityEvents, "Window::Show() - Frame reactivated");
              mpWindowImpl->mbSuppressAccessibilityEvents = FALSE;
+Index: smoketest.pl
+===================================================================
+RCS file: /cvs/installation/smoketestoo_native/smoketest.pl,v
+retrieving revision 1.34.6.1
+diff -u -r1.34.6.1 smoketest.pl
+--- smoketestoo_native/smoketest.pl    30 Jul 2008 13:31:30 -0000      1.34.6.1
++++ smoketextoo_native/smoketest.pl    7 Oct 2008 13:30:32 -0000
+@@ -502,7 +502,7 @@
+     if ($ENV{OS} eq "MACOSX") {
+               delete $ENV{DYLD_LIBRARY_PATH};
+       }
+-      $Command = "\"$programpath" . "$SOFFICEBIN\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
++      $Command = "\"$programpath" . "$SOFFICEBIN\" -no-oosplash -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
+       if ( (defined($ENV{OS})) && ($ENV{OS} eq "MACOSX") ) {
+               $Command = "cd \"$programpath\"; " . $Command;
+       }
+Index: cwscheckapi
+===================================================================
+RCS file: /cvs/tools/solenv/bin/cwscheckapi,v
+retrieving revision 1.3.36.1
+diff -u -r1.3.36.1 cwscheckapi
+--- solenv/bin/cwscheckapi     14 Aug 2008 12:52:20 -0000      1.3.36.1
++++ solenv/bin/cwscheckapi     20 Oct 2008 11:51:21 -0000
+@@ -160,7 +160,7 @@
+       fi
+ fi
+ 
+-PARAM="$PARAM -cmd '$OFFICEBIN  -nofirststartwizard -norestore -nocrashreport -nolockcheck -accept=pipe,name=$USER;urp;'"
++PARAM="$PARAM -cmd '$OFFICEBIN  -nofirststartwizard -no-oosplash -norestore -nocrashreport -nolockcheck -accept=pipe,name=$USER;urp;'"
+ PARAM="$PARAM -cs pipe,name=$USER"
+ PARAM="$PARAM -NoOffice true"
+ PARAM="$PARAM -OOO_EnvSet setsolar"
+

Added: trunk/patches/dev300/xmlhelp-system-lucene-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/xmlhelp-system-lucene-fix.diff	Sun Nov 23 22:02:08 2008
@@ -0,0 +1,23 @@
+--- xmlhelp/source/com/sun/star/help/makefile.mk.orig	2008-10-03 11:07:56.000000000 +0200
++++ xmlhelp/source/com/sun/star/help/makefile.mk	2008-10-03 11:45:41.000000000 +0200
+@@ -103,6 +103,7 @@
+ JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar
+ .IF "$(SYSTEM_LUCENE)" == "YES"
+ XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
++COMP=fix_system_lucene
+ .ELSE
+ JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
+ .ENDIF
+@@ -115,3 +116,12 @@
+ # --- Targets ------------------------------------------------------
+ 
+ .INCLUDE :  target.mk
++
++.IF "$(JARTARGETN)"!=""
++$(JARTARGETN) : $(COMP)
++.ENDIF
++
++fix_system_lucene:
++	@echo "Fix Java Class-Path entry for Lucene libraries from system."
++	@$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
++	-i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Nov 23 22:02:08 2008
@@ -6,7 +6,6 @@
 	Ubuntu.dic \
 	banner_nld.bmp \
 	cli_uno_bridge.dll.config.in \
-	main_transform.xsl \
 	mono-ooo.pc.in \
 	nologoinstall_nld.bmp \
 	ooobanner_nld.bmp \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]