[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                               |    3 -
 patches/dev300/l10n-build-only-selected-langs.diff |   51 ---------------------
 2 files changed, 54 deletions(-)

New commits:
commit a9443749b2151d4e7a592bec944c3d23a8ed0f62
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Mar 31 18:02:53 2011 +0200

    bin obsolete l10n-build-only-selected-langs.diff
    
    implemented another way in the translations repo

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7e6f81e..29154a3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1455,9 +1455,6 @@ sw-team-pane.diff
 sw-do-not-capture-surround-through-objs-patch.diff, n#367341, i#18732, flr
 
 [ LocalizeFixes ]
-# pack only selected languages in the l10n module
-# FIXME dev300-m77 l10n-build-only-selected-langs.diff, i#106185, pmladek
-
 # Fix Spanish translation of the autofilter menu; thanks to Eduardo Moreno
 # FIXME dev300-m77 sc-autofilter-l10n-es.diff, i#103840, pmladek
 
diff --git a/patches/dev300/l10n-build-only-selected-langs.diff b/patches/dev300/l10n-build-only-selected-langs.diff
deleted file mode 100644
index 591da29..0000000
--- a/patches/dev300/l10n-build-only-selected-langs.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- l10n/source/makefile.mk.old1	2009-10-19 17:01:03.000000000 +0200
-+++ l10n/source/makefile.mk	2009-10-20 16:16:15.000000000 +0200
-@@ -67,14 +67,22 @@ TARGET=l10n_merge
- # --- Targets ------------------------------------------------------
- .INCLUDE : settings.mk
- 
--.IF "$(WITH_LANG)" == ""
-+.IF "$(WITH_LANG)" == "ALL"
-+with_lang_list=$(alllangiso)
-+.ELSE
-+with_lang_list=$(WITH_LANG)
-+.ENDIF
-+
-+
-+.IF "$(with_lang_list)" == ""
- 
- @all:
-     @echo "Nothing to do - en-US only build."
-+
- .ELSE
- 
- .IF "$(USE_SHELL)"!="4nt"
--all_sdfs:=$(shell cd $(PRJ)$/source && ls -1 *$/localize.sdf)
-+all_sdfs:=$(shell ls $(foreach,lang,$(with_lang_list) $(lang)/localize.sdf) 2>/dev/null || true)
- .ELSE          # "$(USE_SHELL)"!="4nt"
- all_sdfs:=$(shell $(CDD) $(PRJ)$/source && find * -name localize.sdf)
- all_sdfs!:=$(subst,/,\ $(all_sdfs))
-@@ -84,7 +92,14 @@ all_sdfs!:=$(subst,/,\ $(all_sdfs))
- 
- .INCLUDE : target.mk
- 
--ALLTAR : $(COMMONMISC)$/merge.done
-+
-+ALLTAR : check_merged $(COMMONMISC)$/merge.done
-+
-+check_merged .PHONY :
-+    @+echo Checking merged sdf files...
-+    @+echo "$(all_sdfs)" >$(COMMONMISC)$/merge.done.check
-+    @test -f $(COMMONMISC)$/merge.done && diff -q $(COMMONMISC)$/merge.done $(COMMONMISC)$/merge.done.check || rm -f $(COMMONMISC)$/merge.done
-+    @+rm $(COMMONMISC)$/merge.done.check
- 
- $(COMMONMISC)$/merge.done : $(all_sdfs)
- .IF "$(L10N_LOCK)" != "YES"
-@@ -93,6 +93,6 @@ $(COMMONMISC)$/merge.done : $(all_sdfs)
-     -rm -rf $(COMMONMISC)$/sdf$(INPATH)_begone
-     -$(MKDIRHIER) $(COMMONMISC)$/sdf
- .ENDIF			# "$(L10n_LOCK)" != "YES"
--    $(PERL) $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)$/sdf && $(TOUCH) $@
-+    $(PERL) $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)$/sdf && echo $< >$@
- 
- .ENDIF