Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/scribus/files: scribus-1.3.6-podofo-0.8.0.patch
Date: Fri, 30 Apr 2010 22:53:18
Message-Id: 20100430225315.AB0CE2C043@corvid.gentoo.org
1 zmedico 10/04/30 22:53:15
2
3 Added: scribus-1.3.6-podofo-0.8.0.patch
4 Log:
5 Bug #317909 - Add patch to compile with podofo-0.8.0.
6 (Portage version: 2.2_rc67_p98/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 app-office/scribus/files/scribus-1.3.6-podofo-0.8.0.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/scribus/files/scribus-1.3.6-podofo-0.8.0.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/scribus/files/scribus-1.3.6-podofo-0.8.0.patch?rev=1.1&content-type=text/plain
13
14 Index: scribus-1.3.6-podofo-0.8.0.patch
15 ===================================================================
16 diff -Nur scribus-1.3.6.orig/scribus/pdflib_core.cpp scribus-1.3.6/scribus/pdflib_core.cpp
17 --- scribus-1.3.6.orig/scribus/pdflib_core.cpp 2010-03-16 14:14:03.000000000 -0700
18 +++ scribus-1.3.6/scribus/pdflib_core.cpp 2010-04-30 15:09:29.297220587 -0700
19 @@ -6364,7 +6364,9 @@
20 }
21 */
22 char * mbuffer = NULL;
23 -#if defined(pdf_long)
24 +#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
25 + PoDoFo::pdf_long mlen = 0;
26 +#elif defined(pdf_long)
27 pdf_long mlen = 0;
28 #else
29 long mlen = 0;
30 @@ -6631,7 +6633,9 @@
31 if (obj->HasStream())
32 {
33 char * mbuffer = NULL;
34 -#if defined(pdf_long)
35 +#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
36 + PoDoFo::pdf_long mlen = 0;
37 +#elif defined(pdf_long)
38 pdf_long mlen = 0;
39 #else
40 long mlen = 0;
41 diff -Nur scribus-1.3.6.orig/scribus/plugins/aiimplugin/importai.cpp scribus-1.3.6/scribus/plugins/aiimplugin/importai.cpp
42 --- scribus-1.3.6.orig/scribus/plugins/aiimplugin/importai.cpp 2010-02-17 14:08:03.000000000 -0800
43 +++ scribus-1.3.6/scribus/plugins/aiimplugin/importai.cpp 2010-04-30 15:11:14.985832229 -0700
44 @@ -413,7 +413,9 @@
45 data = priv->GetIndirectKey(PoDoFo::PdfName(Key.toUtf8().data()));
46 PoDoFo::PdfStream const *stream = data->GetStream();
47 char *Buffer;
48 -#if defined(pdf_long)
49 +#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
50 + PoDoFo::pdf_long bLen = 0;
51 +#elif defined(pdf_long)
52 pdf_long bLen = 0;
53 #else
54 long bLen = 0;
55 @@ -432,7 +434,9 @@
56 break;
57 PoDoFo::PdfStream const *stream = data->GetStream();
58 char *Buffer;
59 -#if defined(pdf_long)
60 +#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
61 + PoDoFo::pdf_long bLen = 0;
62 +#elif defined(pdf_long)
63 pdf_long bLen = 0;
64 #else
65 long bLen = 0;