diff options
Diffstat (limited to 'extra/libreoffice')
| -rw-r--r-- | extra/libreoffice/PKGBUILD | 25 | ||||
| -rw-r--r-- | extra/libreoffice/poppler_buildfix.diff | 50 |
2 files changed, 10 insertions, 65 deletions
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 6ba2ea184..1e3205aaa 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192063 2013-08-05 14:17:33Z andyrtr $ +# $Id: PKGBUILD 193556 2013-08-23 16:48:04Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -19,9 +19,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.4.2 -pkgver=4.0.4 -pkgrel=2 +_LOver=4.0.5.2 +pkgver=4.0.5 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -76,9 +76,8 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${_additional_source_url}/libcdr-0.0.14.tar.bz2 ${_additional_source_url}/libmspub-0.0.6.tar.bz2 - ${_additional_source_url}/libvisio-0.0.28.tar.bz2 + ${_additional_source_url}/libvisio-0.0.30.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff - poppler_buildfix.diff libreoffice-common.sh libreoffice-common.csh) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -111,10 +110,10 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip libcdr-0.0.14.tar.bz2 libmspub-0.0.6.tar.bz2 - libvisio-0.0.28.tar.bz2) -md5sums=('19462798bbf6e1dc75a8b12bd1775ea2' - 'a4d5e6504a3251b7a7fbe17216f8d6e7' - '0ba553eea7284abe1370157bb35bd355' + libvisio-0.0.30.tar.bz2) +md5sums=('6cb30bf61cc264f0593a11fffa5cd7ee' + 'a9ddcbde6d7b1148c8fdb626b26c0c69' + '914c5ea3f433643387593cb96d6c119b' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -146,9 +145,8 @@ md5sums=('19462798bbf6e1dc75a8b12bd1775ea2' '185d60944ea767075d27247c3162b3bc' 'd88f9b94df880d2c05be943b000ca112' '1120705cd0f0d9bd5506360bf57b6c2e' - '05574c2ec54dd0c29d75cacdf9419f44' + '9d9eb3ae6bee763c161228b2b12e25f8' '07d2bf5ad839a394cca008b3ec6e7bb1' - '092939d16adbb006780c68040192f8ce' '4195735a80876ae812fca5736b50192a' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') @@ -167,9 +165,6 @@ prepare() { done popd - # fix build with poppler 0.24.0 - patch -Np1 -i ${srcdir}/poppler_buildfix.diff - # fix not upstreamable pyuno paths - patch taken from Debian patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff diff --git a/extra/libreoffice/poppler_buildfix.diff b/extra/libreoffice/poppler_buildfix.diff deleted file mode 100644 index ae11d8b1f..000000000 --- a/extra/libreoffice/poppler_buildfix.diff +++ /dev/null @@ -1,50 +0,0 @@ -From a7688eff345133147984507c35bf444131cc3d63 Mon Sep 17 00:00:00 2001 -From: Petr Mladek <pmladek@suse.cz> -Date: Tue, 16 Jul 2013 14:45:31 +0000 -Subject: fix build with system poppler-0.23.0 - -XRef *xref parameter has been added to the OutputDev::startPage method, see -http://cgit.freedesktop.org/poppler/poppler/commit/?id=8eb489c355d734a72e140ce7e32470d048362499 - -Change-Id: I7ad875bf58f6998e639c740f0dac3795738cd1db -Reviewed-on: https://gerrit.libreoffice.org/4940 -Reviewed-by: Andras Timar <atimar@suse.com> -Tested-by: Andras Timar <atimar@suse.com> ---- -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 03adf89..53a77d3 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -481,7 +481,11 @@ PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : - { - } - --void PDFOutDev::startPage(int /*pageNum*/, GfxState* state) -+void PDFOutDev::startPage(int /*pageNum*/, GfxState* state -+#if POPPLER_CHECK_VERSION(0, 23, 0) -+ , XRef* /*xref*/ -+#endif -+) - { - assert(state); - printf("startPage %f %f\n", -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index c0977cb7..4f3d3a9 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -181,7 +181,11 @@ namespace pdfi - virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE; - - // Start a page. -- virtual void startPage(int pageNum, GfxState *state) SAL_OVERRIDE; -+ virtual void startPage(int pageNum, GfxState *state -+#if POPPLER_CHECK_VERSION(0, 23, 0) -+ , XRef *xref -+#endif -+ ) SAL_OVERRIDE; - - // End a page. - virtual void endPage() SAL_OVERRIDE; --- -cgit v0.9.0.2-2-gbebe - |