Merge master into staging-next

7 files changed, 3 insertions, 201 deletions

diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index dd8162382023..bc58302cb20f 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.21.0";
+  version = "1.21.1";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby";
+    sha256 = "0a5907h896pvpix7a6idc2fspzy6d78xrzf84k8y9fyvnd14nxs4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index c41183f4b24f..f67dc13c8545 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -35,8 +35,6 @@ let overridden = set // overrides; set = with overridden; {
 
   GConf = callPackage ./platform/GConf { };
 
-  gconfmm = callPackage ./platform/gconfmm { };
-
   libgnomecanvas = callPackage ./platform/libgnomecanvas { };
 
   libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { };
@@ -70,8 +68,6 @@ let overridden = set // overrides; set = with overridden; {
 
   gtkglext = callPackage ./platform/gtkglext { };
 
-  gtkglextmm = callPackage ./platform/gtkglextmm { };
-
 #### DESKTOP
 
   gvfs = gvfs.override { gnome = self; };
diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
deleted file mode 100644
index 356d4df9d1d8..000000000000
--- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, GConf, gtkmm, glibmm }:
-
-stdenv.mkDerivation rec {
-  name = "gconfmm-${minVer}.3";
-  minVer = "2.28";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gconfmm/${minVer}/${name}.tar.bz2";
-    sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  propagatedBuildInputs = [ GConf gtkmm glibmm ];
-
-  meta = {
-    description = "C++ wrappers for GConf";
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
deleted file mode 100644
index 63e33aa578ef..000000000000
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, libGLU_combined, gdk_pixbuf
-, pangox_compat, libXmu
-}:
-
-stdenv.mkDerivation rec {
-  name = "gtkglextmm-${minVer}.0";
-  minVer = "1.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtkglextmm/${minVer}/${name}.tar.bz2";
-    sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea";
-  };
-
-  patches = [
-    ./gdk.patch
-
-    # From debian, fixes build with newer gtk "[...] by switching #includes
-    # around so that the G_DISABLE_DEPRECATED trick in glibmm still works".
-    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707356
-    ./fix_ftbfs_gtk_2_36.patch
-  ];
-
-  buildInputs = [ pangox_compat libXmu ];
-
-  nativeBuildInputs = [pkgconfig];
-
-  propagatedBuildInputs = [ gtkglext gtkmm gtk libGLU_combined gdk_pixbuf ];
-
-  meta = {
-    description = "C++ wrappers for GtkGLExt";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch b/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch
deleted file mode 100644
index 88e271e3eb7b..000000000000
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc	2013-05-16 23:40:48.363207736 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc	2013-05-16 23:42:40.193801834 +0200
-@@ -1,15 +1,8 @@
--
--#include <glib.h>
--
- // Disable the 'const' function attribute of the get_type() functions.
- // GCC would optimize them out because we don't use the return value.
- #undef  G_GNUC_CONST
- #define G_GNUC_CONST /* empty */
- 
--#include <gdkmm/gl/wrap_init.h>
--#include <glibmm/error.h>
--#include <glibmm/object.h>
--
- // #include the widget headers so that we can call the get_type() static methods:
- 
- #include "tokens.h"
-@@ -19,6 +12,12 @@
- #include "pixmap.h"
- #include "window.h"
- 
-+#include <glib.h>
-+
-+#include <gdkmm/gl/wrap_init.h>
-+#include <glibmm/error.h>
-+#include <glibmm/object.h>
-+
- extern "C"
- {
- 
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc	2013-05-16 23:40:48.363207736 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc	2013-05-16 23:42:40.193801834 +0200
-@@ -17,10 +17,10 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
--#include <gdk/gdkglquery.h>
--
- #include "query.h"
- 
-+#include <gdk/gdkglquery.h>
-+
- namespace Gdk
- {
-   namespace GL
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc	2013-05-16 23:40:48.363207736 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc	2013-05-16 23:42:40.193801834 +0200
-@@ -17,11 +17,11 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
-+#include "pixmapext.h"
-+
- #include <gdk/gdkgldrawable.h>
- #include <gdk/gdkglpixmap.h>
- 
--#include "pixmapext.h"
--
- namespace Gdk
- {
-   namespace GL
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc	2013-05-16 23:40:48.363207736 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc	2013-05-16 23:42:40.193801834 +0200
-@@ -17,11 +17,11 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
-+#include "windowext.h"
-+
- #include <gdk/gdkgldrawable.h>
- #include <gdk/gdkglwindow.h>
- 
--#include "windowext.h"
--
- namespace Gdk
- {
-   namespace GL
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc	2004-05-18 08:01:49.000000000 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc	2013-05-16 23:43:07.637456821 +0200
-@@ -17,10 +17,10 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
--#include <gdk/gdkglfont.h>
--
- #include "font.h"
- 
-+#include <gdk/gdkglfont.h>
-+
- namespace Gdk
- {
-   namespace GL
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc	2003-02-27 10:49:24.000000000 +0100
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc	2013-05-16 23:44:38.320316782 +0200
-@@ -19,11 +19,11 @@
- 
- #include <cstdlib>
- 
--#include <gdk/gdkglinit.h>
--
- #include "wrap_init.h"
- #include "init.h"
- 
-+#include <gdk/gdkglinit.h>
-+
- namespace Gdk
- {
-   namespace GL
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch b/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch
deleted file mode 100644
index 8a39b521d63c..000000000000
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# fixes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621976
-# reference: http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg250570.html
---- gtkglextmm-1.2.0-orig/gtkglext/gtkmm/gl/widget.cc	2004-05-18 03:01:50.000000000 -0300
-+++ gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc	2011-06-12 17:57:13.075541070 -0300
-@@ -17,9 +17,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
--#include <gtk/gtkglwidget.h>
--
- #include "widget.h"
-+#include <gtk/gtkglwidget.h>
- 
- namespace Gtk
- {
\ No newline at end of file
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 631107fe7a80..b05644366dc0 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-x"
     "--disable-static"
-    "--enable-remote-desktop"
+    # "--enable-remote-desktop"
     "--enable-shape"
     "--enable-sm"
     "--enable-startup-notification"