Cups-1.5 compatibility patch backported from scribus-1.4, #409719

(Portage version: 2.2.0_alpha92/cvs/Linux x86_64)

3 files changed, 36 insertions, 3 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index c1d396c5600e..3894a0603471 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/scribus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.152 2012/02/13 10:55:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.153 2012/03/26 12:09:57 jlec Exp $
+
+  26 Mar 2012; Justin Lecher <jlec@gentoo.org> scribus-1.3.9-r2.ebuild,
+  +files/scribus-1.3.9-cups-1.5.patch:
+  Cups-1.5 compatibility patch backported from scribus-1.4, #409719
 
 *scribus-1.4.9999 (13 Feb 2012)
 *scribus-1.4.0-r1 (13 Feb 2012)
diff --git a/app-office/scribus/files/scribus-1.3.9-cups-1.5.patch b/app-office/scribus/files/scribus-1.3.9-cups-1.5.patch
new file mode 100644
index 000000000000..97a021538a4f
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.3.9-cups-1.5.patch
@@ -0,0 +1,28 @@
+ scribus/cupsoptions.cpp  |    1 +
+ scribus/util_printer.cpp |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/scribus/cupsoptions.cpp b/scribus/cupsoptions.cpp
+index 134bead..34edc06 100644
+--- a/scribus/cupsoptions.cpp
++++ b/scribus/cupsoptions.cpp
+@@ -42,6 +42,7 @@ for which a new license (GPL+exception) is in place.
+ #include "scconfig.h"
+ #ifdef HAVE_CUPS
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #endif
+ #include "util_icon.h"
+ 
+diff --git a/scribus/util_printer.cpp b/scribus/util_printer.cpp
+index 8d08cba..1b173cd 100644
+--- a/scribus/util_printer.cpp
++++ b/scribus/util_printer.cpp
+@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place.
+ 
+ #if defined( HAVE_CUPS )
+  #include <cups/cups.h>
++ #include <cups/ppd.h>
+ #elif defined(_WIN32)
+  #include <windows.h>
+  #include <winspool.h>
diff --git a/app-office/scribus/scribus-1.3.9-r2.ebuild b/app-office/scribus/scribus-1.3.9-r2.ebuild
index 4cdcc4332686..563db9df41d7 100644
--- a/app-office/scribus/scribus-1.3.9-r2.ebuild
+++ b/app-office/scribus/scribus-1.3.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9-r2.ebuild,v 1.2 2011/11/17 17:05:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9-r2.ebuild,v 1.3 2012/03/26 12:09:57 jlec Exp $
 
 EAPI=2
 
@@ -40,6 +40,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.5.1-system-hyphen.patch"
+	"${FILESDIR}/${P}-cups-1.5.patch"
 	)
 
 DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"