packages: libreoffice/libreoffice.spec, libreoffice/libreoffice-poppler.pat...

[arekm]

Author: arekm                        Date: Sun May 27 15:23:12 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; poppler build fix

---- Files affected:
packages/libreoffice:
   libreoffice.spec (1.944 -> 1.945) , libreoffice-poppler.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.944 packages/libreoffice/libreoffice.spec:1.945
--- packages/libreoffice/libreoffice.spec:1.944	Thu May 24 14:59:03 2012
+++ packages/libreoffice/libreoffice.spec	Sun May 27 17:23:07 2012
@@ -50,7 +50,7 @@
 Summary(pl.UTF-8):	LibreOffice - potężny pakiet biurowy
 Name:		libreoffice
 Version:	%{major_ver}.2
-Release:	2
+Release:	3
 License:	GPL/LGPL
 Group:		X11/Applications
 # we use git because released tarballs are buggy too often
@@ -87,6 +87,7 @@
 Source30:	http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 # Source30-md5:	17410483b5b5f267aa18b7e00b65e6e0
 Patch0:		%{name}-hamcrest.patch
+Patch1:		%{name}-poppler.patch
 URL:		http://www.documentfoundation.org/
 BuildRequires:	/usr/bin/getopt
 BuildRequires:	GConf2-devel
@@ -2427,6 +2428,7 @@
 %setup -q -n %{name}-core-%{version} -a1 -a2 -a3 -a4
 
 %patch0 -p0
+%patch1 -p1
 
 for dir in *-%{version}; do
 	[ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
@@ -4097,6 +4099,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.945  2012/05/27 15:23:07  arekm
+- rel 3; poppler build fix
+
 Revision 1.944  2012/05/24 12:59:03  arekm
 - release 2
 

================================================================
Index: packages/libreoffice/libreoffice-poppler.patch
diff -u /dev/null packages/libreoffice/libreoffice-poppler.patch:1.1
--- /dev/null	Sun May 27 17:23:12 2012
+++ packages/libreoffice/libreoffice-poppler.patch	Sun May 27 17:23:07 2012
@@ -0,0 +1,28 @@
+From 704f3155cca2e1fb5ad071539b7f8b5e5522dd97 Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru at archlinux.org>
+Date: Sun, 13 May 2012 23:57:46 +0000
+Subject: 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>
+---
+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();
+--
+cgit v0.9.0.2-2-gbebe
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/libreoffice/libreoffice.spec?r1=1.944&r2=1.945