[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - 2 commits - patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Fri May 21 06:18:59 PDT 2010
patches/dev300/apply | 3 +++
patches/dev300/build-java-1.4-enable.diff | 6 +-----
patches/dev300/jvmfwk-disable-gcj.diff | 20 ++++++++++++++++++++
patches/dev300/layout-generate-localize-sdf.diff | 21 +++++++++++++++------
4 files changed, 39 insertions(+), 11 deletions(-)
New commits:
commit 02d19c9045d623dc4393eb10062f117a6da31e0c
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu May 20 21:42:33 2010 +0200
layouted zoom dialog was not localized (bnc#595823)
* patches/dev300/layout-generate-localize-sdf.diff: the localized strings
were searched in wrong file (bnc#595823)
diff --git a/patches/dev300/layout-generate-localize-sdf.diff b/patches/dev300/layout-generate-localize-sdf.diff
index b5fa21e..2a15595 100644
--- a/patches/dev300/layout-generate-localize-sdf.diff
+++ b/patches/dev300/layout-generate-localize-sdf.diff
@@ -46,9 +46,9 @@
template.sdf:
- $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US $i) > $@
+ $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US "$i") > $@
---- svx/uiconfig/layout/makefile.mk.old 2010-02-18 13:58:56.000000000 +0100
-+++ svx/uiconfig/layout/makefile.mk 2010-02-18 18:17:41.000000000 +0100
-@@ -40,9 +40,8 @@ TARGET=layout
+--- svx/uiconfig/layout/makefile.mk.orig 2010-05-13 19:00:54.000000000 +0200
++++ svx/uiconfig/layout/makefile.mk 2010-05-20 21:15:08.000000000 +0200
+@@ -36,9 +36,8 @@ TARGET=layout
all: ALLTAR
XML_FILES=\
@@ -60,16 +60,16 @@
.INCLUDE : layout.mk
-@@ -52,8 +51,24 @@ all .PHONY:
+@@ -48,8 +47,33 @@ all .PHONY:
.INCLUDE : target.mk
-localize.sdf: $(PRJ)/source/dialog/localize.sdf
- grep srchdlg.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\find-and-replace.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_SEARCH/\t/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@
- grep zoom.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
-+localize.sdf: $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf
++localize.sdf: $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf $(COMMONMISC)$/$(PRJNAME)$/source$/cui$/localize.sdf
+ grep srchdlg.src $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\find-and-replace.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_SEARCH/\t/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@
-+ grep zoom.src $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
++ grep zoom.src $(COMMONMISC)$/$(PRJNAME)$/source$/cui$/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@
rm -f *-$@
+
@@ -81,12 +81,21 @@
+ -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@)
+ $(TOUCH) $@
+
++$(COMMONMISC)$/$(PRJNAME)$/source$/cui$/localize.sdf : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
++ @@-$(MKDIRHIER) $(@:d)
++ -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@)
++ $(TOUCH) $@
++
+.ELSE
+
+$(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf :
+ @@-$(MKDIRHIER) $(@:d)
+ $(TOUCH) $@
+
++$(COMMONMISC)$/$(PRJNAME)$/source$/cui$/localize.sdf :
++ @@-$(MKDIRHIER) $(@:d)
++ $(TOUCH) $@
++
+.ENDIF # "$(WITH_LANG)"!=""
--- sc/uiconfig/layout/makefile.mk.old 2010-02-18 13:58:56.000000000 +0100
+++ sc/uiconfig/layout/makefile.mk 2010-02-18 17:30:57.000000000 +0100
commit ab5f47b17d5a8cb773b0b53e2c8adecb8de80de2
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu May 20 17:46:12 2010 +0200
Disabled gcj in supported JRE's (NovellLinuxOnly)
* patches/dev300/jvmfwk-disable-gcj.diff: disable gcj in javavendors_linux.xml;
OOo newer really worked with it
* patches/dev300/apply: apply the above diff in NovellLinuxOnly section
* patches/dev300/build-java-1.4-enable.diff: update to apply
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5ca410e..ca5db8c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1190,6 +1190,9 @@ mysqlcppconn-static-mysql-binding.diff, pmladek
# Push fonts into the ps stream always
pushfont-psstream.diff, i#84481, michael
+# ignore gcj; OOo newer worked well with it
+jvmfwk-disable-gcj.diff
+
[ BrokenSystemNSS ]
# fix build with system libnss installed apart from mozilla
# strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken
diff --git a/patches/dev300/build-java-1.4-enable.diff b/patches/dev300/build-java-1.4-enable.diff
index 7a5fd2d..89fbd69 100644
--- a/patches/dev300/build-java-1.4-enable.diff
+++ b/patches/dev300/build-java-1.4-enable.diff
@@ -13,7 +13,7 @@
JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
--- jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml.old 2009-02-12 14:50:55.000000000 +0100
+++ jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 2009-02-19 12:07:59.000000000 +0100
-@@ -7,19 +7,19 @@
+@@ -7,16 +7,16 @@
<vendorInfos>
<vendor name="Sun Microsystems Inc.">
@@ -28,10 +28,6 @@
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.4.2</minVersion>
</vendor>
- <vendor name="Free Software Foundation, Inc.">
-- <minVersion>1.5.0</minVersion>
-+ <minVersion>1.4.2</minVersion>
- </vendor>
<vendor name="BEA Systems, Inc.">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.4.1</minVersion>
diff --git a/patches/dev300/jvmfwk-disable-gcj.diff b/patches/dev300/jvmfwk-disable-gcj.diff
new file mode 100644
index 0000000..5f100dc
--- /dev/null
+++ b/patches/dev300/jvmfwk-disable-gcj.diff
@@ -0,0 +1,20 @@
+--- jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml.old 2010-04-28 11:35:17.000000000 +0200
++++ jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 2010-05-20 17:23:46.000000000 +0200
+@@ -15,9 +15,6 @@
+ <vendor name="Blackdown Java-Linux Team">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+- <vendor name="Free Software Foundation, Inc.">
+- <minVersion>1.5.0</minVersion>
+- </vendor>
+ <vendor name="BEA Systems, Inc.">
+ <minVersion>1.5.0</minVersion>
+ </vendor>
+@@ -27,7 +24,6 @@
+ <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+- <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+ </plugins>
+ </javaSelection>
More information about the ooo-build-commit
mailing list