[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Thu Feb 18 11:29:45 PST 2010


 patches/dev300/apply                             |    5 
 patches/dev300/layout-generate-localize-sdf.diff |  135 +++++++++++++++++++++++
 patches/dev300/piece-svx.diff                    |   11 -
 3 files changed, 144 insertions(+), 7 deletions(-)

New commits:
commit 607aab092560ba5c267b825d91751262959ddebb
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Feb 18 18:48:45 2010 +0100

    really localize the layout dialogs (deb#570378)
    
    * patches/dev300/layout-generate-localize-sdf.diff:
    * patches/dev300/apply: generate localize.sdf from the .zip files in solver;
      FIXME: we should avoid cut&paste of the code; well, the layout-related
      makefiles need more clean up
    * patches/dev300/piece-svx.diff: fix to apply after
      layout-generate-localize-sdf.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index cb9a636..4d8ae2b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2494,6 +2494,11 @@ layout-sc-insert-sheet-no.diff, n#559445, pmladek
 # is there a better fix?
 layout-disabled-layout-build-fix.diff, pmladek
 
+# really localize the layout dialogs
+# FIXME: generates localize.sdf from the .zip files in solver
+# should replace layout-localize-fix-sc.diff
+layout-generate-localize-sdf.diff, deb#570378, pmladek
+
 [ FrameworkFeature ]
 SectionOwner => kohei
 SectionIssue => i#62234
diff --git a/patches/dev300/layout-generate-localize-sdf.diff b/patches/dev300/layout-generate-localize-sdf.diff
new file mode 100644
index 0000000..b5fa21e
--- /dev/null
+++ b/patches/dev300/layout-generate-localize-sdf.diff
@@ -0,0 +1,135 @@
+--- svx/uiconfig/layout/layout.mk.old	2010-02-18 13:58:57.000000000 +0100
++++ svx/uiconfig/layout/layout.mk	2010-02-18 13:58:57.000000000 +0100
+@@ -1,33 +1,29 @@
+-# TODO: move to solenv/inc
+-# copies: sw/uiconfig/layout svx/uiconfig/layout
+-
+-TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/tralay
++TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/tralay
+ XML_DEST=$(DLLDEST)
+ XML_LANGS=$(alllangiso)
+ 
+-ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)/$i/$j))
++ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)$/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)$/$i$/$j))
++XML_DEPS=$(foreach,i,$(XML_FILES) $(MISC)$/$i.dep)
+ 
+ # Must remove the -j (no duplicate base file names) flag
+ ZIPUPDATE=-u
+ XML_ZIP = $(PRJNAME)-layout
+ 
+-ALLTAR: $(XML_ZIP)
++ALLTAR .SEQUENTIAL: localize.sdf ALL_XML_DEPS
+ 
+-$(XML_ZIP): $(ALL_XMLS)
++ALL_XML_DEPS: $(XML_DEPS)
+ 
+ ZIP1DIR=$(XML_DEST)
+ ZIP1TARGET=$(XML_ZIP)
+ ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@)
++ZIP1DEPS=localize.sdf $(XML_DEPS)
+ 
+-$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
+-    -$(MKDIR) $(@:d)
+-    @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
+-    $(TRALAY) -m localize.sdf -o $(XML_DEST) -l $(XML_LANGS:f:t" -l ") $<
+-
+-$(XML_DEST)/%.xml: %.xml
+-    -$(MKDIR) $(@:d)
+-    $(COPY) $< $@
++$(MISC)$/%.xml.dep: %.xml
++	-$(MKDIR) "$(XML_DEST)"
++	cp "$<" "$(XML_DEST)"
++    $(TRALAY) -m localize.sdf -o "$(XML_DEST)" -l $(XML_LANGS:f:t" -l ") "$<"
++	$(TOUCH) "$@"
+ 
+ # Don't want to overwrite filled localize.sdf with empty template
+ 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
+ all: ALLTAR
+ 
+ XML_FILES=\
+- "find-and-replace.xml"\
+- zoom.xml\
+-#
++ find-and-replace.xml\
++ zoom.xml
+ 
+ .INCLUDE : layout.mk
+ 
+@@ -52,8 +51,24 @@ 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
++	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-$@
+ 	echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@
+ 	rm -f *-$@
++
++.IF "$(WITH_LANG)"!=""
++
++# FIXME: do not duplicate the code from target.mk
++$(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/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) $@
++
++.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
+@@ -59,15 +59,34 @@ all .PHONY:
+ 
+ .INCLUDE :  target.mk
+ 
+-localize.sdf: $(PRJ)/source/ui/miscdlgs/localize.sdf $(PRJ)/source/ui/src/localize.sdf
+-    grep instbdlg.src $(PRJ)/source/ui/miscdlgs/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", "sc\\uiconfig\\layout\\insert-sheet.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_SCDLG_INSERT_TABLE/\t/' -e 's/\t_label/\tRID_SCDLG_INSERT_TABLE_title/' > insert-sheet-$@
+-    grep -E 'miscdlgs.src.*(FT_DEST|FT_INSERT|STR_NEWDOC|RID_SCDLG_MOVETAB|BTN_COPY)' $(PRJ)/source/ui/src/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", "sc\\uiconfig\\layout\\move-copy-sheet.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_SCDLG_MOVETAB/\t/' -e 's/\t_label/\tRID_SCDLG_MOVETAB_title/'> move-copy-sheet-$@
+-    grep sortdlg.src $(PRJ)/source/ui/src/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", "sc\\uiconfig\\layout\\sort-options.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_SCDLG_SORT/\t/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' -e 's/\tRID_SCPAGE_SORT_OPTIONS/\t/' -e 's/\tRID_SCPAGE_SORT_FIELDS/\t/' > sort-options-$@
++localize.sdf: $(COMMONMISC)$/$(PRJNAME)$/source$/ui$/miscdlgs$/localize.sdf $(COMMONMISC)$/$(PRJNAME)$/source$/ui$/src$/localize.sdf
++    grep instbdlg.src $(COMMONMISC)$/$(PRJNAME)$/source$/ui$/miscdlgs$/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", "sc\\uiconfig\\layout\\insert-sheet.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_SCDLG_INSERT_TABLE/\t/' -e 's/\t_label/\tRID_SCDLG_INSERT_TABLE_title/' > insert-sheet-$@
++    grep -E 'miscdlgs.src.*(FT_DEST|FT_INSERT|STR_NEWDOC|RID_SCDLG_MOVETAB|BTN_COPY)' $(COMMONMISC)$/$(PRJNAME)$/source$/ui$/src$/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", "sc\\uiconfig\\layout\\move-copy-sheet.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_SCDLG_MOVETAB/\t/' -e 's/\t_label/\tRID_SCDLG_MOVETAB_title/'> move-copy-sheet-$@
++    grep sortdlg.src $(COMMONMISC)$/$(PRJNAME)$/source$/ui$/src$/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", "sc\\uiconfig\\layout\\sort-options.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_SCDLG_SORT/\t/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' -e 's/\tRID_SCPAGE_SORT_OPTIONS/\t/' -e 's/\tRID_SCPAGE_SORT_FIELDS/\t/' > sort-options-$@
+     echo '#empty' | cat - insert-sheet-$@ move-copy-sheet-$@ sort-options-$@ > $@
+     rm -f *-$@
+ 
+-$(PRJ)/source/ui/miscdlgs/localize.sdf:
+-	touch $@
++.IF "$(WITH_LANG)"!=""
+ 
+-$(PRJ)/source/ui/src/localize.sdf:
+-	touch $@
++# FIXME: do not duplicate the code from target.mk
++$(COMMONMISC)$/$(PRJNAME)$/source$/ui$/miscdlgs$/localize.sdf : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
++    @@-$(MKDIRHIER) $(@:d)
++    -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@)
++    $(TOUCH) $@
++
++$(COMMONMISC)$/$(PRJNAME)$/source$/ui$/src$/localize.sdf : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
++    @@-$(MKDIRHIER) $(@:d)
++    -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@)
++    $(TOUCH) $@
++
++.ELSE
++
++$(COMMONMISC)$/$(PRJNAME)$/source$/ui$/src$/localize.sdf :
++    @@-$(MKDIRHIER) $(@:d)
++    $(TOUCH) $@
++
++$(COMMONMISC)$/$(PRJNAME)$/source$/ui$/miscdlgs$/localize.sdf :
++    @@-$(MKDIRHIER) $(@:d)
++    $(TOUCH) $@
++
++.ENDIF # "$(WITH_LANG)"!=""
diff --git a/patches/dev300/piece-svx.diff b/patches/dev300/piece-svx.diff
index 3073230..665a2c3 100644
--- a/patches/dev300/piece-svx.diff
+++ b/patches/dev300/piece-svx.diff
@@ -34,13 +34,10 @@
  
  RESLIB1NAME=$(TARGET)
  RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/src
---- svx/uiconfig/layout/layout.mk	2009-10-23 20:14:22.000000000 +0200
-+++ svx/uiconfig/layout/layout.mk.old	2009-10-15 14:52:41.000000000 +0200
-@@ -1,7 +1,7 @@
- # TODO: move to solenv/inc
- # copies: sw/uiconfig/layout svx/uiconfig/layout
- 
--TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/tralay
+--- svx/uiconfig/layout/layout.mk.old	2010-02-18 19:57:03.000000000 +0100
++++ svx/uiconfig/layout/layout.mk	2010-02-18 20:01:01.000000000 +0100
+@@ -1,4 +1,4 @@
+-TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/tralay
 +TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
  XML_DEST=$(DLLDEST)
  XML_LANGS=$(alllangiso)


More information about the ooo-build-commit mailing list