Add patch to make libreoffice build with poppler-0.18.

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 5d73d566ee27fd80c24716dcdb9287aafb22c0ae..4adc5afedb50c04eb35ac66085142ca4724c7277 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.150 2011/09/29 13:20:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.151 2011/09/29 13:42:10 scarabeus Exp $
+
+  29 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/libreoffice-poppler-0.18.0.patch, libreoffice-3.4.3.2-r1.ebuild:
+  Add patch to make libreoffice build with poppler-0.18.
 
   29 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 ad30a4531af9ab0575b3fd4553016f02dc45c584..d92cee09119823f692f430b900d93e33b4b4a11d 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -23,6 +23,7 @@ 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 1160 RMD160 b15e3c478eda9a6efbd22ae2b10d45c36218344d SHA1 bea65d40f42bc874e59d91ab6aba29b57f0738ed SHA256 638ae5f41aef015a5fa87d7c7293b8180a16870f142c90c86d6347e251fc01d8
 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
@@ -171,25 +172,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 18350 RMD160 54bbfb6be956667016eefe1dad15737cc44e1deb SHA1 59dafcc4461a5c8571f814b41843950420b54fdc SHA256 8f883984653e50045ec2404ce4286950bafd82cf31e97347edc38a61e1fe2b4d
+EBUILD libreoffice-3.4.3.2-r1.ebuild 18392 RMD160 988b114219c3914cf18ca8c60fbc6012d310a5a7 SHA1 cf661741a45d50f8489a2c0160701570b4bc0c5b SHA256 0d2d3450a86f19b9959c4efa9e37828cda5a8d313ae7e9e401087a921e313e40
 EBUILD libreoffice-3.4.9999-r1.ebuild 18444 RMD160 6209f79b7aee2ef034810b62a30d80a6c573e683 SHA1 76cd9106979325bbc55127c9a37d83514f179a11 SHA256 578c8666330d5e81c00f11127f6c671e780addb01ac8052dcf508388b691c8fb
 EBUILD libreoffice-9999-r1.ebuild 14073 RMD160 a5c3bbd8bddf989c1293599ed93ca78fd4126eab SHA1 05e064546c1405491947863697c224746d6c586a SHA256 706099d21db822bfcfda507b9fd1ad2935c1687f22c324e1a4aca455fd81573a
-MISC ChangeLog 28551 RMD160 16bf112ce067dd06e095b697f8fa53a5691a3128 SHA1 e40eb46be2e8ea1b580fc53e3d5e2becf1efdd9e SHA256 b228e0c7e92eb0ea9a754224b5fb48303d4f64ed59bc92138ca876242c7547f8
+MISC ChangeLog 28738 RMD160 2fd5b594561aa379de99cf99b3b768873511c1ac SHA1 56bc6667b836486f53ff9846ac57f0154777ede3 SHA256 da8c20c0121293de83277feb54f66ddef08224efd7e07761144630237f6a9e0c
 MISC metadata.xml 1060 RMD160 d45f264670abdfa12c42935b489af5f462f70189 SHA1 d3932fab9bb5ab0bc404a95c60fa6a03f08044bd SHA256 f7a39bf4b3077ec5bada9e35940d1a02dcf9a62b77a56cc6346f750528a1e092
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOhHCJAAoJEOSiRoyO7jvo2VQP/1qOA3+5nb3ZnirlYljVHgaR
-+n2XSjeQvJizgbqCbNiojnQm+e/bGTtFbi6jqV8mfqmbOfctfCrNiE4cAn8K1N6g
-LF76z11m9SWf+jAU1L2byx7rFr4hg4dwJMuP3mD1pDtTuYT3AEBgJJeAS8bv+VP1
-Dzzkok7tn/tOwYoo4UzK8lw2+uJ7r1gboJDll8MIVjfw7euGYzVFHEwUNe83aT/z
-CccjuORZ6a0JuZuYaGi9wEWNIBDkHD+7aX81Q9VdBINlcxW1t9eQg1LGVuiHbuwx
-Jv2p8ykhky96O5qw+4gwwhAVmaL2syl2shtKMEhH3mdKgFYupIYepPe3ubt/leTs
-o9GrUSxwQUUEDaBHblVtvmtJmw3vDvvhs/LndkdgnD2aw8Z4Q3D+LoqcuXLT2Nfn
-VaUU+BrcY7rJcEA6uVoJSAd4mPZOHxao96CF6SNFtzonrs8QfcLPhaUXvxaJgOqq
-UGkZAW/4jHWzgXfHxqEv3sp5IrjHJw2edlG7bLTGbMFp7TMzRI/ijnciUbg6VMxe
-yjg8Zcre+XsBMOYg6GeMtLIVZtUtdjOFhOWDFWsUIob37Z9IORuamtm7aknZXhnZ
-Qp8O4cdjbjqegaCMtrYfb6buzGpOfGBtAlydiFyqi5una5NtHfWJQFLrcup5pgeM
-/LLFqX6fNP4cjr7BE+pz
-=BIam
+iQIcBAEBAgAGBQJOhHWRAAoJEOSiRoyO7jvo5HMQAKFLalSOlBH7gtKYHdIa0lkZ
+UYnIciT5CYZt8ImhBRYF6J357xqoMTdnflYMrAHNDKpielAlx6j8nbgatYyhznZb
+s4BZYJrQhS2iW9U0Elxh9TTrzDnTd+OQpQJ4eWLmEYJQyp4k/7nyHTDNPP4hwUJw
+128Y9jMq3plV+3Rn7feNX0OJo3ZNB7NopkMPaFtnFVMTP0yMro5D9HRUOrfiozQC
+WT/RIMWCvBrOC9uaiGmO+YEReVOIK+JnFWInrZahN7qGWM6hFMbEuxm6T/jOBL7G
+T2O+/90jIGMcUQJ8bDSkgzYzsrbN9Y7K+9kzHNvTmzl4afK8YRuDEAFf8whH1PP7
+szbqhGC7ScBElnu+hWa5Iqfl3xadowdvm9offsWJA9GTMQp0NhRg7yvzSN8PB+TP
+fO6xLyb5HZyprJsQAqYVkiDud/h0SC30aJPy4prUPIsI9d085e547MfaQycAHWex
+iUEMlGNvQxeGN7U0HWwLSyASe/K1VAw5MYS/bZqJ/uy3qKhYQx2JtC05/9U1vA4j
+Hmq4uLt1i0VVRA2DKr6hGejeonG7H53HubzODkAlpxz2bc+FVniaDlEIeqMU1beA
+BNizVAINHoOYXMfz8Kk4Jr0Ipz2KAbtInk2dgyl84qPY8J8MoRo35GXzkOsy3A33
+t4eZyJmpa33GQ7FOKmdS
+=/EhH
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch b/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch
new file mode 100644 (file)
index 0000000..5d47294
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch
@@ -0,0 +1,33 @@
+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

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 f8b3c46341cf5b14402aa792cfa3568c08eaa7dc..677423bd0d0a2631e4b35722f874b13d7e78e6c1 100644 (file)
--- 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.7 2011/09/08 12:33:26 scarabeus Exp $
+# $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 $
 
 EAPI=3
 
@@ -228,6 +228,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-kill-cppunit.patch"
        "${FILESDIR}/${PN}-honor-strip.patch"
        "${FILESDIR}/${PN}-java.patch"
+       "${FILESDIR}/${PN}-poppler-0.18.0.patch"
 )
 
 # Uncoment me when updating to eapi4