[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/

["Priit Laes" <plaes@plaes.org>]

commit:     1ea2733e10c732768ce17693547d8565b86c9c0f
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Aug  5 13:33:04 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Aug  5 13:33:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1ea2733e

x11-libs/gtk+: Fix build with USE=cups and >=cups-1.6

---
 x11-libs/gtk+/files/gtk+-3.5.8-cups-1-6-fix.patch |   24 +++++++++++++++++++++
 x11-libs/gtk+/gtk+-3.5.8.ebuild                   |    2 +
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.5.8-cups-1-6-fix.patch b/x11-libs/gtk+/files/gtk+-3.5.8-cups-1-6-fix.patch
new file mode 100644
index 0000000..3106179
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.5.8-cups-1-6-fix.patch
@@ -0,0 +1,24 @@
+From e8dcfad441aad7e03a8a459f3818018bd6ff63c7 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@t-online.de>
+Date: Sun, 05 Aug 2012 07:56:58 +0000
+Subject: cups: Use IPP api when necessary with CUPS 1.6
+
+---
+diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
+index d9110be..c79fe9d 100644
+--- a/modules/printbackends/cups/gtkprintbackendcups.c
++++ b/modules/printbackends/cups/gtkprintbackendcups.c
+@@ -1835,9 +1835,9 @@ cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend,
+ 	    info->auth_info_required[i] = g_strdup (ippGetString (attr, i, NULL));
+ 	}
+     }
+-  else if (strcmp (attr->name, "number-up-default") == 0)
++  else if (strcmp (ippGetName (attr), "number-up-default") == 0)
+     {
+-      info->default_number_up = attr->values[0].integer;
++      info->default_number_up = ippGetInteger (attr, 0);
+     }
+   else
+     {
+--
+cgit v0.9.0.2

diff --git a/x11-libs/gtk+/gtk+-3.5.8.ebuild b/x11-libs/gtk+/gtk+-3.5.8.ebuild
index 972753c..9cd9dab 100644
--- a/x11-libs/gtk+/gtk+-3.5.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.5.8.ebuild
@@ -108,6 +108,8 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=65410
 	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
 
+	epatch "${FILESDIR}/${P}-cups-1-6-fix.patch"
+
 	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
 	if [[ ${CHOST} == *-solaris* ]]; then
 		sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die