[arch-commits] Commit in libreoffice/trunk (PKGBUILD poppler_buildfix.diff)

[Andreas Radke]

    Date: Wednesday, July 31, 2013 @ 22:08:16
  Author: andyrtr
Revision: 191872

upgpkg: libreoffice 4.0.4-2

poppler rebuild

Added:
  libreoffice/trunk/poppler_buildfix.diff
Modified:
  libreoffice/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   20 ++++++++++++++-----
 poppler_buildfix.diff |   50 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-31 17:39:18 UTC (rev 191871)
+++ PKGBUILD	2013-07-31 20:08:16 UTC (rev 191872)
@@ -21,7 +21,7 @@
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=4.0.4.2
 pkgver=4.0.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -33,7 +33,7 @@
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.4' 
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0' 
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
 	         'ttf-dejavu') # to satisfy regression tests
 
@@ -78,6 +78,7 @@
 	${_additional_source_url}/libmspub-0.0.6.tar.bz2
 	${_additional_source_url}/libvisio-0.0.28.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
@@ -147,12 +148,13 @@
          '1120705cd0f0d9bd5506360bf57b6c2e'
          '05574c2ec54dd0c29d75cacdf9419f44'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
+         '092939d16adbb006780c68040192f8ce'
          '4195735a80876ae812fca5736b50192a'
          'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
 
-build() {
+prepare() {
 
-    cd ${srcdir}/libreoffice-$_LOver
+    cd libreoffice-$_LOver
     
     # fix exttextcat build error
     # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
@@ -164,6 +166,9 @@
 	  ln -s ${srcdir}/$source .
 	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
@@ -179,7 +184,12 @@
 
     # qt4 fix
     sed -i "s:qmake:qmake-qt4:g" configure.ac
+}
 
+build() {
+
+    cd libreoffice-$_LOver
+
 	#autoconf -f
 
 	# non-SMP test build
@@ -275,7 +285,7 @@
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=libreoffice-common.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg'
-          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.4"
+          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.24.0"
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'

Added: poppler_buildfix.diff
===================================================================
--- poppler_buildfix.diff	                        (rev 0)
+++ poppler_buildfix.diff	2013-07-31 20:08:16 UTC (rev 191872)
@@ -0,0 +1,50 @@
+From a7688eff345133147984507c35bf444131cc3d63 Mon Sep 17 00:00:00 2001
+From: Petr Mladek <pmladek at 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 at suse.com>
+Tested-by: Andras Timar <atimar at 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
+