[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 02/02: *really* don't error out on unknown CPPFLAGS



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 6352db28254072cf3cc9021100baa5f03a81bb0b
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Jun 4 00:15:18 2015 +0200

    *really* don't error out on unknown CPPFLAGS
---
 changelog                                      |  5 ++++-
 patches/rsc-no-error-about-unknown-switch.diff | 30 +++++++++++++++-----------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/changelog b/changelog
index 5e3bc5c..f4251ff 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,7 @@
-libreoffice (1:4.4.4~rc1-1.1) UNRELEASED; urgency=medium
+libreoffice (1:4.4.4~rc1-2) UNRELEASED; urgency=medium
+
+  * debian/patches/rsc-no-error-about-unknown-switch.diff: *really* don't
+    error out on unknown CPPFLAGS
 
   * debian/control{,.in}:
     - suggest openclipart2-libreoffice | openclipart-libreoffice
diff --git a/patches/rsc-no-error-about-unknown-switch.diff b/patches/rsc-no-error-about-unknown-switch.diff
index 6c93c78..3eeb18c 100644
--- a/patches/rsc-no-error-about-unknown-switch.diff
+++ b/patches/rsc-no-error-about-unknown-switch.diff
@@ -1,17 +1,23 @@
 diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
-index c5a9fd7..c105f72 100644
+index c5a9fd7..62aa8ab 100644
 --- a/rsc/source/parser/erscerr.cxx
 +++ b/rsc/source/parser/erscerr.cxx
-@@ -163,9 +163,9 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
-             break;
+@@ -389,7 +389,7 @@ void RscError::Error( const ERRTYPE& rError, RscTop * pClass,
+ void RscError::FatalError( const ERRTYPE& rError, const RscId &aId,
+                            const char * pMessage )
+ {
+-    if( ERR_USAGE != rError ){
++    if( ERR_USAGE != rError && ERR_UNKNOWNSW != rError ){
+         nErrors++;
+         ErrorFormat( rError, NULL, aId );
+         WriteError( rError, pMessage );
+@@ -398,7 +398,8 @@ void RscError::FatalError( const ERRTYPE& rError, const RscId &aId,
+     else
+         WriteError( rError, pMessage );
  
-         case ERR_UNKNOWNSW:
--            StdLstErr( "Unknown switch <" );
--            StdLstErr( pMessage );
--            StdLstErr( ">." );
-+            StdLstOut( "Unknown switch <" );
-+            StdLstOut( pMessage );
-+            StdLstOut( ">." );
-             break;
+-    exit( 1 );
++    if( ERR_UNKNOWNSW != rError )
++ 	   exit( 1 );
+ }
  
-         case ERR_REFTODEEP:
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: