Hello community, here is the log from the commit of package gnome-commander for openSUSE:Factory checked in at 2012-05-22 08:14:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-commander (Old) and /work/SRC/openSUSE:Factory/.gnome-commander.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-commander", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-commander/gnome-commander.changes 2012-03-22 12:32:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-commander.new/gnome-commander.changes 2012-05-22 08:14:28.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 18 18:31:41 UTC 2012 - [email protected] + +- Add gnome-commander-poppler020.patch: Fix build with poppler 0.20 +- Add libtool BuildRequires and call to autoreconf, as above patch + touches the build system. + +------------------------------------------------------------------- New: ---- gnome-commander-poppler020.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-commander.spec ++++++ --- /var/tmp/diff_new_pack.5ion3S/_old 2012-05-22 08:14:30.000000000 +0200 +++ /var/tmp/diff_new_pack.5ion3S/_new 2012-05-22 08:14:30.000000000 +0200 @@ -26,6 +26,9 @@ Source: http://download.gnome.org/sources/gnome-commander/1.2/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM gnome-commander-gcc47.patch [email protected] -- Fix build with gcc 4.7. Taken from git, commit a8cf386. Patch0: gnome-commander-gcc47.patch +# PATCH-FIX-UPSTREAM gnome-commander-poppler020.patch bgo#676303 [email protected] -- Fix build with poppler 0.20. +Patch1: gnome-commander-poppler020.patch +# Needed by patch1 BuildRequires: chmlib-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -35,6 +38,7 @@ BuildRequires: libgnomeui-devel BuildRequires: libgsf-devel BuildRequires: libpoppler-devel +BuildRequires: libtool BuildRequires: libxslt BuildRequires: python-devel BuildRequires: taglib-devel @@ -56,9 +60,12 @@ %prep %setup -q %patch0 -p1 -translation-update-upstream +%patch1 -p1 +#translation-update-upstream %build +# Needed by patch1 +autoreconf -fi # FIXME: C/gnome-commander.xml:*: parser error : Entity '*' not defined %configure\ --disable-static\ ++++++ gnome-commander-poppler020.patch ++++++ --- 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 } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
