- fix build with new poppler and libgsf (patches from fedora)

- rel 8

diff --git a/gnome-commander-1.2.8.15-poppler020.patch b/gnome-commander-1.2.8.15-poppler024.patch
similarity index 52%
rename from gnome-commander-1.2.8.15-poppler020.patch
rename to gnome-commander-1.2.8.15-poppler024.patch
index 12965746a20b8b1698218ed18c7e8d42d15b8654..e271d62acde8f117b01d42f801fc659adbe47c51 100644 (file)
--- a/gnome-commander-1.2.8.15-poppler020.patch
+++ b/gnome-commander-1.2.8.15-poppler024.patch
@@ -1,35 +1,29 @@
---- gnome-commander-1.2.8.15/config.h.in       2011-12-06 20:15:56.000000000 +0100
-+++ gnome-commander-1.2.8.15/config.h.in       2012-05-17 14:20:16.000000000 +0200
-@@ -112,6 +112,9 @@
- /* Define to 1 if poppler has support for PDFDoc::getPDFVersion() */
- #undef POPPLER_HAS_GET_PDF_VERSION
- 
-+/* Define to 1 if poppler has support for setErrorCallback() */
-+#undef POPPLER_HAS_SET_ERROR_CALLBACK
-+
- /* definition of PREFIX */
- #undef PREFIX
- 
---- gnome-commander-1.2.8.15/configure.in      2011-12-06 20:10:27.000000000 +0100
-+++ gnome-commander-1.2.8.15/configure.in      2012-05-17 14:21:52.000000000 +0200
-@@ -239,6 +239,9 @@ if test x$with_poppler != xno; then
+--- gnome-commander-1.2.8.15/configure.in.poppler      2011-12-07 04:10:27.000000000 +0900
++++ gnome-commander-1.2.8.15/configure.in      2013-08-23 18:24:54.383027945 +0900
+@@ -239,6 +239,13 @@
      if pkg-config --max-version=0.11.2 poppler; then
          AC_DEFINE(POPPLER_HAS_GET_PDF_VERSION, 1, [Define to 1 if poppler has support for PDFDoc::getPDFVersion()])
      fi
 +    if pkg-config --atleast-version=0.19.0 poppler; then
 +        AC_DEFINE(POPPLER_HAS_SET_ERROR_CALLBACK, 1, [Define to 1 if poppler has support for setErrorCallback()])
++    fi
++    if pkg-config --atleast-version=0.24.0 poppler; then
++        AC_DEFINE(POPPLER_HAS_GOFFSET_ARGUMENT_FOR_SET_ERROR_CALLBACK, 1,
++          [Define to 1 if poppler uses Goffset for the 3rd argument of setErrorCallback])
 +    fi
  fi
  if test "x$have_pdf" = "xyes"; then
     AC_DEFINE(HAVE_PDF, 1, [Define to 1 if you have PDF support])
---- gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc        2011-12-06 20:10:29.000000000 +0100
-+++ gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc        2012-05-17 14:21:39.000000000 +0200
-@@ -40,8 +40,11 @@ using namespace std;
+--- gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc.poppler        2011-12-07 04:10:29.000000000 +0900
++++ gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc        2013-08-23 18:32:03.618636877 +0900
+@@ -40,8 +40,13 @@
  #ifdef HAVE_PDF
  static regex_t rxDate;
  static gboolean rxDate_OK;
 -
-+#ifdef POPPLER_HAS_SET_ERROR_CALLBACK
++#if defined(POPPLER_HAS_GOFFSET_ARGUMENT_FOR_SET_ERROR_CALLBACK)
++static void noErrorReporting(void *, ErrorCategory, Goffset pos, char *msg)
++#elif defined(POPPLER_HAS_SET_ERROR_CALLBACK)
 +static void noErrorReporting(void *, ErrorCategory, int pos, char *msg)
 +#else
  static void noErrorReporting(int pos, char *msg, va_list args)
@@ -37,11 +31,11 @@
  {
  }
  #endif
-@@ -52,8 +55,12 @@ void gcmd_tags_poppler_init()
+@@ -52,8 +57,12 @@
  #ifdef HAVE_PDF
      rxDate_OK = regcomp (&rxDate, "^(D:)?([12][019][0-9][0-9]([01][0-9]([0-3][0-9]([012][0-9]([0-5][0-9]([0-5][0-9])?)?)?)?)?)", REG_EXTENDED)==0;
  
-+#ifdef POPPLER_HAS_SET_ERROR_CALLBACK
++#if defined(POPPLER_HAS_GOFFSET_ARGUMENT_FOR_SET_ERROR_CALLBACK) || defined(POPPLER_HAS_SET_ERROR_CALLBACK)
 +    setErrorCallback(noErrorReporting, NULL);
 +#else
      setErrorFunction(noErrorReporting);

diff --git a/gnome-commander-gsf.patch b/gnome-commander-gsf.patch
new file mode 100644 (file)
index 0000000..a4c1cdb
--- /dev/null
+++ b/gnome-commander-gsf.patch
@@ -0,0 +1,10 @@
+--- gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-doc.cc.newgsf     2011-12-07 04:10:29.000000000 +0900
++++ gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-doc.cc    2013-07-01 17:49:04.126488384 +0900
+@@ -48,6 +48,7 @@
+ #include <gsf/gsf-msole-utils.h>
+ #include <gsf/gsf-opendoc-utils.h>
+ #include <gsf/gsf-utils.h>
++#include <gsf/gsf-doc-meta-data.h>
+ #endif
+ 
+ using namespace std;

diff --git a/gnome-commander.spec b/gnome-commander.spec
index 391de93e4b5129faa02bfa17177cce56d8f67b81..0e6c53c44d5df8f1e88b71a041da0c1256c50431 100644 (file)
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -2,17 +2,18 @@ Summary:      A GNOME filemanager similar to the Midnight Commander
 Summary(pl.UTF-8):     Zarządca plików dla środowiska GNOME w stylu Midnight Commandera
 Name:          gnome-commander
 Version:       1.2.8.15
-Release:       7
+Release:       8
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/%{name}-%{version}.tar.xz
 # Source0-md5: da2f36851f96bc9b2ea7ea363875efed
 Patch0:                %{name}-flags.patch
-Patch1:                %{name}-1.2.8.15-poppler020.patch
+Patch1:                %{name}-1.2.8.15-poppler024.patch
 Patch2:                %{name}-gcc47.patch
 Patch3:                %{name}-format-security.patch
 Patch4:                %{name}-am.patch
 Patch5:                %{name}-const-cast.patch
+Patch6:                %{name}-gsf.patch
 URL:           http://www.nongnu.org/gcmd/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -59,6 +60,7 @@ kilka dodatkowych jak np. klienta FTP.
 %patch3 -p1
 %patch4 -p0
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__glib_gettextize}