update to 2.24.10

changes:
-printing fix was integrated
-more minor fixes

4 files changed, 8 insertions, 135 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 23351919f9e..d47cffc51f8 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.227 2012/02/06 12:41:59 wiz Exp $
+# $NetBSD: Makefile,v 1.228 2012/02/09 12:11:30 drochner Exp $
 
-DISTNAME=	gtk+-2.24.9
+DISTNAME=	gtk+-2.24.10
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/2.24/ \
 		${MASTER_SITE_GNOME:=sources/gtk+/2.24/}
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 14406a7cead..83ac5c6831a 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.81 2012/01/29 10:56:44 drochner Exp $
+@comment $NetBSD: PLIST,v 1.82 2012/02/09 12:11:30 drochner Exp $
 bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
@@ -429,6 +429,7 @@ share/gtk-doc/html/gdk/gdk-Testing.html
 share/gtk-doc/html/gdk/gdk-Threads.html
 share/gtk-doc/html/gdk/gdk-Visuals.html
 share/gtk-doc/html/gdk/gdk-Windows.html
+share/gtk-doc/html/gdk/gdk-X-Window-System-Interaction.html
 share/gtk-doc/html/gdk/gdk.devhelp2
 share/gtk-doc/html/gdk/gobbler.png
 share/gtk-doc/html/gdk/gumby.png
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index f1a42fc1e5e..e2f9e688081 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.141 2012/02/01 18:23:04 drochner Exp $
+$NetBSD: distinfo,v 1.142 2012/02/09 12:11:30 drochner Exp $
 
-SHA1 (gtk+-2.24.9.tar.xz) = 7760411a8ee50a1e01e4480e074f9f221f0884db
-RMD160 (gtk+-2.24.9.tar.xz) = 4e51be9955a9f3d359fcaca9cc30c12477789d28
-Size (gtk+-2.24.9.tar.xz) = 13200580 bytes
+SHA1 (gtk+-2.24.10.tar.xz) = baf5c73e186352cad767392a6b55840be0326ddc
+RMD160 (gtk+-2.24.10.tar.xz) = fe002e63c68d3105f2a177a4144b51dccc4d7ec2
+Size (gtk+-2.24.10.tar.xz) = 13261132 bytes
 SHA1 (patch-aa) = 9eec7fc4764b18856455a18b49f1bb101e5e6b11
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
 SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad
 SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
-SHA1 (patch-ak) = 90c49bf6b7bf79bb8ad270c2661876ea7b0cb5ad
diff --git a/x11/gtk2/patches/patch-ak b/x11/gtk2/patches/patch-ak
deleted file mode 100644
index 2a8b84f7e48..00000000000
--- a/x11/gtk2/patches/patch-ak
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-ak,v 1.6 2012/02/01 18:23:05 drochner Exp $
-
-gnome bug #543520
-
---- modules/printbackends/cups/gtkprintbackendcups.c.orig	2012-01-24 19:38:37.000000000 +0000
-+++ modules/printbackends/cups/gtkprintbackendcups.c
-@@ -485,7 +485,7 @@ cups_print_cb (GtkPrintBackendCups *prin
- 
- typedef struct {
-   GtkCupsRequest *request;
--  GtkPrinterOptionSet *options;
-+  GtkPrinterCups *printer;
- } CupsOptionsData;
- 
- static void
-@@ -495,9 +495,13 @@ add_cups_options (const gchar *key,
- {
-   CupsOptionsData *data = (CupsOptionsData *) user_data;
-   GtkCupsRequest *request = data->request;
--  GtkPrinterOptionSet *options = data->options;
--  GtkPrinterOption *option = NULL;
-+  GtkPrinterCups *printer = data->printer;
-+  gboolean custom_value = FALSE;
-   gchar *new_value = NULL;
-+  gint i;
-+
-+  if (!key || !value)
-+    return;
- 
-   if (!g_str_has_prefix (key, "cups-"))
-     return;
-@@ -505,17 +509,37 @@ add_cups_options (const gchar *key,
-   if (strcmp (value, "gtk-ignore-value") == 0)
-     return;
- 
--  option = gtk_printer_option_set_lookup (options, key);
--  
-   key = key + strlen ("cups-");
- 
--  /* Add "Custom." prefix to custom values */
--  if (value && option &&
--      !gtk_printer_option_has_choice (option, value))
--    new_value = g_strdup_printf ("Custom.%s", value);
-+  if (printer && printer->ppd_file)
-+    {
-+      ppd_coption_t *coption;
-+      gboolean       found = FALSE;
-+      gboolean       custom_values_enabled = FALSE;
-+
-+      coption = ppdFindCustomOption (printer->ppd_file, key);
-+      if (coption && coption->option)
-+        {
-+          for (i = 0; i < coption->option->num_choices; i++)
-+            {
-+              /* Are custom values enabled ? */
-+              if (g_str_equal (coption->option->choices[i].choice, "Custom"))
-+                custom_values_enabled = TRUE;
-+
-+              /* Is the value among available choices ? */
-+              if (g_str_equal (coption->option->choices[i].choice, value))
-+                found = TRUE;
-+            }
-+
-+          if (custom_values_enabled && !found)
-+            custom_value = TRUE;
-+        }
-+    }
- 
--  if (new_value)
-+  /* Add "Custom." prefix to custom values. */
-+  if (custom_value)
-     {
-+      new_value = g_strdup_printf ("Custom.%s", value);
-       gtk_cups_request_encode_option (request, key, new_value);
-       g_free (new_value);
-     }
-@@ -536,9 +560,6 @@ gtk_print_backend_cups_print_stream (Gtk
-   CupsOptionsData *options_data;
-   GtkCupsRequest *request;
-   GtkPrintSettings *settings;
--  GtkPrinterOptionSet *options;
--  GtkPrintCapabilities capabilities;
--  GtkPageSetup *page_setup;
-   const gchar *title;
-   char  printer_absolute_uri[HTTP_MAX_URI];
- 
-@@ -547,8 +568,6 @@ gtk_print_backend_cups_print_stream (Gtk
- 
-   cups_printer = GTK_PRINTER_CUPS (gtk_print_job_get_printer (job));
-   settings = gtk_print_job_get_settings (job);
--  capabilities = cups_printer_get_capabilities (GTK_PRINTER (cups_printer));
--  page_setup = gtk_printer_get_default_page_size (GTK_PRINTER (cups_printer));
- 
-   request = gtk_cups_request_new_with_username (NULL,
-                                                 GTK_CUPS_POST,
-@@ -586,16 +605,10 @@ gtk_print_backend_cups_print_stream (Gtk
-                                      IPP_TAG_NAME, "job-name", 
-                                      NULL, title);
- 
--  options = cups_printer_get_options (GTK_PRINTER (cups_printer), settings, page_setup, capabilities);
--
-   options_data = g_new0 (CupsOptionsData, 1);
-   options_data->request = request;
--  options_data->options = options;
--
-+  options_data->printer = cups_printer;
-   gtk_print_settings_foreach (settings, add_cups_options, options_data);
--
--  g_object_unref (page_setup);
--  g_object_unref (options);
-   g_free (options_data);
- 
-   ps = g_new0 (CupsPrintStreamData, 1);
-@@ -4606,7 +4619,12 @@ cups_printer_get_default_page_size (GtkP
-     return NULL;
- 
-   option = ppdFindOption (ppd_file, "PageSize");
-+  if (option == NULL)
-+    return NULL;
-+
-   size = ppdPageSize (ppd_file, option->defchoice); 
-+  if (size == NULL)
-+    return NULL;
- 
-   return create_page_setup (ppd_file, size);
- }