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

4 files changed, 30 insertions, 26 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index c117e14e70cb..502837fc6149 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,10 +1,9 @@
 # Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/graphics/librsvg2/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom: ports/trunk/graphics/librsvg2/Makefile 20031 2014-11-02 21:47:55Z kwm $
 
 PORTNAME=	librsvg
-PORTVERSION=	2.36.4
-PORTREVISION=	2
+PORTVERSION=	2.40.4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
@@ -17,18 +16,21 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libcroco-0.6.so:${PORTSDIR}/textproc/libcroco
 RUN_DEPENDS=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
 
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	gnomeprefix libgsf gtk20 introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehier gnomeprefix libgsf gtk20 introspection:build
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--with-svgz \
+		--disable-vala \
 		--with-croco \
 		--disable-Bsymbolic \
 		--enable-gtk-theme
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|GTK3_REQUIRED=3.0.0|GTK3_REQUIRED=9.90.0|g' \
+	@${REINPLACE_CMD} -e 's|GTK3_REQUIRED=3.[0-9].[0-9]|GTK3_REQUIRED=9.90.0|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index d666c6d0fd24..d944d7b1fa26 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/librsvg-2.36.4.tar.xz) = 1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2
-SIZE (gnome2/librsvg-2.36.4.tar.xz) = 513028
+SHA256 (gnome2/librsvg-2.40.4.tar.xz) = db76d5494e867613bbb0664e969f7d03296296495ec117f276ccf8f505cd9573
+SIZE (gnome2/librsvg-2.40.4.tar.xz) = 509324
diff --git a/graphics/librsvg2/files/patch-configure b/graphics/librsvg2/files/patch-configure
new file mode 100644
index 000000000000..05b7c6333b5a
--- /dev/null
+++ b/graphics/librsvg2/files/patch-configure
@@ -0,0 +1,15 @@
+--- configure.orig	2014-03-10 13:44:40.999468678 +0000
++++ configure	2014-03-10 13:44:50.090467715 +0000
+@@ -14010,10 +14010,10 @@
+   -Wformat-nonliteral -Werror=format-security \
+   -Wsign-compare -Werror=implicit-function-declaration \
+   -Wpointer-arith -Wwrite-strings -Wstrict-prototypes \
+-  -Wnoaggregate-return -Wcast-align -Wimplicit -Wuninitialized \
++  -Wcast-align -Wimplicit -Wuninitialized \
+   -Wmissing-prototypes -Wmissing-declarations -Wnested-externs \
+   -Wpacked -Wmissing-format-attribute -Wshadow \
+-  -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
++  -Wstrict-aliasing=2 -Winit-self \
+   -Wdeclaration-after-statement -Wold-style-definition \
+   -Wno-missing-field-initializers -Wno-unused-parameter \
+   -Wunused-variable -Wunused-function \
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index f212ef33969d..6b27b2a1ccd1 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -4,18 +4,14 @@ include/librsvg-2.0/librsvg/librsvg-features.h
 include/librsvg-2.0/librsvg/rsvg-cairo.h
 include/librsvg-2.0/librsvg/rsvg.h
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.a
-lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.la
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.so
 lib/girepository-1.0/Rsvg-2.0.typelib
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.a
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.la
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.so
 lib/librsvg-2.a
-lib/librsvg-2.la
 lib/librsvg-2.so
 lib/librsvg-2.so.2
-lib/librsvg-2.so.2.36.4
+lib/librsvg-2.so.2.40.4
 libdata/pkgconfig/librsvg-2.0.pc
+man/man1/rsvg-convert.1.gz
 share/doc/rsvg-2.0/RsvgHandle.html
 share/doc/rsvg-2.0/annotation-glossary.html
 share/doc/rsvg-2.0/api-index-2-14.html
@@ -30,9 +26,11 @@ share/doc/rsvg-2.0/api-index-full.html
 share/doc/rsvg-2.0/home.png
 share/doc/rsvg-2.0/index.html
 share/doc/rsvg-2.0/index.sgml
+share/doc/rsvg-2.0/left-insensitive.png
 share/doc/rsvg-2.0/left.png
 share/doc/rsvg-2.0/licence.html
 share/doc/rsvg-2.0/object-tree.html
+share/doc/rsvg-2.0/right-insensitive.png
 share/doc/rsvg-2.0/right.png
 share/doc/rsvg-2.0/rsvg-2.0.devhelp2
 share/doc/rsvg-2.0/rsvg-Using-RSVG-with-GIO.html
@@ -41,19 +39,8 @@ share/doc/rsvg-2.0/rsvg-Using-RSVG-with-cairo.html
 share/doc/rsvg-2.0/rsvg-Version-check-and-feature-tests.html
 share/doc/rsvg-2.0/rsvg.html
 share/doc/rsvg-2.0/style.css
+share/doc/rsvg-2.0/up-insensitive.png
 share/doc/rsvg-2.0/up.png
 share/gir-1.0/Rsvg-2.0.gir
-share/themes/bubble/gtk-2.0/blue.svg
-share/themes/bubble/gtk-2.0/green.svg
-share/themes/bubble/gtk-2.0/gtkrc
-share/themes/bubble/gtk-2.0/orange.svg
-share/themes/bubble/gtk-2.0/purple.svg
-share/themes/bubble/gtk-2.0/red.svg
-man/man1/rsvg-convert.1.gz
-@dirrm share/doc/rsvg-2.0
-@dirrm include/librsvg-2.0/librsvg
-@dirrm include/librsvg-2.0
-@dirrmtry share/themes/bubble/gtk-2.0
-@dirrmtry share/themes/bubble
 @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true
 @unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true