aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2015-08-05 19:13:24 +0000
committerKoop Mast <kwm@FreeBSD.org>2015-08-05 19:13:24 +0000
commitd129587b5d568b0ff5300386f1e1b706c349f38e (patch)
treee398c7b6ea5203fd3953999e6dd9d6c83c9ec931 /x11-toolkits
parentc13de12f75988e599e389d9c77ed92db8d927185 (diff)
downloadports-d129587b5d568b0ff5300386f1e1b706c349f38e.tar.gz
ports-d129587b5d568b0ff5300386f1e1b706c349f38e.zip
The FreeBSD GNOME team proudly presents GNOME 3.16 for FreeBSD.
The offical GNOME 3.16 release notes can be found at https://help.gnome.org/misc/release-notes/3.16/ Upgrade instructions for port users: Delete the old tracker package with: # pkg delete -f tracker And user port upgrade tool of choice to upgrade. Thanks to Antoine Brodin for running the exp-runs. This release was made possible by the following people: Gustau Perez Ting-Wei_Lan PR: 201980
Notes
Notes: svn path=/head/; revision=393607
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/gdl/Makefile6
-rw-r--r--x11-toolkits/gdl/distinfo4
-rw-r--r--x11-toolkits/gdl/pkg-plist62
-rw-r--r--x11-toolkits/gnome-pty-helper/Makefile10
-rw-r--r--x11-toolkits/gnome-pty-helper/pkg-plist2
-rw-r--r--x11-toolkits/granite/Makefile1
-rw-r--r--x11-toolkits/granite/files/patch-lib__Widgets__ContractorView.vala20
-rw-r--r--x11-toolkits/granite/files/patch-lib__Widgets__DynamicNotebook.vala15
-rw-r--r--x11-toolkits/gtk30/Makefile35
-rw-r--r--x11-toolkits/gtk30/distinfo4
-rw-r--r--x11-toolkits/gtk30/files/patch-34e6e1a28
-rw-r--r--x11-toolkits/gtk30/files/patch-Makefile.in10
-rw-r--r--x11-toolkits/gtk30/files/patch-docs_Makefile.in15
-rw-r--r--x11-toolkits/gtk30/pkg-plist37
-rw-r--r--x11-toolkits/gtkada3/Makefile1
-rw-r--r--x11-toolkits/gtkada3/files/patch-namespace727
-rw-r--r--x11-toolkits/gtkmm30/Makefile5
-rw-r--r--x11-toolkits/gtkmm30/distinfo4
-rw-r--r--x11-toolkits/gtkmm30/pkg-plist7
-rw-r--r--x11-toolkits/gtksourceview3/Makefile2
-rw-r--r--x11-toolkits/gtksourceview3/distinfo4
-rw-r--r--x11-toolkits/gtksourceview3/pkg-plist25
-rw-r--r--x11-toolkits/libgnomeui/Makefile2
-rw-r--r--x11-toolkits/pangomm/Makefile8
-rw-r--r--x11-toolkits/pangomm/distinfo4
-rw-r--r--x11-toolkits/py-vte/Makefile2
-rw-r--r--x11-toolkits/vte/Makefile3
-rw-r--r--x11-toolkits/vte3/Makefile25
-rw-r--r--x11-toolkits/vte3/distinfo4
-rw-r--r--x11-toolkits/vte3/files/patch-gnome-pty-helper_Makefile.in13
-rw-r--r--x11-toolkits/vte3/pkg-plist53
31 files changed, 978 insertions, 160 deletions
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 3adc828d80c1..6f1537439c6a 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gdl
-PORTVERSION= 3.14.0
+PORTVERSION= 3.16.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -13,7 +13,9 @@ COMMENT= Components intended to be shared between GNOME development tools
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_GNOME= gnomeprefix gtk30 intlhack
+PORTSCOUT= limitw:1,even
+
+USE_GNOME= gtk30 intlhack
USES= gettext gmake libtool pathfix pkgconfig tar:xz
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index f6fb0d37bde9..2eba1796bf62 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gdl-3.14.0.tar.xz) = 4b903c28a8894a82b997a1732a443c8b1d6a510304b3c3b511023339ff5d01db
-SIZE (gnome3/gdl-3.14.0.tar.xz) = 537916
+SHA256 (gnome3/gdl-3.16.0.tar.xz) = 34cbe104f5df9a20ea26aa8acca2b6d1a73035448aa854162c598e90f4e6ff80
+SIZE (gnome3/gdl-3.16.0.tar.xz) = 527328
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index ded78c952822..57244eed6e32 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -13,36 +13,39 @@ lib/libgdl-3.so
lib/libgdl-3.so.5
lib/libgdl-3.so.5.0.8
libdata/pkgconfig/gdl-3.0.pc
-share/doc/gdl-3.0/GdlDock.html
-share/doc/gdl-3.0/GdlDockBar.html
-share/doc/gdl-3.0/GdlDockItem.html
-share/doc/gdl-3.0/GdlDockItemButtonImage.html
-share/doc/gdl-3.0/GdlDockItemGrip.html
-share/doc/gdl-3.0/GdlDockLayout.html
-share/doc/gdl-3.0/GdlDockMaster.html
-share/doc/gdl-3.0/GdlDockNotebook.html
-share/doc/gdl-3.0/GdlDockObject.html
-share/doc/gdl-3.0/GdlDockPaned.html
-share/doc/gdl-3.0/GdlDockPlaceholder.html
-share/doc/gdl-3.0/GdlDockTablabel.html
-share/doc/gdl-3.0/GdlPreviewWindow.html
-share/doc/gdl-3.0/GdlSwitcher.html
-share/doc/gdl-3.0/annotation-glossary.html
-share/doc/gdl-3.0/api-index-full.html
-share/doc/gdl-3.0/api.html
-share/doc/gdl-3.0/core.html
-share/doc/gdl-3.0/deprecated.html
-share/doc/gdl-3.0/gdl-3.0.devhelp2
-share/doc/gdl-3.0/home.png
-share/doc/gdl-3.0/index.html
-share/doc/gdl-3.0/index.sgml
-share/doc/gdl-3.0/left.png
-share/doc/gdl-3.0/private.html
-share/doc/gdl-3.0/right.png
-share/doc/gdl-3.0/style.css
-share/doc/gdl-3.0/up.png
-share/doc/gdl-3.0/widget.html
share/gir-1.0/Gdl-3.gir
+share/gtk-doc/html/gdl-3.0/GdlDock.html
+share/gtk-doc/html/gdl-3.0/GdlDockBar.html
+share/gtk-doc/html/gdl-3.0/GdlDockItem.html
+share/gtk-doc/html/gdl-3.0/GdlDockItemButtonImage.html
+share/gtk-doc/html/gdl-3.0/GdlDockItemGrip.html
+share/gtk-doc/html/gdl-3.0/GdlDockLayout.html
+share/gtk-doc/html/gdl-3.0/GdlDockMaster.html
+share/gtk-doc/html/gdl-3.0/GdlDockNotebook.html
+share/gtk-doc/html/gdl-3.0/GdlDockObject.html
+share/gtk-doc/html/gdl-3.0/GdlDockPaned.html
+share/gtk-doc/html/gdl-3.0/GdlDockPlaceholder.html
+share/gtk-doc/html/gdl-3.0/GdlDockTablabel.html
+share/gtk-doc/html/gdl-3.0/GdlPreviewWindow.html
+share/gtk-doc/html/gdl-3.0/GdlSwitcher.html
+share/gtk-doc/html/gdl-3.0/annotation-glossary.html
+share/gtk-doc/html/gdl-3.0/api-index-full.html
+share/gtk-doc/html/gdl-3.0/api.html
+share/gtk-doc/html/gdl-3.0/core.html
+share/gtk-doc/html/gdl-3.0/deprecated.html
+share/gtk-doc/html/gdl-3.0/gdl-3.0.devhelp2
+share/gtk-doc/html/gdl-3.0/home.png
+share/gtk-doc/html/gdl-3.0/index.html
+share/gtk-doc/html/gdl-3.0/index.sgml
+share/gtk-doc/html/gdl-3.0/left-insensitive.png
+share/gtk-doc/html/gdl-3.0/left.png
+share/gtk-doc/html/gdl-3.0/private.html
+share/gtk-doc/html/gdl-3.0/right-insensitive.png
+share/gtk-doc/html/gdl-3.0/right.png
+share/gtk-doc/html/gdl-3.0/style.css
+share/gtk-doc/html/gdl-3.0/up-insensitive.png
+share/gtk-doc/html/gdl-3.0/up.png
+share/gtk-doc/html/gdl-3.0/widget.html
share/locale/am/LC_MESSAGES/gdl-3.mo
share/locale/ar/LC_MESSAGES/gdl-3.mo
share/locale/as/LC_MESSAGES/gdl-3.mo
@@ -51,6 +54,7 @@ share/locale/az/LC_MESSAGES/gdl-3.mo
share/locale/be/LC_MESSAGES/gdl-3.mo
share/locale/bg/LC_MESSAGES/gdl-3.mo
share/locale/bn/LC_MESSAGES/gdl-3.mo
+share/locale/bs/LC_MESSAGES/gdl-3.mo
share/locale/ca/LC_MESSAGES/gdl-3.mo
share/locale/ca@valencia/LC_MESSAGES/gdl-3.mo
share/locale/cs/LC_MESSAGES/gdl-3.mo
diff --git a/x11-toolkits/gnome-pty-helper/Makefile b/x11-toolkits/gnome-pty-helper/Makefile
index 3873e93d51ef..c34738dad5b5 100644
--- a/x11-toolkits/gnome-pty-helper/Makefile
+++ b/x11-toolkits/gnome-pty-helper/Makefile
@@ -11,13 +11,13 @@ COMMENT= utmp/wtmp/lastlog helper program for the vte Terminal widget
VTE3_SLAVE= yes
MASTERDIR= ${.CURDIR}/../../x11-toolkits/vte3
-WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME}
-PATCHDIR= ${.CURDIR}/files
+CONFIGURE_WRKSRC= ${WRKSRC}/gnome-pty-helper
+BUILD_WRKSRC= ${WRKSRC}/gnome-pty-helper
+INSTALL_WRKSRC= ${WRKSRC}/gnome-pty-helper
PLIST= ${.CURDIR}/pkg-plist
USE_GNOME= gnomeprefix
CONFIGURE_ARGS= # empty
-PATCH_STRIP= -p1
-EXTRA_PATCHES+= ${MASTERDIR}/files/patch-gnome-pty-helper_Makefile.in \
- ${MASTERDIR}/files/patch-gnome-pty-helper_gnome-pty-helper.c
+#PATCH_STRIP= -p1
+#EXTRA_PATCHES+= ${MASTERDIR}/files/patch-gnome-pty-helper_gnome-pty-helper.c
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/gnome-pty-helper/pkg-plist b/x11-toolkits/gnome-pty-helper/pkg-plist
index 2423a40c1c7d..cac042dc1a2c 100644
--- a/x11-toolkits/gnome-pty-helper/pkg-plist
+++ b/x11-toolkits/gnome-pty-helper/pkg-plist
@@ -1 +1 @@
-libexec/gnome-pty-helper
+@(root,wheel,4755) libexec/gnome-pty-helper
diff --git a/x11-toolkits/granite/Makefile b/x11-toolkits/granite/Makefile
index 49a18c5767e7..1b9b3878ea68 100644
--- a/x11-toolkits/granite/Makefile
+++ b/x11-toolkits/granite/Makefile
@@ -4,6 +4,7 @@
PORTNAME= granite
PORTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= https://launchpadlibrarian.net/176306383/ \
https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION:R}/+download/
diff --git a/x11-toolkits/granite/files/patch-lib__Widgets__ContractorView.vala b/x11-toolkits/granite/files/patch-lib__Widgets__ContractorView.vala
new file mode 100644
index 000000000000..4b23a1111ed3
--- /dev/null
+++ b/x11-toolkits/granite/files/patch-lib__Widgets__ContractorView.vala
@@ -0,0 +1,20 @@
+--- lib/Widgets/ContractorView.vala.orig 2015-08-02 23:43:12.064726000 +0200
++++ lib/Widgets/ContractorView.vala 2015-08-02 23:43:58.610804000 +0200
+@@ -35,7 +35,7 @@
+ public delegate void ContractCallback ();
+ private Gee.HashMap<int, DelegateWrapper?> outsiders;
+ private int[] blacklisted_pos;
+- private ListStore list;
++ private Gtk.ListStore list;
+
+ private struct DelegateWrapper { unowned ContractCallback method; }
+
+@@ -73,7 +73,7 @@
+ */
+ public ContractorView (string filename, string mime, int icon_size = 32, bool show_contract_name = true) {
+ /* Setup the ListStore */
+- list = new ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
++ list = new Gtk.ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
+ outsiders = new Gee.HashMap<int, DelegateWrapper?> ();
+ this.model = list;
+
diff --git a/x11-toolkits/granite/files/patch-lib__Widgets__DynamicNotebook.vala b/x11-toolkits/granite/files/patch-lib__Widgets__DynamicNotebook.vala
index 99c56ef8f87d..52929ee0c810 100644
--- a/x11-toolkits/granite/files/patch-lib__Widgets__DynamicNotebook.vala
+++ b/x11-toolkits/granite/files/patch-lib__Widgets__DynamicNotebook.vala
@@ -1,6 +1,6 @@
---- lib/Widgets/DynamicNotebook.vala.orig 2014-11-07 00:23:26.781146868 +0100
-+++ lib/Widgets/DynamicNotebook.vala 2014-11-07 00:24:59.547141822 +0100
-@@ -505,10 +505,19 @@
+--- lib/Widgets/DynamicNotebook.vala.orig 2014-05-25 21:42:24.000000000 +0200
++++ lib/Widgets/DynamicNotebook.vala 2015-08-02 23:42:37.151406000 +0200
+@@ -658,10 +658,19 @@
/**
* The text shown in the add button tooltip
*/
@@ -20,3 +20,12 @@
public Tab current {
get { return tabs.nth_data (notebook.get_current_page ()); }
+@@ -918,7 +927,7 @@
+ notebook.create_window.connect (on_create_window);
+ }
+
+- ~Notebook () {
++ ~DynamicNotebook () {
+ notebook.switch_page.disconnect (on_switch_page);
+ notebook.page_added.disconnect (on_page_added);
+ notebook.page_removed.disconnect (on_page_removed);
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 21a9368a5bf3..d085707fd4ce 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,9 +1,10 @@
# Created by: Vanilla I. Shu <vanilla@MinJe.com.TW>
# $FreeBSD$
-# Please keep gtk30 and x11-themes/gnome-themes-standard minor version in sync
+# Please keep gtk30 in sync with the following x11-themes ports:
+# adwaita-icon-theme, gnome-themes-standard and mate-themes
PORTNAME= gtk
-PORTVERSION= 3.14.15
+PORTVERSION= 3.16.6
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -24,6 +25,7 @@ PORTSCOUT= ignore:1
PORTSCOUT= limit:1,even
BUILD_DEPENDS+= at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk
+LIB_DEPENDS= libepoxy.so:${PORTSDIR}/graphics/libepoxy
RUN_DEPENDS+= hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme \
adwaita-icon-theme>=0:${PORTSDIR}/x11-themes/adwaita-icon-theme \
at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk
@@ -31,56 +33,57 @@ RUN_DEPENDS+= hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme \
USE_PERL5= build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_GNOME= atk gdkpixbuf2 gtk-update-icon-cache \
- introspection:build pango
+USE_GNOME= atk gdkpixbuf2 introspection:build pango
+#gtk-update-icon-cache \
+# introspection:build pango
USES+= gettext gmake libtool pathfix perl5 pkgconfig
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
-CONFIGURE_ARGS= --enable-gtk2-dependency \
+CONFIGURE_ARGS= --enable-x11-backend \
--disable-wayland-backend \
- --enable-x11-backend \
--enable-introspection
CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer
LIBS+= -L${LOCALBASE}/lib
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-LIBVERSION= 0.1400.15
+LIBVERSION= 0.1600.6
PLIST_SUB+= LIBVERSION=${LIBVERSION}
GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \
org.gtk.Settings.ColorChooser.gschema.xml \
org.gtk.Settings.Debug.gschema.xml \
- org.gtk.Settings.FileChooser.gschema.xml \
- org.gtk.exampleapp.gschema.xml
+ org.gtk.Settings.FileChooser.gschema.xml
-OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG
-OPTIONS_DEFAULT=CUPS COLORD
+OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY
+OPTIONS_DEFAULT=CUPS COLORD BROADWAY
OPTIONS_SUB= yes
+
+BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets.
+BROADWAY_CONFIGURE_ENABLE= broadway-backend
+
COLORD_DESC= Color profile support
COLORD_LIB_DEPENDS= libcolord.so:${PORTSDIR}/graphics/colord
COLORD_CONFIGURE_ENABLE=colord
+
CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client
CUPS_CONFIGURE_ENABLE= cups
+
CLOUDPRINT_DESC= Cloud printing support
CLOUDPRINT_CONFIGURE_ENABLE= cloudprint
CLOUDPRINT_LIB_DEPENDS= librest-0.7.so:${PORTSDIR}/devel/librest \
libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+
DEBUG_CONFIGURE_ENABLE=debug
# needed for the exists() check, booo
.include <bsd.port.options.mk>
post-patch:
- @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \
- ${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
@${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
${WRKSRC}/gtk/Makefile.in
- @${REINPLACE_CMD} -e 's|-DG_DISABLE_CHECKS||' \
- ${WRKSRC}/configure
pre-configure:
.if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc)
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index f9bf3a410d9f..28bfe9bf3912 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtk+-3.14.15.tar.xz) = 3ac87659112ced9e5ee5bd55d055faa881aafd040f26ca40b0d8ba0fa6509c83
-SIZE (gnome3/gtk+-3.14.15.tar.xz) = 15896532
+SHA256 (gnome3/gtk+-3.16.6.tar.xz) = 4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe
+SIZE (gnome3/gtk+-3.16.6.tar.xz) = 18273872
diff --git a/x11-toolkits/gtk30/files/patch-34e6e1a b/x11-toolkits/gtk30/files/patch-34e6e1a
deleted file mode 100644
index 7a119a5d05be..000000000000
--- a/x11-toolkits/gtk30/files/patch-34e6e1a
+++ /dev/null
@@ -1,28 +0,0 @@
-From 34e6e1a599375da5665f4829faedf4c640f031a6 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 21 Jul 2015 12:03:52 -0400
-Subject: Avoid g_set_object
-
-One of the backported fixes brought in a dependency on new glib
-that I didn't mean to introduce here. Avoid it.
-
-diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
-index 364c382..8ff85ce 100644
---- gtk/gtkdnd.c
-+++ gtk/gtkdnd.c
-@@ -3258,7 +3258,11 @@ set_icon_helper (GdkDragContext *context,
-
- info = gtk_drag_get_source_info (context, FALSE);
-
-- g_set_object (&info->icon_helper, helper);
-+ if (helper)
-+ g_object_ref (helper);
-+ if (info->icon_helper)
-+ g_object_unref (info->icon_helper);
-+ info->icon_helper = helper;
- gtk_drag_set_icon_window (context, NULL, hot_x, hot_y, TRUE);
- }
- else
---
-cgit v0.10.2
-
diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in
index 0f19135f1df4..91413c3d8b73 100644
--- a/x11-toolkits/gtk30/files/patch-Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig 2014-10-14 15:48:07.903444240 +0200
-+++ Makefile.in 2014-10-14 15:49:51.089555876 +0200
-@@ -540,7 +540,7 @@
+--- Makefile.in.orig 2015-03-09 16:12:04.418535000 +0100
++++ Makefile.in 2015-03-09 16:24:27.861927000 +0100
+@@ -552,7 +552,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
--SRC_SUBDIRS = util gdk gtk libgail-util modules demos tests testsuite examples
-+SRC_SUBDIRS = util gdk gtk libgail-util modules demos examples
+-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
++SRC_SUBDIRS = gdk gtk libgail-util modules demos
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
MAINTAINERCLEANFILES = \
diff --git a/x11-toolkits/gtk30/files/patch-docs_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_Makefile.in
index cc9e4c46a65a..ec16ac7340f9 100644
--- a/x11-toolkits/gtk30/files/patch-docs_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-docs_Makefile.in
@@ -1,6 +1,6 @@
---- docs/Makefile.in.orig 2010-12-24 00:14:51.000000000 +0100
-+++ docs/Makefile.in 2010-12-24 00:15:52.000000000 +0100
-@@ -220,7 +220,7 @@
+--- docs/Makefile.in.orig 2015-03-09 16:12:04.497272000 +0100
++++ docs/Makefile.in 2015-03-09 16:23:52.809599000 +0100
+@@ -341,7 +341,7 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -9,3 +9,12 @@
MANIFEST_TOOL = @MANIFEST_TOOL@
MATH_LIB = @MATH_LIB@
MKDIR_P = @MKDIR_P@
+@@ -486,7 +486,7 @@
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
+
+-SUBDIRS = reference tools
++SUBDIRS = reference
+ all: all-recursive
+
+ .SUFFIXES:
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 204aa37bac3f..8125c8454c6b 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,6 +1,8 @@
+%%BROADWAY%%bin/broadwayd
bin/gtk-encode-symbolic-svg
bin/gtk-launch
bin/gtk-query-immodules-3.0
+@comment bin/gtk-update-icon-cache
bin/gtk3-demo
bin/gtk3-demo-application
bin/gtk3-icon-browser
@@ -9,8 +11,14 @@ etc/gtk-3.0/im-multipress.conf
include/gail-3.0/libgail-util/gail-util.h
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/gdkbroadwayvisual.h
+%%BROADWAY%%include/gtk-3.0/gdk/broadway/gdkbroadwaywindow.h
+include/gtk-3.0/gdk/gdk-autocleanup.h
include/gtk-3.0/gdk/gdk.h
include/gtk-3.0/gdk/gdkapplaunchcontext.h
+%%BROADWAY%%include/gtk-3.0/gdk/gdkbroadway.h
include/gtk-3.0/gdk/gdkcairo.h
include/gtk-3.0/gdk/gdkconfig.h
include/gtk-3.0/gdk/gdkcursor.h
@@ -23,6 +31,7 @@ include/gtk-3.0/gdk/gdkenumtypes.h
include/gtk-3.0/gdk/gdkevents.h
include/gtk-3.0/gdk/gdkframeclock.h
include/gtk-3.0/gdk/gdkframetimings.h
+include/gtk-3.0/gdk/gdkglcontext.h
include/gtk-3.0/gdk/gdkkeys.h
include/gtk-3.0/gdk/gdkkeysyms-compat.h
include/gtk-3.0/gdk/gdkkeysyms.h
@@ -42,6 +51,7 @@ include/gtk-3.0/gdk/gdkversionmacros.h
include/gtk-3.0/gdk/gdkvisual.h
include/gtk-3.0/gdk/gdkwindow.h
include/gtk-3.0/gdk/gdkx.h
+include/gtk-3.0/gdk/x11/gdkx-autocleanups.h
include/gtk-3.0/gdk/x11/gdkx11applaunchcontext.h
include/gtk-3.0/gdk/x11/gdkx11cursor.h
include/gtk-3.0/gdk/x11/gdkx11device-core.h
@@ -53,6 +63,7 @@ include/gtk-3.0/gdk/x11/gdkx11devicemanager.h
include/gtk-3.0/gdk/x11/gdkx11display.h
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/gdkx11property.h
include/gtk-3.0/gdk/x11/gdkx11screen.h
@@ -60,6 +71,7 @@ include/gtk-3.0/gdk/x11/gdkx11selection.h
include/gtk-3.0/gdk/x11/gdkx11utils.h
include/gtk-3.0/gdk/x11/gdkx11visual.h
include/gtk-3.0/gdk/x11/gdkx11window.h
+include/gtk-3.0/gtk/a11y/gtk-a11y-autocleanups.h
include/gtk-3.0/gtk/a11y/gtkarrowaccessible.h
include/gtk-3.0/gtk/a11y/gtkbooleancellaccessible.h
include/gtk-3.0/gtk/a11y/gtkbuttonaccessible.h
@@ -137,6 +149,7 @@ include/gtk-3.0/gtk/deprecated/gtkrc.h
include/gtk-3.0/gtk/deprecated/gtkrecentaction.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
@@ -151,6 +164,7 @@ include/gtk-3.0/gtk/deprecated/gtkvscale.h
include/gtk-3.0/gtk/deprecated/gtkvscrollbar.h
include/gtk-3.0/gtk/deprecated/gtkvseparator.h
include/gtk-3.0/gtk/gtk-a11y.h
+include/gtk-3.0/gtk/gtk-autocleanups.h
include/gtk-3.0/gtk/gtk.h
include/gtk-3.0/gtk/gtkaboutdialog.h
include/gtk-3.0/gtk/gtkaccelgroup.h
@@ -238,6 +252,7 @@ include/gtk-3.0/gtk/gtkgesturerotate.h
include/gtk-3.0/gtk/gtkgesturesingle.h
include/gtk-3.0/gtk/gtkgestureswipe.h
include/gtk-3.0/gtk/gtkgesturezoom.h
+include/gtk-3.0/gtk/gtkglarea.h
include/gtk-3.0/gtk/gtkgrid.h
include/gtk-3.0/gtk/gtkheaderbar.h
include/gtk-3.0/gtk/gtkicontheme.h
@@ -265,6 +280,7 @@ include/gtk-3.0/gtk/gtkmenuitem.h
include/gtk-3.0/gtk/gtkmenushell.h
include/gtk-3.0/gtk/gtkmenutoolbutton.h
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/gtknotebook.h
@@ -277,6 +293,7 @@ include/gtk-3.0/gtk/gtkpapersize.h
include/gtk-3.0/gtk/gtkplacessidebar.h
include/gtk-3.0/gtk/gtkplug.h
include/gtk-3.0/gtk/gtkpopover.h
+include/gtk-3.0/gtk/gtkpopovermenu.h
include/gtk-3.0/gtk/gtkprintcontext.h
include/gtk-3.0/gtk/gtkprintoperation.h
include/gtk-3.0/gtk/gtkprintoperationpreview.h
@@ -292,6 +309,7 @@ include/gtk-3.0/gtk/gtkrecentchoosermenu.h
include/gtk-3.0/gtk/gtkrecentchooserwidget.h
include/gtk-3.0/gtk/gtkrecentfilter.h
include/gtk-3.0/gtk/gtkrecentmanager.h
+include/gtk-3.0/gtk/gtkrender.h
include/gtk-3.0/gtk/gtkrevealer.h
include/gtk-3.0/gtk/gtkscale.h
include/gtk-3.0/gtk/gtkscalebutton.h
@@ -313,9 +331,9 @@ 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/gtkstylecontext.h
-include/gtk-3.0/gtk/gtkstyleproperties.h
include/gtk-3.0/gtk/gtkstyleprovider.h
include/gtk-3.0/gtk/gtkswitch.h
include/gtk-3.0/gtk/gtktestutils.h
@@ -357,16 +375,19 @@ include/gtk-3.0/gtk/gtkwidget.h
include/gtk-3.0/gtk/gtkwidgetpath.h
include/gtk-3.0/gtk/gtkwindow.h
include/gtk-3.0/gtk/gtkwindowgroup.h
+include/gtk-3.0/gtk/gtkx-autocleanups.h
include/gtk-3.0/gtk/gtkx.h
include/gtk-3.0/unix-print/gtk/gtkpagesetupunixdialog.h
include/gtk-3.0/unix-print/gtk/gtkprinter.h
include/gtk-3.0/unix-print/gtk/gtkprintjob.h
include/gtk-3.0/unix-print/gtk/gtkprintunixdialog.h
+include/gtk-3.0/unix-print/gtk/gtkunixprint-autocleanups.h
include/gtk-3.0/unix-print/gtk/gtkunixprint.h
lib/girepository-1.0/Gdk-3.0.typelib
lib/girepository-1.0/GdkX11-3.0.typelib
lib/girepository-1.0/Gtk-3.0.typelib
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.so
+%%BROADWAY%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-broadway.so
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.so
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cyrillic-translit.so
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-inuktitut.so
@@ -392,8 +413,10 @@ lib/libgtk-3.so.0
lib/libgtk-3.so.%%LIBVERSION%%
libdata/pkgconfig/gail-3.0.pc
libdata/pkgconfig/gdk-3.0.pc
+%%BROADWAY%%libdata/pkgconfig/gdk-broadway-3.0.pc
libdata/pkgconfig/gdk-x11-3.0.pc
libdata/pkgconfig/gtk+-3.0.pc
+%%BROADWAY%%libdata/pkgconfig/gtk+-broadway-3.0.pc
libdata/pkgconfig/gtk+-unix-print-3.0.pc
libdata/pkgconfig/gtk+-x11-3.0.pc
man/man1/gtk-query-immodules-3.0.1.gz
@@ -405,17 +428,29 @@ share/gir-1.0/Gdk-3.0.gir
share/gir-1.0/GdkX11-3.0.gir
share/gir-1.0/Gtk-3.0.gir
share/gtk-3.0/gtkbuilder.rng
+share/icons/hicolor/16x16/apps/gtk3-demo-symbolic.symbolic.png
share/icons/hicolor/16x16/apps/gtk3-demo.png
+share/icons/hicolor/16x16/apps/gtk3-widget-factory-symbolic.symbolic.png
share/icons/hicolor/16x16/apps/gtk3-widget-factory.png
+share/icons/hicolor/22x22/apps/gtk3-demo-symbolic.symbolic.png
share/icons/hicolor/22x22/apps/gtk3-demo.png
+share/icons/hicolor/22x22/apps/gtk3-widget-factory-symbolic.symbolic.png
share/icons/hicolor/22x22/apps/gtk3-widget-factory.png
+share/icons/hicolor/24x24/apps/gtk3-demo-symbolic.symbolic.png
share/icons/hicolor/24x24/apps/gtk3-demo.png
+share/icons/hicolor/24x24/apps/gtk3-widget-factory-symbolic.symbolic.png
share/icons/hicolor/24x24/apps/gtk3-widget-factory.png
+share/icons/hicolor/256x256/apps/gtk3-demo-symbolic.symbolic.png
share/icons/hicolor/256x256/apps/gtk3-demo.png
+share/icons/hicolor/256x256/apps/gtk3-widget-factory-symbolic.symbolic.png
share/icons/hicolor/256x256/apps/gtk3-widget-factory.png
+share/icons/hicolor/32x32/apps/gtk3-demo-symbolic.symbolic.png
share/icons/hicolor/32x32/apps/gtk3-demo.png
+share/icons/hicolor/32x32/apps/gtk3-widget-factory-symbolic.symbolic.png
share/icons/hicolor/32x32/apps/gtk3-widget-factory.png
+share/icons/hicolor/48x48/apps/gtk3-demo-symbolic.symbolic.png
share/icons/hicolor/48x48/apps/gtk3-demo.png
+share/icons/hicolor/48x48/apps/gtk3-widget-factory-symbolic.symbolic.png
share/icons/hicolor/48x48/apps/gtk3-widget-factory.png
share/locale/af/LC_MESSAGES/gtk30-properties.mo
share/locale/af/LC_MESSAGES/gtk30.mo
diff --git a/x11-toolkits/gtkada3/Makefile b/x11-toolkits/gtkada3/Makefile
index 3ad1bb3c1836..928ad666c8f3 100644
--- a/x11-toolkits/gtkada3/Makefile
+++ b/x11-toolkits/gtkada3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gtkada
PORTVERSION= 3.8.3.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://downloads.dragonlace.net/src/
PKGNAMESUFFIX= 3
diff --git a/x11-toolkits/gtkada3/files/patch-namespace b/x11-toolkits/gtkada3/files/patch-namespace
new file mode 100644
index 000000000000..03ff6f5893b7
--- /dev/null
+++ b/x11-toolkits/gtkada3/files/patch-namespace
@@ -0,0 +1,727 @@
+Workaround for name collisions with stuff that was added to GTK+
+
+http://pkgs.fedoraproject.org/cgit/GtkAda3.git/tree/GtkAda-3.8.2-namespace.patch
+
+diff -u --recursive src/opengl/gdk-gl.adb src/opengl/gdk-gl.adb
+--- src/opengl/gdk-gl.adb 2014-01-06 11:22:20.000000000 +0100
++++ src/opengl/gdk-gl.adb 2015-03-21 20:25:54.034038707 +0100
+@@ -32,7 +32,7 @@
+ function Query return Boolean
+ is
+ function Internal return Gint;
+- pragma Import (C, Internal, "gdk_gl_query");
++ pragma Import (C, Internal, "gdkada_gl_query");
+ begin
+ return Boolean'Val (Internal);
+ end Query;
+diff -u --recursive src/opengl/gdkgl.c src/opengl/gdkgl.c
+--- src/opengl/gdkgl.c 2014-01-06 11:22:20.000000000 +0100
++++ src/opengl/gdkgl.c 2015-03-21 20:23:58.813868867 +0100
+@@ -39,16 +39,16 @@
+ #endif
+
+ /*
+- * The GdkGLContext class
++ * The GdkadaGLContext class
+ */
+-struct _GdkGLContext {
++struct _GdkadaGLContext {
+ GObject parent;
+ #if defined GDK_WINDOWING_WIN32
+ gboolean initialised;
+ HGLRC hglrc;
+ HDC hdc;
+ HWND hwnd;
+- GdkGLContext *share;
++ GdkadaGLContext *share;
+ PIXELFORMATDESCRIPTOR pfd;
+ #elif defined GDK_WINDOWING_X11
+ Display *xdisplay;
+@@ -56,13 +56,13 @@
+ #endif
+ };
+
+-struct _GdkGLContextClass {
++struct _GdkadaGLContextClass {
+ GObjectClass parent_class;
+ };
+-typedef struct _GdkGLContextClass GdkGLContextClass;
++typedef struct _GdkadaGLContextClass GdkadaGLContextClass;
+
+ static GObjectClass *glcontext_parent_class;
+-static void gdk_gl_context_class_init (GdkGLContextClass *class);
++static void gdkada_gl_context_class_init (GdkadaGLContextClass *class);
+
+ /*
+ * Local helper functions
+@@ -78,7 +78,7 @@
+ * Generic GL support
+ */
+
+-gint gdk_gl_query(void)
++gint gdkada_gl_query(void)
+ {
+ #if defined GDK_WINDOWING_WIN32
+ return TRUE;
+@@ -90,7 +90,7 @@
+ }
+
+
+-gchar *gdk_gl_get_info()
++gchar *gdkada_gl_get_info()
+ {
+ char const *vendor, *version, *extensions;
+ #if defined GDK_WINDOWING_WIN32
+@@ -111,7 +111,7 @@
+ }
+
+
+-GdkVisual *gdk_gl_choose_visual(int *attrlist)
++GdkVisual *gdkada_gl_choose_visual(int *attrlist)
+ {
+ #if defined GDK_WINDOWING_WIN32
+ return gdk_visual_get_system ();
+@@ -131,13 +131,13 @@
+ XFree(vi);
+ return visual;
+ #else
+- g_warning ("gdk_gl_choose_visual not implemented on " PLATFORM);
++ g_warning ("gdkada_gl_choose_visual not implemented on " PLATFORM);
+ return NULL;
+ #endif
+ }
+
+
+-int gdk_gl_get_config(GdkVisual *visual, int attrib)
++int gdkada_gl_get_config(GdkVisual *visual, int attrib)
+ {
+ #if defined GDK_WINDOWING_X11
+ Display *dpy;
+@@ -158,7 +158,7 @@
+ XFree(vi);
+ return -1;
+ #else
+- g_warning ("gdk_gl_get_config not implemented on " PLATFORM);
++ g_warning ("gdkada_gl_get_config not implemented on " PLATFORM);
+ return 0;
+ #endif
+ }
+@@ -169,7 +169,7 @@
+ */
+
+ GType
+-gdk_gl_context_get_type (void)
++gdkada_gl_context_get_type (void)
+ {
+ static GType object_type = 0;
+
+@@ -177,30 +177,30 @@
+ {
+ static const GTypeInfo object_info =
+ {
+- sizeof (GdkGLContextClass),
++ sizeof (GdkadaGLContextClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+- (GClassInitFunc) gdk_gl_context_class_init,
++ (GClassInitFunc) gdkada_gl_context_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+- sizeof (GdkGLContext),
++ sizeof (GdkadaGLContext),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) NULL,
+ };
+
+ object_type = g_type_register_static (G_TYPE_OBJECT,
+- "GdkGLContext",
++ "GdkadaGLContext",
+ &object_info, 0);
+ }
+ return object_type;
+ }
+
+ static void
+-gdk_gl_context_finalize(GObject *object)
++gdkada_gl_context_finalize(GObject *object)
+ {
+- GdkGLContext *context;
++ GdkadaGLContext *context;
+
+- context = GDK_GL_CONTEXT(object);
++ context = GDKADA_GL_CONTEXT(object);
+
+ #if defined GDK_WINDOWING_WIN32
+ if (context->hglrc == wglGetCurrentContext ())
+@@ -227,47 +227,47 @@
+
+
+ static void
+-gdk_gl_context_class_init(GdkGLContextClass *class)
++gdkada_gl_context_class_init(GdkadaGLContextClass *class)
+ {
+ GObjectClass *gobject_class;
+
+ gobject_class = G_OBJECT_CLASS(class);
+ glcontext_parent_class = g_type_class_peek_parent(class);
+
+- gobject_class->finalize = gdk_gl_context_finalize;
++ gobject_class->finalize = gdkada_gl_context_finalize;
+ }
+
+
+-GdkGLContext *
+-gdk_gl_context_new(GdkVisual *visual)
++GdkadaGLContext *
++gdkada_gl_context_new(GdkVisual *visual)
+ {
+ #if defined GDK_WINDOWING_WIN32 || defined GDK_WINDOWING_X11
+- return gdk_gl_context_share_new(visual, NULL, FALSE);
++ return gdkada_gl_context_share_new(visual, NULL, FALSE);
+ #else
+- g_warning ("gdk_gl_context_new not implemented on " PLATFORM);
++ g_warning ("gdkada_gl_context_new not implemented on " PLATFORM);
+ return NULL;
+ #endif
+ }
+
+
+-GdkGLContext *
+-gdk_gl_context_share_new(GdkVisual *visual, GdkGLContext *sharelist, gint direct)
++GdkadaGLContext *
++gdkada_gl_context_share_new(GdkVisual *visual, GdkadaGLContext *sharelist, gint direct)
+ {
+ #if defined GDK_WINDOWING_WIN32
+- GdkGLContext *context;
++ GdkadaGLContext *context;
+ #elif defined GDK_WINDOWING_X11
+ Display *dpy;
+ XVisualInfo *vi;
+ GLXContext glxcontext;
+- GdkGLContext *context;
++ GdkadaGLContext *context;
+ #else
+- g_warning ("gdk_gl_context_share_new not implemented on " PLATFORM);
++ g_warning ("gdkada_gl_context_share_new not implemented on " PLATFORM);
+ return NULL;
+ #endif
+
+ g_return_val_if_fail (visual != NULL, NULL);
+
+- context = g_object_new(GDK_TYPE_GL_CONTEXT, NULL);
++ context = g_object_new(GDKADA_TYPE_GL_CONTEXT, NULL);
+ if (!context)
+ return NULL;
+
+@@ -313,21 +313,21 @@
+ return context;
+ }
+
+-GdkGLContext *gdk_gl_context_attrlist_share_new(int *attrlist, GdkGLContext *sharelist, gint direct)
++GdkadaGLContext *gdkada_gl_context_attrlist_share_new(int *attrlist, GdkadaGLContext *sharelist, gint direct)
+ {
+ #if defined GDK_WINDOWING_WIN32
+- GdkGLContext *context;
++ GdkadaGLContext *context;
+ #elif defined GDK_WINDOWING_X11
+ GdkVisual *visual;
+ #else
+- g_warning ("gdk_gl_context_attrlist_share_new not implemented on " PLATFORM);
++ g_warning ("gdkada_gl_context_attrlist_share_new not implemented on " PLATFORM);
+ return NULL;
+ #endif
+
+ g_return_val_if_fail(attrlist != NULL, NULL);
+
+ #if defined GDK_WINDOWING_WIN32
+- context = g_object_new(GDK_TYPE_GL_CONTEXT, NULL);
++ context = g_object_new(GDKADA_TYPE_GL_CONTEXT, NULL);
+ if (!context)
+ return NULL;
+
+@@ -340,19 +340,19 @@
+
+ return context;
+ #elif defined GDK_WINDOWING_X11
+- visual = gdk_gl_choose_visual(attrlist);
++ visual = gdkada_gl_choose_visual(attrlist);
+ if (!visual)
+ return NULL;
+
+- return gdk_gl_context_share_new(visual, sharelist, direct);
++ return gdkada_gl_context_share_new(visual, sharelist, direct);
+ #endif
+ }
+
+
+-gint gdk_gl_make_current(GdkWindow *window, GdkGLContext *context)
++gint gdkada_gl_make_current(GdkWindow *window, GdkadaGLContext *context)
+ {
+ // g_return_val_if_fail (GDK_IS_DRAWABLE(drawable), FALSE);
+-// g_return_val_if_fail (GDK_IS_GL_CONTEXT(context), FALSE);
++// g_return_val_if_fail (GDKADA_IS_GL_CONTEXT(context), FALSE);
+
+ #if defined GDK_WINDOWING_WIN32
+ if (!context->initialised)
+@@ -405,11 +405,11 @@
+ }
+ #endif
+ #else
+- g_warning ("gdk_gl_make_current not implemented on " PLATFORM);
++ g_warning ("gdkada_gl_make_current not implemented on " PLATFORM);
+ #endif
+ }
+
+-void gdk_gl_swap_buffers(GdkWindow *window)
++void gdkada_gl_swap_buffers(GdkWindow *window)
+ {
+ #if defined GDK_WINDOWING_WIN32
+ HDC hdc;
+@@ -423,7 +423,7 @@
+ hdc = GetDC (hwnd);
+ if (hdc == NULL)
+ {
+- g_warning ("gdk_gl_swap_buffers: GetDC failed");
++ g_warning ("gdkada_gl_swap_buffers: GetDC failed");
+ return;
+ }
+ SwapBuffers (hdc);
+@@ -431,11 +431,11 @@
+ #elif defined GDK_WINDOWING_X11
+ glXSwapBuffers(GDK_WINDOW_XDISPLAY(window), gdk_x11_window_get_xid(window));
+ #else
+- g_warning ("gdk_gl_swap_buffers not implemented on " PLATFORM);
++ g_warning ("gdkada_gl_swap_buffers not implemented on " PLATFORM);
+ #endif
+ }
+
+-void gdk_gl_wait_gdk(void)
++void gdkada_gl_wait_gdk(void)
+ {
+ #if defined GDK_WINDOWING_WIN32
+ GdiFlush();
+@@ -444,7 +444,7 @@
+ #endif
+ }
+
+-void gdk_gl_wait_gl (void)
++void gdkada_gl_wait_gl (void)
+ {
+ #if defined GDK_WINDOWING_WIN32
+ glFinish();
+diff -u --recursive src/opengl/gdkgl.h src/opengl/gdkgl.h
+--- src/opengl/gdkgl.h 2014-01-06 11:49:08.000000000 +0100
++++ src/opengl/gdkgl.h 2015-03-21 20:17:59.401585102 +0100
+@@ -17,8 +17,8 @@
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+-#ifndef __GDK_GL_H__
+-#define __GDK_GL_H__
++#ifndef __GDKADA_GL_H__
++#define __GDKADA_GL_H__
+
+ #include <glib.h>
+ #include <cairo/cairo.h>
+@@ -71,46 +71,46 @@
+ };
+
+
+-#define GDK_TYPE_GL_CONTEXT (gdk_gl_context_get_type())
+-#define GDK_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_GL_CONTEXT, GdkGLContext))
+-#define GDK_GL_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDK_TYPE_GL_CONTEXT, GdkGLContextClass))
+-#define GDK_IS_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_GL_CONTEXT))
+-#define GDK_IS_GL_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_GL_CONTEXT))
+-#define GDK_GL_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_GL_CONTEXT, GdkGLContext))
++#define GDKADA_TYPE_GL_CONTEXT (gdkada_gl_context_get_type())
++#define GDKADA_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDKADA_TYPE_GL_CONTEXT, GdkadaGLContext))
++#define GDKADA_GL_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDKADA_TYPE_GL_CONTEXT, GdkadaGLContextClass))
++#define GDKADA_IS_GL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDKADA_TYPE_GL_CONTEXT))
++#define GDKADA_IS_GL_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDKADA_TYPE_GL_CONTEXT))
++#define GDKADA_GL_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDKADA_TYPE_GL_CONTEXT, GdkadaGLContext))
+
+-typedef struct _GdkGLContext GdkGLContext;
++typedef struct _GdkadaGLContext GdkadaGLContext;
+
+
+-gint gdk_gl_query(void);
+-gchar *gdk_gl_get_info(void);
++gint gdkada_gl_query(void);
++gchar *gdkada_gl_get_info(void);
+
+-GdkVisual *gdk_gl_choose_visual(int *attrlist);
+-int gdk_gl_get_config(GdkVisual *visual, int attrib);
++GdkVisual *gdkada_gl_choose_visual(int *attrlist);
++int gdkada_gl_get_config(GdkVisual *visual, int attrib);
+
+-GType gdk_gl_context_get_type(void);
+-GdkGLContext *gdk_gl_context_new(GdkVisual *visual);
+-GdkGLContext *gdk_gl_context_share_new(GdkVisual *visual, GdkGLContext *sharelist, gint direct);
+-GdkGLContext *gdk_gl_context_attrlist_share_new(int *attrlist, GdkGLContext *sharelist, gint direct);
++GType gdkada_gl_context_get_type(void);
++GdkadaGLContext *gdkada_gl_context_new(GdkVisual *visual);
++GdkadaGLContext *gdkada_gl_context_share_new(GdkVisual *visual, GdkadaGLContext *sharelist, gint direct);
++GdkadaGLContext *gdkada_gl_context_attrlist_share_new(int *attrlist, GdkadaGLContext *sharelist, gint direct);
+
+-gint gdk_gl_make_current(GdkWindow *window, GdkGLContext *context);
+-void gdk_gl_swap_buffers(GdkWindow *window);
++gint gdkada_gl_make_current(GdkWindow *window, GdkadaGLContext *context);
++void gdkada_gl_swap_buffers(GdkWindow *window);
+
+
+-void gdk_gl_wait_gdk(void);
+-void gdk_gl_wait_gl(void);
++void gdkada_gl_wait_gdk(void);
++void gdkada_gl_wait_gl(void);
+
+ /* fonts */
+-// void gdk_gl_use_gdk_font(GdkFont *font, int first, int count, int list_base);
++// void gdkada_gl_use_gdk_font(GdkFont *font, int first, int count, int list_base);
+
+
+ #ifndef GTKGL_DISABLE_DEPRECATED
+-# define gdk_gl_context_ref(context) g_object_ref(context)
+-# define gdk_gl_context_unref(context) g_object_unref(context)
+-# define gdk_gl_pixmap_ref(pixmap) g_object_ref(pixmap)
+-# define gdk_gl_pixmap_unref(pixmap) g_object_unref(pixmap)
++# define gdkada_gl_context_ref(context) g_object_ref(context)
++# define gdkada_gl_context_unref(context) g_object_unref(context)
++# define gdkada_gl_pixmap_ref(pixmap) g_object_ref(pixmap)
++# define gdkada_gl_pixmap_unref(pixmap) g_object_unref(pixmap)
+ #endif
+
+ G_END_DECLS
+
+-#endif /* __GDK_GL_H__ */
++#endif /* __GDKADA_GL_H__ */
+
+diff -u --recursive src/opengl/gtk-glarea.adb src/opengl/gtk-glarea.adb
+--- src/opengl/gtk-glarea.adb 2014-01-06 11:22:20.000000000 +0100
++++ src/opengl/gtk-glarea.adb 2015-03-21 20:36:47.933805110 +0100
+@@ -69,7 +69,7 @@
+ Attr_List : Attributes_Array)
+ is
+ function Internal (Attr_List : System.Address) return System.Address;
+- pragma Import (C, Internal, "gtk_gl_area_new");
++ pragma Import (C, Internal, "gtkada_gl_area_new");
+ Attributes : Attributes_Array (0 .. Attr_List'Length);
+ use type System.Address;
+ S : System.Address;
+@@ -113,7 +113,7 @@
+ function Internal (Attr_List : System.Address;
+ Share : System.Address)
+ return System.Address;
+- pragma Import (C, Internal, "gtk_gl_area_share_new");
++ pragma Import (C, Internal, "gtkada_gl_area_share_new");
+ Attributes : Attributes_Array (0 .. Attr_List'Length);
+ begin
+ Attributes (0 .. Attr_List'Length - 1) := Attr_List;
+@@ -133,7 +133,7 @@
+ return Boolean
+ is
+ function Internal (GLArea : System.Address) return Gint;
+- pragma Import (C, Internal, "gtk_gl_area_make_current");
++ pragma Import (C, Internal, "gtkada_gl_area_make_current");
+ begin
+ return Boolean'Val (Internal (Get_Object (Glarea)));
+ end Make_Current;
+@@ -144,7 +144,7 @@
+
+ procedure Swap_Buffers (Glarea : access Gtk_GLArea_Record'Class) is
+ procedure Internal (Glarea : System.Address);
+- pragma Import (C, Internal, "gtk_gl_area_swap_buffers");
++ pragma Import (C, Internal, "gtkada_gl_area_swap_buffers");
+ begin
+ Internal (Get_Object (Glarea));
+ end Swap_Buffers;
+diff -u --recursive src/opengl/gtk-glarea.ads src/opengl/gtk-glarea.ads
+--- src/opengl/gtk-glarea.ads 2014-01-06 11:22:20.000000000 +0100
++++ src/opengl/gtk-glarea.ads 2015-03-21 20:37:40.293985032 +0100
+@@ -94,5 +94,5 @@
+ type Gtk_GLArea_Record is
+ new Gtk.Drawing_Area.Gtk_Drawing_Area_Record with null record;
+
+- pragma Import (C, Get_Type, "gtk_gl_area_get_type");
++ pragma Import (C, Get_Type, "gtkada_gl_area_get_type");
+ end Gtk.GLArea;
+diff -u --recursive src/opengl/gtkglarea.c src/opengl/gtkglarea.c
+--- src/opengl/gtkglarea.c 2014-01-06 11:22:20.000000000 +0100
++++ src/opengl/gtkglarea.c 2015-03-21 20:22:44.511050540 +0100
+@@ -22,15 +22,15 @@
+ #include "gdkgl.h"
+ #include "gtkglarea.h"
+
+-static void gtk_gl_area_class_init (GtkGLAreaClass *klass);
+-static void gtk_gl_area_init (GtkGLArea *glarea);
+-static void gtk_gl_area_destroy (GObject *object); /* change to finalize? */
++static void gtkada_gl_area_class_init (GtkadaGLAreaClass *klass);
++static void gtkada_gl_area_init (GtkadaGLArea *glarea);
++static void gtkada_gl_area_destroy (GObject *object); /* change to finalize? */
+
+ static GtkDrawingAreaClass *parent_class = NULL;
+
+
+ GType
+-gtk_gl_area_get_type (void)
++gtkada_gl_area_get_type (void)
+ {
+ static GType object_type = 0;
+
+@@ -38,38 +38,38 @@
+ {
+ static const GTypeInfo object_info =
+ {
+- sizeof (GtkGLAreaClass),
++ sizeof (GtkadaGLAreaClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+- (GClassInitFunc) gtk_gl_area_class_init,
++ (GClassInitFunc) gtkada_gl_area_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+- sizeof (GtkGLArea),
++ sizeof (GtkadaGLArea),
+ 0, /* n_preallocs */
+- (GInstanceInitFunc) gtk_gl_area_init,
++ (GInstanceInitFunc) gtkada_gl_area_init,
+ };
+
+ object_type = g_type_register_static (GTK_TYPE_DRAWING_AREA,
+- "GtkGLArea",
++ "GtkadaGLArea",
+ &object_info, 0);
+ }
+ return object_type;
+ }
+
+ static void
+-gtk_gl_area_class_init (GtkGLAreaClass *klass)
++gtkada_gl_area_class_init (GtkadaGLAreaClass *klass)
+ {
+ GObjectClass *object_class;
+
+ parent_class = g_type_class_peek_parent(klass);
+ object_class = (GObjectClass*) klass;
+
+- object_class->finalize = gtk_gl_area_destroy;
++ object_class->finalize = gtkada_gl_area_destroy;
+ }
+
+
+ static void
+-gtk_gl_area_init (GtkGLArea *gl_area)
++gtkada_gl_area_init (GtkadaGLArea *gl_area)
+ {
+ gl_area->glcontext = NULL;
+ gtk_widget_set_double_buffered(GTK_WIDGET(gl_area), FALSE);
+@@ -78,7 +78,7 @@
+
+
+ GtkWidget*
+-gtk_gl_area_new_vargs(GtkGLArea *share, ...)
++gtkada_gl_area_new_vargs(GtkadaGLArea *share, ...)
+ {
+ GtkWidget *glarea;
+ va_list ap;
+@@ -99,7 +99,7 @@
+ i++;
+ va_end(ap);
+
+- glarea = gtk_gl_area_share_new(attrlist, share);
++ glarea = gtkada_gl_area_share_new(attrlist, share);
+
+ g_free(attrlist);
+
+@@ -107,30 +107,30 @@
+ }
+
+ GtkWidget*
+-gtk_gl_area_new (int *attrlist)
++gtkada_gl_area_new (int *attrlist)
+ {
+- return gtk_gl_area_share_new(attrlist, NULL);
++ return gtkada_gl_area_share_new(attrlist, NULL);
+ }
+
+ GtkWidget*
+-gtk_gl_area_share_new (int *attrlist, GtkGLArea *share)
++gtkada_gl_area_share_new (int *attrlist, GtkadaGLArea *share)
+ {
+- GdkGLContext *glcontext;
+- GtkGLArea *gl_area;
++ GdkadaGLContext *glcontext;
++ GtkadaGLArea *gl_area;
+ #if defined GDK_WINDOWING_X11
+ GdkVisual *visual;
+ #endif
+
+- g_return_val_if_fail(share == NULL || GTK_IS_GL_AREA(share), NULL);
++ g_return_val_if_fail(share == NULL || GTKADA_IS_GL_AREA(share), NULL);
+
+ #if defined GDK_WINDOWING_X11
+- visual = gdk_gl_choose_visual(attrlist);
++ visual = gdkada_gl_choose_visual(attrlist);
+ if (visual == NULL)
+ return NULL;
+
+- glcontext = gdk_gl_context_share_new(visual, share ? share->glcontext : NULL, TRUE);
++ glcontext = gdkada_gl_context_share_new(visual, share ? share->glcontext : NULL, TRUE);
+ #else
+- glcontext = gdk_gl_context_attrlist_share_new(attrlist, share ? share->glcontext : NULL, TRUE);
++ glcontext = gdkada_gl_context_attrlist_share_new(attrlist, share ? share->glcontext : NULL, TRUE);
+ #endif
+ if (glcontext == NULL)
+ return NULL;
+@@ -141,7 +141,7 @@
+ // gtk_widget_push_visual(visual);
+ #endif
+
+- gl_area = g_object_new(GTK_TYPE_GL_AREA, NULL);
++ gl_area = g_object_new(GTKADA_TYPE_GL_AREA, NULL);
+ gl_area->glcontext = glcontext;
+
+ #if defined GDK_WINDOWING_X11
+@@ -155,14 +155,14 @@
+
+
+ static void
+-gtk_gl_area_destroy(GObject *object)
++gtkada_gl_area_destroy(GObject *object)
+ {
+- GtkGLArea *gl_area;
++ GtkadaGLArea *gl_area;
+
+ g_return_if_fail (object != NULL);
+- g_return_if_fail (GTK_IS_GL_AREA(object));
++ g_return_if_fail (GTKADA_IS_GL_AREA(object));
+
+- gl_area = GTK_GL_AREA(object);
++ gl_area = GTKADA_GL_AREA(object);
+
+ if (gl_area->glcontext)
+ g_object_unref(gl_area->glcontext);
+@@ -173,20 +173,20 @@
+ }
+
+
+-gint gtk_gl_area_make_current(GtkGLArea *gl_area)
++gint gtkada_gl_area_make_current(GtkadaGLArea *gl_area)
+ {
+ g_return_val_if_fail(gl_area != NULL, FALSE);
+- g_return_val_if_fail(GTK_IS_GL_AREA (gl_area), FALSE);
++ g_return_val_if_fail(GTKADA_IS_GL_AREA (gl_area), FALSE);
+ // g_return_val_if_fail(GTK_WIDGET_REALIZED(gl_area), FALSE);
+
+- return gdk_gl_make_current(gtk_widget_get_window(GTK_WIDGET(gl_area)), gl_area->glcontext);
++ return gdkada_gl_make_current(gtk_widget_get_window(GTK_WIDGET(gl_area)), gl_area->glcontext);
+ }
+
+-void gtk_gl_area_swap_buffers(GtkGLArea *gl_area)
++void gtkada_gl_area_swap_buffers(GtkadaGLArea *gl_area)
+ {
+ g_return_if_fail(gl_area != NULL);
+- g_return_if_fail(GTK_IS_GL_AREA(gl_area));
++ g_return_if_fail(GTKADA_IS_GL_AREA(gl_area));
+ // g_return_if_fail(GTK_WIDGET_REALIZED(gl_area));
+
+- gdk_gl_swap_buffers(gtk_widget_get_window (GTK_WIDGET (gl_area)));
++ gdkada_gl_swap_buffers(gtk_widget_get_window (GTK_WIDGET (gl_area)));
+ }
+diff -u --recursive src/opengl/gtkglarea.h src/opengl/gtkglarea.h
+--- src/opengl/gtkglarea.h 2014-01-06 11:49:08.000000000 +0100
++++ src/opengl/gtkglarea.h 2015-03-21 20:19:16.546358090 +0100
+@@ -18,8 +18,8 @@
+ */
+
+
+-#ifndef __GTK_GL_AREA_H__
+-#define __GTK_GL_AREA_H__
++#ifndef __GTKADA_GL_AREA_H__
++#define __GTKADA_GL_AREA_H__
+
+ #include <gdk/gdk.h>
+ #include <gdkgl.h>
+@@ -28,57 +28,57 @@
+
+ G_BEGIN_DECLS
+
+-#define GTK_TYPE_GL_AREA (gtk_gl_area_get_type())
+-#define GTK_GL_AREA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_GL_AREA, GtkGLArea))
+-#define GTK_GL_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GTK_TYPE_GL_AREA, GtkGLAreaClass))
+-#define GTK_IS_GL_AREA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_GL_AREA))
+-#define GTK_IS_GL_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_GL_AREA))
+-#define GTK_GL_AREA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_GL_AREA, GtkGLArea))
++#define GTKADA_TYPE_GL_AREA (gtkada_gl_area_get_type())
++#define GTKADA_GL_AREA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTKADA_TYPE_GL_AREA, GtkadaGLArea))
++#define GTKADA_GL_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GTKADA_TYPE_GL_AREA, GtkadaGLAreaClass))
++#define GTKADA_IS_GL_AREA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTKADA_TYPE_GL_AREA))
++#define GTKADA_IS_GL_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTKADA_TYPE_GL_AREA))
++#define GTKADA_GL_AREA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTKADA_TYPE_GL_AREA, GtkadaGLArea))
+
+
+-typedef struct _GtkGLArea GtkGLArea;
+-typedef struct _GtkGLAreaClass GtkGLAreaClass;
++typedef struct _GtkadaGLArea GtkadaGLArea;
++typedef struct _GtkadaGLAreaClass GtkadaGLAreaClass;
+
+
+-struct _GtkGLArea
++struct _GtkadaGLArea
+ {
+ GtkDrawingArea darea;
+- GdkGLContext *glcontext;
++ GdkadaGLContext *glcontext;
+ };
+
+-struct _GtkGLAreaClass
++struct _GtkadaGLAreaClass
+ {
+ GtkDrawingAreaClass parent_class;
+ };
+
+-GType gtk_gl_area_get_type (void);
+-GtkWidget* gtk_gl_area_new (int *attrList);
+-GtkWidget* gtk_gl_area_share_new (int *attrList,
+- GtkGLArea *share);
+-GtkWidget* gtk_gl_area_new_vargs (GtkGLArea *share,
++GType gtkada_gl_area_get_type (void);
++GtkWidget* gtkada_gl_area_new (int *attrList);
++GtkWidget* gtkada_gl_area_share_new (int *attrList,
++ GtkadaGLArea *share);
++GtkWidget* gtkada_gl_area_new_vargs (GtkadaGLArea *share,
+ ...);
+
+
+-gint gtk_gl_area_make_current(GtkGLArea *glarea);
++gint gtkada_gl_area_make_current(GtkadaGLArea *glarea);
+
+-void gtk_gl_area_endgl (GtkGLArea *glarea); /* deprecated */
++void gtkada_gl_area_endgl (GtkadaGLArea *glarea); /* deprecated */
+
+-void gtk_gl_area_swap_buffers(GtkGLArea *glarea);
++void gtkada_gl_area_swap_buffers(GtkadaGLArea *glarea);
+
+
+ #ifndef GTKGL_DISABLE_DEPRECATED
+
+-# define gtk_gl_area_begingl(glarea) \
+- gtk_gl_area_make_current(glarea)
+-# define gtk_gl_area_endgl(glarea) \
++# define gtkada_gl_area_begingl(glarea) \
++ gtkada_gl_area_make_current(glarea)
++# define gtkada_gl_area_endgl(glarea) \
+ glFlush()
+-# define gtk_gl_area_swapbuffers(glarea) \
+- gtk_gl_area_swap_buffers(glarea)
+-# define gtk_gl_area_size(glarea, width, height) \
++# define gtkada_gl_area_swapbuffers(glarea) \
++ gtkada_gl_area_swap_buffers(glarea)
++# define gtkada_gl_area_size(glarea, width, height) \
+ gtk_widget_set_size_request(GTK_WIDGET(glarea), (width), (height))
+
+ #endif
+
+ G_END_DECLS
+
+-#endif /* __GTK_GL_AREA_H__ */
++#endif /* __GTKADA_GL_AREA_H__ */
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 55b05de5a3cc..b9c7bd13a7b9 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -1,9 +1,8 @@
# Created by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
# $FreeBSD$
-# $MCom: ports/trunk/x11-toolkits/gtkmm30/Makefile 19949 2014-10-15 06:25:06Z gusi $
PORTNAME= gtkmm
-PORTVERSION= 3.14.0
+PORTVERSION= 3.16.0
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
@@ -30,7 +29,7 @@ LIBS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-documentation
INSTALL_TARGET= install-strip
-PLIST_SUB= VERSION="3.0" API_VERSION="3.0"
+PLIST_SUB= API_VERSION="3.0"
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \
diff --git a/x11-toolkits/gtkmm30/distinfo b/x11-toolkits/gtkmm30/distinfo
index 46fae29b4e0b..4663db246574 100644
--- a/x11-toolkits/gtkmm30/distinfo
+++ b/x11-toolkits/gtkmm30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtkmm-3.14.0.tar.xz) = d9f528a62c6ec226fa08287c45c7465b2dce5aae5068e9ac48d30a64a378e48b
-SIZE (gnome3/gtkmm-3.14.0.tar.xz) = 11400284
+SHA256 (gnome3/gtkmm-3.16.0.tar.xz) = 9b8d4af5e1bb64e52b53bc8ef471ef43e1b9d11a829f16ef54c3a92985b0dd0c
+SIZE (gnome3/gtkmm-3.16.0.tar.xz) = 11468644
diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist
index 1f0f7e97cd1f..7f90afc7f86b 100644
--- a/x11-toolkits/gtkmm30/pkg-plist
+++ b/x11-toolkits/gtkmm30/pkg-plist
@@ -103,6 +103,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/combobox.h
include/gtkmm-%%API_VERSION%%/gtkmm/comboboxtext.h
include/gtkmm-%%API_VERSION%%/gtkmm/container.h
include/gtkmm-%%API_VERSION%%/gtkmm/cssprovider.h
+include/gtkmm-%%API_VERSION%%/gtkmm/csssection.h
include/gtkmm-%%API_VERSION%%/gtkmm/dialog.h
include/gtkmm-%%API_VERSION%%/gtkmm/drawingarea.h
include/gtkmm-%%API_VERSION%%/gtkmm/editable.h
@@ -246,6 +247,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/combobox_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/comboboxtext_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/container_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/cssprovider_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/csssection_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/dialog_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/drawingarea_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/editable_p.h
@@ -368,6 +370,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/socket_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/spinbutton_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/spinner_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/stack_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/stacksidebar_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/stackswitcher_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/statusbar_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/statusicon_p.h
@@ -415,6 +418,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/volumebutton_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/widget_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/widgetpath_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/window_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/windowgroup_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/progressbar.h
include/gtkmm-%%API_VERSION%%/gtkmm/radioaction.h
include/gtkmm-%%API_VERSION%%/gtkmm/radiobutton.h
@@ -450,6 +454,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/socket.h
include/gtkmm-%%API_VERSION%%/gtkmm/spinbutton.h
include/gtkmm-%%API_VERSION%%/gtkmm/spinner.h
include/gtkmm-%%API_VERSION%%/gtkmm/stack.h
+include/gtkmm-%%API_VERSION%%/gtkmm/stacksidebar.h
include/gtkmm-%%API_VERSION%%/gtkmm/stackswitcher.h
include/gtkmm-%%API_VERSION%%/gtkmm/statusbar.h
include/gtkmm-%%API_VERSION%%/gtkmm/statusicon.h
@@ -457,6 +462,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/stock.h
include/gtkmm-%%API_VERSION%%/gtkmm/stockid.h
include/gtkmm-%%API_VERSION%%/gtkmm/stockitem.h
include/gtkmm-%%API_VERSION%%/gtkmm/stylecontext.h
+include/gtkmm-%%API_VERSION%%/gtkmm/styleproperty.h
include/gtkmm-%%API_VERSION%%/gtkmm/styleprovider.h
include/gtkmm-%%API_VERSION%%/gtkmm/switch.h
include/gtkmm-%%API_VERSION%%/gtkmm/table.h
@@ -502,6 +508,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/volumebutton.h
include/gtkmm-%%API_VERSION%%/gtkmm/widget.h
include/gtkmm-%%API_VERSION%%/gtkmm/widgetpath.h
include/gtkmm-%%API_VERSION%%/gtkmm/window.h
+include/gtkmm-%%API_VERSION%%/gtkmm/windowgroup.h
include/gtkmm-%%API_VERSION%%/gtkmm/wrap_init.h
lib/gdkmm-%%API_VERSION%%/include/gdkmmconfig.h
lib/gtkmm-%%API_VERSION%%/include/gtkmmconfig.h
diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile
index e2b2d4f3f30a..6de2ee1752c3 100644
--- a/x11-toolkits/gtksourceview3/Makefile
+++ b/x11-toolkits/gtksourceview3/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gtksourceview
-PORTVERSION= 3.14.4
+PORTVERSION= 3.16.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
diff --git a/x11-toolkits/gtksourceview3/distinfo b/x11-toolkits/gtksourceview3/distinfo
index 8ed148f30ce9..3aa5189ee787 100644
--- a/x11-toolkits/gtksourceview3/distinfo
+++ b/x11-toolkits/gtksourceview3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtksourceview-3.14.4.tar.xz) = 1c9d6155705d50ae5cd1cd61167cc4824e413896f10d30ee158a83e8961a4d8b
-SIZE (gnome3/gtksourceview-3.14.4.tar.xz) = 1262660
+SHA256 (gnome3/gtksourceview-3.16.1.tar.xz) = 669e9846ca744ec4d04ce61377e85df7ca909ad476329922a6abf4da423f1b0c
+SIZE (gnome3/gtksourceview-3.16.1.tar.xz) = 1272152
diff --git a/x11-toolkits/gtksourceview3/pkg-plist b/x11-toolkits/gtksourceview3/pkg-plist
index 06ab05c008bf..413f9d3d8996 100644
--- a/x11-toolkits/gtksourceview3/pkg-plist
+++ b/x11-toolkits/gtksourceview3/pkg-plist
@@ -24,6 +24,9 @@ include/gtksourceview-3.0/gtksourceview/gtksourcesearchcontext.h
include/gtksourceview-3.0/gtksourceview/gtksourcesearchsettings.h
include/gtksourceview-3.0/gtksourceview/gtksourcestyle.h
include/gtksourceview-3.0/gtksourceview/gtksourcestylescheme.h
+include/gtksourceview-3.0/gtksourceview/gtksourcestyleschemechooser.h
+include/gtksourceview-3.0/gtksourceview/gtksourcestyleschemechooserbutton.h
+include/gtksourceview-3.0/gtksourceview/gtksourcestyleschemechooserwidget.h
include/gtksourceview-3.0/gtksourceview/gtksourcestyleschememanager.h
include/gtksourceview-3.0/gtksourceview/gtksourcetypes.h
include/gtksourceview-3.0/gtksourceview/gtksourceundomanager.h
@@ -33,9 +36,8 @@ include/gtksourceview-3.0/gtksourceview/gtksourceview.h
lib/girepository-1.0/GtkSource-3.0.typelib
lib/libgtksourceview-3.0.so
lib/libgtksourceview-3.0.so.1
-lib/libgtksourceview-3.0.so.1.3.0
+lib/libgtksourceview-3.0.so.1.4.0
libdata/pkgconfig/gtksourceview-3.0.pc
-share/gir-1.0/GtkSource-3.0.gir
share/doc/gtksourceview-3.0/GtkSourceBuffer.html
share/doc/gtksourceview-3.0/GtkSourceCompletion.html
share/doc/gtksourceview-3.0/GtkSourceCompletionContext.html
@@ -61,6 +63,9 @@ share/doc/gtksourceview-3.0/GtkSourceSearchContext.html
share/doc/gtksourceview-3.0/GtkSourceSearchSettings.html
share/doc/gtksourceview-3.0/GtkSourceStyle.html
share/doc/gtksourceview-3.0/GtkSourceStyleScheme.html
+share/doc/gtksourceview-3.0/GtkSourceStyleSchemeChooser.html
+share/doc/gtksourceview-3.0/GtkSourceStyleSchemeChooserButton.html
+share/doc/gtksourceview-3.0/GtkSourceStyleSchemeChooserWidget.html
share/doc/gtksourceview-3.0/GtkSourceStyleSchemeManager.html
share/doc/gtksourceview-3.0/GtkSourceUndoManager.html
share/doc/gtksourceview-3.0/GtkSourceView.html
@@ -69,11 +74,18 @@ share/doc/gtksourceview-3.0/api-index-3-0.html
share/doc/gtksourceview-3.0/api-index-3-10.html
share/doc/gtksourceview-3.0/api-index-3-12.html
share/doc/gtksourceview-3.0/api-index-3-14.html
+share/doc/gtksourceview-3.0/api-index-3-16.html
share/doc/gtksourceview-3.0/api-index-3-4.html
share/doc/gtksourceview-3.0/api-index-deprecated.html
share/doc/gtksourceview-3.0/api-index-full.html
share/doc/gtksourceview-3.0/ch01.html
share/doc/gtksourceview-3.0/ch02.html
+share/doc/gtksourceview-3.0/ch03.html
+share/doc/gtksourceview-3.0/ch04.html
+share/doc/gtksourceview-3.0/ch05.html
+share/doc/gtksourceview-3.0/ch06.html
+share/doc/gtksourceview-3.0/ch07.html
+share/doc/gtksourceview-3.0/ch08.html
share/doc/gtksourceview-3.0/gtksourceview-3.0-GtkSourceUtils.html
share/doc/gtksourceview-3.0/gtksourceview-3.0.devhelp2
share/doc/gtksourceview-3.0/home.png
@@ -84,16 +96,19 @@ share/doc/gtksourceview-3.0/lang-tutorial.html
share/doc/gtksourceview-3.0/left-insensitive.png
share/doc/gtksourceview-3.0/left.png
share/doc/gtksourceview-3.0/object-tree.html
+share/doc/gtksourceview-3.0/pt01.html
+share/doc/gtksourceview-3.0/pt02.html
share/doc/gtksourceview-3.0/right-insensitive.png
share/doc/gtksourceview-3.0/right.png
share/doc/gtksourceview-3.0/style-reference.html
share/doc/gtksourceview-3.0/style.css
share/doc/gtksourceview-3.0/up-insensitive.png
share/doc/gtksourceview-3.0/up.png
+share/gir-1.0/GtkSource-3.0.gir
share/gtksourceview-3.0/language-specs/R.lang
share/gtksourceview-3.0/language-specs/actionscript.lang
-share/gtksourceview-3.0/language-specs/ansforth94.lang
share/gtksourceview-3.0/language-specs/ada.lang
+share/gtksourceview-3.0/language-specs/ansforth94.lang
share/gtksourceview-3.0/language-specs/asp.lang
share/gtksourceview-3.0/language-specs/automake.lang
share/gtksourceview-3.0/language-specs/awk.lang
@@ -128,6 +143,7 @@ share/gtksourceview-3.0/language-specs/fortran.lang
share/gtksourceview-3.0/language-specs/fsharp.lang
share/gtksourceview-3.0/language-specs/gap.lang
share/gtksourceview-3.0/language-specs/gdb-log.lang
+share/gtksourceview-3.0/language-specs/genie.lang
share/gtksourceview-3.0/language-specs/glsl.lang
share/gtksourceview-3.0/language-specs/go.lang
share/gtksourceview-3.0/language-specs/gtk-doc.lang
@@ -175,6 +191,7 @@ share/gtksourceview-3.0/language-specs/opencl.lang
share/gtksourceview-3.0/language-specs/pascal.lang
share/gtksourceview-3.0/language-specs/perl.lang
share/gtksourceview-3.0/language-specs/php.lang
+share/gtksourceview-3.0/language-specs/pig.lang
share/gtksourceview-3.0/language-specs/pkgconfig.lang
share/gtksourceview-3.0/language-specs/po.lang
share/gtksourceview-3.0/language-specs/prolog.lang
@@ -197,6 +214,7 @@ share/gtksourceview-3.0/language-specs/systemverilog.lang
share/gtksourceview-3.0/language-specs/t2t.lang
share/gtksourceview-3.0/language-specs/tcl.lang
share/gtksourceview-3.0/language-specs/texinfo.lang
+share/gtksourceview-3.0/language-specs/thrift.lang
share/gtksourceview-3.0/language-specs/vala.lang
share/gtksourceview-3.0/language-specs/vbnet.lang
share/gtksourceview-3.0/language-specs/verilog.lang
@@ -250,6 +268,7 @@ share/locale/hu/LC_MESSAGES/gtksourceview-3.0.mo
share/locale/id/LC_MESSAGES/gtksourceview-3.0.mo
share/locale/it/LC_MESSAGES/gtksourceview-3.0.mo
share/locale/ja/LC_MESSAGES/gtksourceview-3.0.mo
+share/locale/kk/LC_MESSAGES/gtksourceview-3.0.mo
share/locale/kn/LC_MESSAGES/gtksourceview-3.0.mo
share/locale/ko/LC_MESSAGES/gtksourceview-3.0.mo
share/locale/lt/LC_MESSAGES/gtksourceview-3.0.mo
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 748f051a1d18..410ce89ce86d 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
USES+= bison gettext gmake libtool:keepla pathfix pkgconfig
-USE_GNOME= gnomeprefix libbonoboui referencehack gvfs
+USE_GNOME= gnomeprefix intltool libbonoboui referencehack gvfs
USE_XORG= sm
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index ee1b62130f79..058c93384f59 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -1,10 +1,9 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11-toolkits/pangomm/Makefile 19822 2014-08-20 08:57:46Z gusi $
PORTNAME= pangomm
-PORTVERSION= 2.34.0
-PORTREVISION?= 1
+PORTVERSION= 2.36.0
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,6 +14,7 @@ COMMENT= C++ wrapper for Pango
USES= tar:xz
.if !defined(REFERENCE_PORT)
+PORTSCOUT= limitw:1,even
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
@@ -38,4 +38,6 @@ post-patch:
.include <bsd.port.mk>
+.else
+PORTSCOUT= ignore:1
.endif
diff --git a/x11-toolkits/pangomm/distinfo b/x11-toolkits/pangomm/distinfo
index 73c14339446c..771712d6b486 100644
--- a/x11-toolkits/pangomm/distinfo
+++ b/x11-toolkits/pangomm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/pangomm-2.34.0.tar.xz) = 0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41
-SIZE (gnome2/pangomm-2.34.0.tar.xz) = 516028
+SHA256 (gnome2/pangomm-2.36.0.tar.xz) = a8d96952c708d7726bed260d693cece554f8f00e48b97cccfbf4f5690b6821f0
+SIZE (gnome2/pangomm-2.36.0.tar.xz) = 773628
diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile
index 962c5abe3db2..93940815e805 100644
--- a/x11-toolkits/py-vte/Makefile
+++ b/x11-toolkits/py-vte/Makefile
@@ -16,7 +16,7 @@ DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
USES= python
-USE_GNOME= vte pygtk2
+USE_GNOME= intltool pygtk2 vte
CONFIGURE_ARGS= --enable-python \
--disable-Bsymbolic \
--disable-freetypetest
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 57b4224eb6dd..4607e84d9df3 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -1,6 +1,5 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11-toolkits/vte/Makefile 18940 2013-12-08 01:12:24Z kwm $
PORTNAME= vte
PORTVERSION= 0.28.2
@@ -23,7 +22,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gno
USES+= cpe gettext gmake libtool pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_GNOME?= gnomeprefix gtk20 introspection:build referencehack
+USE_GNOME?= gnomeprefix gtk20 intltool introspection:build referencehack
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile
index aedda06a25fa..1457507c724e 100644
--- a/x11-toolkits/vte3/Makefile
+++ b/x11-toolkits/vte3/Makefile
@@ -1,9 +1,8 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11-toolkits/vte3/Makefile 19957 2014-10-15 11:07:14Z gusi $
PORTNAME?= vte
-PORTVERSION= 0.38.3
+PORTVERSION= 0.40.2
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME/sources/${PORTNAME:S/gnome-pty-helper/vte/}/${PORTVERSION:R}
@@ -18,17 +17,22 @@ USES= tar:xz
.if !defined(REFERENCE_PORT)
VTE3_SLAVE?= no
+PORTSCOUT= limitw:1,even
.if ${VTE3_SLAVE} != yes
BUILD_DEPENDS+= vapigen:${PORTSDIR}/lang/vala \
bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
RUN_DEPENDS+= ${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gnome-pty-helper
+.else
+# we need gnutls for configure to pass for gnome-pty-helper ..
+BUILD_DEPENDS+= gnutls>=0:${PORTSDIR}/security/gnutls
.endif
USES+= bison gettext gmake libtool pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_GNOME?= gnomeprefix gtk30 referencehack introspection:build
+USE_GNOME?= gtk30 intltool referencehack introspection:build
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS?=--disable-python \
@@ -48,18 +52,33 @@ PLIST_SUB= VERSION=2.91
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c
.endif
+.if ${OSVERSION} < 1000000
+CFLAGS+= -lz
+.endif
+
post-patch:
.if ${VTE3_SLAVE} != yes
@${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \
${WRKSRC}/src/Makefile.in
.endif
+# zlib.pc only is available on 10.1-R and newer.
+.if ${OSVERSION} < 1000000
+ @${REINPLACE_CMD} -e 's|gio-unix-2.0 zlib|gio-unix-2.0|g' \
+ ${WRKSRC}/configure
+.endif
# borrowed osversion from bsd.ssp.mk
.if ${OSVERSION} < 1000036 && ${ARCH} == i386
@${REINPLACE_CMD} -e 's|-fstack-protector-strong||g; \
s|-fstack-protector||g' \
${WRKSRC}/configure
.endif
+ @${REINPLACE_CMD} -e 's|(AM_MAKEFLAGS) install-exec-hook|(AM_MAKEFLAGS)|g' \
+ ${WRKSRC}/gnome-pty-helper/Makefile.in
+ @${REINPLACE_CMD} -e 's|zlib"|"|g' \
+ ${WRKSRC}/configure
.include <bsd.port.mk>
+.else
+PORTSCOUT= ignore:1
.endif
diff --git a/x11-toolkits/vte3/distinfo b/x11-toolkits/vte3/distinfo
index ce5c4ae5a2b7..f51564204901 100644
--- a/x11-toolkits/vte3/distinfo
+++ b/x11-toolkits/vte3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/vte-0.38.3.tar.xz) = 3f3ae063207ceea9ca2abd1cf9c9f8bd2b66ca82156609f31f3554288c0c2bf4
-SIZE (gnome3/vte-0.38.3.tar.xz) = 1005548
+SHA256 (gnome3/vte-0.40.2.tar.xz) = 9b68fbc16b27f2d79e6271f2b0708808594ac5acf979d0fccea118608199fd2d
+SIZE (gnome3/vte-0.40.2.tar.xz) = 923852
diff --git a/x11-toolkits/vte3/files/patch-gnome-pty-helper_Makefile.in b/x11-toolkits/vte3/files/patch-gnome-pty-helper_Makefile.in
deleted file mode 100644
index 93f9d08dab50..000000000000
--- a/x11-toolkits/vte3/files/patch-gnome-pty-helper_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnome-pty-helper/Makefile.in.orig 2009-05-06 01:20:54.000000000 -0400
-+++ gnome-pty-helper/Makefile.in 2009-05-06 01:21:30.000000000 -0400
-@@ -590,8 +590,8 @@ uninstall-am: uninstall-libexecPROGRAMS
-
-
- install-exec-hook:
-- chown root.utmp $(DESTDIR)$(libexecdir)/gnome-pty-helper || true
-- chmod g+s $(DESTDIR)$(libexecdir)/gnome-pty-helper || true
-+ chown root:wheel $(DESTDIR)$(libexecdir)/gnome-pty-helper || true
-+ chmod u+s $(DESTDIR)$(libexecdir)/gnome-pty-helper || true
-
- -include $(top_srcdir)/git.mk
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/x11-toolkits/vte3/pkg-plist b/x11-toolkits/vte3/pkg-plist
index ec8757f38d8d..a06db59797c2 100644
--- a/x11-toolkits/vte3/pkg-plist
+++ b/x11-toolkits/vte3/pkg-plist
@@ -1,6 +1,7 @@
bin/vte-%%VERSION%%
etc/profile.d/vte.sh
include/vte-%%VERSION%%/vte/vte.h
+include/vte-%%VERSION%%/vte/vtedeprecated.h
include/vte-%%VERSION%%/vte/vteenums.h
include/vte-%%VERSION%%/vte/vteglobals.h
include/vte-%%VERSION%%/vte/vtemacros.h
@@ -11,32 +12,33 @@ include/vte-%%VERSION%%/vte/vteversion.h
lib/girepository-1.0/Vte-%%VERSION%%.typelib
lib/libvte-%%VERSION%%.so
lib/libvte-%%VERSION%%.so.0
-lib/libvte-%%VERSION%%.so.0.3800.3
+lib/libvte-%%VERSION%%.so.0.4000.2
libdata/pkgconfig/vte-%%VERSION%%.pc
-share/doc/vte-%%VERSION%%/VteTerminal.html
-share/doc/vte-%%VERSION%%/annotation-glossary.html
-share/doc/vte-%%VERSION%%/api-index-deprecated.html
-share/doc/vte-%%VERSION%%/api-index-full.html
-share/doc/vte-%%VERSION%%/ch01.html
-share/doc/vte-%%VERSION%%/ch02.html
-share/doc/vte-%%VERSION%%/ch03.html
-share/doc/vte-%%VERSION%%/home.png
-share/doc/vte-%%VERSION%%/index.html
-share/doc/vte-%%VERSION%%/index.sgml
-share/doc/vte-%%VERSION%%/left-insensitive.png
-share/doc/vte-%%VERSION%%/left.png
-share/doc/vte-%%VERSION%%/licence.html
-share/doc/vte-%%VERSION%%/object-hierarchy.html
-share/doc/vte-%%VERSION%%/pt01.html
-share/doc/vte-%%VERSION%%/right-insensitive.png
-share/doc/vte-%%VERSION%%/right.png
-share/doc/vte-%%VERSION%%/style.css
-share/doc/vte-%%VERSION%%/up-insensitive.png
-share/doc/vte-%%VERSION%%/up.png
-share/doc/vte-%%VERSION%%/vte-%%VERSION%%.devhelp2
-share/doc/vte-%%VERSION%%/vte-Version-Information.html
-share/doc/vte-%%VERSION%%/vte-Vte-PTY.html
share/gir-1.0/Vte-%%VERSION%%.gir
+share/gtk-doc/html/vte-%%VERSION%%/VteTerminal.html
+share/gtk-doc/html/vte-%%VERSION%%/annotation-glossary.html
+share/gtk-doc/html/vte-%%VERSION%%/api-index-0-40.html
+share/gtk-doc/html/vte-%%VERSION%%/api-index-deprecated.html
+share/gtk-doc/html/vte-%%VERSION%%/api-index-full.html
+share/gtk-doc/html/vte-%%VERSION%%/ch01.html
+share/gtk-doc/html/vte-%%VERSION%%/ch02.html
+share/gtk-doc/html/vte-%%VERSION%%/ch03.html
+share/gtk-doc/html/vte-%%VERSION%%/home.png
+share/gtk-doc/html/vte-%%VERSION%%/index.html
+share/gtk-doc/html/vte-%%VERSION%%/index.sgml
+share/gtk-doc/html/vte-%%VERSION%%/left-insensitive.png
+share/gtk-doc/html/vte-%%VERSION%%/left.png
+share/gtk-doc/html/vte-%%VERSION%%/licence.html
+share/gtk-doc/html/vte-%%VERSION%%/object-hierarchy.html
+share/gtk-doc/html/vte-%%VERSION%%/pt01.html
+share/gtk-doc/html/vte-%%VERSION%%/right-insensitive.png
+share/gtk-doc/html/vte-%%VERSION%%/right.png
+share/gtk-doc/html/vte-%%VERSION%%/style.css
+share/gtk-doc/html/vte-%%VERSION%%/up-insensitive.png
+share/gtk-doc/html/vte-%%VERSION%%/up.png
+share/gtk-doc/html/vte-%%VERSION%%/vte-%%VERSION%%.devhelp2
+share/gtk-doc/html/vte-%%VERSION%%/vte-Version-Information.html
+share/gtk-doc/html/vte-%%VERSION%%/vte-Vte-PTY.html
share/locale/am/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/ang/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/ar/LC_MESSAGES/vte-%%VERSION%%.mo
@@ -81,6 +83,7 @@ share/locale/is/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/ka/LC_MESSAGES/vte-%%VERSION%%.mo
+share/locale/kk/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/kn/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/ku/LC_MESSAGES/vte-%%VERSION%%.mo
@@ -96,8 +99,8 @@ share/locale/mn/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/mr/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/ms/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/vte-%%VERSION%%.mo
-share/locale/ne/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/nds/LC_MESSAGES/vte-%%VERSION%%.mo
+share/locale/ne/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/nn/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/oc/LC_MESSAGES/vte-%%VERSION%%.mo