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

[Tomas Chvatal (scarabeus)]

scarabeus    11/09/30 10:09:16

  Modified:             libreoffice-poppler-0.18.0.patch
  Added:                libreoffice-poppler-0.18.0-2.patch
  Log:
  Add another patch to fix poppler for good.
  
  (Portage version: 2.2.0_alpha60/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  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.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch?rev=1.3&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.2&r2=1.3

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libreoffice-poppler-0.18.0.patch	29 Sep 2011 14:09:59 -0000	1.2
+++ libreoffice-poppler-0.18.0.patch	30 Sep 2011 10:09:16 -0000	1.3
@@ -1,24 +1,62 @@
-From 91313fc05abbfe35ee1e0c2464a28dd580780f07 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@××××××.com>
-Date: Fri, 02 Sep 2011 12:15:49 +0000
-Subject: Resolves: rhbz#735182 libreoffice doesn't build with poppler-0.17.3
+From 53e66aea4c1b3617363fd138a7903190d964da6b Mon Sep 17 00:00:00 2001
+From: Tomáš Chvátal <tchvatal@××××.cz>
+Date: Fri, 30 Sep 2011 09:51:04 +0000
+Subject: This is merge of f6f8f67460bba296c49f794d14621b7313df4f7d.
+
+It is not posible to git-am due to merge to core/ repository.
+It had one minor collision on pdfioutdev_gpl.hxx.
 
+Orginal header:
+From f6f8f67460bba296c49f794d14621b7313df4f7d Mon Sep 17 00:00:00 2001
+From: Caolán McNamara <caolanm@××××××.com>
+Date: Tue, 19 Jul 2011 07:54:07 +0000
+Subject: poppler 0.17.0 changed its api for no some reason or other
 ---
 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index cf28922..3f1261c 100644
+index f7741b4..5022dd5 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();
+@@ -489,7 +489,11 @@ void PDFOutDev::endPage()
+     printf("endPage\n");
+ }
+ 
++#if POPPLER_CHECK_VERSION(0, 17, 0)
++void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
 +#else
-     str = ((DCTStream *)str)->getRawStream();
+ void PDFOutDev::processLink(Link* link, Catalog*)
 +#endif
-     str->reset();
+ {
+     assert(link);
+ 
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index 3ac0f49..8a1708c 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -65,7 +65,10 @@ class GfxPath;
+ class GfxFont;
+ class PDFDoc;
+ #ifndef SYSTEM_POPPLER
++#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
+ typedef GString GooString;
++#else
++#include <glib/poppler-features.h>
+ #endif
  
-     int c;
+ namespace pdfi
+@@ -193,9 +196,13 @@ namespace pdfi
+         // Convert between device and user coordinates.
+         // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
+         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
+-        
++       
++        #if POPPLER_CHECK_VERSION(0, 17, 0)
++        virtual void processLink(AnnotLink *link, Catalog *catalog);
++        #else
+         //----- link borders
+         virtual void processLink(Link *link, Catalog *catalog);
++        #endif 
+         
+         //----- save/restore graphics state
+         virtual void saveState(GfxState *state);
 --
 cgit v0.9.0.2-2-gbebe



1.1                  app-office/libreoffice/files/libreoffice-poppler-0.18.0-2.patch

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

Index: libreoffice-poppler-0.18.0-2.patch
===================================================================
From 9540db43f3f1b11d3407a45aefda235d7e78f76b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@××××××.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 5022dd5..bd6d721 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