Update the gtk+ stack [1]

Update gdk-pixbuf2 to 2.36.6
Update gtk30 to 3.22.12
Update cairomm to 1.12.2
Update gtkmm30 to 3.22.0

Update the following themes to be compatible with the new gtk+ version:
Update adwaita-icon-theme to 3.22.0
Update gnome-themes-standard to 3.22.3
Update gtk-E17-theme to 3.22.1 [2]
Update gtk-arc-themes to 20170302 [3]
Update mate-themes to 3.22.10

Bump xfce4-notifyd due to new gtk30 version, requested by olivierd@.
Mark LordsaWar broken, it doesn't build with cairomm 1.12.

PR:		210272 [1], 210696 [2], 218667 [3]
Submitted by:	Matthew Rezny [2]
Obtained from:	Unless otherwise stated obtained from GNOME devel repo
Exp-run by:	antoine@ [1]

4 files changed, 41 insertions, 26 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index d2d89ba15bb0..ecd7cbca9423 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -4,8 +4,8 @@
 # adwaita-icon-theme, gnome-themes-standard and mate-themes
 
 PORTNAME=	gtk
-PORTVERSION=	3.18.8
-PORTREVISION?=	4
+PORTVERSION=	3.22.12
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMESUFFIX=	3
@@ -25,7 +25,10 @@ PORTSCOUT=	ignore:1
 PORTSCOUT=	limit:1,even
 
 BUILD_DEPENDS+=	at-spi2-atk>=0:accessibility/at-spi2-atk
-LIB_DEPENDS=	libepoxy.so:graphics/libepoxy
+LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS+=	hicolor-icon-theme>=0:misc/hicolor-icon-theme \
 		adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \
 		at-spi2-atk>=0:accessibility/at-spi2-atk
@@ -33,20 +36,19 @@ RUN_DEPENDS+=	hicolor-icon-theme>=0:misc/hicolor-icon-theme \
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	atk gdkpixbuf2 introspection:build pango
+USE_GNOME=	atk cairo gdkpixbuf2 introspection:build pango
 #gtk-update-icon-cache
-USES+=		gettext gmake gnome libtool pathfix perl5 pkgconfig
+USES+=		gettext gmake gnome libtool localbase pathfix perl5 pkgconfig
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 CONFIGURE_ARGS=	--enable-x11-backend \
 		--disable-wayland-backend \
 		--enable-introspection
-CPPFLAGS+=	-I${LOCALBASE}/include -fno-omit-frame-pointer
-LIBS+=		-L${LOCALBASE}/lib
+CPPFLAGS+=	-fno-omit-frame-pointer
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
-LIBVERSION=	0.1800.8
+LIBVERSION=	0.2200.12
 PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
 GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
@@ -54,7 +56,7 @@ GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
 		org.gtk.Settings.Debug.gschema.xml \
 		org.gtk.Settings.FileChooser.gschema.xml
 
-OPTIONS_DEFINE=	CUPS CLOUDPRINT COLORD DEBUG BROADWAY
+OPTIONS_DEFINE=	CUPS CLOUDPRINT COLORD BROADWAY
 OPTIONS_DEFAULT=CUPS COLORD BROADWAY
 OPTIONS_SUB=	yes
 
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 43cbf52bfefe..79404c8a50cb 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gtk+-3.18.8.tar.xz) = 1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8
-SIZE (gnome3/gtk+-3.18.8.tar.xz) = 16806532
+TIMESTAMP = 1491985486
+SHA256 (gnome3/gtk+-3.22.12.tar.xz) = 84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c
+SIZE (gnome3/gtk+-3.22.12.tar.xz) = 18236348
diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure
index 78cbf3ca2309..a98cb678afbe 100644
--- a/x11-toolkits/gtk30/files/patch-configure
+++ b/x11-toolkits/gtk30/files/patch-configure
@@ -1,15 +1,6 @@
---- configure.orig	2016-02-24 05:04:43 UTC
-+++ configure
-@@ -25758,7 +25758,7 @@ fi
-     CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
-     CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
- 
--    if test $CUPS_API_MAJOR -gt 1 -o \
-+    if test $CUPS_API_MAJOR -lt 1 -o \
-             $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
-       as_fn_error $? "CUPS >= 1.2 not found" "$LINENO" 5
-     fi
-@@ -26190,9 +26190,7 @@ fi
+--- configure.orig	2016-10-24 05:10:09.000000000 +0200
++++ configure	2016-11-15 07:54:17.741400000 +0100
+@@ -27913,9 +27913,7 @@ fi
  if test "$have_cups" = "yes"; then
    GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cups"
  fi
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 7fdf78843569..0e8cbac4dbf4 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -3,6 +3,7 @@ bin/gtk-builder-tool
 bin/gtk-encode-symbolic-svg
 bin/gtk-launch
 bin/gtk-query-immodules-3.0
+bin/gtk-query-settings
 @comment bin/gtk-update-icon-cache
 bin/gtk3-demo
 bin/gtk3-demo-application
@@ -14,8 +15,10 @@ include/gail-3.0/libgail-util/gailmisc.h
 include/gail-3.0/libgail-util/gailtextutil.h
 %%BROADWAY%%include/gtk-3.0/gdk/broadway/gdkbroadwaycursor.h
 %%BROADWAY%%include/gtk-3.0/gdk/broadway/gdkbroadwaydisplay.h
+%%BROADWAY%%include/gtk-3.0/gdk/broadway/gdkbroadwaymonitor.h
 %%BROADWAY%%include/gtk-3.0/gdk/broadway/gdkbroadwayvisual.h
 %%BROADWAY%%include/gtk-3.0/gdk/broadway/gdkbroadwaywindow.h
+include/gtk-3.0/gdk/deprecated/gdkcolor.h
 include/gtk-3.0/gdk/gdk-autocleanup.h
 include/gtk-3.0/gdk/gdk.h
 include/gtk-3.0/gdk/gdkapplaunchcontext.h
@@ -25,9 +28,12 @@ include/gtk-3.0/gdk/gdkconfig.h
 include/gtk-3.0/gdk/gdkcursor.h
 include/gtk-3.0/gdk/gdkdevice.h
 include/gtk-3.0/gdk/gdkdevicemanager.h
+include/gtk-3.0/gdk/gdkdevicepad.h
+include/gtk-3.0/gdk/gdkdevicetool.h
 include/gtk-3.0/gdk/gdkdisplay.h
 include/gtk-3.0/gdk/gdkdisplaymanager.h
 include/gtk-3.0/gdk/gdkdnd.h
+include/gtk-3.0/gdk/gdkdrawingcontext.h
 include/gtk-3.0/gdk/gdkenumtypes.h
 include/gtk-3.0/gdk/gdkevents.h
 include/gtk-3.0/gdk/gdkframeclock.h
@@ -37,6 +43,7 @@ include/gtk-3.0/gdk/gdkkeys.h
 include/gtk-3.0/gdk/gdkkeysyms-compat.h
 include/gtk-3.0/gdk/gdkkeysyms.h
 include/gtk-3.0/gdk/gdkmain.h
+include/gtk-3.0/gdk/gdkmonitor.h
 include/gtk-3.0/gdk/gdkpango.h
 include/gtk-3.0/gdk/gdkpixbuf.h
 include/gtk-3.0/gdk/gdkprivate.h
@@ -44,6 +51,7 @@ include/gtk-3.0/gdk/gdkproperty.h
 include/gtk-3.0/gdk/gdkrectangle.h
 include/gtk-3.0/gdk/gdkrgba.h
 include/gtk-3.0/gdk/gdkscreen.h
+include/gtk-3.0/gdk/gdkseat.h
 include/gtk-3.0/gdk/gdkselection.h
 include/gtk-3.0/gdk/gdktestutils.h
 include/gtk-3.0/gdk/gdkthreads.h
@@ -66,6 +74,7 @@ include/gtk-3.0/gdk/x11/gdkx11displaymanager.h
 include/gtk-3.0/gdk/x11/gdkx11dnd.h
 include/gtk-3.0/gdk/x11/gdkx11glcontext.h
 include/gtk-3.0/gdk/x11/gdkx11keys.h
+include/gtk-3.0/gdk/x11/gdkx11monitor.h
 include/gtk-3.0/gdk/x11/gdkx11property.h
 include/gtk-3.0/gdk/x11/gdkx11screen.h
 include/gtk-3.0/gdk/x11/gdkx11selection.h
@@ -114,6 +123,7 @@ include/gtk-3.0/gtk/a11y/gtkscalebuttonaccessible.h
 include/gtk-3.0/gtk/a11y/gtkscrolledwindowaccessible.h
 include/gtk-3.0/gtk/a11y/gtkspinbuttonaccessible.h
 include/gtk-3.0/gtk/a11y/gtkspinneraccessible.h
+include/gtk-3.0/gtk/a11y/gtkstackaccessible.h
 include/gtk-3.0/gtk/a11y/gtkstatusbaraccessible.h
 include/gtk-3.0/gtk/a11y/gtkswitchaccessible.h
 include/gtk-3.0/gtk/a11y/gtktextcellaccessible.h
@@ -123,7 +133,6 @@ include/gtk-3.0/gtk/a11y/gtktoplevelaccessible.h
 include/gtk-3.0/gtk/a11y/gtktreeviewaccessible.h
 include/gtk-3.0/gtk/a11y/gtkwidgetaccessible.h
 include/gtk-3.0/gtk/a11y/gtkwindowaccessible.h
-include/gtk-3.0/gdk/deprecated/gdkcolor.h
 include/gtk-3.0/gtk/deprecated/gtkaction.h
 include/gtk-3.0/gtk/deprecated/gtkactiongroup.h
 include/gtk-3.0/gtk/deprecated/gtkactivatable.h
@@ -148,10 +157,10 @@ include/gtk-3.0/gtk/deprecated/gtknumerableicon.h
 include/gtk-3.0/gtk/deprecated/gtkradioaction.h
 include/gtk-3.0/gtk/deprecated/gtkrc.h
 include/gtk-3.0/gtk/deprecated/gtkrecentaction.h
+include/gtk-3.0/gtk/deprecated/gtkstatusicon.h
 include/gtk-3.0/gtk/deprecated/gtkstock.h
 include/gtk-3.0/gtk/deprecated/gtkstyle.h
 include/gtk-3.0/gtk/deprecated/gtkstyleproperties.h
-include/gtk-3.0/gtk/deprecated/gtkstatusicon.h
 include/gtk-3.0/gtk/deprecated/gtksymboliccolor.h
 include/gtk-3.0/gtk/deprecated/gtktable.h
 include/gtk-3.0/gtk/deprecated/gtktearoffmenuitem.h
@@ -223,6 +232,8 @@ include/gtk-3.0/gtk/gtkcsssection.h
 include/gtk-3.0/gtk/gtkdebug.h
 include/gtk-3.0/gtk/gtkdialog.h
 include/gtk-3.0/gtk/gtkdnd.h
+include/gtk-3.0/gtk/gtkdragdest.h
+include/gtk-3.0/gtk/gtkdragsource.h
 include/gtk-3.0/gtk/gtkdrawingarea.h
 include/gtk-3.0/gtk/gtkeditable.h
 include/gtk-3.0/gtk/gtkentry.h
@@ -235,6 +246,7 @@ include/gtk-3.0/gtk/gtkexpander.h
 include/gtk-3.0/gtk/gtkfilechooser.h
 include/gtk-3.0/gtk/gtkfilechooserbutton.h
 include/gtk-3.0/gtk/gtkfilechooserdialog.h
+include/gtk-3.0/gtk/gtkfilechoosernative.h
 include/gtk-3.0/gtk/gtkfilechooserwidget.h
 include/gtk-3.0/gtk/gtkfilefilter.h
 include/gtk-3.0/gtk/gtkfixed.h
@@ -284,10 +296,12 @@ include/gtk-3.0/gtk/gtkmessagedialog.h
 include/gtk-3.0/gtk/gtkmodelbutton.h
 include/gtk-3.0/gtk/gtkmodules.h
 include/gtk-3.0/gtk/gtkmountoperation.h
+include/gtk-3.0/gtk/gtknativedialog.h
 include/gtk-3.0/gtk/gtknotebook.h
 include/gtk-3.0/gtk/gtkoffscreenwindow.h
 include/gtk-3.0/gtk/gtkorientable.h
 include/gtk-3.0/gtk/gtkoverlay.h
+include/gtk-3.0/gtk/gtkpadcontroller.h
 include/gtk-3.0/gtk/gtkpagesetup.h
 include/gtk-3.0/gtk/gtkpaned.h
 include/gtk-3.0/gtk/gtkpapersize.h
@@ -324,16 +338,21 @@ include/gtk-3.0/gtk/gtkseparator.h
 include/gtk-3.0/gtk/gtkseparatormenuitem.h
 include/gtk-3.0/gtk/gtkseparatortoolitem.h
 include/gtk-3.0/gtk/gtksettings.h
+include/gtk-3.0/gtk/gtkshortcutlabel.h
+include/gtk-3.0/gtk/gtkshortcutsgroup.h
+include/gtk-3.0/gtk/gtkshortcutssection.h
+include/gtk-3.0/gtk/gtkshortcutsshortcut.h
+include/gtk-3.0/gtk/gtkshortcutswindow.h
 include/gtk-3.0/gtk/gtkshow.h
 include/gtk-3.0/gtk/gtksizegroup.h
 include/gtk-3.0/gtk/gtksizerequest.h
 include/gtk-3.0/gtk/gtksocket.h
 include/gtk-3.0/gtk/gtkspinbutton.h
 include/gtk-3.0/gtk/gtkspinner.h
-include/gtk-3.0/gtk/gtkstatusbar.h
 include/gtk-3.0/gtk/gtkstack.h
 include/gtk-3.0/gtk/gtkstacksidebar.h
 include/gtk-3.0/gtk/gtkstackswitcher.h
+include/gtk-3.0/gtk/gtkstatusbar.h
 include/gtk-3.0/gtk/gtkstylecontext.h
 include/gtk-3.0/gtk/gtkstyleprovider.h
 include/gtk-3.0/gtk/gtkswitch.h
@@ -425,6 +444,8 @@ share/aclocal/gtk-3.0.m4
 share/applications/gtk3-demo.desktop
 share/applications/gtk3-icon-browser.desktop
 share/applications/gtk3-widget-factory.desktop
+share/gettext/its/gtkbuilder.its
+share/gettext/its/gtkbuilder.loc
 share/gir-1.0/Gdk-3.0.gir
 share/gir-1.0/GdkX11-3.0.gir
 share/gir-1.0/Gtk-3.0.gir