ooo-build r14932 - in trunk: . patches/dev300

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14932 - in trunk: . patches/dev300
Date: Thu, 25 Dec 2008 20:14:00 +0000 (UTC)
Author: rengelhard
Date: Thu Dec 25 20:14:00 2008
New Revision: 14932
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14932&view=rev

Log:
2008-12-25  Rene Engelhard  <rene debian org>

        *  patches/dev300/apply,
           patches/dev300/config_office-openjdk-paths-m37.diff,
           patches/dev300/config_office-openjdk-paths.diff: m38


Added:
   trunk/patches/dev300/config_office-openjdk-paths-m37.diff   (props changed)
      - copied unchanged from r14930, /trunk/patches/dev300/config_office-openjdk-paths.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/config_office-openjdk-paths.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Dec 25 20:14:00 2008
@@ -14,7 +14,7 @@
 	 Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
 	 Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
 	 GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, WebDAV, \
-	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
+	 Layout, VBABits, CalcErrors, Store, CJK, GCJ, Lwp, \
 	 OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting, \
 	 PopupRemoval, LinkWarningDlg, RadioButtons, InternalCairo, \
 	 FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, UnusedMethodsRemoval, \
@@ -32,7 +32,7 @@
 	      UnUsedButNotYetRemovedFromSVN, WebDAVUpstream, \
 	      PostgreSQL, SELinux, VOSremoval, Glib2, \
 	      UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, \
-	      KDE4, MinGW
+	      KDE4, MinGW, VBAObjects
 DebianLooseSections: DebianBaseNoHelpContent
 # Optional sections
 Optional : DejaVuFonts, NovellOnlyExtensionFixes, Win32OnlyExtensionFixes, Linux32OnlyExtensionFixes
@@ -481,7 +481,7 @@
 
 [ Fixes == dev300-m37 ]
 # import/export form control's visibility
-form-control-visibility.diff, i#88878, jianhua
+#FIXME m38 form-control-visibility.diff, i#88878, jianhua
 
 [ Fixes > dev300-m37 ]
 # import/export form control's visibility
@@ -822,9 +822,9 @@
 # load, store and save the sheet protection options from and to an Excel file,
 # and use that information to constrain cell cursor movement when the sheet is
 # protected.  Also to support encryption on Excel file export.
-cws-scsheetprotection02-sc.diff,   i#60305, i#71468, i#84766, kohei
-cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei
-cws-scsheetprotection02-svx.diff,  i#60305, i#71468, i#84766, kohei
+#cws-scsheetprotection02-sc.diff,   i#60305, i#71468, i#84766, kohei
+#cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei
+#cws-scsheetprotection02-svx.diff,  i#60305, i#71468, i#84766, kohei
 
 # Ensure that Print Preview is consistent with Print output.
 sc-print-selected-sheets.diff, n#335684, i#45497, jonp
@@ -867,7 +867,7 @@
 sc-cellformat-icon-toggle.diff, n#358548, i#86377, kohei
 
 # overwrite character level font attributes when changing them at cell level.
-sc-overwrite-char-font-attrs.diff, n#374580, i#53545, i#96853, kohei
+#sc-overwrite-char-font-attrs.diff, n#374580, i#53545, i#96853, kohei
 
 # ignore manual breaks when the "fit to x pages wide and x pages tall" option
 # is used, for Excel interoperability.
@@ -1054,7 +1054,7 @@
 gcj-32bit-runtime-path.diff, i#64888, mklose
 # remove mozilla plug-in option completely since we enable it per default
 # and therefore this option is sense-/useless
-no-mozilla-plug-in-option.diff
+#no-mozilla-plug-in-option.diff
 # read variables from /etc/openoffice/sofficerc, since /usr/lib/openoffice/sofficerc
 # just refers to it
 #FIXME_m37 oosplash-etc-openoffice-sofficerc.diff
@@ -1065,7 +1065,7 @@
 
 # mention openoffice.org-report-builder instead of getting people
 # to download it from elsewhere
-reportdesign-mention-package.diff, rengelha
+#reportdesign-mention-package.diff, rengelha
 
 # fix the splash progressbar colors
 debian-splash.diff
@@ -1129,7 +1129,7 @@
 
 
 [ BuildBits ]
-novell-win32-agfa-monotype-fonts.diff, tml
+#novell-win32-agfa-monotype-fonts.diff, tml
 
 # allow to define java target, so the build is usable with the JVM 1.5
 # even when it is built with JDK 1.6
@@ -1151,11 +1151,16 @@
 installer-get-path-correctly.diff, pmladek
 
 # enable build with IBM Java 1.6.0
-build-ibm-java-enable.diff, i#93114, pmladek
+#build-ibm-java-enable.diff, i#93114, pmladek
 
 # allow to use the prebuilt jsr173_1.0_api.jar
 build-prebuilt-stax.diff, i#93116, pmladek
 
+[ BuildBits < dev300-m38 ]
+# OpenJDK paths for some archs
+config_office-openjdk-paths-m37.diff, i91783
+
+[ BuildBits >= dev300-m38 ]
 # OpenJDK paths for some archs
 config_office-openjdk-paths.diff, i91783
 
@@ -1224,7 +1229,7 @@
 default-no-startup-wizard.diff, michael
 
 # don't throw up the style dialog on 1st run
-default-no-style-dialog.diff, michael
+#default-no-style-dialog.diff, michael
 
 # pestering people serves no useful purpose
 default-no-registration.diff, michael
@@ -1637,7 +1642,7 @@
 svx-source-inc-fmundo-hxx.diff, i#68893
 svx-source-form-fmscriptingenv-cxx.diff, i#68893
 svx-source-form-makefile.diff, i#68893
-svx-source-form-fmundo-cxx.diff, i#68893
+#svx-source-form-fmundo-cxx.diff, i#68893
 
 vbaevents-services-build.diff, i#68893
 
@@ -1684,7 +1689,7 @@
 # Application.Caller
 api-application-caller.diff, n#339941, noelpwer
 
-default-autotext-and-form-name.diff, n#353687, i#85358
+#default-autotext-and-form-name.diff, n#353687, i#85358
 
 # fix --disable-vba build
 oovbaapi-disable-vba.diff
@@ -1846,7 +1851,7 @@
 sfx2-pre-and-postprocess-crash-fix.diff, n#270544, rodo
 # hack to ignore writerfilter if odf-converter is present
 odf-converter-ignore-writerfilter.diff, n#348471, jholesov
-sw-accept-reject-redline.diff, n#249775, Amelia Wang
+#sw-accept-reject-redline.diff, n#249775, Amelia Wang
 
 
 [ msaccess ]
@@ -1899,6 +1904,7 @@
 calc-formula-variable-separators-svx.diff,       n#447164, i#92056, kohei
 calc-formula-variable-separators-officecfg.diff, n#447164, i#92056, kohei
 
+[ CalcFixes < dev300-m38 ]
 # Fix parse failure on non-ASCII sheet names in Excel A1 and R1C1 modes.
 calc-xls-parser-sheet-name-fix-sc.diff, n#407807, i#92379, kohei
 
@@ -1915,17 +1921,17 @@
 calc-formula-datevalue-strip-time.diff, i#94765, kohei
 
 # Implement external range names.
-calc-external-defined-names-sc.diff, i#3740, i#4385, n#355685, kohei
-calc-external-defined-names-offapi.diff, i#3740, i#4385, n#355685, kohei
-calc-external-defined-names-officecfg.diff, i#3740, i#4385, n#355685, kohei
-calc-external-defined-names-svtools.diff, i#3740, i#4385, n#355685, kohei
+#calc-external-defined-names-sc.diff, i#3740, i#4385, n#355685, kohei
+#calc-external-defined-names-offapi.diff, i#3740, i#4385, n#355685, kohei
+#calc-external-defined-names-officecfg.diff, i#3740, i#4385, n#355685, kohei
+#calc-external-defined-names-svtools.diff, i#3740, i#4385, n#355685, kohei
 
 # Don't adjust row height on xls load for better layout preservation and
 # faster file load.
 calc-xls-disable-adjust-row-height.diff, kohei
 
 # Support PHONETIC function to display asian phonetic guide.
-calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
+#calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
 
 # Support Excel English grammar needed for VBA and (probably) for xlsx filter.
 calc-grammar-xls-english-offapi.diff, kohei
@@ -2290,7 +2296,7 @@
 # FIXME: file more issuses when ready
 
 # teach build.pl what to do with prj/tests.lst's
-unittesting-build-pl.diff
+#unittesting-build-pl.diff
 
 # the tests
 unittesting-basebmp.diff
@@ -2584,10 +2590,10 @@
 
 # have Impress outline text boxes shrink font automatically when text
 # starts to overflow
-fit-list-to-size.diff, i#94086, thorsten
-fit-list-to-size-ui.diff, i#94086, thorsten
-fit-list-to-size-style-defaults.diff, i#94086, thorsten
-fit-list-to-size-popup.diff, i#94086, thorsten
+#fit-list-to-size.diff, i#94086, thorsten
+#fit-list-to-size-ui.diff, i#94086, thorsten
+#fit-list-to-size-style-defaults.diff, i#94086, thorsten
+#fit-list-to-size-popup.diff, i#94086, thorsten
 
 # apply this patch if you need to disable vcl grabbing your mouse -
 # after applying the patch, set SAL_NO_MOUSEGRABS in your env

Modified: trunk/patches/dev300/config_office-openjdk-paths.diff
==============================================================================
--- trunk/patches/dev300/config_office-openjdk-paths.diff	(original)
+++ trunk/patches/dev300/config_office-openjdk-paths.diff	Thu Dec 25 20:14:00 2008
@@ -1,6 +1,8 @@
---- config_office/set_soenv.in.orig	2008-11-23 17:30:18.000000000 +0000
-+++ config_office/set_soenv.in	2008-11-23 17:31:10.000000000 +0000
-@@ -400,6 +400,7 @@
+Index: set_soenv.in
+===================================================================
+--- config_office/set_soenv.in	(.../tags/DEV300_m38/config_office/set_soenv.in)	(Revision 265803)
++++ config_office/set_soenv.in	(.../cws/configuretoplevel/set_soenv.in)	(Revision 265803)
+@@ -399,6 +394,7 @@
        else {      
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
@@ -8,7 +10,7 @@
        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
        }
-@@ -421,6 +422,7 @@
+@@ -420,6 +416,7 @@
        $OUTPATH        = "unxlngx6";
        # Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
@@ -16,38 +18,46 @@
        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
-@@ -445,8 +447,9 @@
+@@ -444,7 +441,7 @@
        $CPUNAME        = "SPARC";
        $OUTPATH        = "unxlngs";
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
 -      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client";
 +      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."server";
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
-+      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
+       $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
     }
-    elsif ($platform =~ m/^powerpc/)
-    {
-@@ -478,11 +481,18 @@
-             $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-             $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
+@@ -473,18 +470,18 @@
+             $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
+             $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
+          elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
+-         {  $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."bin";
+-            $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
+-            $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin";
+-            $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."xawt";
++         {  $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
++            $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
++            $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
++            $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
           }
+-         else { 
+-	    # OpenJDK (aka JDK=sun)
+-            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."powerpc";
+-            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."powerpc".$ds."client";
+-            $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."powerpc".$ds."native_threads";
+-      	    $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."powerpc".$ds."xawt";
+-         }
 +	 # OpenJDK
 +	 elsif ($JDK =~ m/sun/) {
 +	    $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-+	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."server";
++	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
 +	    $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
 +	    $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
 +	 }
        }
  
        $CPU            = "P";
- 
--      # fallback
-+      # fallback (IBMJava2-ppc-142)
-       if ( "$JRELIBDIR" eq "" ) {
-           $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."bin";
-           $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
-@@ -506,7 +516,7 @@
+@@ -507,7 +504,7 @@
           $OUTPATH        = "unxlngs390";
        }
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
@@ -56,7 +66,7 @@
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."xawt";
        $CPU            = "3";
-@@ -530,7 +540,7 @@
+@@ -531,7 +528,7 @@
        $CPUNAME        = "ALPHA_";
        $OUTPATH        = "unxlnga";
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";
@@ -65,7 +75,7 @@
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
     }
     elsif ($platform =~ m/^arm.*?l-/)
-@@ -540,8 +550,9 @@
+@@ -541,8 +538,9 @@
        $CPUNAME        = "ARM";
        $OUTPATH        = "unxlngr";
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm";
@@ -76,26 +86,3 @@
        $EPM_FLAGS      = "-a arm";
     }
     elsif ($platform =~ m/^mips/)
-@@ -577,10 +588,18 @@
-         }
-       }
- 
--      $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
--      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client";
--      $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
--      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
-+      # OpenJDK
-+      if ($JDK =~ m/sun/) {
-+        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
-+        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client";
-+        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
-+        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."xawt";
-+      } else {
-+        $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
-+        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client";
-+        $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
-+        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
-+      }
-    }
- 
-
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]