From bd8428efa13764f3bf6ac7de538afa5f50023aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Mon, 18 Feb 2013 19:57:27 +0100
Subject: [PATCH] wayland: update to 1.0.5.

Also updated weston to 1.0.5, and got rid of the patch that's no longer needed.
They fixed it upstream even if it was actually caused by our pkg-config patch.
---
 .../window-managers/weston/default.nix        |  8 +---
 .../window-managers/weston/makefile.patch     | 45 -------------------
 .../development/libraries/wayland/default.nix |  4 +-
 3 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/weston/makefile.patch

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index c8285475f8d..f5d4e346f9f 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -2,20 +2,16 @@
 , cairo, libxcb, libXcursor, x11, udev, libdrm2_4_40, mtdev
 , libjpeg, pam, autoconf, automake, libtool }:
 
-let version = "1.0.4"; in
+let version = "1.0.5"; in
 
 stdenv.mkDerivation rec {
   name = "weston-${version}";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1841sd6i8nq9gs1xkx8lwcg4lzy6yfcs95nnsfaf0y1ppd6c9sj2";
+    sha256 = "0g2k82pnlxl8b70ykazj7kn8xffjfsmgcgx427qdrm4083z2hgm0";
   };
 
-  patches = [
-    ./makefile.patch
-  ];
-
   buildInputs = [ pkgconfig wayland mesa90x libxkbcommon pixman
     cairo libxcb libXcursor x11 udev libdrm2_4_40 mtdev
     libjpeg pam autoconf automake libtool ];
diff --git a/pkgs/applications/window-managers/weston/makefile.patch b/pkgs/applications/window-managers/weston/makefile.patch
deleted file mode 100644
index 1d6276d4091..00000000000
--- a/pkgs/applications/window-managers/weston/makefile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/clients/Makefile.am b/clients/Makefile.am
-index 81d1b57..fec50af 100644
---- a/clients/Makefile.am
-+++ b/clients/Makefile.am
-@@ -80,6 +80,8 @@ libtoytoolkit_a_SOURCES =			\
- 	text-cursor-position-client-protocol.h	\
- 	workspaces-protocol.c			\
- 	workspaces-client-protocol.h
-+libtoytoolkit_a_CPPFLAGS = \
-+	$(AM_CPPFLAGS) $(PIXMAN_CFLAGS) $(CAIRO_CFLAGS)
- 
- toolkit_libs =						\
- 	libtoytoolkit.a					\
-@@ -96,6 +98,7 @@ weston_terminal_SOURCES = terminal.c
- weston_terminal_LDADD = $(toolkit_libs) -lutil
- 
- image_SOURCES = image.c
-+image_CPPFLAGS = $(PIXMAN_CFLAGS) $(CAIRO_CFLAGS)
- image_LDADD = $(toolkit_libs)
- 
- cliptest_SOURCES = cliptest.c
-@@ -103,6 +106,7 @@ cliptest_CPPFLAGS = $(AM_CPPFLAGS) $(PIXMAN_CFLAGS)
- cliptest_LDADD = $(toolkit_libs) $(PIXMAN_LIBS)
- 
- dnd_SOURCES = dnd.c
-+dnd_CPPFLAGS = $(PIXMAN_CFLAGS) $(CAIRO_CFLAGS)
- dnd_LDADD = $(toolkit_libs)
- 
- smoke_SOURCES = smoke.c
-@@ -141,12 +145,15 @@ weston_desktop_shell_SOURCES =			\
- 	desktop-shell.c				\
- 	desktop-shell-client-protocol.h		\
- 	desktop-shell-protocol.c
-+weston_desktop_shell_CPPFLAGS = \
-+	$(AM_CPPFLAGS) $(PIXMAN_CFLAGS) $(CAIRO_CFLAGS)
- weston_desktop_shell_LDADD = $(toolkit_libs)
- 
- weston_tablet_shell_SOURCES =			\
- 	tablet-shell.c				\
- 	tablet-shell-client-protocol.h		\
- 	tablet-shell-protocol.c
-+weston_tablet_shell_CPPFLAGS = $(PIXMAN_CFLAGS) $(CAIRO_CFLAGS)
- weston_tablet_shell_LDADD = $(toolkit_libs)
- 
- BUILT_SOURCES =					\
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 6995a4019a2..9b547df9469 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, libffi, expat, doxygen }:
 
-let version = "1.0.4"; in
+let version = "1.0.5"; in
 
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "074n94d79bqvihf9wmszvar8r9v4g4n1h9m8vs8ki6xjhsk07s4d";
+    sha256 = "130n7v5i7rfsrli2n8vdzfychlgd8v7by7sfgp8vfqdlss5km34w";
   };
 
   buildInputs = [ pkgconfig libffi expat doxygen ];