Add colord profile fix from Debian, bug 475714

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

6 files changed, 55 insertions, 9 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 9b59fb87f3b8..49a38d744f91 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.552 2013/07/12 19:44:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.553 2013/07/12 20:02:55 dilfridge Exp $
+
+*cups-1.6.3-r1 (12 Jul 2013)
+
+  12 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.3.ebuild,
+  +cups-1.6.3-r1.ebuild, +files/cups-1.6.3-colord-profile.patch,
+  cups-1.6.9999.ebuild, cups-1.7_rc1.ebuild, cups-9999.ebuild:
+  Add colord profile fix from Debian, bug 475714
 
 *cups-1.7_rc1 (12 Jul 2013)
 
diff --git a/net-print/cups/cups-1.6.3.ebuild b/net-print/cups/cups-1.6.3-r1.ebuild
index 5b0e760e9a44..340ae9cce4aa 100644
--- a/net-print/cups/cups-1.6.3.ebuild
+++ b/net-print/cups/cups-1.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.3.ebuild,v 1.1 2013/07/12 18:37:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.3-r1.ebuild,v 1.1 2013/07/12 20:02:55 dilfridge Exp $
 
 EAPI=5
 
@@ -11,13 +11,16 @@ inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pa
 MY_P=${P/_beta/b}
 MY_PV=${PV/_beta/b}
 
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-else
+if [[ ${PV} == *9999 ]]; then
 	inherit git-2
 	EGIT_REPO_URI="http://www.cups.org/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
 	KEYWORDS=""
+else
+	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="The Common Unix Printing System"
@@ -84,6 +87,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch"	# systemd support
 	"${FILESDIR}/${PN}-1.6.2-statedir.patch"
+	"${FILESDIR}/${PN}-1.6.3-colord-profile.patch"
 )
 
 pkg_setup() {
diff --git a/net-print/cups/cups-1.6.9999.ebuild b/net-print/cups/cups-1.6.9999.ebuild
index a9af384b2ea9..521eafd02c4b 100644
--- a/net-print/cups/cups-1.6.9999.ebuild
+++ b/net-print/cups/cups-1.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.9999.ebuild,v 1.2 2013/07/12 19:33:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.9999.ebuild,v 1.3 2013/07/12 20:02:55 dilfridge Exp $
 
 EAPI=5
 
@@ -87,6 +87,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch"	# systemd support
 	"${FILESDIR}/${PN}-1.6.2-statedir.patch"
+	"${FILESDIR}/${PN}-1.6.3-colord-profile.patch"
 )
 
 pkg_setup() {
diff --git a/net-print/cups/cups-1.7_rc1.ebuild b/net-print/cups/cups-1.7_rc1.ebuild
index c57d8281d940..feb7aaa894d8 100644
--- a/net-print/cups/cups-1.7_rc1.ebuild
+++ b/net-print/cups/cups-1.7_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7_rc1.ebuild,v 1.1 2013/07/12 19:44:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7_rc1.ebuild,v 1.2 2013/07/12 20:02:55 dilfridge Exp $
 
 EAPI=5
 
@@ -88,6 +88,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch"	# systemd support
+	"${FILESDIR}/${PN}-1.6.3-colord-profile.patch"
 )
 
 pkg_setup() {
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index ca4f346978ac..077203c5d692 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.39 2013/07/12 19:44:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.40 2013/07/12 20:02:55 dilfridge Exp $
 
 EAPI=5
 
@@ -88,6 +88,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch"	# systemd support
+	"${FILESDIR}/${PN}-1.6.3-colord-profile.patch"
 )
 
 pkg_setup() {
diff --git a/net-print/cups/files/cups-1.6.3-colord-profile.patch b/net-print/cups/files/cups-1.6.3-colord-profile.patch
new file mode 100644
index 000000000000..c03968099446
--- /dev/null
+++ b/net-print/cups/files/cups-1.6.3-colord-profile.patch
@@ -0,0 +1,32 @@
+Description: Add colord profile fix
+Author: Alexey Galakhov <agalakhov@gmail.com>
+Bug-Debian: http://bugs.debian.org/711868
+Last-Update: 2013-06-10
+
+--- cups-1.6.2.orig/scheduler/colorman.c	2013-02-20 05:53:01.000000000 +0600
++++ cups-1.6.2/scheduler/colorman.c	2013-06-10 18:50:49.000000000 +0600
+@@ -84,10 +84,13 @@
+ #  define COLORD_KIND_PRINTER	"printer"
+ 					/* printing output device */
+ 
+-#  define COLORD_DBUS_MSG(p,m)	dbus_message_new_method_call(\
++#  define COLORD_DBUS_MSG_PARM(p,x,m)	dbus_message_new_method_call(\
+ 					"org.freedesktop.ColorManager", (p),\
+-                                        "org.freedesktop.ColorManager", (m))
++                                        "org.freedesktop.ColorManager" x, (m))
+                                         /* Macro to make new colord messages */
++#  define COLORD_DBUS_MSG(p,m)	COLORD_DBUS_MSG_PARM(p,"",m)
++                                        /* Macro to make new colord messages */
++
+ #  define COLORD_DBUS_PATH	"/org/freedesktop/ColorManager"
+ 					/* Path for color management system */
+ #  define COLORD_DBUS_TIMEOUT	5000	/* Timeout for connecting to colord in ms */
+@@ -1177,7 +1180,7 @@
+   DBusError	error;			/* D-Bus error */
+ 
+ 
+-  message = COLORD_DBUS_MSG(device_path, "AddProfile");
++  message = COLORD_DBUS_MSG_PARM(device_path, ".Device", "AddProfile");
+ 
+   dbus_message_iter_init_append(message, &args);
+   dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &relation);