[Libreoffice-commits] core.git: 2 commits - epm/epm-3.7.patch sc/qa

[Stephan Bergmann]

 epm/epm-3.7.patch              |    9 +++++++++
 sc/qa/unit/helper/qahelper.cxx |    2 ++
 2 files changed, 11 insertions(+)

New commits:
commit 2b62198dfcfd3fe738382207235a68cdc9b40d30
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 9 12:46:37 2013 +0200

    Fix EPMs deb Depends syntax
    
    ...that it is broken at least in our bundled EPM 3.7 became evident with
    d07cbe86f34ca6dfc6580b63879235c339831a5e "fdo#65541: Proper EPM %requires
    dependencies, at least for Linux" failing for --with-package-format=deb now.
    
    I cannot verify whether this is a known/fixed problem in upstream EPM (which is
    at version 4.2 by now), as the download links at
    <http://freecode.com/projects/epm> point at a (temporarily, at least)
    unavailable ftp.easysw.com server.
    
    Change-Id: Idad1cdfc55d870200ccb24ea94a2fe7c0ed2c9e8

diff --git a/epm/epm-3.7.patch b/epm/epm-3.7.patch
index 02835bc..869c141 100644
--- a/epm/epm-3.7.patch
+++ b/epm/epm-3.7.patch
@@ -260,6 +260,15 @@ diff -urN epm-3.7-old//deb.c epm-3.7/deb.c
    else
      fprintf(fp, "Architecture: %s\n", platform->machine);
  
+@@ -139,7 +192,7 @@
+ 	  else
+ 	  {
+ 	    if (d->vernumber[1] < INT_MAX)
+-	      fprintf(fp, " (>= %s, <= %s)", d->version[0], d->version[1]);
++	      fprintf(fp, " (>= %s), %s (<= %s)", d->version[0], d->product, d->version[1]);
+ 	    else
+ 	      fprintf(fp, " (>= %s)", d->version[0]);
+ 	  }
 @@ -148,9 +193,9 @@
        putc('\n', fp);
      }
commit 13cddb12ff8c7357a2c8e54d603b840ce7b29737
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 9 11:57:41 2013 +0200

    -Werror=unused-macros
    
    Change-Id: I31cee3db3db0000ba577289ea73b9366efc5ee79

diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index ee806bc..14cd6dd 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -9,7 +9,9 @@
 
 #include "qahelper.hxx"
 
+#if defined _WIN32 || defined __CYGWIN__
 #define __ORCUS_STATIC_LIB
+#endif
 #include <orcus/csv_parser.hpp>
 
 #include <fstream>