Bug #317909 - Add patch to compile with podofo-0.8.0.

Package-Manager: portage-2.2_rc67_p98/cvs/Linux i686

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 2db686b96c2db50aab309dc0d0bd657d1bca64c3..8268dd82fe9f9f4bd97a3283f9d20547a8ae5ad5 100644 (file)
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/scribus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.126 2010/03/17 10:02:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.127 2010/04/30 22:53:15 zmedico Exp $
+
+  30 Apr 2010; Zac Medico <zmedico@gentoo.org> scribus-1.3.6.ebuild,
+  +files/scribus-1.3.6-podofo-0.8.0.patch:
+  Bug #317909 - Add patch to compile with podofo-0.8.0.
 
   17 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   -scribus-1.3.3.11.ebuild, -scribus-1.3.3.13.ebuild,

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 357ba2be1aaa0727fb1588cccfd520b5cd5d6416..672abcc51fce1ead4598c3a5ee2bd33eea317e15 100644 (file)
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX scribus-1.3.5.1-check-hdict.patch 763 RMD160 c3c91f54004f69fce789d65c5bf298b3c7e2f034 SHA1 81e43534289516f41a33d5d2c1d7dc93b1291cbc SHA256 ee50555430cb6a14d63c5e7ec2bd64b3240a3adb2266eed90f850fdeeeaf10bc
 AUX scribus-1.3.5.1-lib2geom.patch 1052 RMD160 cda2ac0a8d053d049579276220adb574cdfaab10 SHA1 bb983d29223bedabeb8759d2c90a0baf446d8ec1 SHA256 1efb7fedad54a6a19a86b35121243800c7f38a550381329e09447fe1eec540b4
 AUX scribus-1.3.5.1-system-hyphen.patch 3754 RMD160 15e0768f9f2aaf1c297b2226bd040d9ff8b0a648 SHA1 c5f9513799f41fb6569cc6bf9a2f7825d3a494bd SHA256 f17ef356e0c096b71e83048a4c97b53e455a73af7f25bc9048136c8000744e67
+AUX scribus-1.3.6-podofo-0.8.0.patch 1749 RMD160 f5a54609d7f382cc99e90857c430585f704b9918 SHA1 901631c1b1b2a01ed4acb594ad8bc1a54803810c SHA256 498e2ec592175123b54cc090b1b839c8452c1a1a768d9b29737c5386aad963b7
 DIST scribus-1.3.5.1.tar.bz2 23680739 RMD160 8b8a73909b3c482de2a77cd344e91a8aedbf2611 SHA1 d138e47e2177974d18c2f7c87a1db9e462bf6287 SHA256 2e40fdf19aec6e4cfa7923bcf1214a8ab76e298c2a8401553fe808ee1b29006c
 DIST scribus-1.3.6.tar.bz2 22910849 RMD160 ab12c1191ee2c260280114bea0c112b933be5c7c SHA1 02bb65e9b7688e09c24eda60eefdd2aa990ca40c SHA256 262989072fca29dab29f1677e9498b4d551aa1c0f2fe0dec866a6c304ec8ecc3
 EBUILD scribus-1.3.5.1.ebuild 1726 RMD160 0d03679f5ef9fecd474becfa09187a6939b06e01 SHA1 a82ef3b3a8c65ae6c0c1ca65b7484443b06cf4f7 SHA256 98b528bc076447bce4528930f6b624659f7d19b4906a825a2d747cff5dc8803f
-EBUILD scribus-1.3.6.ebuild 1687 RMD160 4025a60d86a5b939f0408be148a3a2cd6c21fe62 SHA1 9be84c52311a36a12c37fb08d6448e562a399cfc SHA256 44d95b86eddcfa46fbe75a09e8865f4f8b97df5b367a478fc245de0705c52c4a
-MISC ChangeLog 15225 RMD160 30ee22bc809ca558d5e22e456116bb1855234ab4 SHA1 469d39c9517566fa481f75a97569c27224e1bda6 SHA256 86696f4e35fd9b1d60b039f8251c87a0fb754fbca23fbe7d5d537450b236294f
+EBUILD scribus-1.3.6.ebuild 1730 RMD160 299e1710ec13edb16ef192d327ff3620352d9637 SHA1 f1aa6d7477c740678637836f83d777eff7834870 SHA256 7b0abd3bc122dba7f042a3364c84ca7927cef9173f3c2b8d9681944ea5ad0f8c
+MISC ChangeLog 15392 RMD160 cf28ecee04aef137b347174f8823a6cc08e5a32e SHA1 e4f66a3f520713334cc56774fa27c8e57a2e20ac SHA256 01e2ead0314aba7282fd022d1d982bd2b92248f3d11b2f897985b44ed4c3b865
 MISC metadata.xml 362 RMD160 9199b9f1cdf7ead6f377a2a112c075a1e99a8650 SHA1 03e3f1197ae7b149c9a365136d134d55f3fb9995 SHA256 c0a47d4ce874707eda75a4ae913db075febcfa5e8aff6428daf1beaf9d93cf0a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvbX20ACgkQ/ejvha5XGaPAQgCfdv6kOx1lldvclvW7KE1uez8v
+IYEAoM+3xiyDasX9ajjXH0rgNVDLrzz4
+=8D/V
+-----END PGP SIGNATURE-----

diff --git a/app-office/scribus/files/scribus-1.3.6-podofo-0.8.0.patch b/app-office/scribus/files/scribus-1.3.6-podofo-0.8.0.patch
new file mode 100644 (file)
index 0000000..2d590b3
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.3.6-podofo-0.8.0.patch
@@ -0,0 +1,50 @@
+diff -Nur scribus-1.3.6.orig/scribus/pdflib_core.cpp scribus-1.3.6/scribus/pdflib_core.cpp
+--- scribus-1.3.6.orig/scribus/pdflib_core.cpp 2010-03-16 14:14:03.000000000 -0700
++++ scribus-1.3.6/scribus/pdflib_core.cpp      2010-04-30 15:09:29.297220587 -0700
+@@ -6364,7 +6364,9 @@
+                       }
+                       */
+                       char * mbuffer = NULL;
+-#if defined(pdf_long)
++#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
++                      PoDoFo::pdf_long mlen = 0;
++#elif defined(pdf_long)
+                       pdf_long mlen = 0;
+ #else
+                       long mlen = 0;
+@@ -6631,7 +6633,9 @@
+       if (obj->HasStream())
+       {
+               char * mbuffer = NULL;
+-#if defined(pdf_long)
++#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
++                      PoDoFo::pdf_long mlen = 0;
++#elif defined(pdf_long)
+                       pdf_long mlen = 0;
+ #else
+                       long mlen = 0;
+diff -Nur scribus-1.3.6.orig/scribus/plugins/aiimplugin/importai.cpp scribus-1.3.6/scribus/plugins/aiimplugin/importai.cpp
+--- scribus-1.3.6.orig/scribus/plugins/aiimplugin/importai.cpp 2010-02-17 14:08:03.000000000 -0800
++++ scribus-1.3.6/scribus/plugins/aiimplugin/importai.cpp      2010-04-30 15:11:14.985832229 -0700
+@@ -413,7 +413,9 @@
+                                                       data = priv->GetIndirectKey(PoDoFo::PdfName(Key.toUtf8().data()));\r
+                                                       PoDoFo::PdfStream const *stream = data->GetStream();\r
+                                                       char *Buffer;\r
+-#if defined(pdf_long)\r
++#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)\r
++                                                      PoDoFo::pdf_long bLen = 0;\r
++#elif defined(pdf_long)\r
+                                                       pdf_long bLen = 0;\r
+ #else\r
+                                                       long bLen = 0;\r
+@@ -432,7 +434,9 @@
+                                                                       break;\r
+                                                               PoDoFo::PdfStream const *stream = data->GetStream();\r
+                                                               char *Buffer;\r
+-#if defined(pdf_long)\r
++#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)\r
++                                                              PoDoFo::pdf_long bLen = 0;\r
++#elif defined(pdf_long)\r
+                                                               pdf_long bLen = 0;\r
+ #else\r
+                                                               long bLen = 0;\r

diff --git a/app-office/scribus/scribus-1.3.6.ebuild b/app-office/scribus/scribus-1.3.6.ebuild
index 5081717f27516aff3c01798b1a1674f688303d50..7a1e7230fb7b13c8e1c43c28bd063480dff52ebd 100644 (file)
--- a/app-office/scribus/scribus-1.3.6.ebuild
+++ b/app-office/scribus/scribus-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.6.ebuild,v 1.1 2010/03/17 09:56:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.6.ebuild,v 1.2 2010/04/30 22:53:15 zmedico Exp $
 
 EAPI=2
 
@@ -36,7 +36,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
        dev-libs/boost"
 
-PATCHES=( "${FILESDIR}/${PN}-1.3.5.1-system-hyphen.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.3.5.1-system-hyphen.patch" "${FILESDIR}/${PN}-1.3.6-podofo-0.8.0.patch" )
 
 DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"