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

10 files changed, 0 insertions, 213 deletions

diff --git a/x11/gnome-pie/files/patch-CMakeLists.txt b/x11/gnome-pie/files/patch-CMakeLists.txt
deleted file mode 100644
index 379bb596d833..000000000000
--- a/x11/gnome-pie/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./CMakeLists.txt.orig	2013-03-06 18:35:57.000000000 +0100
-+++ ./CMakeLists.txt	2013-03-06 18:36:57.000000000 +0100
-@@ -26,7 +26,9 @@
- find_package(PkgConfig)
- 
- # check whether GTK3 is supported
-+if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
- pkg_check_modules(GTK3 gtk+-3.0)
-+endif (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
- 
- if (${GTK3_FOUND})
-     pkg_check_modules(INDICATOR3 appindicator3-0.1)
-@@ -38,7 +40,7 @@
-     pkg_check_modules(INDICATOR appindicator-0.1)
-     pkg_check_modules(UNIQUE REQUIRED unique-1.0)
-     pkg_check_modules(WNCK REQUIRED libwnck-1.0)
--    pkg_check_modules(BAMF REQUIRED libbamf)
-+#    pkg_check_modules(BAMF REQUIRED libbamf)
- endif (${GTK3_FOUND})
- 
- pkg_check_modules(GIO REQUIRED gio-unix-2.0)
-@@ -186,7 +188,7 @@
- else (${GTK3_FOUND})
-     LIST(APPEND VALA_PKGS gtk+-2.0)
-     LIST(APPEND VALA_PKGS gdk-x11-2.0)
--    LIST(APPEND VALA_PKGS bamf)
-+#    LIST(APPEND VALA_PKGS bamf)
-     LIST(APPEND VALA_PKGS libwnck-1.0)
-     LIST(APPEND VALA_PKGS unique-1.0)
- endif (${GTK3_FOUND})
diff --git a/x11/gnome-pie/files/patch-resources__gnome-pie.desktop b/x11/gnome-pie/files/patch-resources__gnome-pie.desktop
deleted file mode 100644
index 019a50600d0b..000000000000
--- a/x11/gnome-pie/files/patch-resources__gnome-pie.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./resources/gnome-pie.desktop.orig	2013-01-23 23:33:16.000000000 +0100
-+++ ./resources/gnome-pie.desktop	2013-01-24 21:41:21.000000000 +0100
-@@ -4,4 +4,4 @@
- Comment=Cakes don't lie.
- Exec=gnome-pie
- Icon=gnome-pie
--Categories=GNOME;Utility;
-+Categories=GTK;GNOME;Utility;
diff --git a/x11/gnome-pie/files/patch-src__CMakeLists.txt b/x11/gnome-pie/files/patch-src__CMakeLists.txt
deleted file mode 100644
index b35444807d24..000000000000
--- a/x11/gnome-pie/files/patch-src__CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
---- ./src/CMakeLists.txt.orig	2013-01-23 23:33:16.000000000 +0100
-+++ ./src/CMakeLists.txt	2013-01-24 21:41:57.000000000 +0100
-@@ -43,6 +43,7 @@
- 		${CMAKE_INSTALL_PREFIX}/bin
- )
- 
-+if (INSTALL_DOCS)
- # install credits
- install(
- 	FILES
-@@ -50,7 +51,9 @@
- 	DESTINATION
- 		${CMAKE_INSTALL_PREFIX}/share/doc/gnome-pie
- )
-+endif()
- 
-+if (INSTALL_NLS)
- # install locales
- install(
- 	DIRECTORY
-@@ -61,6 +64,7 @@
- 	PATTERN *.pot EXCLUDE
- 	PATTERN *.sh EXCLUDE
- )
-+endif()
- 
- # install themes
- install(
-@@ -95,11 +99,12 @@
- 		${CMAKE_INSTALL_PREFIX}/share/applications
- )
- 
-+if (NOT NO_INSTALL_MANPAGES)
- # install manpage
- install(
- 	FILES
- 		${CMAKE_SOURCE_DIR}/resources/gnome-pie.1
- 	DESTINATION
--		${CMAKE_INSTALL_PREFIX}/share/man/man1
-+		${CMAKE_INSTALL_PREFIX}/man/man1
- )
--
-+endif()
diff --git a/x11/gnome-pie/files/patch-src__actionGroups__windowListGroup.vala b/x11/gnome-pie/files/patch-src__actionGroups__windowListGroup.vala
deleted file mode 100644
index 5c4a903744c0..000000000000
--- a/x11/gnome-pie/files/patch-src__actionGroups__windowListGroup.vala
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./src/actionGroups/windowListGroup.vala.orig	2013-01-23 23:33:16.000000000 +0100
-+++ ./src/actionGroups/windowListGroup.vala	2013-01-24 21:41:21.000000000 +0100
-@@ -76,13 +76,13 @@
-     private void load() {
-         unowned GLib.List<Wnck.Window?> windows = this.screen.get_windows();
-         
--        var matcher = Bamf.Matcher.get_default();
-+        //var matcher = Bamf.Matcher.get_default();
- 
-         foreach (var window in windows) {
-             if (window.get_window_type() == Wnck.WindowType.NORMAL
-             	&& !window.is_skip_pager() && !window.is_skip_tasklist()) {
-                 var application = window.get_application();
--                var bamf_app = matcher.get_application_for_xid((uint32)window.get_xid());
-+                //var bamf_app = matcher.get_application_for_xid((uint32)window.get_xid());
-                 
-                 string name = window.get_name();
-                 
-@@ -91,7 +91,8 @@
-                 
-                 var action = new SigAction(
-                     name,
--                    (bamf_app == null) ? application.get_icon_name().down() : bamf_app.get_icon(),
-+                    //(bamf_app == null) ? application.get_icon_name().down() : bamf_app.get_icon(),
-+                    application.get_icon_name().down(),
-                     "%lu".printf(window.get_xid()) 
-                 );
-                 action.activated.connect(() => {
diff --git a/x11/gnome-pie/files/patch-src__actions__actionRegistry.vala b/x11/gnome-pie/files/patch-src__actions__actionRegistry.vala
deleted file mode 100644
index 3a963e11e3c1..000000000000
--- a/x11/gnome-pie/files/patch-src__actions__actionRegistry.vala
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/actions/actionRegistry.vala.orig	2013-01-23 23:33:16.000000000 +0100
-+++ ./src/actions/actionRegistry.vala	2013-01-24 21:41:21.000000000 +0100
-@@ -108,7 +108,7 @@
-             case "application":
-                 var file_name = uri.split("//")[1];
-                 
--                var desktop_file = GLib.File.new_for_path("/usr/share/applications/" + file_name);
-+                var desktop_file = GLib.File.new_for_path("%%DESKTOPDIR%%/" + file_name);
-                 if (desktop_file.query_exists())
-                     return new_for_desktop_file(desktop_file.get_path());
- 
diff --git a/x11/gnome-pie/files/patch-src__gui__indicator.vala b/x11/gnome-pie/files/patch-src__gui__indicator.vala
deleted file mode 100644
index e504035e1a80..000000000000
--- a/x11/gnome-pie/files/patch-src__gui__indicator.vala
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src/gui/indicator.vala.orig	2013-03-19 01:40:47.000000000 +0100
-+++ ./src/gui/indicator.vala	2013-03-19 01:41:57.000000000 +0100
-@@ -93,10 +93,7 @@
-         #else
-             this.indicator = new Gtk.StatusIcon();
-             try {
--                var file = GLib.File.new_for_path(GLib.Path.build_filename(
--                    GLib.Path.get_dirname(GLib.FileUtils.read_link("/proc/self/exe"))+"/resources",
--                    icon + ".svg"
--                ));
-+                var file = GLib.File.new_for_path(GLib.Path.build_filename("%%DATADIR%%/resources", icon + ".svg"));
- 
-                 if (!file.query_exists())
-                   this.indicator.set_from_icon_name(icon);
diff --git a/x11/gnome-pie/files/patch-src__gui__themeList.vala b/x11/gnome-pie/files/patch-src__gui__themeList.vala
deleted file mode 100644
index 0be0574bf8c4..000000000000
--- a/x11/gnome-pie/files/patch-src__gui__themeList.vala
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/gui/themeList.vala.orig	2013-03-19 01:24:16.000000000 +0100
-+++ ./src/gui/themeList.vala	2013-03-19 01:24:23.000000000 +0100
-@@ -81,7 +81,7 @@
-                     
-                     this.on_select_new();
-     
--                    Config.global.theme.load();
-+                    //Config.global.theme.load();
-                     Config.global.theme.load_images();
-                     return false;
-                 });  
diff --git a/x11/gnome-pie/files/patch-src__utilities__bindingManager.vala b/x11/gnome-pie/files/patch-src__utilities__bindingManager.vala
deleted file mode 100644
index 27a6d43be434..000000000000
--- a/x11/gnome-pie/files/patch-src__utilities__bindingManager.vala
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./src/utilities/bindingManager.vala.orig	2013-03-15 23:02:39.000000000 +0100
-+++ ./src/utilities/bindingManager.vala	2013-03-15 23:03:13.000000000 +0100
-@@ -228,12 +228,12 @@
-     
-     private Gdk.FilterReturn event_filter(Gdk.XEvent gdk_xevent, Gdk.Event gdk_event) { 
-         
--        #if VALA_0_16 || VALA_0_17
--            X.Event* xevent = (X.Event*) gdk_xevent;
--        #else
-+        //#if VALA_0_16 || VALA_0_17
-+        //    X.Event* xevent = (X.Event*) gdk_xevent;
-+        //#else
-             void* pointer = &gdk_xevent;
-             X.Event* xevent = (X.Event*) pointer;
--        #endif
-+        //#endif
-  
-         if(xevent->type == X.EventType.KeyPress) {
-             foreach(var binding in bindings) {
diff --git a/x11/gnome-pie/files/patch-src__utilities__paths.vala b/x11/gnome-pie/files/patch-src__utilities__paths.vala
deleted file mode 100644
index 2043d8782569..000000000000
--- a/x11/gnome-pie/files/patch-src__utilities__paths.vala
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./src/utilities/paths.vala.orig	2013-03-17 12:15:02.000000000 +0100
-+++ ./src/utilities/paths.vala	2013-03-19 01:34:39.000000000 +0100
-@@ -71,21 +71,21 @@
-     /// usually /usr/share/gnome-pie/themes.
-     /////////////////////////////////////////////////////////////////////
-     
--    public static string global_themes { get; private set; default=""; }
-+    public static string global_themes { get; private set; default="%%DATADIR%%/themes"; }
-     
-     /////////////////////////////////////////////////////////////////////
-     /// The directory containing locale files
-     /// usually /usr/share/locale.
-     /////////////////////////////////////////////////////////////////////
-     
--    public static string locales { get; private set; default=""; }
-+    public static string locales { get; private set; default="%%PREFIX%%/share/locale"; }
-     
-     /////////////////////////////////////////////////////////////////////
-     /// The directory containing UI declaration files
-     /// usually /usr/share/gnome-pie/ui/.
-     /////////////////////////////////////////////////////////////////////
-     
--    public static string ui_files { get; private set; default=""; }
-+    public static string ui_files { get; private set; default="%%DATADIR%%/ui"; }
-     
-     /////////////////////////////////////////////////////////////////////
-     /// The autostart file of gnome-pie_config
-@@ -115,7 +115,7 @@
-     
-         // get path of executable
-         try {
--            executable = GLib.File.new_for_path(GLib.FileUtils.read_link("/proc/self/exe")).get_path();
-+            executable = GLib.File.new_for_path("%%PREFIX%%/bin/gnome-pie").get_path();
-         } catch (GLib.FileError e) {
-             warning("Failed to get path of executable!");
-         }
diff --git a/x11/gnome-pie/files/pkg-message.in b/x11/gnome-pie/files/pkg-message.in
deleted file mode 100644
index 0d31b94780dd..000000000000
--- a/x11/gnome-pie/files/pkg-message.in
+++ /dev/null
@@ -1,13 +0,0 @@
-***************************************************************
-
-If you do not use GNOME as window manager, and do not see any
-icon in Gnome-Pie preferences, then run the following command:
-
-  (cd %%PORTSDIR%%/x11/gnome-pie && make gnome-pie-user)
-
-and add this line to your ~/.xinitrc
-
-  %%LOCALBASE%%/libexec/gnome-settings-daemon&
-  (sleep 2 && gnome-pie)&
-
-***************************************************************