Update to gtk+2-2.24.33.

As per release notes:
* This is the final GTK 2.x release.
* There will be no more updates to GTK 2.
* All users are encouraged to update to GTK 3 or 4.

x11/gtk+2/Makefile

@@ -1,19 +1,16 @@
-# $OpenBSD: Makefile,v 1.237 2020/12/07 20:21:32 naddy Exp $
+# $OpenBSD: Makefile,v 1.238 2020/12/21 11:38:21 ajacoutot Exp $
 
 DPB_PROPERTIES=		parallel
 
 COMMENT-main=		multi-platform graphical toolkit
 COMMENT-cups=		gtk+2 CUPS print backend
 
-GNOME_VERSION=		2.24.32
+GNOME_VERSION=		2.24.33
 GNOME_PROJECT=		gtk+
 
 PKGNAME-main=		gtk+2-${GNOME_VERSION}
 PKGNAME-cups=		gtk+2-cups-${GNOME_VERSION}
 
-REVISION-main=		11
-REVISION-cups=		4
-
 CATEGORIES=		x11 devel
 
 SHARED_LIBS +=  gdk-x11-2.0          2400.0   # 2400.32
@@ -27,12 +24,12 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 # LGPLv2
 PERMIT_PACKAGE=	Yes
 
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
-WANTLIB += Xrandr Xrender atk-1.0 cairo expat ffi fontconfig
+WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo expat
-WANTLIB += freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += ffi fontconfig freetype fribidi gdk_pixbuf-2.0 gio-2.0
-WANTLIB += gobject-2.0 graphite2 gthread-2.0 harfbuzz m pango-1.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 harfbuzz
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
+WANTLIB += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += xcb xcb-render xcb-shm z iconv intl fribidi
+WANTLIB += pcre pixman-1 png xcb xcb-render xcb-shm z
 
 WANTLIB-main += ${WANTLIB} c
 

x11/gtk+2/distinfo

@@ -1,2 +1,2 @@
-SHA256 (gtk+-2.24.32.tar.xz) = tsipPd2l6r47/uHrOWNsmgPSpWx7YoKLNZvxl5Q8WC4=
+SHA256 (gtk+-2.24.33.tar.xz) = rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto=
-SIZE (gtk+-2.24.32.tar.xz) = 12620860
+SIZE (gtk+-2.24.33.tar.xz) = 12661828

x11/gtk+2/patches/patch-gtk_Makefile_in

@@ -1,8 +1,9 @@
-$OpenBSD: patch-gtk_Makefile_in,v 1.49 2018/01/09 13:22:24 ajacoutot Exp $
+$OpenBSD: patch-gtk_Makefile_in,v 1.50 2020/12/21 11:38:22 ajacoutot Exp $
+
 Index: gtk/Makefile.in
 --- gtk/Makefile.in.orig
 +++ gtk/Makefile.in
-@@ -1577,7 +1577,7 @@ SUBDIRS = theme-bits . tests
+@@ -2014,7 +2014,7 @@ SUBDIRS = theme-bits . tests
  DIST_SUBDIRS = theme-bits tests
  @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE@GTK_PRINT_BACKENDS = file,lpr
  @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi
@@ -10,4 +11,4 @@ Index: gtk/Makefile.in
 +@HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups,lpr
  @HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups
  GTK_BASE_CFLAGS_DEFINES = \
- 	-DG_LOG_DOMAIN=\"Gtk\"				\
+ 	-DGTK_VERSION=\"$(GTK_VERSION)\"		\

x11/gtk+2/patches/patch-gtk_gtkfilechooserdefault_c

@@ -1,34 +0,0 @@
-$OpenBSD: patch-gtk_gtkfilechooserdefault_c,v 1.4 2018/06/24 07:12:33 ajacoutot Exp $
-
-From 168434c4a1ba90609b6f58d0098436c6be7be75b Mon Sep 17 00:00:00 2001
-From: Daniel Boles <dboles.src@gmail.com>
-Date: Fri, 22 Jun 2018 15:10:56 +0100
-Subject: [PATCH] FileChooserDefault: Avoid printf()ing a NULL char*
-
-Index: gtk/gtkfilechooserdefault.c
---- gtk/gtkfilechooserdefault.c.orig
-+++ gtk/gtkfilechooserdefault.c
-@@ -2810,8 +2810,8 @@ bookmarks_check_remove_sensitivity (GtkFileChooserDefa
- {
-   GtkTreeIter iter;
-   gboolean removable = FALSE;
-+  gboolean have_bookmark_name = FALSE;
-   gchar *name = NULL;
--  gchar *tip;
-   
-   if (shortcuts_get_selected (impl, &iter))
-     {
-@@ -2820,6 +2820,13 @@ bookmarks_check_remove_sensitivity (GtkFileChooserDefa
-                           SHORTCUTS_COL_NAME, &name,
-                           -1);
-       gtk_widget_set_sensitive (impl->browse_shortcuts_remove_button, removable);
-+
-+      have_bookmark_name = name != NULL && name[0] != '\0';
-+    }
-+
-+  if (have_bookmark_name)
-+    {
-+      char *tip;
- 
-       if (removable)
-         tip = g_strdup_printf (_("Remove the bookmark '%s'"), name);

x11/gtk+2/patches/patch-gtk_gtksettings_c

@@ -1,4 +1,5 @@
-$OpenBSD: patch-gtk_gtksettings_c,v 1.9 2010/04/25 20:35:08 ajacoutot Exp $
+$OpenBSD: patch-gtk_gtksettings_c,v 1.10 2020/12/21 11:38:22 ajacoutot Exp $
+
 --- gtk/gtksettings.c.orig	Sun Apr 25 22:31:10 2010
 +++ gtk/gtksettings.c	Sun Apr 25 22:31:53 2010
 @@ -38,7 +38,7 @@

x11/gtk+2/patches/patch-modules_engines_pixbuf_pixbuf-render_c

@@ -1,26 +0,0 @@
-$OpenBSD: patch-modules_engines_pixbuf_pixbuf-render_c,v 1.1 2020/05/02 11:21:08 sthen Exp $
-
-From d1b21ff1598cfab03e6b918edd76de766356566c Mon Sep 17 00:00:00 2001
-From: Nam Nguyen <namn@berkeley.edu>
-Date: Fri, 1 May 2020 21:55:49 +0000
-Subject: [PATCH] Resolve GIMP segfault from accessing memory past end of
- pixbuf Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/2684
-
-GIMP segfaults while switching themes between dark and gray and inputting Ctrl-O
-to open a file. This is because p advances past end of pixbuf in pixbuf-render.c
-compute_hint() with num_channels = 3 (no alpha). This is resolved by fixing the
-if statement to only check for alpha, thereby advancing p, if there is an alpha
-channel.
-
-Index: modules/engines/pixbuf/pixbuf-render.c
---- modules/engines/pixbuf/pixbuf-render.c.orig
-+++ modules/engines/pixbuf/pixbuf-render.c
-@@ -603,7 +603,7 @@ compute_hint (GdkPixbuf *pixbuf,
- 	  if (r != *(p++) ||
- 	      g != *(p++) ||
- 	      b != *(p++) ||
--	      (n_channels != 4 && a != *(p++)))
-+	      (n_channels == 4 && a != *(p++)))
- 	    {
- 	      hints &= ~THEME_CONSTANT_ROWS;
- 	      if (!(hints & THEME_MISSING))