Update gtk3 to 3.6.1

* The accessibility bridge code that exports accessible objects
  on the bus is now used by default; atk-bridge has been converted
  into a library that GTK+ links against. To void the linking,
  pass --without-atk-bridge when configuring GTK+.

* GDK threading support has been deprecated. It is recommended to
  use g_idle_add(), g_main_context_invoke() and similar funtions
  to make all GTK+ calls from the main thread.

* GTK+ now follows the XDG Base Directory specification for
  user configuration and data files. In detail,
  * $XDG_CONFIG_HOME/gtk-3.0/custom-papers is the new location
    for $HOME/.gtk-custom-papers
  * $XDG_CONFIG_HOME/gtk-3.0/bookmarks is the new location
    for $HOME/.gtk-bookmarks
  * $XDG_DATA_HOME/themes is preferred over $HOME/.themes
  * $XDG_DATA_HOME/icons is preferred over $HOME/.icons.
  Existing files from the old location will still be read
  if the new location does not exist.

* $HOME/.gtk-3.0 is no longer in the default module load path.
  If you want to load modules from there, add it to the GTK_PATH
  environment variable.

8 files changed, 65 insertions, 97 deletions

diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile
index e1feeae93a8..68280b2886c 100644
--- a/x11/gtk3/Makefile
+++ b/x11/gtk3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2012/10/08 23:00:34 adam Exp $
+# $NetBSD: Makefile,v 1.30 2012/10/18 19:08:47 prlw1 Exp $
 
-DISTNAME=	gtk+-3.4.4
+DISTNAME=	gtk+-3.6.1
 PKGNAME=	${DISTNAME:S/gtk/gtk3/}
-PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/${PKGVERSION_NOREV:R}/ \
 		${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
@@ -34,10 +33,8 @@ MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 TEST_TARGET=		check
 
 PKGCONFIG_OVERRIDE+=	gdk-3.0.pc.in
-PKGCONFIG_OVERRIDE+=	gtk+-3.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gtk+-3.0.pc.in
 PKGCONFIG_OVERRIDE+=	gtk+-unix-print-3.0.pc.in
-PKGCONFIG_OVERRIDE+=	gail-3.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gail-3.0.pc.in
 
 INSTALLATION_DIRS+=	lib/gtk-3.0/immodules
@@ -63,7 +60,7 @@ CONFIGURE_ENV+=		ac_cv_func_isnan=yes
 CONFIGURE_ENV+=		ac_cv_func_isinf=yes
 .endif
 
-CFLAGS.SunOS+=		-std=gnu99 -D_XOPEN_SOURCE=600
+CFLAGS.SunOS+=		-std=gnu99
 
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 
@@ -77,13 +74,16 @@ _BUILDING_GTK3=	yes
 .include "modules.mk"
 
 .include "../../databases/shared-mime-info/buildlink3.mk"
-BUILDLINK_API_DEPENDS.atk+=	atk>=2.2.0nb2
+BUILDLINK_API_DEPENDS.atk+=	atk>=2.5.3
 .include "../../devel/atk/buildlink3.mk"
+BUILDLINK_API_DEPENDS.at-spi2-atk+=	at-spi2-atk>=2.6.1
+.include "../../devel/at-spi2-atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.29.14
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.33.1
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gdk-pixbuf2+=	gdk-pixbuf2>=2.24.1nb2
+BUILDLINK_API_DEPENDS.gdk-pixbuf2+=	gdk-pixbuf2>=2.26.0
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection:=	build
 BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=1.32
 .include "../../devel/gobject-introspection/buildlink3.mk"
 
diff --git a/x11/gtk3/PLIST b/x11/gtk3/PLIST
index ace6a34bbaf..c4b5f6db264 100644
--- a/x11/gtk3/PLIST
+++ b/x11/gtk3/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2012/04/30 14:26:38 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/10/18 19:08:47 prlw1 Exp $
+bin/gtk-launch
 bin/gtk-query-immodules-3.0
 bin/gtk3-demo
 bin/gtk3-demo-application
@@ -185,12 +186,14 @@ include/gtk-3.0/gtk/gtkinfobar.h
 include/gtk-3.0/gtk/gtkinvisible.h
 include/gtk-3.0/gtk/gtklabel.h
 include/gtk-3.0/gtk/gtklayout.h
+include/gtk-3.0/gtk/gtklevelbar.h
 include/gtk-3.0/gtk/gtklinkbutton.h
 include/gtk-3.0/gtk/gtkliststore.h
 include/gtk-3.0/gtk/gtklockbutton.h
 include/gtk-3.0/gtk/gtkmain.h
 include/gtk-3.0/gtk/gtkmenu.h
 include/gtk-3.0/gtk/gtkmenubar.h
+include/gtk-3.0/gtk/gtkmenubutton.h
 include/gtk-3.0/gtk/gtkmenuitem.h
 include/gtk-3.0/gtk/gtkmenushell.h
 include/gtk-3.0/gtk/gtkmenutoolbutton.h
@@ -229,6 +232,7 @@ include/gtk-3.0/gtk/gtkscalebutton.h
 include/gtk-3.0/gtk/gtkscrollable.h
 include/gtk-3.0/gtk/gtkscrollbar.h
 include/gtk-3.0/gtk/gtkscrolledwindow.h
+include/gtk-3.0/gtk/gtksearchentry.h
 include/gtk-3.0/gtk/gtkselection.h
 include/gtk-3.0/gtk/gtkseparator.h
 include/gtk-3.0/gtk/gtkseparatormenuitem.h
@@ -324,6 +328,7 @@ ${PLIST.quartz}lib/pkgconfig/gtk+-quartz-3.0.pc
 lib/pkgconfig/gtk+-unix-print-3.0.pc
 ${PLIST.x11}lib/pkgconfig/gtk+-x11-3.0.pc
 libdata/gtk-3.0/im-multipress.conf
+man/man1/gtk-launch.1
 man/man1/gtk-query-immodules-3.0.1
 man/man1/gtk-update-icon-cache.1
 share/aclocal/gtk-3.0.m4
@@ -336,6 +341,7 @@ share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
 share/gtk-3.0/demo/alphatest.png
 share/gtk-3.0/demo/apple-red.png
 share/gtk-3.0/demo/application.c
+share/gtk-3.0/demo/application.ui
 share/gtk-3.0/demo/appwindow.c
 share/gtk-3.0/demo/assistant.c
 share/gtk-3.0/demo/background.jpg
@@ -345,6 +351,17 @@ share/gtk-3.0/demo/changedisplay.c
 share/gtk-3.0/demo/clipboard.c
 share/gtk-3.0/demo/colorsel.c
 share/gtk-3.0/demo/combobox.c
+share/gtk-3.0/demo/css_accordion.c
+share/gtk-3.0/demo/css_accordion.css
+share/gtk-3.0/demo/css_basics.c
+share/gtk-3.0/demo/css_basics.css
+share/gtk-3.0/demo/css_multiplebgs.c
+share/gtk-3.0/demo/css_multiplebgs.css
+share/gtk-3.0/demo/css_pixbufs.c
+share/gtk-3.0/demo/css_pixbufs.css
+share/gtk-3.0/demo/css_shadows.c
+share/gtk-3.0/demo/css_shadows.css
+share/gtk-3.0/demo/cssview.css
 share/gtk-3.0/demo/demo.ui
 share/gtk-3.0/demo/dialog.c
 share/gtk-3.0/demo/drawingarea.c
@@ -352,6 +369,7 @@ share/gtk-3.0/demo/editable_cells.c
 share/gtk-3.0/demo/entry_buffer.c
 share/gtk-3.0/demo/entry_completion.c
 share/gtk-3.0/demo/expander.c
+share/gtk-3.0/demo/fancy.css
 share/gtk-3.0/demo/floppybuddy.gif
 share/gtk-3.0/demo/gnome-applets.png
 share/gtk-3.0/demo/gnome-calendar.png
@@ -362,6 +380,8 @@ share/gtk-3.0/demo/gnome-gimp.png
 share/gtk-3.0/demo/gnome-gmush.png
 share/gtk-3.0/demo/gnome-gsame.png
 share/gtk-3.0/demo/gnu-keys.png
+share/gtk-3.0/demo/gtk-logo-24.png
+share/gtk-3.0/demo/gtk-logo-48.png
 share/gtk-3.0/demo/gtk-logo-rgb.gif
 share/gtk-3.0/demo/hypertext.c
 share/gtk-3.0/demo/iconview.c
@@ -371,6 +391,7 @@ share/gtk-3.0/demo/infobar.c
 share/gtk-3.0/demo/links.c
 share/gtk-3.0/demo/list_store.c
 share/gtk-3.0/demo/menus.c
+share/gtk-3.0/demo/menus.ui
 share/gtk-3.0/demo/offscreen_window.c
 share/gtk-3.0/demo/offscreen_window2.c
 share/gtk-3.0/demo/overlay.c
@@ -378,6 +399,7 @@ share/gtk-3.0/demo/panes.c
 share/gtk-3.0/demo/pickers.c
 share/gtk-3.0/demo/pixbufs.c
 share/gtk-3.0/demo/printing.c
+share/gtk-3.0/demo/reset.css
 share/gtk-3.0/demo/rotated_text.c
 share/gtk-3.0/demo/search_entry.c
 share/gtk-3.0/demo/sizegroup.c
@@ -385,6 +407,9 @@ share/gtk-3.0/demo/spinner.c
 share/gtk-3.0/demo/stock_browser.c
 share/gtk-3.0/demo/textscroll.c
 share/gtk-3.0/demo/textview.c
+share/gtk-3.0/demo/theming.ui
+share/gtk-3.0/demo/theming_custom_css.c
+share/gtk-3.0/demo/theming_style_classes.c
 share/gtk-3.0/demo/toolpalette.c
 share/gtk-3.0/demo/transparent.c
 share/gtk-3.0/demo/tree_store.c
@@ -411,6 +436,7 @@ share/gtk-doc/html/gdk3/annotation-glossary.html
 share/gtk-doc/html/gdk3/api-index-3-0.html
 share/gtk-doc/html/gdk3/api-index-3-2.html
 share/gtk-doc/html/gdk3/api-index-3-4.html
+share/gtk-doc/html/gdk3/api-index-3-6.html
 share/gtk-doc/html/gdk3/api-index-deprecated.html
 share/gtk-doc/html/gdk3/api-index-full.html
 share/gtk-doc/html/gdk3/arrow.png
@@ -454,6 +480,7 @@ share/gtk-doc/html/gdk3/gdk3-Points-Rectangles-and-Regions.html
 share/gtk-doc/html/gdk3/gdk3-Properties-and-Atoms.html
 share/gtk-doc/html/gdk3/gdk3-RGBA-Colors.html
 share/gtk-doc/html/gdk3/gdk3-Selections.html
+share/gtk-doc/html/gdk3/gdk3-Testing.html
 share/gtk-doc/html/gdk3/gdk3-Threads.html
 share/gtk-doc/html/gdk3/gdk3-Visuals.html
 share/gtk-doc/html/gdk3/gdk3-Windows.html
@@ -618,11 +645,13 @@ share/gtk-doc/html/gtk3/GtkInfoBar.html
 share/gtk-doc/html/gtk3/GtkInvisible.html
 share/gtk-doc/html/gtk3/GtkLabel.html
 share/gtk-doc/html/gtk3/GtkLayout.html
+share/gtk-doc/html/gtk3/GtkLevelBar.html
 share/gtk-doc/html/gtk3/GtkLinkButton.html
 share/gtk-doc/html/gtk3/GtkListStore.html
 share/gtk-doc/html/gtk3/GtkLockButton.html
 share/gtk-doc/html/gtk3/GtkMenu.html
 share/gtk-doc/html/gtk3/GtkMenuBar.html
+share/gtk-doc/html/gtk3/GtkMenuButton.html
 share/gtk-doc/html/gtk3/GtkMenuItem.html
 share/gtk-doc/html/gtk3/GtkMenuShell.html
 share/gtk-doc/html/gtk3/GtkMenuToolButton.html
@@ -660,6 +689,7 @@ share/gtk-doc/html/gtk3/GtkScaleButton.html
 share/gtk-doc/html/gtk3/GtkScrollable.html
 share/gtk-doc/html/gtk3/GtkScrollbar.html
 share/gtk-doc/html/gtk3/GtkScrolledWindow.html
+share/gtk-doc/html/gtk3/GtkSearchEntry.html
 share/gtk-doc/html/gtk3/GtkSeparator.html
 share/gtk-doc/html/gtk3/GtkSeparatorMenuItem.html
 share/gtk-doc/html/gtk3/GtkSeparatorToolItem.html
@@ -734,6 +764,7 @@ share/gtk-doc/html/gtk3/annotation-glossary.html
 share/gtk-doc/html/gtk3/api-index-3-0.html
 share/gtk-doc/html/gtk3/api-index-3-2.html
 share/gtk-doc/html/gtk3/api-index-3-4.html
+share/gtk-doc/html/gtk3/api-index-3-6.html
 share/gtk-doc/html/gtk3/api-index-deprecated.html
 share/gtk-doc/html/gtk3/api-index-full.html
 share/gtk-doc/html/gtk3/appchooserbutton.png
@@ -782,6 +813,9 @@ share/gtk-doc/html/gtk3/document-revert-ltr.png
 share/gtk-doc/html/gtk3/document-revert-rtl.png
 share/gtk-doc/html/gtk3/document-save-as.png
 share/gtk-doc/html/gtk3/document-save.png
+share/gtk-doc/html/gtk3/down-center.png
+share/gtk-doc/html/gtk3/down-end.png
+share/gtk-doc/html/gtk3/down-start.png
 share/gtk-doc/html/gtk3/drawing.png
 share/gtk-doc/html/gtk3/drive-harddisk.png
 share/gtk-doc/html/gtk3/ease-in-out.png
@@ -864,6 +898,7 @@ share/gtk-doc/html/gtk3/gtk-edit.png
 share/gtk-doc/html/gtk3/gtk-font.png
 share/gtk-doc/html/gtk3/gtk-getting-started.html
 share/gtk-doc/html/gtk3/gtk-index.png
+share/gtk-doc/html/gtk3/gtk-launch.html
 share/gtk-doc/html/gtk3/gtk-migrating-2-to-3.html
 share/gtk-doc/html/gtk3/gtk-migrating-GtkGrid.html
 share/gtk-doc/html/gtk3/gtk-migrating-GtkStyleContext-bonus-points.html
@@ -940,7 +975,11 @@ share/gtk-doc/html/gtk3/layout-rlbt.png
 share/gtk-doc/html/gtk3/layout-rltb.png
 share/gtk-doc/html/gtk3/layout-tblr.png
 share/gtk-doc/html/gtk3/layout-tbrl.png
+share/gtk-doc/html/gtk3/left-center.png
+share/gtk-doc/html/gtk3/left-end.png
+share/gtk-doc/html/gtk3/left-start.png
 share/gtk-doc/html/gtk3/left.png
+share/gtk-doc/html/gtk3/levelbar.png
 share/gtk-doc/html/gtk3/linear.png
 share/gtk-doc/html/gtk3/link-button.png
 share/gtk-doc/html/gtk3/list-add.png
@@ -966,6 +1005,7 @@ share/gtk-doc/html/gtk3/media-skip-backward-ltr.png
 share/gtk-doc/html/gtk3/media-skip-backward-rtl.png
 share/gtk-doc/html/gtk3/media-skip-forward-ltr.png
 share/gtk-doc/html/gtk3/media-skip-forward-rtl.png
+share/gtk-doc/html/gtk3/menu-button.png
 share/gtk-doc/html/gtk3/menubar.png
 share/gtk-doc/html/gtk3/messagedialog.png
 share/gtk-doc/html/gtk3/migrating.html
@@ -987,9 +1027,13 @@ share/gtk-doc/html/gtk3/progressbar.png
 share/gtk-doc/html/gtk3/pt06.html
 share/gtk-doc/html/gtk3/radio-group.png
 share/gtk-doc/html/gtk3/recentchooserdialog.png
+share/gtk-doc/html/gtk3/right-center.png
+share/gtk-doc/html/gtk3/right-end.png
+share/gtk-doc/html/gtk3/right-start.png
 share/gtk-doc/html/gtk3/right.png
 share/gtk-doc/html/gtk3/scales.png
 share/gtk-doc/html/gtk3/scrolledwindow.png
+share/gtk-doc/html/gtk3/search-entry.png
 share/gtk-doc/html/gtk3/separator.png
 share/gtk-doc/html/gtk3/slices.png
 share/gtk-doc/html/gtk3/sliders.png
@@ -1006,6 +1050,9 @@ share/gtk-doc/html/gtk3/toolbar.png
 share/gtk-doc/html/gtk3/toolpalette.png
 share/gtk-doc/html/gtk3/tools-check-spelling.png
 share/gtk-doc/html/gtk3/tree-view-coordinates.png
+share/gtk-doc/html/gtk3/up-center.png
+share/gtk-doc/html/gtk3/up-end.png
+share/gtk-doc/html/gtk3/up-start.png
 share/gtk-doc/html/gtk3/up.png
 share/gtk-doc/html/gtk3/view-fullscreen.png
 share/gtk-doc/html/gtk3/view-refresh.png
@@ -1131,6 +1178,8 @@ share/locale/ko/LC_MESSAGES/gtk30-properties.mo
 share/locale/ko/LC_MESSAGES/gtk30.mo
 share/locale/ku/LC_MESSAGES/gtk30-properties.mo
 share/locale/ku/LC_MESSAGES/gtk30.mo
+share/locale/ky/LC_MESSAGES/gtk30-properties.mo
+share/locale/ky/LC_MESSAGES/gtk30.mo
 share/locale/lg/LC_MESSAGES/gtk30-properties.mo
 share/locale/lg/LC_MESSAGES/gtk30.mo
 share/locale/li/LC_MESSAGES/gtk30-properties.mo
diff --git a/x11/gtk3/buildlink3.mk b/x11/gtk3/buildlink3.mk
index ba411954228..e0509e955f6 100644
--- a/x11/gtk3/buildlink3.mk
+++ b/x11/gtk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2012/10/08 23:00:34 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2012/10/18 19:08:47 prlw1 Exp $
 
 BUILDLINK_TREE+=	gtk3
 
@@ -14,6 +14,7 @@ BUILDLINK_PKGSRCDIR.gtk3?=	../../x11/gtk3
 pkgbase := gtk3
 .include "../../mk/pkg-build-options.mk"
 
+.include "../../devel/at-spi2-atk/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo
index f1f29d54dd0..ffeaed9127f 100644
--- a/x11/gtk3/distinfo
+++ b/x11/gtk3/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.12 2012/07/24 18:27:41 drochner Exp $
+$NetBSD: distinfo,v 1.13 2012/10/18 19:08:47 prlw1 Exp $
 
-SHA1 (gtk+-3.4.4.tar.xz) = f260cc9b1750afb99da144c8abdf1198c0386d5f
-RMD160 (gtk+-3.4.4.tar.xz) = 82f00e0d1f2841f8d39857f9d4a174915b2961d0
-Size (gtk+-3.4.4.tar.xz) = 12854476 bytes
-SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
-SHA1 (patch-af) = f1c8d7929ea84a3b92f0bfc76f32f8e79e1d4352
+SHA1 (gtk+-3.6.1.tar.xz) = bacec358996c802c098f2ff9e99513061e294413
+RMD160 (gtk+-3.6.1.tar.xz) = 004ce15a003f39d157e96e01a3d19b8c21352373
+Size (gtk+-3.6.1.tar.xz) = 13282048 bytes
 SHA1 (patch-aj) = 88d5a5c25bcc005bce8597d1262e68a9e67b5f93
-SHA1 (patch-ak) = bcafa213ce14ebf37e0e2e8530f8f94271679c9f
-SHA1 (patch-gtk_gtksearchenginesimple.c) = 963e31773f4c7219f06e0d8105d79680e06e9d0b
diff --git a/x11/gtk3/patches/patch-ab b/x11/gtk3/patches/patch-ab
deleted file mode 100644
index 8a3e797ee67..00000000000
--- a/x11/gtk3/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2011/03/18 17:06:10 drochner Exp $
-
-http://mail.gnome.org/archives/gtk-devel-list/2010-March/msg00113.html
-
---- gtk/gtkentry.c.orig	2010-05-02 03:14:28.000000000 +0000
-+++ gtk/gtkentry.c
-@@ -6712,8 +6712,11 @@ gtk_entry_set_buffer (GtkEntry       *en
-   g_object_notify (obj, "invisible-char-set");
-   g_object_thaw_notify (obj);
- 
--  gtk_editable_set_position (GTK_EDITABLE (entry), 0);
--  gtk_entry_recompute (entry);
-+  if (priv->buffer)
-+    {
-+      gtk_editable_set_position (GTK_EDITABLE (entry), 0);
-+      gtk_entry_recompute (entry);
-+    }
- }
- 
- /**
diff --git a/x11/gtk3/patches/patch-af b/x11/gtk3/patches/patch-af
deleted file mode 100644
index 7f763b02870..00000000000
--- a/x11/gtk3/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.3 2012/02/03 14:48:45 drochner Exp $
-
---- configure.orig	2011-12-19 14:16:11.000000000 +0000
-+++ configure
-@@ -18927,7 +18927,7 @@ fi
- fi
- 
- 
--if test "x$enable_broadway_backend" == xyes; then
-+if test "x$enable_broadway_backend" = xyes; then
-   GDK_BACKENDS="$GDK_BACKENDS broadway"
-   cairo_backends="$cairo_backends cairo"
-   GDK_WINDOWING="$GDK_WINDOWING
-@@ -18952,7 +18952,7 @@ fi
- 
- fi
- 
--if test "x$enable_wayland_backend" == "xyes"; then
-+if test "x$enable_wayland_backend" = "xyes"; then
-   # Wayland uses cairo-gl
-   cairo_backends="$cairo_backends cairo-gl"
-   GDK_BACKENDS="$GDK_BACKENDS wayland"
-@@ -22056,7 +22056,7 @@ _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--       X_LIBS="$X_LIBS -R$x_libraries"
-+       X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries"
- else
-   LIBS="$ac_xsave_LIBS -R $x_libraries"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/x11/gtk3/patches/patch-ak b/x11/gtk3/patches/patch-ak
deleted file mode 100644
index 6ae392bc5cc..00000000000
--- a/x11/gtk3/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2012/04/30 14:26:38 drochner Exp $
-
---- gtk/gtkthemingengine.c.orig	2012-04-15 17:32:48.000000000 +0000
-+++ gtk/gtkthemingengine.c
-@@ -1481,7 +1481,7 @@ set_stroke_style (cairo_t        *cr,
-       /* Optimize the common case of an integer-sized rectangle
-        * Again, we care about focus rectangles.
-        */
--      if (n == nearbyint (n))
-+      if (n == floor (n + 0.5))
-         {
-           segments[0] = 1;
-           segments[1] = 2;
diff --git a/x11/gtk3/patches/patch-gtk_gtksearchenginesimple.c b/x11/gtk3/patches/patch-gtk_gtksearchenginesimple.c
deleted file mode 100644
index 2adc43951af..00000000000
--- a/x11/gtk3/patches/patch-gtk_gtksearchenginesimple.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gtk_gtksearchenginesimple.c,v 1.2 2012/07/24 18:27:41 drochner Exp $
-
---- gtk/gtksearchenginesimple.c.orig	2012-07-15 16:58:25.000000000 +0000
-+++ gtk/gtksearchenginesimple.c
-@@ -26,7 +26,9 @@
-  * export ftw() and friends only if _XOPEN_SOURCE and _GNU_SOURCE
-  * are defined. see bug #444097.
-  */
-+#ifndef _XOPEN_SOURCE
- #define _XOPEN_SOURCE 600
-+#endif
- #define _GNU_SOURCE
- 
- #ifdef HAVE_FTW_H