- rel 3; poppler build fix

Changed files:
    libreoffice-poppler.patch -> 1.1
    libreoffice.spec -> 1.945

diff --git a/libreoffice-poppler.patch b/libreoffice-poppler.patch
new file mode 100644 (file)
index 0000000..4bb690d
--- /dev/null
+++ b/libreoffice-poppler.patch
@@ -0,0 +1,28 @@
+From 704f3155cca2e1fb5ad071539b7f8b5e5522dd97 Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru@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@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

diff --git a/libreoffice.spec b/libreoffice.spec
index 4e2e0c2b8c5b9b00682ebfc1b7ac382d585c4f29..04fa935e0d115b04799e37a63b004f60585a91ea 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -49,7 +49,7 @@ Summary:      LibreOffice - powerful office suite
 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
@@ -86,6 +86,7 @@ Source29:     http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a33504
 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
@@ -2426,6 +2427,7 @@ bashowe uzupełnianie nazw dla LibreOffice.
 %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