Fix buid with USE="cups debug" (bug #416625, thanks to Jakub Daniel). Remove unused patches.

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

7 files changed, 49 insertions, 197 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 08346e58d355..59dc8843ec65 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.594 2012/05/16 15:02:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.595 2012/05/19 19:58:13 tetromino Exp $
+
+  19 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/gtk+-3.4.1-extraneous-events-scrolling.patch,
+  -files/gtk+-3.4.1-toolpalette-adjustment.patch,
+  -files/gtk+-3.4.1-toolpalette-rename.patch, gtk+-3.4.3.ebuild,
+  +files/gtk+-3.4.3-gtkprintbackendcups-debug.patch:
+  Fix buid with USE="cups debug" (bug #416625, thanks to Jakub Daniel). Remove
+  unused patches.
 
   16 May 2012; Jeroen Roovers <jer@gentoo.org> gtk+-2.24.10-r1.ebuild,
   gtk+-3.2.4-r1.ebuild:
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 4c1e80f10176..a3a0e21d1ca2 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -23,9 +23,7 @@ AUX gtk+-3.2.2-toolbutton-icon-widget-GtkMisc.patch 2093 RMD160 552e6e0df6e683d7
 AUX gtk+-3.2.4-fallback-theme.patch 2880 RMD160 bf88b6a0610513d065aa243274726f303bb98728 SHA1 cc9044a95ae816062f953d1da0434098de2e26e7 SHA256 d021df0cc77b7033b57b62e0a3585c2fe7ae6d50273f0819b5de3acfdb73336c
 AUX gtk+-3.3.18-fallback-theme.patch 2841 RMD160 01f69c2800ae57c1e21e22ba5be562061cae20b0 SHA1 0800ab93bd2b1b311ead6bd2a423fec984fb78f1 SHA256 a552218132b903835a480881803e29be678a311d3a653b8111eba1fd0ea04922
 AUX gtk+-3.3.20-wayland-xkbcommon-headers.patch 1347 RMD160 b21bfb4fdca683e385b08f181ce10922bc1d3b58 SHA1 d74d0fe0ca3058044f22520fdc288e5c0758311d SHA256 9876be3bf2ef19413248e5de51e285aa1545b3d94751e840692b811c7b4bd9a9
-AUX gtk+-3.4.1-extraneous-events-scrolling.patch 3418 RMD160 912717e3348c9f363709c887f56354a3bb3a131b SHA1 c8f27b8c5a0f49ff750f5ecb3a2791909edebd2a SHA256 49b0ab6747618815f3d0df1b619263f21c38ab323ceb2ab2bca440e4d57efa16
-AUX gtk+-3.4.1-toolpalette-adjustment.patch 1766 RMD160 4cab2ddf622426fc634c8f5f0d210f5421c85c9a SHA1 e47271055c46b68062e635fecea93043ec077703 SHA256 39edf79b13488b61cd0df2da8dfbff596d3a9f79f5f303d82f185690f15698a7
-AUX gtk+-3.4.1-toolpalette-rename.patch 1785 RMD160 52cd193b0b983bbd909458b61c1621522ecca73a SHA1 abb44f9cb573f2a1cc0f4a884321ad04e9ddf3ec SHA256 81c1a48d3af97296c02d0c4ddd595a58af86f0cd502e0e3c9e46ca2e06aac4e9
+AUX gtk+-3.4.3-gtkprintbackendcups-debug.patch 1034 RMD160 76cb78b17f30917638c7701fd593e759e76123b0 SHA1 bafa68078c0115a8162a5a3630460591a4273e8e SHA256 a7459288586e529c8c6aec8a1aa4df05e10d601ef7dfcbe70e581c3219a65b35
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
 AUX settings.ini 96 RMD160 ff8d7e28f097820b15ea1d2168d9405db1a5707b SHA1 92c3120655ba14f163846a22d5c94fa50b0eb437 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
@@ -46,13 +44,17 @@ EBUILD gtk+-3.0.12-r1.ebuild 6148 RMD160 f816b26c2a66013c4a5779805ea5f3b2918a490
 EBUILD gtk+-3.2.3.ebuild 6764 RMD160 f28b20cadc3a247bc7b248ed2c1a45f9406d8867 SHA1 5e6f43748043cb9873b3efcc120faf1ad7df70cc SHA256 cff69ac823724aa8b99796fbcafe8e6a96757caa13a1638eba14468d6e819889
 EBUILD gtk+-3.2.4-r1.ebuild 7006 RMD160 bee6a784306d1a0cc7092c8f6ff0bbcc7a4bd6d1 SHA1 d2dd3f260f94f87d07833fdcee8e4654aab8140d SHA256 04c7c1eb6cde6dba393b842dc3bb7d4f9b87eec929e2c1254d25c75849ee058d
 EBUILD gtk+-3.4.2.ebuild 7132 RMD160 755b993c3b861573766638f16bccc8290119d155 SHA1 0e5f187a9b522759cb24c0592370416a3acc51e5 SHA256 3568350ebd29309efe2bdcf39b5572806573e998097b1df11bead2df8d754709
-EBUILD gtk+-3.4.3.ebuild 7139 RMD160 7598012455429ff6021205d1ea14b4482de9ef8f SHA1 92790fa15e18a17ee90942da34d5583a7f877eb9 SHA256 d0ddabb3d50f2a6890397dc2e202e040c1e1bf5bfb8e73a473ef1cd95d825199
-MISC ChangeLog 91736 RMD160 034a12a6990207637e03013ef4168e78e2230885 SHA1 0afc4a072c43d88c99d6d10b3a77bf501aeef9d4 SHA256 efc445a2ccb11fedf2539737f254fdb83f8e46ee772173716b34547ad666434c
+EBUILD gtk+-3.4.3.ebuild 7270 RMD160 2178c0f11a3d2f7f47c26823592acb61fe604f31 SHA1 305c480c725054ef0a48c0a3e8f65a80e0c8db91 SHA256 5a2eb6e3c1a51b92f564aaad27f8c8fa650a17d8f37d8804e0a601264a7c66b1
+MISC ChangeLog 92122 RMD160 64f109c516531a57261ef8c2353aa10e31402321 SHA1 51881441d97e7930be1df9aae4e14eec306b948e SHA256 ca9d3721a0917a4a6db7525ff80b9076fe6bbdc4339d03c40ec2a1b96fa619b8
 MISC metadata.xml 870 RMD160 a94fb5c6acb8fb9015e5f4c40c8b9b1eb3ddf9d8 SHA1 2769a95a236ce2a234c7d5bd75231de142345445 SHA256 90835d0edfdbbc25c781b0c7bcf9b7b6db82ce5f412082ec56d250891e1853ea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+zwXQACgkQVWmRsqeSphMpLACbB9l+bPF9ZF+oYS1XBKvZ7QsC
-fGUAn0wfKlEzV9Jp+2W7UDUY2M4X+9Aw
-=MrWT
+iQEcBAEBAgAGBQJPt/taAAoJEJ0WA1zPCt1hHnkH/2ZHngj4Dn+cI5hz8HNse87m
+6RQHdHnm843TSDL+Ltyct1w6Kr7oivAXMyi7Dm5YLjr1V6Gf20KNH9ydrPpzCk1F
+B8EUUwJlBIIM94tB4i9+3kHJW8Ft6sQj/4G7VYvZST/81RTUTgjaHze7BgEjjBZU
+pf4fuMMBmXCCXfex5Oay/iLY2C9O4SZIf6Vs+x4d/QhUgaQJK1gQU2w6YTxLCLHW
+kiaOXuEPqplF1ZdekeR5Mvp7R63y7Gb7C7j/MVARDlVxI+XxxFdKpKq/y3MGhvt8
+0t9Zcf482z6PwAzQ078RNmfF7XlqEzvYxsd9PxvpAO6FHGzjUdm2+Psn1mPVhi4=
+=qeb3
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-3.4.1-extraneous-events-scrolling.patch b/x11-libs/gtk+/files/gtk+-3.4.1-extraneous-events-scrolling.patch
deleted file mode 100644
index ea93d98abfde..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.4.1-extraneous-events-scrolling.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 37e3722d3a80be13bd8f7a4d3ac8edc923fc2750 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Fri, 20 Apr 2012 17:34:08 -0400
-Subject: [PATCH] xi2: ignore extraneous events for smooth scroll
-
-Since the event will be ignored anyway after it's translated (slave
-devices are disabled), don't let it run in the smooth scroll code path,
-as it will burn our caches for the actual event we're interested in.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=673644
----
- gdk/x11/gdkdevicemanager-xi2.c |   23 +++++++++++++++--------
- 1 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
-index a34bd09..15f095b 100644
---- a/gdk/x11/gdkdevicemanager-xi2.c
-+++ b/gdk/x11/gdkdevicemanager-xi2.c
-@@ -1305,13 +1305,24 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
-     case XI_Motion:
-       {
-         XIDeviceEvent *xev = (XIDeviceEvent *) ev;
--        GdkDevice *source_device;
-+        GdkDevice *source_device, *device;
-         gdouble delta_x, delta_y;
- 
-         source_device = g_hash_table_lookup (device_manager->id_table,
-                                              GUINT_TO_POINTER (xev->sourceid));
-+        device = g_hash_table_lookup (device_manager->id_table,
-+                                      GUINT_TO_POINTER (xev->deviceid));
- 
--        if (scroll_valuators_changed (GDK_X11_DEVICE_XI2 (source_device),
-+        /* When scrolling, X might send events twice here; once with both the
-+         * device and the source device set to the physical device, and once
-+         * with the device set to the master device.
-+         * Since we are only interested in the latter, and
-+         * scroll_valuators_changed() updates the valuator cache for the
-+         * source device, we need to explicitly ignore the first event in
-+         * order to get the correct delta for the second.
-+         */
-+        if (gdk_device_get_device_type (device) != GDK_DEVICE_TYPE_SLAVE &&
-+            scroll_valuators_changed (GDK_X11_DEVICE_XI2 (source_device),
-                                       &xev->valuators, &delta_x, &delta_y))
-           {
-             event->scroll.type = GDK_SCROLL;
-@@ -1333,9 +1344,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
-             event->scroll.delta_x = delta_x;
-             event->scroll.delta_y = delta_y;
- 
--            event->scroll.device = g_hash_table_lookup (device_manager->id_table,
--                                                        GUINT_TO_POINTER (xev->deviceid));
--
-+            event->scroll.device = device;
-             gdk_event_set_source_device (event, source_device);
- 
-             event->scroll.state = _gdk_x11_device_xi2_translate_state (&xev->mods, &xev->buttons, &xev->group);
-@@ -1350,9 +1359,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
-         event->motion.x_root = (gdouble) xev->root_x;
-         event->motion.y_root = (gdouble) xev->root_y;
- 
--        event->motion.device = g_hash_table_lookup (device_manager->id_table,
--                                                    GINT_TO_POINTER (xev->deviceid));
--
-+        event->motion.device = device;
-         gdk_event_set_source_device (event, source_device);
- 
-         event->motion.state = _gdk_x11_device_xi2_translate_state (&xev->mods, &xev->buttons, &xev->group);
--- 
-1.7.8.6
-
diff --git a/x11-libs/gtk+/files/gtk+-3.4.1-toolpalette-adjustment.patch b/x11-libs/gtk+/files/gtk+-3.4.1-toolpalette-adjustment.patch
deleted file mode 100644
index 78b715dc30af..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.4.1-toolpalette-adjustment.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 67e2e41907add988746f59857ef86d6ea37b8392 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Fri, 27 Apr 2012 03:33:57 +0200
-Subject: [PATCH] toolpalette: Configure adjustment properly
-
-https://bugzilla.gnome.org/show_bug.cgi?id=673650
----
- gtk/gtktoolpalette.c |   17 +++++++----------
- 1 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
-index 0dd9b21..0655bff 100644
---- a/gtk/gtktoolpalette.c
-+++ b/gtk/gtktoolpalette.c
-@@ -665,30 +665,27 @@ gtk_tool_palette_size_allocate (GtkWidget     *widget,
-   /* update the scrollbar to match the displayed adjustment */
-   if (adjustment)
-     {
--      gdouble value, lower, upper;
-+      gdouble lower, upper;
-+
-+      total_size = MAX (0, total_size);
-+      page_size = MIN (total_size, page_size);
- 
-       if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation ||
-           GTK_TEXT_DIR_LTR == direction)
-         {
-           lower = 0;
--          upper = MAX (0, total_size);
--
--          value = MIN (offset, upper - page_size);
--          gtk_adjustment_clamp_page (adjustment, value, offset + page_size);
-+          upper = total_size;
-         }
-       else
-         {
--          lower = page_size - MAX (0, total_size);
-+          lower = page_size - total_size;
-           upper = page_size;
- 
-           offset = -offset;
--
--          value = MAX (offset, lower);
--          gtk_adjustment_clamp_page (adjustment, offset, value + page_size);
-         }
- 
-       gtk_adjustment_configure (adjustment,
--                                value,
-+                                offset,
-                                 lower,
-                                 upper,
-                                 page_size * 0.1,
--- 
-1.7.8.6
-
diff --git a/x11-libs/gtk+/files/gtk+-3.4.1-toolpalette-rename.patch b/x11-libs/gtk+/files/gtk+-3.4.1-toolpalette-rename.patch
deleted file mode 100644
index bdbadc0c263a..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.4.1-toolpalette-rename.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 27ff5516cce371395c0e8c22ae3e25f91078771c Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Fri, 27 Apr 2012 03:28:22 +0200
-Subject: [PATCH] toolpalette: Rename variable
-
-The variable that holds the total size for all widget allocations
-shouldn't be called page_start.
----
- gtk/gtktoolpalette.c |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
-index be6297a..0dd9b21 100644
---- a/gtk/gtktoolpalette.c
-+++ b/gtk/gtktoolpalette.c
-@@ -473,7 +473,7 @@ gtk_tool_palette_size_allocate (GtkWidget     *widget,
-   gint remaining_space = 0;
-   gint expand_space = 0;
- 
--  gint page_start, page_size = 0;
-+  gint total_size, page_size;
-   gint offset = 0;
-   guint i;
-   guint border_width;
-@@ -652,14 +652,14 @@ gtk_tool_palette_size_allocate (GtkWidget     *widget,
-       child_allocation.y += border_width;
-       child_allocation.y += offset;
- 
--      page_start = child_allocation.y;
-+      total_size = child_allocation.y;
-     }
-   else
-     {
-       x += border_width;
-       x += offset;
- 
--      page_start = x;
-+      total_size = x;
-     }
- 
-   /* update the scrollbar to match the displayed adjustment */
-@@ -671,14 +671,14 @@ gtk_tool_palette_size_allocate (GtkWidget     *widget,
-           GTK_TEXT_DIR_LTR == direction)
-         {
-           lower = 0;
--          upper = MAX (0, page_start);
-+          upper = MAX (0, total_size);
- 
-           value = MIN (offset, upper - page_size);
-           gtk_adjustment_clamp_page (adjustment, value, offset + page_size);
-         }
-       else
-         {
--          lower = page_size - MAX (0, page_start);
-+          lower = page_size - MAX (0, total_size);
-           upper = page_size;
- 
-           offset = -offset;
--- 
-1.7.8.6
-
diff --git a/x11-libs/gtk+/files/gtk+-3.4.3-gtkprintbackendcups-debug.patch b/x11-libs/gtk+/files/gtk+-3.4.3-gtkprintbackendcups-debug.patch
new file mode 100644
index 000000000000..6ab60987f45a
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.4.3-gtkprintbackendcups-debug.patch
@@ -0,0 +1,25 @@
+From 18db64749fafc78ca4b7a5c9cb5c8ddc2d85d9ac Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 30 Apr 2012 07:07:33 -0400
+Subject: [PATCH] Fix build with --enable-debug
+
+---
+ modules/printbackends/cups/gtkprintbackendcups.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
+index b7e008b..cddb6b7 100644
+--- a/modules/printbackends/cups/gtkprintbackendcups.c
++++ b/modules/printbackends/cups/gtkprintbackendcups.c
+@@ -1900,7 +1900,7 @@ cups_create_printer (GtkPrintBackendCups *cups_backend,
+     {
+       cups_printer->ppd_name = g_strdup (resource + 10);
+       GTK_NOTE (PRINTING,
+-		g_print ("CUPS Backend: Setting ppd name '%s' for printer/class '%s'\n", cups_printer->ppd_name, printer_name));
++		g_print ("CUPS Backend: Setting ppd name '%s' for printer/class '%s'\n", cups_printer->ppd_name, info->printer_name));
+     }
+ 
+   gethostname (uri, sizeof (uri));
+-- 
+1.7.8.6
+
diff --git a/x11-libs/gtk+/gtk+-3.4.3.ebuild b/x11-libs/gtk+/gtk+-3.4.3.ebuild
index f40aa6c18644..8fad462a2f8c 100644
--- a/x11-libs/gtk+/gtk+-3.4.3.ebuild
+++ b/x11-libs/gtk+/gtk+-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.4.3.ebuild,v 1.1 2012/05/12 13:00:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.4.3.ebuild,v 1.2 2012/05/19 19:58:13 tetromino Exp $
 
 EAPI="4"
 
@@ -103,6 +103,9 @@ src_prepare() {
 	# Apparently needed for new libxkbcommon headers; bug #408131
 	epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch"
 
+	# Fix build with USE="cups debug", from 3.5.1; bug #416625
+	epatch "${FILESDIR}/${PN}-3.4.3-gtkprintbackendcups-debug.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