[arch-commits] Commit in libreoffice/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Monday, May 14, 2012 @ 14:19:40
  Author: andyrtr
Revision: 159003

upgpkg: libreoffice 3.5.3-2

poppler rebuild

Modified:
  libreoffice/trunk/PKGBUILD
Deleted:
  libreoffice/trunk/0001-poppler-0.20-changed-its-api.patch

-----------------------------------------+
 0001-poppler-0.20-changed-its-api.patch |   32 ------------------------------
 PKGBUILD                                |    5 +++-
 2 files changed, 4 insertions(+), 33 deletions(-)

Deleted: 0001-poppler-0.20-changed-its-api.patch
===================================================================
--- 0001-poppler-0.20-changed-its-api.patch	2012-05-14 18:18:21 UTC (rev 159002)
+++ 0001-poppler-0.20-changed-its-api.patch	2012-05-14 18:19:40 UTC (rev 159003)
@@ -1,32 +0,0 @@
-From 233b2018d69effbe31b28405f5ce8d87deff149f Mon Sep 17 00:00:00 2001
-From: Ionut Biru <ibiru at archlinux.org>
-Date: Sun, 13 May 2012 23:57:46 +0000
-Subject: [PATCH] poppler 0.20 changed its api
-
-Modification introduced in
-http://cgit.freedesktop.org/poppler/poppler/commit/?id=c0affb1845c339f89ca67608cb9fd9134ff902f5
-
-Signed-off-by: Ionut Biru <ibiru at archlinux.org>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 77e5896..c9ffed3 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -407,7 +407,11 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state )
- 
-     GooString* pFamily = gfxFont->getName();
-     if( ! pFamily )
-+#if POPPLER_CHECK_VERSION(0, 20, 0)
-+        pFamily = gfxFont->getName();
-+#else
-         pFamily = gfxFont->getOrigName();
-+#endif
-     if( pFamily )
-     {
-         aNewFont.familyName.clear();
--- 
-1.7.10.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-14 18:18:21 UTC (rev 159002)
+++ PKGBUILD	2012-05-14 18:19:40 UTC (rev 159003)
@@ -21,7 +21,7 @@
 	'libreoffice-extension-report-builder')
 _LOver=3.5.3.2
 pkgver=3.5.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -75,6 +75,7 @@
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
 	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
+	poppler_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ac68934592ec7d838cf5c22744be8d97aa4a1a47
 	buildfix_icu49.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
@@ -138,6 +139,7 @@
          '185d60944ea767075d27247c3162b3bc'
          '60ce5dc9bd098f95c2e621a930c98dd9'
          '661a52a02a31b3afbe4b3b3146061afd'
+         '72ba8d57cefdc25a6f1bc845edfd4d78'
          '9734ea20c9f67e1b6e1c5a1247fbd3ff'
          'f0e72d0e1bc93a50a3aa9d31350b156c'
          '867c682b45f477f916786e00c45d7ab7')
@@ -165,6 +167,7 @@
 	patch -Np1 -i ${srcdir}/gmake_install.diff
 	patch -Np1 -i ${srcdir}/smp_buildfix.diff
 	patch -Np0 -i ${srcdir}/buildfix_icu49.diff
+	patch -Np1 -i ${srcdir}/poppler_buildfix.diff
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205