The FreeBSD GNOME team proudly presents GNOME 3.14 and Cinnamon 2.2.

Gnome 3.14.1 and Cinnamon 2.2.16 are supported on FreeBSD 9.3-RELEASE and up.

This commit removes the old GNOME 2 desktop, bindings and some ports that
can't be compiled. A few ports where updated to more recent versions to
allow them to compile with this update.

Apart from updating ports to newer versions

GDM is more integrated with gnome-shell now, and handles several things for
the GNOME desktop such as screen locking. If you want to use GNOME 3 via
startx, you will have to add your own lock screen/screensaver. For example xscreensaver
can be used for sessions started without GDM.

Shell Extensions can be installed via https://extensions.gnome.org/ , we have
ported a few that can't be installed via this way.
The old gnome-utils and gnome-games ports where split up into single ports
and where converted to meta-ports.
gnome-terminal requires a UTF-8 locale to run, gdm handles this already, but
if you use startx you need to do this yourself.

Upgrade instructions:

Delete the old and conflicting packages:
# pkg delete clutter gnome-utils gnome-panel gnome-keyring vala-vapigen \
    guile gcalctool gnome-media libgnomekbd
# pkg delete gnome-screensaver gnome-applets bug-buddy evolution-exchange \
    evolution-webcal gnome-system-tools seahorse-plugins gnome-control-center

For package users the following lines will be enough:
# pkg upgrade
# pkg install gnome3

For ports users should do the following:
# portmaster -a
# portmaster x11/gnome3

We are currently aware of two issues. The first issue is a bug in the
file monitoring code in the glib20 port. This bug causes glib programs
to crash when files in a monitored directory are added or removed.
Upstream is aware of the problem, but since the problem is quite complex
there is no solution yet. This problem isn't restricted to BSD.

The second issue is that on certain video cards totem will display a
purple/pink overlay on the video. It not clear yet where the issues
comes from.

Major thanks goes to Gustau Perez for being a driving force behind getting
GNOME 3 up to speed again. Also thanks to Antoine Brodin for running the exp-runs.

This update was also made possible by:
	Joe Maloney
	Kris Moore
	Beeblebrox
	Ryan Lortie
	Antoine Jacoutot
	and everyone I missed

8 files changed, 34 insertions, 96 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 1870b7f955d8..0c93f265578f 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,10 +1,9 @@
 # Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/devel/gobject-introspection/Makefile 18652 2013-08-18 15:14:13Z kwm $
+#   $MCom: ports/trunk/devel/gobject-introspection/Makefile 20031 2014-11-02 21:47:55Z kwm $
 
 PORTNAME=	gobject-introspection
-PORTVERSION=	1.36.0
-PORTREVISION=	3
+PORTVERSION=	1.42.0
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -19,11 +18,10 @@ LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
 USES=		bison gettext gmake libtool pathfix pkgconfig \
 		python:2 tar:xz
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehier glib20
+USE_GNOME=	glib20
 USE_LDCONFIG=	yes
-MAKE_JOBS_UNSAFE=yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 # Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index a72b0f501568..d5ce5b50693c 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gobject-introspection-1.36.0.tar.xz) = e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383
-SIZE (gnome3/gobject-introspection-1.36.0.tar.xz) = 1201108
+SHA256 (gnome3/gobject-introspection-1.42.0.tar.xz) = 3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7
+SIZE (gnome3/gobject-introspection-1.42.0.tar.xz) = 1308056
diff --git a/devel/gobject-introspection/files/patch-Makefile.in b/devel/gobject-introspection/files/patch-Makefile.in
deleted file mode 100644
index d35bf348b2d8..000000000000
--- a/devel/gobject-introspection/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in.orig	2012-10-02 11:01:03.000000000 +0000
-+++ Makefile.in	2012-10-02 11:02:59.000000000 +0000
-@@ -973,12 +973,11 @@
- GLib_2_0_gir_PACKAGES = glib-2.0
- GLib_2_0_gir_CFLAGS = \
-             -I$(GLIB_INCLUDEDIR) \
--            -I$(GLIB_LIBDIR)/glib-2.0/include \
-             -DGETTEXT_PACKAGE=Dummy \
-             -DGLIB_COMPILATION \
-             -D__G_I18N_LIB_H__
- 
--GLib_2_0_gir_FILES = $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
-+GLib_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/glibconfig.h \
- 	$(GLIB_INCLUDEDIR)/glib/*.h \
- 	$(GLIB_INCLUDEDIR)/gobject/glib-types.h gir/glib-2.0.c \
- 	$(am__append_4)
diff --git a/devel/gobject-introspection/files/patch-configure b/devel/gobject-introspection/files/patch-configure
deleted file mode 100644
index 693f3a8534f3..000000000000
--- a/devel/gobject-introspection/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2013-03-29 22:15:44.000000000 +0000
-+++ configure	2013-03-29 22:18:30.000000000 +0000
-@@ -14623,7 +14623,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to link against libpython" >&5
- $as_echo_n "checking for libraries required to link against libpython... " >&6; }
--if test "x$PYTHON_LIBS" == x; then
-+if test "x$PYTHON_LIBS" = x; then
- 	PYTHON_LIBS=`$PYTHON-config --ldflags --libs`
- fi
- 
diff --git a/devel/gobject-introspection/files/patch-giscanner_dumper.py b/devel/gobject-introspection/files/patch-giscanner_dumper.py
deleted file mode 100644
index 7307c617e314..000000000000
--- a/devel/gobject-introspection/files/patch-giscanner_dumper.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- giscanner/dumper.py.orig	2013-02-23 11:40:08.000000000 +0100
-+++ giscanner/dumper.py	2013-06-28 21:51:35.000000000 +0200
-@@ -89,8 +89,9 @@
-         # Enable the --msvc-syntax pkg-config flag when
-         # the Microsoft compiler is used
-         # (This is the other way to check whether Visual C++ is used subsequently)
--        if 'cl' in self._compiler_cmd:
--            self._pkgconfig_msvc_flags = '--msvc-syntax'
-+        if 'clang' not in self._compiler_cmd:
-+            if 'cl' in self._compiler_cmd:
-+                self._pkgconfig_msvc_flags = '--msvc-syntax'
-         self._uninst_srcdir = os.environ.get(
-             'UNINSTALLED_INTROSPECTION_SRCDIR')
-         self._packages = ['gio-2.0 gmodule-2.0']
diff --git a/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l b/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l
deleted file mode 100644
index 43c2636e5ba1..000000000000
--- a/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-giscanner_scannerlexer.l,v 1.2 2013/05/05 09:20:44 drochner Exp $
-
-Ignore __asm volatile as per PR pkg/46017
-https://bugzilla.gnome.org/show_bug.cgi?id=678794
-
---- giscanner/scannerlexer.l.orig	2012-12-18 16:27:16.000000000 +0000
-+++ giscanner/scannerlexer.l
-@@ -134,6 +134,8 @@ stringtext				([^\\\"])|(\\.)
- ","					{ return ','; }
- "->"					{ return ARROW; }
- 
-+"__asm"[\t\f\v\r ]+"volatile"		{ if (!parse_ignored_macro()) REJECT; }
-+"__asm__"[\t\f\v\r ]+"volatile"		{ if (!parse_ignored_macro()) REJECT; }
- "__asm" 	        	        { if (!parse_ignored_macro()) REJECT; }
- "__asm__" 	        	        { if (!parse_ignored_macro()) REJECT; }
- "__attribute__" 		        { if (!parse_ignored_macro()) REJECT; }
-@@ -145,6 +147,8 @@ stringtext				([^\\\"])|(\\.)
- "__signed__"				{ return SIGNED; }
- "__restrict"				{ return RESTRICT; }
- "__typeof"				{ if (!parse_ignored_macro()) REJECT; }
-+"__volatile"				{ if (!parse_ignored_macro()) REJECT; }
-+"__volatile__"				{ if (!parse_ignored_macro()) REJECT; }
- "_Bool"					{ return BOOL; }
- 
- "G_GINT64_CONSTANT"			{ return INTL_CONST; }
diff --git a/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py b/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py
deleted file mode 100644
index 999fc742b2ff..000000000000
--- a/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py
+++ /dev/null
@@ -1,16 +0,0 @@
---- giscanner/sourcescanner.py.orig	2013-03-06 23:53:19.000000000 +0100
-+++ giscanner/sourcescanner.py	2013-06-28 22:01:04.000000000 +0200
-@@ -281,8 +281,11 @@
-         # some help from gcc from MinGW/Cygwin or so.
-         # Note that the generated dumper program is
-         # still built and linked by Visual C++.
--        if 'cl' in cpp_exec:
--            cpp_args = 'gcc'.split()
-+        if 'clang' not in cpp_exec:
-+            if 'cl' in cpp_exec:
-+                cpp_args = 'gcc'.split()
-+            else:
-+	        cpp_args = cpp_exec
-         else:
-             cpp_args = cpp_exec
-         cpp_args += ['-E', '-C', '-I.', '-']
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
index 7271af12c451..903340789b93 100644
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -21,6 +21,7 @@ include/gobject-introspection-1.0/gitypeinfo.h
 include/gobject-introspection-1.0/gitypelib.h
 include/gobject-introspection-1.0/gitypes.h
 include/gobject-introspection-1.0/giunioninfo.h
+include/gobject-introspection-1.0/giversionmacros.h
 include/gobject-introspection-1.0/givfuncinfo.h
 lib/girepository-1.0/DBus-1.0.typelib
 lib/girepository-1.0/DBusGLib-1.0.typelib
@@ -34,6 +35,7 @@ lib/girepository-1.0/cairo-1.0.typelib
 lib/girepository-1.0/fontconfig-2.0.typelib
 lib/girepository-1.0/freetype2-2.0.typelib
 lib/girepository-1.0/libxml2-2.0.typelib
+lib/girepository-1.0/win32-1.0.typelib
 lib/girepository-1.0/xfixes-4.0.typelib
 lib/girepository-1.0/xft-2.0.typelib
 lib/girepository-1.0/xlib-2.0.typelib
@@ -55,39 +57,60 @@ lib/gobject-introspection/giscanner/ast.pyo
 lib/gobject-introspection/giscanner/cachestore.py
 lib/gobject-introspection/giscanner/cachestore.pyc
 lib/gobject-introspection/giscanner/cachestore.pyo
+lib/gobject-introspection/giscanner/ccompiler.py
+lib/gobject-introspection/giscanner/ccompiler.pyc
+lib/gobject-introspection/giscanner/ccompiler.pyo
 lib/gobject-introspection/giscanner/codegen.py
 lib/gobject-introspection/giscanner/codegen.pyc
 lib/gobject-introspection/giscanner/codegen.pyo
+lib/gobject-introspection/giscanner/collections/__init__.py
+lib/gobject-introspection/giscanner/collections/__init__.pyc
+lib/gobject-introspection/giscanner/collections/__init__.pyo
+lib/gobject-introspection/giscanner/collections/counter.py
+lib/gobject-introspection/giscanner/collections/counter.pyc
+lib/gobject-introspection/giscanner/collections/counter.pyo
+lib/gobject-introspection/giscanner/collections/ordereddict.py
+lib/gobject-introspection/giscanner/collections/ordereddict.pyc
+lib/gobject-introspection/giscanner/collections/ordereddict.pyo
 lib/gobject-introspection/giscanner/docmain.py
 lib/gobject-introspection/giscanner/docmain.pyc
 lib/gobject-introspection/giscanner/docmain.pyo
+lib/gobject-introspection/giscanner/doctemplates/C/callback.tmpl
 lib/gobject-introspection/giscanner/doctemplates/C/class.tmpl
 lib/gobject-introspection/giscanner/doctemplates/C/constructor.tmpl
 lib/gobject-introspection/giscanner/doctemplates/C/default.tmpl
 lib/gobject-introspection/giscanner/doctemplates/C/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/field.tmpl
 lib/gobject-introspection/giscanner/doctemplates/C/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/interface.tmpl
 lib/gobject-introspection/giscanner/doctemplates/C/method.tmpl
 lib/gobject-introspection/giscanner/doctemplates/C/namespace.tmpl
 lib/gobject-introspection/giscanner/doctemplates/C/property.tmpl
 lib/gobject-introspection/giscanner/doctemplates/C/record.tmpl
 lib/gobject-introspection/giscanner/doctemplates/C/signal.tmpl
 lib/gobject-introspection/giscanner/doctemplates/C/vfunc.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/callback.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Gjs/class.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Gjs/constructor.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Gjs/default.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Gjs/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/field.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Gjs/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/interface.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Gjs/method.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Gjs/namespace.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Gjs/property.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Gjs/record.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Gjs/signal.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Gjs/vfunc.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/callback.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Python/class.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Python/constructor.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Python/default.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Python/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/field.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Python/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/interface.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Python/method.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Python/namespace.tmpl
 lib/gobject-introspection/giscanner/doctemplates/Python/property.tmpl
@@ -124,9 +147,6 @@ lib/gobject-introspection/giscanner/maintransformer.pyo
 lib/gobject-introspection/giscanner/message.py
 lib/gobject-introspection/giscanner/message.pyc
 lib/gobject-introspection/giscanner/message.pyo
-lib/gobject-introspection/giscanner/odict.py
-lib/gobject-introspection/giscanner/odict.pyc
-lib/gobject-introspection/giscanner/odict.pyo
 lib/gobject-introspection/giscanner/scannermain.py
 lib/gobject-introspection/giscanner/scannermain.pyc
 lib/gobject-introspection/giscanner/scannermain.pyo
@@ -157,6 +177,9 @@ lib/libgirepository-1.0.so.1
 lib/libgirepository-1.0.so.1.0.0
 libdata/pkgconfig/gobject-introspection-1.0.pc
 libdata/pkgconfig/gobject-introspection-no-export-1.0.pc
+man/man1/g-ir-compiler.1.gz
+man/man1/g-ir-generate.1.gz
+man/man1/g-ir-scanner.1.gz
 share/aclocal/introspection.m4
 share/gir-1.0/DBus-1.0.gir
 share/gir-1.0/DBusGLib-1.0.gir
@@ -170,6 +193,7 @@ share/gir-1.0/cairo-1.0.gir
 share/gir-1.0/fontconfig-2.0.gir
 share/gir-1.0/freetype2-2.0.gir
 share/gir-1.0/libxml2-2.0.gir
+share/gir-1.0/win32-1.0.gir
 share/gir-1.0/xfixes-4.0.gir
 share/gir-1.0/xft-2.0.gir
 share/gir-1.0/xlib-2.0.gir
@@ -186,12 +210,10 @@ share/gobject-introspection-1.0/tests/foo.c
 share/gobject-introspection-1.0/tests/foo.h
 share/gobject-introspection-1.0/tests/gimarshallingtests.c
 share/gobject-introspection-1.0/tests/gimarshallingtests.h
+share/gobject-introspection-1.0/tests/gitestmacros.h
 share/gobject-introspection-1.0/tests/regress.c
 share/gobject-introspection-1.0/tests/regress.h
 share/gobject-introspection-1.0/tests/utility.c
 share/gobject-introspection-1.0/tests/utility.h
 share/gobject-introspection-1.0/tests/warnlib.c
 share/gobject-introspection-1.0/tests/warnlib.h
-man/man1/g-ir-compiler.1.gz
-man/man1/g-ir-generate.1.gz
-man/man1/g-ir-scanner.1.gz