 @@ -1,119 +1,120 @@
-# $NetBSD: Makefile,v 1.225 2012/01/29 10:56:44 drochner Exp $
+# $NetBSD: Makefile,v 1.226 2012/02/01 18:23:04 drochner Exp $
 DISTNAME=	gtk+-2.24.9
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
 PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/2.24/ \
 		${MASTER_SITE_GNOME:=sources/gtk+/2.24/}
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gtk.org/
 COMMENT=	GIMP Toolkit v2 - libraries for building X11 user interfaces
 LICENSE=	gnu-lgpl-v2.1
 # gtk-builder-convert uses minidom from xml.dom, which needs expat
 DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=		gtk2-engines<2.6.0
 CONFLICTS+=		gail-[0-9]*
 SUPERSEDES=		gail-[0-9]*
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt perl pkg-config
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 PTHREAD_AUTO_VARS=	yes
 GNU_CONFIGURE=		yes
 # bashism in "configure" (illegal variable substitution), patched
 #CONFIG_SHELL=		bash
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/libdata
 # Work around build problems, disable unstable PAPI, PR #41608:
 CONFIGURE_ARGS+=	--disable-papi
 # Not to unwanted pick up of db2html, PR#44908
 CONFIGURE_ENV+=		ac_cv_prog_DB2HTML=false
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 TEST_TARGET=		check
 PKGCONFIG_OVERRIDE=	gdk-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gdk-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gtk+-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gtk+-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gtk+-unix-print-2.0.pc.in
 #PKGCONFIG_OVERRIDE+=	gdk-pixbuf-2.0-uninstalled.pc.in
 #PKGCONFIG_OVERRIDE+=	gdk-pixbuf-2.0.pc.in
 #PKGCONFIG_OVERRIDE+=	contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
 INSTALLATION_DIRS+=	lib/gtk-2.0/immodules
 INSTALLATION_DIRS+=	lib/gtk-2.0/modules
 INSTALLATION_DIRS+=	lib/gtk-2.0/2.10.0/filesystems
 REQD_DIRS+=		${PREFIX}/libdata/gtk-2.0
 BUILD_DIRS=		. demos/gtk-demo
 .include "../../mk/bsd.prefs.mk"
 # fix for 'only weak aliases are supported on darwin' error
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--disable-visibility
 .endif
 # gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms
 # which do not have it.
 .if ${OPSYS} == "SunOS"
 BUILD_DEPENDS+=		grep-[0-9]*:../../textproc/grep
 TOOLS_PATH.grep=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep
 .endif
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 #SUBST_CLASSES+=		pthread
 #SUBST_STAGE.pthread=	pre-configure
 #SUBST_MESSAGE.pthread=	Fixing pthread flags.
 #SUBST_SED.pthread=	-e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
 #SUBST_FILES.pthread=	gdk-pixbuf/Makefile.in
 PYTHON_PATCH_SCRIPTS=	gtk/gtk-builder-convert
 # We remove the module databases during post-install since we create them
 # anew in the +INSTALL script as part of the POST-INSTALL action.
+#
 post-install:
 	${RM} -f ${DESTDIR}${GTK_IMMODULES_DB}
 EVAL_PREFIX+=		PREFIX.hicolor=hicolor-icon-theme
 FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk-update-icon-cache"
 FILES_SUBST+=		ICON_THEME_DIR="${PREFIX.hicolor}/share/icons/hicolor"
 INSTALL_TEMPLATES+=	../../x11/gtk2/files/icon-cache.tmpl
 PRINT_PLIST_AWK+=	/^share\/icons\/hicolor\/icon-theme.cache$$/ { next; }
 _BUILDING_GTK2=	yes
 .include "modules.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 BUILDLINK_API_DEPENDS.atk+=	atk>=1.30.0
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.28.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "options.mk"
 BUILDLINK_API_DEPENDS.pango+=	pango>=1.20.0
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.6.0
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 #.include "../../mk/jpeg.buildlink3.mk"
 #.include "../../graphics/png/buildlink3.mk"
 #.include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,97 +1,126 @@
-$NetBSD: patch-ak,v 1.5 2012/01/29 10:56:44 drochner Exp $
+$NetBSD: patch-ak,v 1.6 2012/02/01 18:23:05 drochner Exp $
-revert upstream commit 8170436e61ea68c713d75ad374d22c3261be9203,
+gnome bug #543520
 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
+@@ -485,7 +485,7 @@ cups_print_cb (GtkPrintBackendCups *prin
    GDK_THREADS_LEAVE ();
--typedef struct {
+ typedef struct {
--  GtkCupsRequest *request;
+   GtkCupsRequest *request;
 -  GtkPrinterOptionSet *options;
--} CupsOptionsData;
++  GtkPrinterCups *printer;
  } CupsOptionsData;
  static void
- add_cups_options (const gchar *key,
+@@ -495,9 +495,13 @@ add_cups_options (const gchar *key,
  		  const gchar *value,
  		  gpointer     user_data)
+ {
--  CupsOptionsData *data = (CupsOptionsData *) user_data;
+   CupsOptionsData *data = (CupsOptionsData *) user_data;
--  GtkCupsRequest *request = data->request;
+   GtkCupsRequest *request = data->request;
 -  GtkPrinterOptionSet *options = data->options;
 -  GtkPrinterOption *option = NULL;
--  gchar *new_value = NULL;
++  GtkPrinterCups *printer = data->printer;
-+  GtkCupsRequest *request = user_data;
++  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)
--  if (new_value)
++    {
--    {
++      ppd_coption_t *coption;
--      gtk_cups_request_encode_option (request, key, new_value);
++      gboolean       found = FALSE;
--      g_free (new_value);
++      gboolean       custom_values_enabled = FALSE;
 -    }
--  else
++      coption = ppdFindCustomOption (printer->ppd_file, key);
--    gtk_cups_request_encode_option (request, key, value);
++      if (coption && coption->option)
-+  gtk_cups_request_encode_option (request, key, value);
++        {
 +          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;
 +        }
 +    }
- static void
+-  if (new_value)
-@@ -533,12 +511,8 @@ gtk_print_backend_cups_print_stream (Gtk
++  /* Add "Custom." prefix to custom values. */
 +  if (custom_value)
    GtkPrinterCups *cups_printer;
-   CupsPrintStreamData *ps;
++      new_value = g_strdup_printf ("Custom.%s", value);
--  CupsOptionsData *options_data;
+       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 +521,6 @@ gtk_print_backend_cups_print_stream (Gtk
+@@ -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,18 +558,8 @@ gtk_print_backend_cups_print_stream (Gtk
+@@ -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 = g_new0 (CupsOptionsData, 1);
--  options_data->request = request;
+   options_data->request = request;
 -  options_data->options = options;
+-
--  gtk_print_settings_foreach (settings, add_cups_options, options_data);
++  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);
+   g_free (options_data);
 +  gtk_print_settings_foreach (settings, add_cups_options, request);
    ps = g_new0 (CupsPrintStreamData, 1);
-   ps->callback = callback;
+@@ -4606,7 +4619,12 @@ cups_printer_get_default_page_size (GtkP
-   ps->user_data = user_data;
+     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);
+ }

 @@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.140 2012/01/29 10:56:44 drochner Exp $
+$NetBSD: distinfo,v 1.141 2012/02/01 18:23:04 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 (patch-aa) = 9eec7fc4764b18856455a18b49f1bb101e5e6b11
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
 SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad
 SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
-SHA1 (patch-ak) = 4f9badd2b5607c94c8ccb5c22d60a87105cc1ae3
+SHA1 (patch-ak) = 90c49bf6b7bf79bb8ad270c2661876ea7b0cb5ad