From 9dff6f8c818b56c4072d06e7499fb076cde3cca4 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Fri, 6 May 2016 13:21:55 +0200 Subject: [PATCH] libreoffice: rebuild against poppler-0.43.0 Actually it depends on poppler-cpp-devel to get the poppler version. Otherwise, the poppler version gets redefined, won't build. Thus, the patch is not needed. --- .../patches/0001-poppler-version.patch | 16 ---------------- srcpkgs/libreoffice/template | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 srcpkgs/libreoffice/patches/0001-poppler-version.patch diff --git a/srcpkgs/libreoffice/patches/0001-poppler-version.patch b/srcpkgs/libreoffice/patches/0001-poppler-version.patch deleted file mode 100644 index 943a1424183..00000000000 --- a/srcpkgs/libreoffice/patches/0001-poppler-version.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2016-02-23 15:45:23.435519407 +0100 -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2016-02-23 15:45:39.779520585 +0100 -@@ -54,10 +54,10 @@ - #if HAVE_POPPLER_VERSION_H - #include - #else --#define POPPLER_VERSION "0.12.3" -+#define POPPLER_VERSION "0.41.0" - #define POPPLER_VERSION_MAJOR 0 --#define POPPLER_VERSION_MINOR 12 --#define POPPLER_VERSION_MICRO 3 -+#define POPPLER_VERSION_MINOR 41 -+#define POPPLER_VERSION_MICRO 0 - #endif - #define POPPLER_CHECK_VERSION(major,minor,micro) \ - (POPPLER_VERSION_MAJOR > (major) || \ diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index e6b847fec99..2ac8d569a86 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice version=5.1.2.2 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-werror" nopie=yes @@ -18,7 +18,7 @@ makedepends="apr-devel boost-devel cups-devel libcurl-devel gst-plugins-base1-devel gtk+-devel gtk+3-devel harfbuzz-devel icu-devel libatomic_ops-devel lcms2-devel librsvg-devel libxml2-devel libxslt-devel MesaLib-devel neon-devel nss-devel python3.4-devel libressl-devel libgcrypt-devel - libgpg-error-devel poppler-devel postgresql-libs-devel redland-devel + libgpg-error-devel poppler-cpp-devel postgresql-libs-devel redland-devel lpsolve-devel unixodbc-devel libXt-devel avahi-libs-devel hunspell-devel hyphen-devel libabw-devel libcdr-devel CoinMP-devel libcmis-devel libcppunit-devel libe-book-devel libfbclient-devel libfreehand-devel