4 files changed, 25 insertions, 18 deletions
diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile
index 76aa1e348a4..0f80566021b 100644
--- a/x11/gtk3/Makefile
+++ b/x11/gtk3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.119 2018/10/17 08:39:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.120 2018/10/23 07:42:23 leot Exp $
 
-DISTNAME=	gtk+-3.22.30
+DISTNAME=	gtk+-3.24.1
 PKGNAME=	${DISTNAME:S/gtk/gtk3/}
-PKGREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
@@ -85,14 +84,14 @@ BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=1.39.0
 
 .include "../../devel/glib2/schemas.mk"
 
-BUILDLINK_API_DEPENDS.pango+=	pango>=1.37.3
+BUILDLINK_API_DEPENDS.pango+=	pango>=1.41
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.14.0
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libepoxy+=	libepoxy>=1.2nb2
+BUILDLINK_API_DEPENDS.libepoxy+=	libepoxy>=1.4
 .include "../../graphics/libepoxy/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/x11/gtk3/PLIST b/x11/gtk3/PLIST
index 34aa5229282..d652b15c8b7 100644
--- a/x11/gtk3/PLIST
+++ b/x11/gtk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2017/11/07 12:05:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2018/10/23 07:42:23 leot Exp $
 bin/gtk-builder-tool
 bin/gtk-encode-symbolic-svg
 bin/gtk-launch
@@ -248,6 +248,9 @@ include/gtk-3.0/gtk/gtkentrycompletion.h
 include/gtk-3.0/gtk/gtkenums.h
 include/gtk-3.0/gtk/gtkeventbox.h
 include/gtk-3.0/gtk/gtkeventcontroller.h
+include/gtk-3.0/gtk/gtkeventcontrollerkey.h
+include/gtk-3.0/gtk/gtkeventcontrollermotion.h
+include/gtk-3.0/gtk/gtkeventcontrollerscroll.h
 include/gtk-3.0/gtk/gtkexpander.h
 include/gtk-3.0/gtk/gtkfilechooser.h
 include/gtk-3.0/gtk/gtkfilechooserbutton.h
@@ -269,6 +272,7 @@ include/gtk-3.0/gtk/gtkgesturemultipress.h
 include/gtk-3.0/gtk/gtkgesturepan.h
 include/gtk-3.0/gtk/gtkgesturerotate.h
 include/gtk-3.0/gtk/gtkgesturesingle.h
+include/gtk-3.0/gtk/gtkgesturestylus.h
 include/gtk-3.0/gtk/gtkgestureswipe.h
 include/gtk-3.0/gtk/gtkgesturezoom.h
 include/gtk-3.0/gtk/gtkglarea.h
@@ -707,6 +711,9 @@ share/gtk-doc/html/gtk3/GtkEntryBuffer.html
 share/gtk-doc/html/gtk3/GtkEntryCompletion.html
 share/gtk-doc/html/gtk3/GtkEventBox.html
 share/gtk-doc/html/gtk3/GtkEventController.html
+share/gtk-doc/html/gtk3/GtkEventControllerKey.html
+share/gtk-doc/html/gtk3/GtkEventControllerMotion.html
+share/gtk-doc/html/gtk3/GtkEventControllerScroll.html
 share/gtk-doc/html/gtk3/GtkExpander.html
 share/gtk-doc/html/gtk3/GtkFileChooser.html
 share/gtk-doc/html/gtk3/GtkFileChooserButton.html
@@ -730,6 +737,7 @@ share/gtk-doc/html/gtk3/GtkGestureMultiPress.html
 share/gtk-doc/html/gtk3/GtkGesturePan.html
 share/gtk-doc/html/gtk3/GtkGestureRotate.html
 share/gtk-doc/html/gtk3/GtkGestureSingle.html
+share/gtk-doc/html/gtk3/GtkGestureStylus.html
 share/gtk-doc/html/gtk3/GtkGestureSwipe.html
 share/gtk-doc/html/gtk3/GtkGestureZoom.html
 share/gtk-doc/html/gtk3/GtkGrid.html
diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo
index da558e18620..6d5bb7eec34 100644
--- a/x11/gtk3/distinfo
+++ b/x11/gtk3/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.56 2018/04/27 15:08:55 wiz Exp $
+$NetBSD: distinfo,v 1.57 2018/10/23 07:42:23 leot Exp $
 
-SHA1 (gtk+-3.22.30.tar.xz) = 1be769c97b4dac9221d63f62f61ef724c55a14a3
-RMD160 (gtk+-3.22.30.tar.xz) = 915f2ccceefab24893e02e0e26c57b0146909218
-SHA512 (gtk+-3.22.30.tar.xz) = 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38
-Size (gtk+-3.22.30.tar.xz) = 18946084 bytes
+SHA1 (gtk+-3.24.1.tar.xz) = 0a5ce28ba6065a484308093bdb56ff6056b0db3c
+RMD160 (gtk+-3.24.1.tar.xz) = f1e26685ff6a267ad0a81e0f8dd06112b6a5a5b8
+SHA512 (gtk+-3.24.1.tar.xz) = 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d
+Size (gtk+-3.24.1.tar.xz) = 19307612 bytes
 SHA1 (patch-aj) = cbfab43f27352f7c6bc57a7c562c2d84c69da07a
 SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f
-SHA1 (patch-configure) = 1dca87c6a85ee927b85d4edc14b0985c5130c0d9
+SHA1 (patch-configure) = d531b33e52facf960058f1223b70db680da35300
 SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5
 SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78
 SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
diff --git a/x11/gtk3/patches/patch-configure b/x11/gtk3/patches/patch-configure
index 39676773dc9..fa43696f90a 100644
--- a/x11/gtk3/patches/patch-configure
+++ b/x11/gtk3/patches/patch-configure
@@ -1,18 +1,18 @@
-$NetBSD: patch-configure,v 1.3 2014/09/08 12:06:48 wiz Exp $
+$NetBSD: patch-configure,v 1.4 2018/10/23 07:42:23 leot Exp $
 
 Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
 
---- configure.orig	2014-03-25 00:21:59.000000000 +0000
+--- configure.orig	2018-09-19 01:46:05.000000000 +0000
 +++ configure
-@@ -1035,6 +1035,7 @@ enable_glibtest
+@@ -1062,6 +1062,7 @@ enable_glibtest
  enable_modules
  with_included_immodules
  with_x
 +with_atk_bridge
+ enable_win32_gles
  enable_cups
  enable_papi
- enable_cloudprint
-@@ -1782,6 +1783,7 @@ Optional Packages:
+@@ -1831,6 +1832,7 @@ Optional Packages:
    --with-included-immodules=MODULE1,MODULE2,...
                            build the specified input methods into gtk
    --with-x                use the X Window System
@@ -20,7 +20,7 @@ Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
    --with-html-dir=PATH    path to installed docs
    --with-xml-catalog=CATALOG
                            path to xml catalog to use
-@@ -24467,8 +24469,20 @@ fi
+@@ -26974,8 +26976,20 @@ fi
  # Check for Accessibility Toolkit flags
  ########################################