[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-poppler-0.18.0.patch

[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-poppler-0.18.0.patch

[Tomas Chvatal (scarabeus)]

scarabeus    11/09/29 13:42:10

  Added:                libreoffice-poppler-0.18.0.patch
  Log:
  Add patch to make libreoffice build with poppler-0.18.
  
  (Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch?rev=1.1&content-type=text/plain

Index: libreoffice-poppler-0.18.0.patch
===================================================================
From 91313fc05abbfe35ee1e0c2464a28dd580780f07 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 02 Sep 2011 12:15:49 +0000
Subject: Resolves: rhbz#735182 libreoffice doesn't build with poppler-0.17.3

---
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index cf28922..3f1261c 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer )
 void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
 {
     // dump JPEG file as-is
+#if POPPLER_CHECK_VERSION(0, 17, 3)
+    str = str->getBaseStream();
+#else
     str = ((DCTStream *)str)->getRawStream();
+#endif
     str->reset();
 
     int c;
@@ -490,7 +494,7 @@ void PDFOutDev::endPage()
 }
 
 #if POPPLER_CHECK_VERSION(0, 17, 0)
-void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
+void PDFOutDev::processLink(AnnotLink *link, Catalog *)
 #else
 void PDFOutDev::processLink(Link* link, Catalog*)
 #endif
--
cgit v0.9.0.2-2-gbebe

[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-poppler-0.18.0.patch

[Tomas Chvatal (scarabeus)]

scarabeus    11/09/29 14:09:59

  Modified:             libreoffice-poppler-0.18.0.patch
  Log:
  Cleanup the patch not to apply that much changes.
  
  (Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch?r1=1.1&r2=1.2

Index: libreoffice-poppler-0.18.0.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-poppler-0.18.0.patch	29 Sep 2011 13:42:10 -0000	1.1
+++ libreoffice-poppler-0.18.0.patch	29 Sep 2011 14:09:59 -0000	1.2
@@ -20,14 +20,5 @@
      str->reset();
  
      int c;
-@@ -490,7 +494,7 @@ void PDFOutDev::endPage()
- }
- 
- #if POPPLER_CHECK_VERSION(0, 17, 0)
--void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
-+void PDFOutDev::processLink(AnnotLink *link, Catalog *)
- #else
- void PDFOutDev::processLink(Link* link, Catalog*)
- #endif
 --
 cgit v0.9.0.2-2-gbebe