ooo-build r15371 - in trunk: . patches/dev300
- From: pmladek svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r15371 - in trunk: . patches/dev300
- Date: Wed, 18 Feb 2009 18:04:19 +0000 (UTC)
Author: pmladek
Date: Wed Feb 18 18:04:19 2009
New Revision: 15371
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15371&view=rev
Log:
2009-02-18 Petr Mladek <pmladek suse cz>
* patches/dev300/build-java-1.4-qadevOOo.diff:
* patches/dev300/build-java-1.4-wizards.diff:
* patches/dev300/apply: fix build with Sun Java 1.4; apply only
on SLED10
* patches/dev300/build-icu-3.8.1.diff: hack; removed problematic
rule that made build problems with the system icu-3.8.1;
apply only on openSUSE-11.0
* patches/dev300/buildfix-gcc-4.1.2-linker-error.diff: used
-Wl,--no-as-needed to link cppcanvas and sw to avoid link error
on SLED10; has an effect only with gcc-4.1.2
Added:
trunk/patches/dev300/build-icu-3.8.1.diff
trunk/patches/dev300/build-java-1.4-qadevOOo.diff
trunk/patches/dev300/build-java-1.4-wizards.diff
trunk/patches/dev300/buildfix-gcc-4.1.2-linker-error.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Wed Feb 18 18:04:19 2009
@@ -63,7 +63,7 @@
SUSE-10.1 : NovellBase, BerkeleyDB43, BrokenSystemNSS, Java14, GTK28
SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus, Java14, OpenGLTransitionsMesa703
SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus, Java14
-SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, PostgreSQL
+SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, PostgreSQL, ICU38
SUSE-11.1 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL, Python26
SUSE : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL, Python26
SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
@@ -254,6 +254,10 @@
# until the internal compiler error is fixed
# buildfix-gcc-4.3-compiler-error.diff, n#370383, pmladek
+# temporary hack to avoid a linker crash with ooo310-m1 on SLED10
+# it adds -Wl,--no-as-needed when the gcc-4.1.2 is used
+buildfix-gcc-4.1.2-linker-error.diff
+
# Make the historically very verbose build quieter, helps us see warnings.
quiet-build.diff, i#84497, michael
@@ -1126,6 +1130,9 @@
build-java-1.4-enable.diff, i#12345, pmladek
# disable optional @Override; can't go upstream
build-java-1.4-filter.diff, i#12345, pmladek
+# various build fixes for Sun Java 1.4; can't go upstream
+build-java-1.4-qadevOOo.diff, i#12345, pmladek
+build-java-1.4-wizards.diff, i#12345, pmladek
# Sun Java 1.4 does not know the -Xbootclasspath option, will not go upstream
build-java-1.4-no-Xbootclasspath.diff, i#12345, pmladek
# another fallback to load libhsqldb with JRE 1.4
@@ -1142,6 +1149,13 @@
# do not try to read them to avoid annoying warning messages
vcl-gtk-2.8-unsupported-link-colors.diff, n#440514, pmladek
+[ ICU38 ]
+
+# FIXME: RuleBasedCollator failed on this rule with the system icu-3.8.1
+# It should be better to fix the system icu but...
+# I think that it is not much important thing => using this hack for openSUSE-11.0; it works fine on openSUSE-11.1, ...
+build-icu-3.8.1.diff, pmladek
+
[ NovellOnlyWin32 ]
SectionOwner => tml
Added: trunk/patches/dev300/build-icu-3.8.1.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/build-icu-3.8.1.diff Wed Feb 18 18:04:19 2009
@@ -0,0 +1,51 @@
+--- i18npool/source/collator/data/my_dictionary.txt.old 2009-02-12 14:52:43.000000000 +0100
++++ i18npool/source/collator/data/my_dictionary.txt 2009-02-18 18:26:57.000000000 +0100
+@@ -3,48 +3,6 @@
+ &á<á<á<áá
+ &á<<á
+ &á<áá<<áá<ááá<<ááá
+-&á<á<áá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<á
+-ááá<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<á
+-áá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<
+-ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<
+-<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<
+-áááá<áááá<<áááá<ááá<<áá<áááá<<ááá<<áááá<<ááá<áááá<<ááá<áááá<<ááá<ááá
+-á<<ááá<ááááá<<áááá<<ááááá<<áááá<ááááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<áá
+-á<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<<á
+-á<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áá
+-áá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<á
+-ááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<ááá<<ááá<ááá<ááá<ááá<áááá<<áááá<
+-áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá
+-<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<
+-ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá
+-<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<<áá
+-<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<ááá
+-á<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áá
+-áá<<áááá<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<á
+-áá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<
+-ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<ááá
+-á<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<á
+-ááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá
+-<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<áá
+-á<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<<áá<áá
+-á<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<á
+-ááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<
+-<áááá<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<
+-<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá
+-<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<á
+-á<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá
+-<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<á
+-áá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<
+-ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<
+-ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá
+-<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<ááá<áááá<<áá
+-áá<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<áá
+-á<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<ááá<<ááá<ááá<ááá<ááá
+-<áááá<<áááá<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<ááá<ááá<<ááá<ááá<<áá
+-á<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<<áá<ááá<<ááá<<ááá<<ááá<ááá<<á
+-áá<ááá<<ááá<ááá<<ááá<áááá<<áááá<<áááá<<áááá<áááá<<áááá<áá<ááá<<ááá<á
+-áá<ááá<ááá<áááá<<áááá<áááá<áá<ááá<<ááá<ááá<ááá<ááá<áááá<<áááá<áááá<á
+-<á<á<á<á<á<á<á<áá<áá<áá<áá<áá<ááá<ááá
+ &áá<<<á
+ &áá<<<á
+ &áá<<<á
Added: trunk/patches/dev300/build-java-1.4-qadevOOo.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/build-java-1.4-qadevOOo.diff Wed Feb 18 18:04:19 2009
@@ -0,0 +1,97 @@
+--- qadevOOo/runner/helper/CwsDataExchangeImpl.java.old 2009-02-12 14:55:56.000000000 +0100
++++ qadevOOo/runner/helper/CwsDataExchangeImpl.java 2009-02-17 17:37:53.000000000 +0100
+@@ -78,7 +78,7 @@ public class CwsDataExchangeImpl impleme
+
+ final String[] outs = procHdl.getOutputText().split("\n");
+
+- final ArrayList<String> moduleNames = new ArrayList<String>();
++ final ArrayList moduleNames = new ArrayList();
+ boolean start = false;
+ for (int i = 0; i < outs.length; i++) {
+ final String line = outs[i];
+--- qadevOOo/runner/util/DesktopTools.java.old 2009-02-12 14:55:56.000000000 +0100
++++ qadevOOo/runner/util/DesktopTools.java 2009-02-17 17:30:22.000000000 +0100
+@@ -411,7 +411,6 @@ public class DesktopTools {
+ * @param xModel
+ * @deprecated
+ */
+- @Deprecated
+ public static void bringWindowToFromt(XModel xModel){
+ bringWindowToFront(xModel);
+ }
+--- qadevOOo/runner/graphical/JPEGComparator.java.old 2009-02-18 11:59:04.000000000 +0100
++++ qadevOOo/runner/graphical/JPEGComparator.java 2009-02-18 12:22:16.000000000 +0100
+@@ -185,7 +185,7 @@ public class JPEGComparator extends Enha
+ int good = 0;
+ int bad = 0;
+ int ugly = 0;
+- int ok_status = 1; // 1=ok 2=bad 3=ugly
++ Integer ok_status = new Integer(1); // 1=ok 2=bad 3=ugly
+
+ IniFile aResultIniFile = new IniFile(sResultIniFile);
+ int nPages = aResultIniFile.getIntValue("global", "pages", 0);
+@@ -200,12 +200,12 @@ public class JPEGComparator extends Enha
+ else if (nPercent <= 5)
+ {
+ bad ++;
+- ok_status=2;
++ ok_status= new Integer(2);
+ }
+ else
+ {
+ ugly ++;
+- ok_status=3;
++ ok_status=new Integer(3);
+ }
+ }
+
+--- qadevOOo/runner/helper/OfficeProvider.java.old 2009-02-12 14:55:56.000000000 +0100
++++ qadevOOo/runner/helper/OfficeProvider.java 2009-02-18 11:55:52.000000000 +0100
+@@ -416,13 +416,15 @@ public class OfficeProvider implements A
+ if (msf != null) {
+
+ // disable QuickStarter
+- try {
+- Object quickStarter = msf.createInstance("com.sun.star.office.Quickstart");
+- XFastPropertySet fps = (XFastPropertySet) UnoRuntime.queryInterface(XFastPropertySet.class, quickStarter);
+- fps.setFastPropertyValue(0, false);
+- } catch (com.sun.star.uno.Exception ex) {
+- dbg("ERROR: Could not disable QuickStarter: " + ex.toString());
+- }
++ // can't be compiled with Sun Java 1.4
++ // anyway, we do not have enabled the quickstarter by default
++// try {
++// Object quickStarter = msf.createInstance("com.sun.star.office.Quickstart");
++// XFastPropertySet fps = (XFastPropertySet) UnoRuntime.queryInterface(XFastPropertySet.class, quickStarter);
++// fps.setFastPropertyValue(0, false);
++// } catch (com.sun.star.uno.Exception ex) {
++// dbg("ERROR: Could not disable QuickStarter: " + ex.toString());
++// }
+
+ try {
+ desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class,
+--- qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java.old 2009-02-12 14:55:51.000000000 +0100
++++ qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java 2009-02-18 12:10:23.000000000 +0100
+@@ -298,7 +298,10 @@ public class OQueryDesign extends TestCa
+
+ }
+
+- @Override
++ // @Override is optional; It just helps the compiler to catch errors, see
++ // http://java.sun.com/docs/books/tutorial/java/javaOO/annotations.html
++ // We will disable to to be able to compile with JRE 1.4
++ // @Override
+ protected void cleanup(TestParameters tParam, PrintWriter log) {
+ try {
+ xConn.close() ;
+--- qadevOOo/runner/graphical/PostscriptCreator.java.old 2009-02-12 14:55:56.000000000 +0100
++++ qadevOOo/runner/graphical/PostscriptCreator.java 2009-02-18 12:23:32.000000000 +0100
+@@ -54,7 +54,7 @@ public class PostscriptCreator extends E
+ GlobalLogWriter.set(log);
+ ParameterHelper aParam = new ParameterHelper(param);
+
+- param.put(util.PropertyName.OFFICE_CLOSE_TIME_OUT, 2000);
++ param.put(util.PropertyName.OFFICE_CLOSE_TIME_OUT, new Integer(2000));
+ // run through all documents found in Inputpath
+ foreachDocumentinInputPath(aParam);
+ }
Added: trunk/patches/dev300/build-java-1.4-wizards.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/build-java-1.4-wizards.diff Wed Feb 18 18:04:19 2009
@@ -0,0 +1,15 @@
+--- wizards/com/sun/star/wizards/ui/FilterComponent.java.old 2009-02-12 14:53:19.000000000 +0100
++++ wizards/com/sun/star/wizards/ui/FilterComponent.java 2009-02-18 17:14:54.000000000 +0100
+@@ -692,10 +692,10 @@ public class FilterComponent
+ else if (AnyConverter.isBoolean(_filtercondition.Value))
+ {
+ boolean b = AnyConverter.toBoolean(_filtercondition.Value);
+- double nValue = 0.0;
++ Double nValue = new Double(0.0);
+ if (b)
+ {
+- nValue = 1.0;
++ nValue = new Double(1.0);
+ }
+ Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue", nValue);
+ }
Added: trunk/patches/dev300/buildfix-gcc-4.1.2-linker-error.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-gcc-4.1.2-linker-error.diff Wed Feb 18 18:04:19 2009
@@ -0,0 +1,28 @@
+--- cppcanvas/util/makefile.mk.old 2009-02-12 14:58:01.000000000 +0100
++++ cppcanvas/util/makefile.mk 2009-02-18 12:54:35.000000000 +0100
+@@ -48,6 +48,11 @@ LIB1FILES=\
+ $(SLB)$/metafilerenderer.lib \
+ $(SLB)$/cppcanvastools.lib
+
++.IF "$(COMID)"=="gcc3" && "$(CCNUMVER)"=="000400010002"
++# linker started to crash on SLED10 with ooo310-m1 sources
++LINKFLAGS+=-Wl,--no-as-needed
++.ENDIF
++
+ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+ SHL1IMPLIB= i$(TARGET)
+ SHL1STDLIBS= $(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB)
+--- sw/util/makefile.mk.old 2009-02-17 13:34:44.000000000 +0100
++++ sw/util/makefile.mk 2009-02-18 14:43:26.000000000 +0100
+@@ -47,6 +47,11 @@ USE_DEFFILE=TRUE
+ LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=40
+ .ENDIF
+
++.IF "$(COMID)"=="gcc3" && "$(CCNUMVER)"=="000400010002"
++# linker started to crash on SLED10 with ooo310-m1 sources
++LINKFLAGS+=-Wl,--no-as-needed
++.ENDIF
++
+ sw_res_files= \
+ $(SRS)$/app.srs \
+ $(SRS)$/dialog.srs \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
