update to 2.24.9

changes: bugfixes

pkgsrc note: backed out upstream change for cups Custom print options,
it causes crashes at least with firefox, see gnome bug #543520

4 files changed, 106 insertions, 11 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 6a7bde36af4..a0401e282a6 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.224 2011/11/17 12:57:34 drochner Exp $
+# $NetBSD: Makefile,v 1.225 2012/01/29 10:56:44 drochner Exp $
 
-DISTNAME=	gtk+-2.24.8
+DISTNAME=	gtk+-2.24.9
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/2.24/ \
 		${MASTER_SITE_GNOME:=sources/gtk+/2.24/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gtk.org/
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index cab2cfb5c64..14406a7cead 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.80 2011/11/17 12:57:34 drochner Exp $
+@comment $NetBSD: PLIST,v 1.81 2012/01/29 10:56:44 drochner Exp $
 bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
@@ -350,7 +350,6 @@ share/gtk-2.0/demo/tree_store.c
 share/gtk-2.0/demo/ui_manager.c
 share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailMisc.html
 share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailTextUtil.html
-share/gtk-doc/html/gail-libgail-util/gail-libgail-util.devhelp
 share/gtk-doc/html/gail-libgail-util/gail-libgail-util.devhelp2
 share/gtk-doc/html/gail-libgail-util/home.png
 share/gtk-doc/html/gail-libgail-util/index.html
@@ -430,7 +429,6 @@ 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.devhelp
 share/gtk-doc/html/gdk/gdk.devhelp2
 share/gtk-doc/html/gdk/gobbler.png
 share/gtk-doc/html/gdk/gumby.png
@@ -871,7 +869,6 @@ share/gtk-doc/html/gtk/gtk-update-icon-cache.html
 share/gtk-doc/html/gtk/gtk-windows.html
 share/gtk-doc/html/gtk/gtk-x11.html
 share/gtk-doc/html/gtk/gtk-yes.png
-share/gtk-doc/html/gtk/gtk.devhelp
 share/gtk-doc/html/gtk/gtk.devhelp2
 share/gtk-doc/html/gtk/gtk.html
 share/gtk-doc/html/gtk/gtkbase.html
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 8884657ef66..1bf7aba71b6 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.139 2011/11/17 12:57:34 drochner Exp $
+$NetBSD: distinfo,v 1.140 2012/01/29 10:56:44 drochner Exp $
 
-SHA1 (gtk+-2.24.8.tar.bz2) = df808f26c9a37c6bcb077c316406bb3a18a4c68d
-RMD160 (gtk+-2.24.8.tar.bz2) = efd9e1a8e5050e9763a8f81d0625a9e0f002cfe9
-Size (gtk+-2.24.8.tar.bz2) = 16607980 bytes
+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 (patch-aa) = 9eec7fc4764b18856455a18b49f1bb101e5e6b11
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
 SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad
 SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
+SHA1 (patch-ak) = 4f9badd2b5607c94c8ccb5c22d60a87105cc1ae3
diff --git a/x11/gtk2/patches/patch-ak b/x11/gtk2/patches/patch-ak
new file mode 100644
index 00000000000..1485c85f947
--- /dev/null
+++ b/x11/gtk2/patches/patch-ak
@@ -0,0 +1,97 @@
+$NetBSD: patch-ak,v 1.5 2012/01/29 10:56:44 drochner Exp $
+
+revert upstream commit 8170436e61ea68c713d75ad374d22c3261be9203,
+it causes firefox crashes (see gnome bug #543520)
+
+--- modules/printbackends/cups/gtkprintbackendcups.c.orig	2012-01-24 19:38:37.000000000 +0000
++++ modules/printbackends/cups/gtkprintbackendcups.c
+@@ -483,44 +483,22 @@ cups_print_cb (GtkPrintBackendCups *prin
+   GDK_THREADS_LEAVE ();  
+ }
+ 
+-typedef struct {
+-  GtkCupsRequest *request;
+-  GtkPrinterOptionSet *options;
+-} CupsOptionsData;
+-
+ static void
+ add_cups_options (const gchar *key,
+ 		  const gchar *value,
+ 		  gpointer     user_data)
+ {
+-  CupsOptionsData *data = (CupsOptionsData *) user_data;
+-  GtkCupsRequest *request = data->request;
+-  GtkPrinterOptionSet *options = data->options;
+-  GtkPrinterOption *option = NULL;
+-  gchar *new_value = NULL;
++  GtkCupsRequest *request = user_data;
+ 
+   if (!g_str_has_prefix (key, "cups-"))
+     return;
+ 
+   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 (new_value)
+-    {
+-      gtk_cups_request_encode_option (request, key, new_value);
+-      g_free (new_value);
+-    }
+-  else
+-    gtk_cups_request_encode_option (request, key, value);
++  gtk_cups_request_encode_option (request, key, value);
+ }
+ 
+ static void
+@@ -533,12 +511,8 @@ gtk_print_backend_cups_print_stream (Gtk
+ {
+   GtkPrinterCups *cups_printer;
+   CupsPrintStreamData *ps;
+-  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 +521,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,18 +558,8 @@ 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;
+-
+-  gtk_print_settings_foreach (settings, add_cups_options, options_data);
+-
+-  g_object_unref (page_setup);
+-  g_object_unref (options);
+-  g_free (options_data);
+-
++  gtk_print_settings_foreach (settings, add_cups_options, request);
++  
+   ps = g_new0 (CupsPrintStreamData, 1);
+   ps->callback = callback;
+   ps->user_data = user_data;