[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                               |    5 -
 patches/dev300/transex3-localize.pl-ooo-build.diff |   73 ---------------------
 2 files changed, 78 deletions(-)

New commits:
commit 74b9da4fec1916863f293c4ecbe792abe4705203
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 17:43:20 2011 +0200

    bin transex3-localize.pl-ooo-build.diff; already applied (i#107386)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c21330b..59fcadc 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -419,11 +419,6 @@ jvmfwk-disable-gcj.diff
 # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
-[ BuildBits ]
-# add -o option to force localizition of ooo modules
-# return 0 with -h option
-# FIXME dev300-m77 transex3-localize.pl-ooo-build.diff, i#107386, pmladek # RENAMED transex3 -> l10ntools
-
 [ Java14 ]
 
 # enable build with Java 1.4; can't go upstream
diff --git a/patches/dev300/transex3-localize.pl-ooo-build.diff b/patches/dev300/transex3-localize.pl-ooo-build.diff
deleted file mode 100644
index 5e7ce3c..0000000
--- a/patches/dev300/transex3-localize.pl-ooo-build.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-From aa2d01ea8717677b7b927fafd1682aa180d0ce29 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 16:57:55 +0200
-Subject: [PATCH 288/878] transex3-localize.pl-ooo-build.diff
-
----
- transex3/scripts/localize.pl |   15 +++++++++++----
- 1 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/transex3/scripts/localize.pl b/transex3/scripts/localize.pl
-index 9da77eb..b674c03 100755
---- a/transex3/scripts/localize.pl
-+++ b/transex3/scripts/localize.pl
-@@ -78,6 +78,7 @@ my $WIN;
- my $languages;
- #my %sl_modules;     # Contains all modules where en-US and de is source language
- my $use_default_date = '0';
-+my $force_ooo_module = '0';
- my %is_ooo_module;
- my %is_so_module;
- my $DELIMITER;
-@@ -275,7 +276,7 @@ sub check_modules_scm
- sub is_openoffice_module
- {
-     my $module              = shift;
--    return "TRUE", if defined $is_ooo_module{ $module };
-+    return "TRUE", if ( $force_ooo_module || defined $is_ooo_module{ $module } );
-     return "";
- }
- 
-@@ -336,7 +337,7 @@ sub write_sdf
-             foreach my $string( @sdf_file ){
-                 print DESTFILE "$string\n";
-             }
--            close ( DESTFILE );     
-+            close ( DESTFILE );
-             if( move( $current_l10n_file , $current_l10n_file.".backup" ) ){
-                 if( copy( $tmpfile , $current_l10n_file ) ){ 
-                     unlink $l10n_file.".backup";  
-@@ -1113,7 +1114,7 @@ sub parse_options{
-     my $extract;
-     my $success = GetOptions('f=s' => \$sdffile , 'l=s' => \$languages , 's=s' => \$srcpath ,  'h' => \$help , 'v' => \$bVerbose , 
-                              'm' => \$merge , 'e' => \$extract , 'x' => \$no_sort , 'd' => \$use_default_date , 'c' => \$create_dirs ,
--                             'n' => \$no_gsicheck );
-+                             'n' => \$no_gsicheck , 'o' => \$force_ooo_module );
-     $outputfile = $sdffile;
-     
-     #print STDOUT "DBG: lang = $languages\n";
-@@ -1125,7 +1126,11 @@ sub parse_options{
-             exit(1);
-         }
-     }
--    if( $help || !$success || $#ARGV > 1 || ( !$sdffile ) ){
-+    if( $help ){
-+        usage();
-+        exit(0);
-+    }
-+    if( !$success || $#ARGV > 1 || ( !$sdffile ) ){
-         usage();
-         exit(1);
-     }
-@@ -1166,6 +1171,8 @@ sub usage{
-     print STDERR "    -h              File with localize.sdf's\n!";
-     print STDERR "    -n              No gsicheck\n"; 
-     print STDERR "    -i              Module to merge\n";
-+    print STDERR "    -o              force using ooo localization from the l10n module instead of l10n_so; \n";
-+    print STDERR "                    useful if the type can't be detected by the .svn tags; \n";
-     print STDERR "    -v              Verbose\n";
-     print STDERR "\nExample:\n";
-     print STDERR "\nlocalize -e -l en-US,pt-BR=en-US -f my.sdf\n( Extract en-US and pt-BR with en-US fallback )\n";
--- 
-1.7.0.1
-