From 328f3c5d7435df41d4715266dd35403ac5a24107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <sharkcz@fedoraproject.org>
Date: Thu, 29 Apr 2010 13:20:02 +0000
Subject: [PATCH] - fix build with podofo 0.8.0

---
 scribus-1.3.6-podofo-0.8.0.patch | 60 ++++++++++++++++++++++++++++++++
 scribus.spec                     |  8 ++++-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 scribus-1.3.6-podofo-0.8.0.patch

diff --git a/scribus-1.3.6-podofo-0.8.0.patch b/scribus-1.3.6-podofo-0.8.0.patch
new file mode 100644
index 0000000..e2bdc1c
--- /dev/null
+++ b/scribus-1.3.6-podofo-0.8.0.patch
@@ -0,0 +1,60 @@
+commit bc55f2b3d31111a4c95372b6ad1ae139d29f3076
+Author: jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>
+Date:   Mon Apr 26 21:31:23 2010 +0000
+
+    some fixes for building with podofo 0.8.0
+    
+    git-svn-id: svn://scribus.info/Scribus/branches/Version135@15016 11d20701-8431-0410-a711-e3c959e3b870
+
+diff --git a/Scribus/scribus/pdflib_core.cpp b/Scribus/scribus/pdflib_core.cpp
+index bc25070..cbf637c 100644
+--- a/Scribus/scribus/pdflib_core.cpp
++++ b/Scribus/scribus/pdflib_core.cpp
+@@ -6364,7 +6364,9 @@ bool PDFLibCore::PDF_EmbeddedPDF(PageItem* c, const QString& fn, double sx, doub
+ 			}
+ 			*/
+ 			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 @@ void PDFLibCore::copyPoDoFoObject(const PoDoFo::PdfObject* obj, uint scObjID, QM
+ 	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 --git a/Scribus/scribus/plugins/import/ai/importai.cpp b/Scribus/scribus/plugins/import/ai/importai.cpp
+index 287f508..482962f 100644
+--- a/Scribus/scribus/plugins/aiimplugin/importai.cpp
++++ b/Scribus/scribus/plugins/aiimplugin/importai.cpp
+@@ -413,7 +413,9 @@ bool AIPlug::extractFromPDF(QString infile, QString outfile)
+ 							data = priv->GetIndirectKey(PoDoFo::PdfName(Key.toUtf8().data()));
+ 							PoDoFo::PdfStream const *stream = data->GetStream();
+ 							char *Buffer;
+-#if defined(pdf_long)
++#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
++							PoDoFo::pdf_long bLen = 0;
++#elif defined(pdf_long)
+ 							pdf_long bLen = 0;
+ #else
+ 							long bLen = 0;
+@@ -432,7 +434,9 @@ bool AIPlug::extractFromPDF(QString infile, QString outfile)
+ 									break;
+ 								PoDoFo::PdfStream const *stream = data->GetStream();
+ 								char *Buffer;
+-#if defined(pdf_long)
++#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
++								PoDoFo::pdf_long bLen = 0;
++#elif defined(pdf_long)
+ 								pdf_long bLen = 0;
+ #else
+ 								long bLen = 0;
diff --git a/scribus.spec b/scribus.spec
index a074f15..099a699 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.3.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -17,6 +17,8 @@ Patch1:         %{name}-1.3.6-version.patch
 Patch2:         %{name}-1.3.6-qstring.patch
 # fix linking with --no-add-needed
 Patch3:         %{name}-1.3.6-linker.patch
+# fix build with podofo 0.8.0
+Patch4:         %{name}-1.3.6-podofo-0.8.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -87,6 +89,7 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12.beta
 %patch1 -p1 -b .version
 %patch2 -p1 -b .qstring
 %patch3 -p1 -b .linker
+%patch4 -p2 -b .podofo
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -194,6 +197,9 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 
 
 %changelog
+* Thu Apr 29 2010 Dan Horák <dan[AT]danny.cz> - 1.3.6-4
+- fix build with podofo 0.8.0
+
 * Thu Apr 29 2010 Dan Horák <dan[AT]danny.cz> - 1.3.6-3
 - rebuilt for podofo 0.8.0