packages: gnome-commander/gnome-commander.spec, gnome-commander/gnome-comma...

[arekm]

Author: arekm                        Date: Sun May 27 15:25:47 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; poppler build fix; add python plugins

---- Files affected:
packages/gnome-commander:
   gnome-commander.spec (1.73 -> 1.74) , gnome-commander-1.2.8.15-poppler020.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnome-commander/gnome-commander.spec
diff -u packages/gnome-commander/gnome-commander.spec:1.73 packages/gnome-commander/gnome-commander.spec:1.74
--- packages/gnome-commander/gnome-commander.spec:1.73	Thu May 24 14:58:56 2012
+++ packages/gnome-commander/gnome-commander.spec	Sun May 27 17:25:41 2012
@@ -3,12 +3,13 @@
 Summary(pl.UTF-8):	Zarządca plików dla środowiska GNOME w stylu Midnight Commandera
 Name:		gnome-commander
 Version:	1.2.8.12
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/%{name}-%{version}.tar.bz2
 # Source0-md5:	210cd59699dda373a80367b5141a3157
 Patch0:		%{name}-flags.patch
+Patch1:		gnome-commander-1.2.8.15-poppler020.patch
 URL:		http://www.nongnu.org/gcmd/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -48,6 +49,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__glib_gettextize}
@@ -87,6 +89,7 @@
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/lib*.so*
+%{_libdir}/%{name}/plugins/*.py*
 %attr(755,root,root) %{_libdir}/%{name}/plugins/lib*.so*
 %{_pixmapsdir}/*
 %{_desktopdir}/gnome-commander.desktop
@@ -99,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2012/05/27 15:25:41  arekm
+- rel 4; poppler build fix; add python plugins
+
 Revision 1.73  2012/05/24 12:58:56  arekm
 - release 3
 

================================================================
Index: packages/gnome-commander/gnome-commander-1.2.8.15-poppler020.patch
diff -u /dev/null packages/gnome-commander/gnome-commander-1.2.8.15-poppler020.patch:1.1
--- /dev/null	Sun May 27 17:25:47 2012
+++ packages/gnome-commander/gnome-commander-1.2.8.15-poppler020.patch	Sun May 27 17:25:41 2012
@@ -0,0 +1,52 @@
+--- 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
+     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
+ 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;
+ #ifdef HAVE_PDF
+ static regex_t rxDate;
+ static gboolean rxDate_OK;
+-
++#ifdef 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)
++#endif
+ {
+ }
+ #endif
+@@ -52,8 +55,12 @@ void gcmd_tags_poppler_init()
+ #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
++    setErrorCallback(noErrorReporting, NULL);
++#else
+     setErrorFunction(noErrorReporting);
+ #endif
++#endif
+ }
+ 
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/gnome-commander/gnome-commander.spec?r1=1.73&r2=1.74