[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                                |    3 -
 patches/dev300/transex3-localize-gsicheck-path.diff |   31 --------------------
 2 files changed, 34 deletions(-)

New commits:
commit 3f785760e5efb7ac369e417fade044e09cafe6af
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 17:40:55 2011 +0200

    bin transex3-localize-gsicheck-path.diff; applied in OOo-3.3

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6432d2a..c21330b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -420,9 +420,6 @@ jvmfwk-disable-gcj.diff
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
 [ BuildBits ]
-# find gsicheck in the solver
-# FIXME dev300-m77 transex3-localize-gsicheck-path.diff, i#109378, pmladek # RENAMED transex3 -> l10ntools
-
 # 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
diff --git a/patches/dev300/transex3-localize-gsicheck-path.diff b/patches/dev300/transex3-localize-gsicheck-path.diff
deleted file mode 100644
index ee1b49d..0000000
--- a/patches/dev300/transex3-localize-gsicheck-path.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From defe8b414566cfc9d5d8c0aa9f91677bd202f6ce Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 16:57:52 +0200
-Subject: [PATCH 285/878] transex3-localize-gsicheck-path.diff
-
----
- transex3/scripts/localize.pl |    8 +++-----
- 1 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/transex3/scripts/localize.pl b/transex3/scripts/localize.pl
-index 66e0e06..9da77eb 100755
---- a/transex3/scripts/localize.pl
-+++ b/transex3/scripts/localize.pl
-@@ -401,11 +401,9 @@ sub merge_gsicheck{
-     my ( $TMPHANDLE , $tmpfile ) = File::Temp::tempfile();
-     close ( $TMPHANDLE );
-     
--    if( $ENV{WRAPCMD} ){
--        $command = "$ENV{WRAPCMD} gsicheck";
--    }else{
--        $command = "gsicheck";
--    }
-+    $command = "$ENV{WRAPCMD} " if( $ENV{WRAPCMD} );
-+    $command .= fix_cygwin_path("$ENV{SOLARVER}/$ENV{INPATH}/bin/gsicheck");
-+
-     my $errfile = $sdffile.".err";
-     $command .= " -k -c -wcf $tmpfile -wef ".fix_cygwin_path($errfile)." -l \"\" ".fix_cygwin_path($sdffile);
-     #my $rc = system( $command );
--- 
-1.7.0.1
-