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.
This commit is contained in:
Alessio Sergi 2016-05-06 13:21:55 +02:00
parent de03ca264a
commit 9dff6f8c81
2 changed files with 2 additions and 18 deletions

View File

@ -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 <cpp/poppler-version.h>
#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) || \

View File

@ -1,7 +1,7 @@
# Template file for 'libreoffice' # Template file for 'libreoffice'
pkgname=libreoffice pkgname=libreoffice
version=5.1.2.2 version=5.1.2.2
revision=3 revision=4
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-werror" configure_args="--disable-werror"
nopie=yes 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 gst-plugins-base1-devel gtk+-devel gtk+3-devel harfbuzz-devel icu-devel
libatomic_ops-devel lcms2-devel librsvg-devel libxml2-devel libxslt-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 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 lpsolve-devel unixodbc-devel libXt-devel
avahi-libs-devel hunspell-devel hyphen-devel libabw-devel libcdr-devel CoinMP-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 libcmis-devel libcppunit-devel libe-book-devel libfbclient-devel libfreehand-devel