[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                         |    2 -
 patches/dev300/localize-pl-cygwin-paths.diff |   45 ---------------------------
 2 files changed, 47 deletions(-)

New commits:
commit fffa2638f0b7dcb9bbca793f81e2bd21a34b487d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Mar 31 20:15:17 2011 +0200

    pushed localize-pl-cygwin-paths.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8be04e8..5319824 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -236,8 +236,6 @@ desktop-application-octet-stream-mime-type.diff, i#73301, flr
 # check real help path defined in registry instead of the $(instpath)/help
 sfx-check-real-help-path.diff, i#81139, pmladek
 
-localize-pl-cygwin-paths.diff, tml
-
 # fix erroneous element exists exception while defining new toolbar/menu
 # buried in cws-vbasupportdev300
 #fix-uiconfiguration-insert.diff, i#105154, noelpwer
diff --git a/patches/dev300/localize-pl-cygwin-paths.diff b/patches/dev300/localize-pl-cygwin-paths.diff
deleted file mode 100644
index afb353c..0000000
--- a/patches/dev300/localize-pl-cygwin-paths.diff
+++ /dev/null
@@ -1,45 +0,0 @@
----
- l10ntools/scripts/localize.pl |   18 ++++++++++++++++--
- 1 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git l10ntools/scripts/localize.pl l10ntools/scripts/localize.pl
-index 8310435..78b6b6e 100644
---- l10ntools/scripts/localize.pl
-+++ l10ntools/scripts/localize.pl
-@@ -386,8 +386,9 @@ sub merge_gsicheck{
-     $command .= "$ENV{SOLARVER}/$ENV{INPATH}/bin/gsicheck";
- 
-     my $errfile = $sdffile.".err";
--    $command .= " -k -c -wcf $tmpfile -wef $errfile -l \"\" $sdffile";
-+    $command .= " -k -c -wcf $tmpfile -wef ".fix_cygwin_path($errfile)." -l \"\" ".fix_cygwin_path($sdffile);
-     #my $rc = system( $command );
-+    if ($bVerbose) { print STDOUT "localize.pl running $command\n"; }
-     my $output = `$command`;
-     my $rc = $? << 8;
-     if ( $output ne "" ){
-@@ -492,7 +493,7 @@ sub collectfiles{
-         # if ( -x $command ){
-         if( $command ){
-             if( !$bVerbose  ){ $args .= " "; }
--            $args .= " -e -f $localizeSDF -l ";
-+            $args .= " -e -f ".fix_cygwin_path($localizeSDF)." -l ";
-             my $bFlag="";
-             if( $bAll ) {$args .= " en-US";}
-             else{
-@@ -1154,3 +1155,16 @@ sub usage{
-     print STDERR "\nlocalize -m -l cs -f my.sdf\n( Merge cs translation into the sourcecode ) \n";
- }
- 
-+sub fix_cygwin_path
-+{
-+    my ( $path ) = @_;
-+
-+    if ( $^O eq 'cygwin' )
-+    {
-+    $path = qx{cygpath -m "$path"};
-+    chomp($path);
-+    }
-+
-+    return $path;
-+}
-+