Add another patch to fix poppler for good.

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

5 files changed, 110 insertions, 32 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index e44f14e6b5dc..46ff82b990b9 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.154 2011/09/30 08:25:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.155 2011/09/30 10:09:16 scarabeus Exp $
+
+  30 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/libreoffice-poppler-0.18.0-2.patch,
+  files/libreoffice-poppler-0.18.0.patch, libreoffice-3.4.3.2-r1.ebuild:
+  Add another patch to fix poppler for good.
 
   30 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-9999-r1.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 24c48dab1325..a5c439b7221d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -23,7 +23,8 @@ AUX libreoffice-installed-files-permissions.patch 374 RMD160 83d650b6b0e84a02e2a
 AUX libreoffice-java.patch 1879 RMD160 2a1a3ab82a9eb526d09beed577b98be24f485e33 SHA1 08f7d6c300e494ba9f056b941752419872d6d2cc SHA256 beab05671a22a685acf0a60bff8ed65deaa2b2ba79c79b6fcff59d87e2a7ecd4
 AUX libreoffice-kill-cppunit.patch 555 RMD160 97655715899b1518b3c7935e6db504196f561d00 SHA1 05d28cbc51ca13b8f77c95e78a1810318a423afc SHA256 5d792f868f0dec1ee3147a1054e127ecbf07aa33a69132a5f60e3b692896543e
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
-AUX libreoffice-poppler-0.18.0.patch 885 RMD160 9745263963377bf7a9bd0b675a1f080f190e8614 SHA1 3079b643390e46a92a34d7cd3ee2ebe5366ac3ba SHA256 66f2a281c4feebffce5ac634177186a353e2712648cb71a3ac335a4cc4b1787a
+AUX libreoffice-poppler-0.18.0-2.patch 1160 RMD160 366ef7a3afd4be4fc4239cf1afa4307725f6d9c9 SHA1 6dcbda54bc11c6d1db3f42a31702fedd0ff4d9bb SHA256 0b6ac87bb34bb1e4b43d8980d19f2d05b3bbd5eae8a378269385042c0b22a3d5
+AUX libreoffice-poppler-0.18.0.patch 2277 RMD160 b9ba9a1750899b019b1b25d3b3a06dd97164caef SHA1 ff3b070d09f47b75ffb8a558aff14bbd728ede5d SHA256 1014be0825744828735fa4147c5d4665c0c0cbac7711c22b7dfdd5cd466f1a54
 AUX libreoffice-solenv-build-crash.patch 492 RMD160 b5220c76d90e785a5bb38548cad8d5d9d73de7d2 SHA1 a0571d2301ce9f03ff5b58326906fe2078ea39b5 SHA256 45276cdc69444a0542bac4e949ef92bac4286db58b824198a59f797bd71c81f6
 AUX libreoffice-svx.patch 1347 RMD160 91d5f142df33d119666252ecc319dc4e7ec70f6d SHA1 020db7d4e784a131acc63413ccc625715d44df70 SHA256 dbcd451e390c78102075b048e1472cb45c8d960608bef4ac0c0611c7aeaea736
 AUX libreoffice-translate-toolkit-parallel-solenv.patch 439 RMD160 03aad89f6ee542243e599e80419a270b040916ca SHA1 c5c41c21881e6b6de7c7c784f66c640f6a06a1c6 SHA256 cf8ab3923825706d6607c7efc28c26eedac886a4678586129e75be1b689d1ea1
@@ -172,25 +173,25 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599
 EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2
-EBUILD libreoffice-3.4.3.2-r1.ebuild 18392 RMD160 988b114219c3914cf18ca8c60fbc6012d310a5a7 SHA1 cf661741a45d50f8489a2c0160701570b4bc0c5b SHA256 0d2d3450a86f19b9959c4efa9e37828cda5a8d313ae7e9e401087a921e313e40
+EBUILD libreoffice-3.4.3.2-r1.ebuild 18436 RMD160 b191fa9979d6dbdaa1bcd28e2c6d2f9032bbc1e3 SHA1 8257e6ccadccce2be69f4b505434b6797acb069a SHA256 db88c53de529b6375dc88e0d80a20fb9e60c6662141ef0a6671cfb266c4b67c7
 EBUILD libreoffice-3.4.9999-r1.ebuild 16078 RMD160 e296524c64209e00a4fbdeefd022eaef87b4eabd SHA1 6f82a057952733af6a7762b9a0cd61b46212ec90 SHA256 44246714d937e8cedf3e78109fa69484099d07bbcab6f1c76e3125d00087fa3f
 EBUILD libreoffice-9999-r1.ebuild 14140 RMD160 2cf3c484fbe1db40b586287b063a5d41ba99b357 SHA1 74963ad6963c4d6c4d0595c06796178b77cb5acd SHA256 e6c5d0c9c8559ad17c47f0fccc03ad935366ed20f4e4a57693279a4bce6ec9aa
-MISC ChangeLog 29172 RMD160 757a97fa29dd11ccc3a3e0586ed3210d1e3d66da SHA1 7985ef600e0d5e12163110990621c3d781846ef8 SHA256 18a459334416c2aedf91cbc444b2ca785248d3223aab06de22049d9122c81ff6
+MISC ChangeLog 29391 RMD160 a13ab8a25333dab105f1b7a7178f03e62920f4ce SHA1 2cd2cc8c7d3c110a4d66b311169ee62fb0f03cca SHA256 cd244bbb5422e4b935f4b32458cd9dafde3ba5ba0703bda7b66e49eab0228311
 MISC metadata.xml 1192 RMD160 f723ac57dc7424dea71c29a052e2aae915c908dd SHA1 87181bf865c0bd53b4215ec36063a1f422e5eca5 SHA256 e3515fe7fcec3baa6e0b2dfb769c91f459ab6c34cf29a6b68498e17c3c7400a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOhX0QAAoJEOSiRoyO7jvoa0cQAJGwl6m4t3ZvPduy8fVcEYOZ
-z/iIxN/4um2eTWH5mECSLscjAhXRZv6pAoM9rdgsPq8oTeDrfQVbS6VP9ds54Psp
-7k2BHio3PSSe12Big6p4HawG0hyLCy9xtvzWoKBhrPaf6IhD0GIpBHQXEJ7onPdW
-RXtXlyPLBXq0Ri/387nkD7qDw7F4v0H0ExWHBM1uqdZ5jF1hr27BY3W9M2Ldq12X
-guB/DI2933GJ41MaQOKQaulJz9XORDxOj1uNuBG2gAeU5JMrASENCJqz5PGWpZ4Q
-NyHYVAK/yl27eAcAa2qQuWQ47+e2epLpfOTHtLlh3BnKAnCVrz6V4JdggVbDJhiH
-XMw7B8jpvCx2RQ1xX/3IBClQhje+IO1PWScLS5XF4fwpXF+bmIBoLewklFdnTy/b
-mjcaVpCOpyYI4IMzblavP0549XO30HswNpOouhh3b67ZeaSF1JEQIk/nBMSLrlwO
-iDOLF1J+L16fDXScUa/ZRIRnHSD3amS48NKKhM95sWNJiQoo1Ad127AHfebyaNhW
-b9d2OM60d5uT9eS0JLwO+FMSl7PPd9bDiVe6nKieaUz1EAfDo4QJtDi0abniVvmi
-wjlRQL9mmhBc5ukzEI8LPoh+ll4HsF28nVX53AhL3pwEk4oMhdxJI63XWknkWfrb
-aCCAcWBEJhs55yPws1Yp
-=qAFn
+iQIcBAEBAgAGBQJOhZV2AAoJEOSiRoyO7jvor6IP/2HXj+JdTrofFzjY4sjmCSyU
+niD2uAxHjwuw7d5VhvhBdfeavCw1V5ePzg584Qy0eT4dtV6WktbfDe2R/oRNwiT9
+iuT5F/ReHjjNPfb8K6d7BfdXdYldmIAwqR8SjI13bH6z+3dJ4+y6gXAHGkUwEeco
+678YtDceujBIjIiTvjpG/+B+Al5H7Zpn4xQQIyvBemYEfd2RKI4lQLIKAIUI9k9K
++6lMkiVbw4V0r6Iflt8OC+6JP+bcfXUjcal/M3N7p6A6DIVsFOrYyQubjnPPugYR
+Jv7no9D7CnJcKJ7JscHIMk0fux2RF3nabQ5v6i0RHwDHzL8ywmCQfnP0tf2Wu6X5
+WBzR4kfId0OGo7iRTpD2KMv2ibep+RoPxQ6UXTz3GuOLiFoENaQKDi2cGRluEuTV
+k8GMhHr9PPXe33BjWL8b4cdCpkF3yJRtdKHlAOYepppTnQgZB9B65mLbBm31G688
+iTlw9J+9iwrakyecrOyolMwUKWdmM4IrdZMyAUO40OHLgmipPYlQdw4CPe0SqKip
+BF2TQoeSnpeA25ifahG053htyZFw4ZTdAPVVhHVzcYOqp6hSBHjB2AyXSOiKK9Nj
+L+fb19kyEMoCgp5rMdXuvEC3rdvSqwZZz0GBKnyuQEA/KPtSe0FhJdBB5wW0ccW5
+pq697Qa1rFRKh95/V09D
+=G4JX
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-poppler-0.18.0-2.patch b/app-office/libreoffice/files/libreoffice-poppler-0.18.0-2.patch
new file mode 100644
index 000000000000..d627f9c9b1fb
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-poppler-0.18.0-2.patch
@@ -0,0 +1,33 @@
+From 9540db43f3f1b11d3407a45aefda235d7e78f76b 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 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
diff --git a/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch b/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch
index 87fbe41c48fd..819deaf29e14 100644
--- a/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch
+++ b/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch
@@ -1,24 +1,62 @@
-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
+From 53e66aea4c1b3617363fd138a7903190d964da6b Mon Sep 17 00:00:00 2001
+From: Tomáš Chvátal <tchvatal@suse.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@redhat.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
diff --git a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
index 677423bd0d0a..032d316bdbba 100644
--- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.8 2011/09/29 13:42:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.9 2011/09/30 10:09:16 scarabeus Exp $
 
 EAPI=3
 
@@ -229,6 +229,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-honor-strip.patch"
 	"${FILESDIR}/${PN}-java.patch"
 	"${FILESDIR}/${PN}-poppler-0.18.0.patch"
+	"${FILESDIR}/${PN}-poppler-0.18.0-2.patch"
 )
 
 # Uncoment me when updating to eapi4