Fix build with poppler 0.18 also for 3.3 branch. Patch adjusted by Petr Pisar <petr.pisar [at] atlas.cz> all kudos to him.

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

4 files changed, 97 insertions, 17 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index a49f6c2a0d32..750a64f6fad9 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.178 2011/10/21 07:56:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.179 2011/10/25 09:08:26 scarabeus Exp $
+
+  25 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.3.4.ebuild, +files/libreoffice-3.3.4-poppler-0.18.0.diff:
+  Fix build with poppler 0.18 also for 3.3 branch. Patch adjusted by Petr Pisar
+  <petr.pisar [at] atlas.cz> all kudos to him.
 
   21 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-9999-r1.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 11e68f50d714..5b7fb250c26a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -11,6 +11,7 @@ AUX libreoffice-3.3-libpng-1.5.diff 522 RMD160 4bc6ad8cec9c35d5a30b87c71d78deb75
 AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ceb4b862ec0f8a95099367b0 SHA1 a888ff72ba4998ccc59cd88c31db452c715e3c34 SHA256 bf177f6445f67a1a2d9ac972e835b1308835ba4c1358f582939345caf469079c
 AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
 AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
+AUX libreoffice-3.3.4-poppler-0.18.0.diff 2636 RMD160 c101f9fcb93ab129478086c8a39493e1e75f7d05 SHA1 3105fae366691a90b4064b3633c32127d1c34bc5 SHA256 716c982b63487d2ce42ad97a909505ed333fd33bdf00eedd23cd6616a078f06a
 AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
 AUX libreoffice-32b-qt4-libdir.patch 878 RMD160 5d1d90ca61106ac4962d7f70489910191f4347b6 SHA1 5be37237f9564613c893a7e486b2a1ebb24584c7 SHA256 9785fe9ae6c11f922b13941a5b60733a8bce70b08db71a9447e960191b210f0d
 AUX libreoffice-append-no-avx.patch 2418 RMD160 8c9a45ccb95425c13a2de5895761703022d99ac9 SHA1 f181c74bb600c9ecafc9d295148061cc0e0be701 SHA256 1720741dcfbd48345140029b405db68c25564245eaaa3b336113a59b005df611
@@ -150,26 +151,26 @@ DIST libreoffice-ure-3.4.3.2.tar.bz2 6214027 RMD160 188aa9c9621fa03d4af10832fc25
 DIST libreoffice-writer-3.3.4.1.tar.bz2 6778265 RMD160 a2a3bbe1f8e6ff0f03b419ece249bc0752bd081c SHA1 d572efceaf4249ebd97df0446d7b2aa74d506858 SHA256 312aaf0610753a789d7e7ed5ebf407e0fc12a4e35f50d3df51dbcb40af799c15
 DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6addb59fee22ace29 SHA1 57a549b811c0b95898a9532968ce4a9f6fc33f16 SHA256 65fdcb132a84fae9f4ec0d84501f13ada3861fbd7646947ad0cea495b637be9a
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.3.4.ebuild 18162 RMD160 f29963441e78ecd4062d176119987355296e3057 SHA1 4b3d262b9255dc76e833434583f31a7d6086d23a SHA256 fb483c75ac39fdf2450e07b70d4577c34df333f547b972660904d6d652f647dc
+EBUILD libreoffice-3.3.4.ebuild 18254 RMD160 f8ccfefe0f1663982a07f9468db62cd8be2e98f9 SHA1 76ee2d703a045fe306a119f7c750d5f1633a240e SHA256 4d723c31545c807a77b3b24199b566bcec50f4784a5a767ef021a13f5843d1f1
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18446 RMD160 ea7208dc6ed726a698cdd68c96be0417eed323fa SHA1 b82fc9f6ee1215215fdc80f40c76307c9792b459 SHA256 629940b89965508ad7de68acd9a770b10c4d53e8d11b8bd769a7777aded1ef3a
 EBUILD libreoffice-3.4.9999-r1.ebuild 16269 RMD160 d9449d2f8445a12f33fbe5f1af717671d055c792 SHA1 bcbeea0f27b205e64f4659f36ea01b972102c8da SHA256 1189703251017dfb2aca26c53e602598b8be589903d97570fd8138c21888e08e
 EBUILD libreoffice-9999-r1.ebuild 14462 RMD160 a65aecc481120833bc96832d15775ab18c1f86a0 SHA1 1aebed8dcd80c13c56ff2f65c4aba44041d5090a SHA256 6d16e5950b6ede3be9a7847894441b0e64b03679384779e72f19a1a37e99bb26
-MISC ChangeLog 32490 RMD160 ce39b4a03c5b1aae1fae685b7569353749357110 SHA1 7e9a34707c1392c7b022f5c23961c8c682f77a55 SHA256 d950e18b695eaecca89454e1f0869d475a84e43fb4b12b5978a19723f0fb7483
+MISC ChangeLog 32747 RMD160 79a1502e3f0673c37763b3a6bb1b161292871a73 SHA1 cb32e5c16129b397a7335bc5bf9448b8c276fda0 SHA256 20d1636a17a04753ff4aa15a344d2545118b466c603107d2732cd1a9463b4673
 MISC metadata.xml 1192 RMD160 f723ac57dc7424dea71c29a052e2aae915c908dd SHA1 87181bf865c0bd53b4215ec36063a1f422e5eca5 SHA256 e3515fe7fcec3baa6e0b2dfb769c91f459ab6c34cf29a6b68498e17c3c7400a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOoSWDAAoJEOSiRoyO7jvoC6wP/2NCz1cCzvNXikCW3AVwarrF
-7gNQRZUuv3HGQtOn5UVrLscxxPe1G+PEe7NYk8HyqOSrkLsX9DCTLlNJ5AnvROio
-QS7ySoG46e1I4NUkrdUS1YVIFqs0W8y6FDcOc+XEkwzzz4M1sa3eoUMnjB2yX9GG
-hvTLQRVX/IGSPW/MwSXj1T+1eV0EQHIPrKXYxBlvMhpic7OCTvHkPQq2OVRWysr5
-VDckQhXXFcv2KBDuoAqI5IglMN60/QUAKa6wdLUw2YdlKJZktEyZfo6dOtwd6j1R
-ZTzHEx3jRjF0wEI0nQa2SqY92LUajZOHwGslHhbz8Z36zDxLrEDHKKYbnGXkWHUU
-acAwrQZYMND2btcKbqQvnr4iO+6AXWqH+9GUgzH6MOKpsfLsjSf9jb9aKLoSKJdh
-if0tRv6VUiVBysF8nXiVsIJOKoqD07waJq+ccyUUsgoppV1I7j8CsZ7h5HQiAG0V
-N6p0MMYC9oKZkpS7kAs9RuXSJiV61vaZaj+Hd7HqE4aAjKkVTSq0Ma2qeS9wh7MM
-7tzwJWlXNpcD3J2iBtLnxwH1NUYbAWgzpxmtUIKyFsV5Pyo4nSN5NjKrazwDbNPf
-9aLLagiC16VvGW59Ffb4sQ694ZSmv1z4G8pcLKhp+DPFGg8COvJ5OecwTZBgeM8i
-iKzzHzCLui79aBrRJkdq
-=++1t
+iQIcBAEBAgAGBQJOpnw+AAoJEOSiRoyO7jvoYu4P/A61E4vtHwTJauOOFVJeDRIm
+YxZhplpJizrkjU+gT5VO2KTWG4K9iNLSxpGy5PV0AzskYNtqU3k2yKLfTU0Z/4gS
+TkLHMlHhBBgpS3nx6sDueSWBWdrDDEkulbv6cLCH8sJWGevPkLskWfBx7vasVMPp
+ssUNImjGOq9Wd0/pyjG04KnlbkniXskM+rgxdlcfh5eWuve6NNt4KXm0DvJmqEZT
+AuFAqCmS6FDHQOtGe6we6OSgcXjcJdikOuSYmL80KHJ47HeQhwwCG14BAF4Co0/y
+wg9UVHvFt317iqvgYbZPp3PwaWGHi3J28Q+iB2dLYv8u91TTuZjPZIchBe89KdoT
+UJ8WtO7wQoeuhltgm5/MHwBO9OVCp/ze7wRxAyKY6KRMmrvQ+ssurvgSLAUeMUVh
+r1z5EgsnX7jd9U6T/DR619MfQhKZDhp45hch5pfyGjg3GY7OJs3VB+Pwaersnf6f
+OoE/YY5Hrmn9YxWjeja7+2R3bFLslhxPgEGDv29Y5UmDf/UzVL3pNucDWzYa5wiM
+6YCcJYcVvd1P17l+3rXetMQdtBpsdcG+DV0u3DAJnsRAEZGLm5xO4uMnyJuXx4B0
+sZd5ctcKUqqQq9JBSYeTImbO8y6ADinJ9niRqJIu+zTpf1XOfRZmxabupuZzfaC9
+l4ULcJqbo2FWYXov9Pbx
+=sKG8
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-3.3.4-poppler-0.18.0.diff b/app-office/libreoffice/files/libreoffice-3.3.4-poppler-0.18.0.diff
new file mode 100644
index 000000000000..c88fa844a47e
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.3.4-poppler-0.18.0.diff
@@ -0,0 +1,72 @@
+From f6f8f67460bba296c49f794d14621b7313df4f7d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Tue, 19 Jul 2011 08:54:07 +0100
+Subject: [PATCH] poppler 0.17.0 changed its api for no some reason or other
+
+From 91313fc05abbfe35ee1e0c2464a28dd580780f07 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Fri, 2 Sep 2011 13:15:49 +0100
+Subject: [PATCH] Resolves: rhbz#735182 libreoffice doesn't build with
+ poppler-0.17.3
+
+---
+ .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx       |    8 ++++++++
+ .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx       |    7 +++++++
+ 2 files changed, 15 insertions(+), 0 deletions(-)
+
+diff --git sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index f7741b4..bd6d721 100644
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ 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;
+@@ -489,7 +493,11 @@ void PDFOutDev::endPage()
+     printf("endPage\n");
+ }
+ 
++#if POPPLER_CHECK_VERSION(0, 17, 0)
++void PDFOutDev::processLink(AnnotLink *link, Catalog *)
++#else
+ void PDFOutDev::processLink(Link* link, Catalog*)
++#endif
+ {
+     assert(link);
+ 
+diff --git sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index 3ac0f49..88a60d6 100644
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ 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
+ 
+ namespace pdfi
+@@ -194,8 +197,12 @@ namespace pdfi
+         // 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);
diff --git a/app-office/libreoffice/libreoffice-3.3.4.ebuild b/app-office/libreoffice/libreoffice-3.3.4.ebuild
index e61fb91c13c0..5378af617d4a 100644
--- a/app-office/libreoffice/libreoffice-3.3.4.ebuild
+++ b/app-office/libreoffice/libreoffice-3.3.4.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.3.4.ebuild,v 1.6 2011/10/20 11:10:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.4.ebuild,v 1.7 2011/10/25 09:08:26 scarabeus Exp $
 
 EAPI="3"
 
@@ -271,6 +271,8 @@ src_prepare() {
 	cp -f "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff" "${S}/patches/hotfixes"
 	cp -f "${FILESDIR}/${PN}-libdb5-fix-check.diff" "${S}/patches/hotfixes"
 	cp -f "${FILESDIR}/${PN}-3.3.2-bison25.diff" "${S}/patches/hotfixes"
+	# Bug #387735
+	cp -f "${FILESDIR}/${PN}-3.3.4-poppler-0.18.0.diff" "${S}/patches/hotfixes"
 
 	#Use flag checks
 	if use java ; then