gtk3: remove unnecessary patch, fix PLIST for Darwin with Quartz

3 files changed, 3 insertions, 60 deletions

diff --git a/x11/gtk3/PLIST b/x11/gtk3/PLIST
index dcafdd79dc4..4c8bf7a2fb9 100644
--- a/x11/gtk3/PLIST
+++ b/x11/gtk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2021/01/07 10:02:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.35 2021/06/18 07:40:27 adam Exp $
 bin/gtk-builder-tool
 bin/gtk-encode-symbolic-svg
 bin/gtk-launch
@@ -55,6 +55,7 @@ include/gtk-3.0/gdk/gdkvisual.h
 ${PLIST.wayland}include/gtk-3.0/gdk/gdkwayland.h
 include/gtk-3.0/gdk/gdkwindow.h
 ${PLIST.x11}include/gtk-3.0/gdk/gdkx.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartz-cocoa-access.h
 ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartz-gtk-only.h
 ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzcursor.h
 ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdevice-core.h
diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo
index c3c57cbb734..1e3bc8f6aa9 100644
--- a/x11/gtk3/distinfo
+++ b/x11/gtk3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.88 2021/04/28 22:49:29 leot Exp $
+$NetBSD: distinfo,v 1.89 2021/06/18 07:40:27 adam Exp $
 
 SHA1 (gtk+-3.24.29.tar.xz) = 2faab763eeeea30c7b81d1a4749594ed39dc9cbe
 RMD160 (gtk+-3.24.29.tar.xz) = b9c289ce270e8d58a1daf28d547d18227c75dbe8
@@ -8,7 +8,6 @@ SHA1 (patch-Makefile.in) = 8edcfe2ff492d90138a24b680fe39814c3848d80
 SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f
 SHA1 (patch-configure) = d531b33e52facf960058f1223b70db680da35300
 SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5
-SHA1 (patch-gdk_quartz_gdkquartz-gtk-only.h) = 24aefa2631c2546ef726eba0aee0f9460c1664ed
 SHA1 (patch-gdk_wayland_gdkdevice-wayland.c) = e283bd6533ea1307b971c524bc05f0d3ee90453d
 SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78
 SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
diff --git a/x11/gtk3/patches/patch-gdk_quartz_gdkquartz-gtk-only.h b/x11/gtk3/patches/patch-gdk_quartz_gdkquartz-gtk-only.h
deleted file mode 100644
index afd2afbb401..00000000000
--- a/x11/gtk3/patches/patch-gdk_quartz_gdkquartz-gtk-only.h
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-gdk_quartz_gdkquartz-gtk-only.h,v 1.1 2020/01/08 14:57:29 adam Exp $
-
-https://gitlab.gnome.org/GNOME/gtk/issues/2279
-
---- /dev/null	2020-01-01 20:40:06.000000000 +0000
-+++ gdk/quartz/gdkquartz-gtk-only.h
-@@ -0,0 +1,50 @@
-+/* gdkquartz-gtk-only.h
-+ *
-+ * Copyright (C) 2005-2007 Imendio AB
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef __GDK_QUARTZ_GTK_ONLY_H__
-+#define __GDK_QUARTZ_GTK_ONLY_H__
-+
-+#if !(defined (GTK_COMPILATION) || defined (GDK_COMPILATION))
-+#error "This API is for use only in Gtk internal code."
-+#endif
-+
-+#include <Appkit/Appkit.h>
-+#include <gdk/gdk.h>
-+#include <gdk/quartz/gdkquartz.h>
-+
-+/* Drag and Drop/Clipboard */
-+GDK_AVAILABLE_IN_ALL
-+GdkAtom   gdk_quartz_pasteboard_type_to_atom_libgtk_only        (NSString       *type);
-+GDK_AVAILABLE_IN_ALL
-+NSString *gdk_quartz_target_to_pasteboard_type_libgtk_only      (const gchar    *target);
-+GDK_AVAILABLE_IN_ALL
-+NSString *gdk_quartz_atom_to_pasteboard_type_libgtk_only        (GdkAtom         atom);
-+
-+/* Utilities */
-+GDK_AVAILABLE_IN_ALL
-+NSImage  *gdk_quartz_pixbuf_to_ns_image_libgtk_only (GdkPixbuf *pixbuf);
-+GDK_AVAILABLE_IN_ALL
-+NSEvent  *gdk_quartz_event_get_nsevent              (GdkEvent  *event);
-+
-+/* Window */
-+GDK_AVAILABLE_IN_ALL
-+NSWindow *gdk_quartz_window_get_nswindow            (GdkWindow *window);
-+GDK_AVAILABLE_IN_ALL
-+NSView   *gdk_quartz_window_get_nsview              (GdkWindow *window);
-+
-+#endif