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

Package-Manager: portage-2.2.0_alpha92/cvs/Linux x86_64

4 files changed, 42 insertions, 8 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/Manifest b/app-office/scribus/Manifest
index 31618f50a9e6..f61e7bd7ad00 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -3,21 +3,22 @@ Hash: SHA512
 
 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
+AUX scribus-1.3.9-cups-1.5.patch 840 RMD160 2831edaa6de55768bad09792e13f2d24be1aaf8f SHA1 3c8516813b59633a838ab90d2fc70e35699e521f SHA256 1bd000e5d7813b484727a468c9b49f85662a7c6a94140025b6d8eba6fc49f245
 AUX scribus-1.4.0-export.patch 786 RMD160 42b78bc3f6d3abe9d950dede35ac71092bddb374 SHA1 9488389074e67641092b9226cd40bc6f17eaa76b SHA256 f7e1a9db36f65b77282d728a0aaf064fe8ea939fb0cdb8184e3de93b350c6379
 AUX scribus-1.4.0_rc5-docs.patch 828 RMD160 599634de0a6f7bc2594c28f2a1d089f3818f1fd5 SHA1 e9df8b185e0bf72c19c2e1586a6a8d1ceb9bb72a SHA256 50c56976bcc2e2a7d04ee62b8c2398d91137360f69e95910c6f2a01b49c8595f
 DIST scribus-1.3.9.tar.bz2 35729860 RMD160 63e1d3f7f723843e9d1c787e1405b57a15f08fcc SHA1 86bc4db2d8fbb91fe94f8535327991e9128c5862 SHA256 fb172f6b9a812f3b0a9de911b245012a067a9aad50473fa1da1d1c5861641eac
 DIST scribus-1.4.0.tar.bz2 42134397 RMD160 f4a0813c1961f1929bccaaa4c0a21f84dfd75c62 SHA1 d19e455f261c4075076f1d6f4a55fbd934a66c60 SHA256 9ae4e50523f0891c9dce45893ca9f58d32096442e43e75acec466fd9405362a9
-EBUILD scribus-1.3.9-r2.ebuild 2116 RMD160 c6c4c443911ea6d6052e0f094685e0e83d0a4324 SHA1 48327cd45dfc02a60b989b920bccf6770ee823d5 SHA256 85b650842af55f1ebd063d898fb3b32e4a4c7d3c3bbfa6e2382f024b485143fb
+EBUILD scribus-1.3.9-r2.ebuild 2151 RMD160 8567a07bceaf0e2bfeef124511df946743bac0c2 SHA1 850ed27464646f3919d53d11fc8b5e3a2ccb75ec SHA256 8896e578d4f95160cae05d74f7414fed6511cd895b7b1d750fbee7aa4c1941de
 EBUILD scribus-1.3.9.ebuild 1760 RMD160 98f5cdabc0a96a5e2851f310491062d69fad782a SHA1 ddf0cad864308587b1e0e6c4c1711e8dcb2428be SHA256 fca86c8dec51f2cf185702bb0db6aa3ceaa483895d1ac2c200005c33f2492849
 EBUILD scribus-1.4.0-r1.ebuild 2905 RMD160 5388c1bb0a684a2460bedadc76ea66c5f60c762f SHA1 96e3aedeb4bab002d298dc386dee0132d287dbd1 SHA256 03b1b59f0620209c232412a3a5bf1cc618ca433910fbd5130a194b65c4aa46c3
 EBUILD scribus-1.4.9999.ebuild 2969 RMD160 7b1ccc8cdd70ab48d33e4822ee351af96fcd57c1 SHA1 773a0b5cd031afb28543430bfe67b4c11012011c SHA256 38eebca7f224af26e2dfa503f66890c5c81ab1cc22e29d0fbeb546c5162f6faa
 EBUILD scribus-9999.ebuild 2951 RMD160 77bd6e3b2e46b0dce5033678e6e228f968f1b08a SHA1 c4ff832ca4cd0fa4a70e0e62fa0a9c9a53cf3487 SHA256 86971283dc370b8b35fff58c79fbddd8b60a4418fff40faea03014ac40300855
-MISC ChangeLog 19682 RMD160 69a740adb1779a0db8ad1835c541550903241a13 SHA1 6a0c1ff5edb7f5d7facb975a715ac0abb12ec44b SHA256 84285afbffea86027bb364c90ec43443cfe7c17f291d1e234e10ab0cb55f3a6b
+MISC ChangeLog 19862 RMD160 3af4914934671fd2b08b04f5ae0657e0cf3546f1 SHA1 195afddfc3721aa5a9fd36957debc16739592854 SHA256 00c18bb653bb8dab264fd2707b5883b58afacca7344204a7c28ffb2df181887b
 MISC metadata.xml 1137 RMD160 00e3b693f409e0d90ee575f294c3caa1cbcc2b22 SHA1 8b7b7aef6154e329325efd40da2c22b7c099c513 SHA256 794d317abd9329bff636e333c582e7fd79a8f4cccfe8d606d960eb2aebb22ccc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk847DgACgkQgAnW8HDreRYrAQCgp7NCNcMOZVfWYmqbVquhNkrQ
-/oUAoKOFWhDoASb3tMqiYdzkP0s7O4aG
-=TApo
+iEYEAREKAAYFAk9wXJoACgkQgAnW8HDreRbaLACfe7uIXHSSNCZTRSVUJk2Jwrqn
+4/oAn3phPG1f7/aEqa4RnOvzIOaieZD7
+=88ih
 -----END PGP SIGNATURE-----
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"