diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-04-30 22:53:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-04-30 22:53:15 +0000 |
| commit | 4fdd02a4c218eb39c5b8f5b4d6f6cda56727ae07 (patch) | |
| tree | 81ffd41080d5317007d3000875cab8d4473ef078 | |
| parent | Version bump (#317833) (diff) | |
| download | gentoo-2-4fdd02a4c218eb39c5b8f5b4d6f6cda56727ae07.tar.gz gentoo-2-4fdd02a4c218eb39c5b8f5b4d6f6cda56727ae07.tar.bz2 gentoo-2-4fdd02a4c218eb39c5b8f5b4d6f6cda56727ae07.zip | |
Bug #317909 - Add patch to compile with podofo-0.8.0.
(Portage version: 2.2_rc67_p98/cvs/Linux i686)
| -rw-r--r-- | app-office/scribus/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/scribus/files/scribus-1.3.6-podofo-0.8.0.patch | 50 | ||||
| -rw-r--r-- | app-office/scribus/scribus-1.3.6.ebuild | 4 |
3 files changed, 57 insertions, 3 deletions
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog index 2db686b96c2d..8268dd82fe9f 100644 --- 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/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 index 000000000000..2d590b3f56d1 --- /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()));
+ 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 @@ + 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/app-office/scribus/scribus-1.3.6.ebuild b/app-office/scribus/scribus-1.3.6.ebuild index 5081717f2751..7a1e7230fb7b 100644 --- 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" |