From d088e0621e11a03cd50b27863f883fb0f8d3db36 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 19 Apr 2016 19:41:27 -0500
Subject: dbus: 1.8.20 -> 1.10.8

---
 pkgs/development/libraries/dbus/default.nix        |  7 +++----
 .../dbus/ignore-missing-includedirs.patch          | 23 ----------------------
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/development/libraries/dbus/ignore-missing-includedirs.patch

(limited to 'pkgs/development/libraries/dbus')

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 83635d9739f1..dd86ca540815 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.8.20";
-  sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw";
+  version = "1.10.8";
+  sha256 = "0560y3hxpgh346w6avcrcz79c8ansmn771y5xpcvvlr6m8mx5wxs";
 
 self =  stdenv.mkDerivation {
     name = "dbus-${version}";
@@ -17,8 +17,7 @@ self =  stdenv.mkDerivation {
       inherit sha256;
     };
 
-    patches = [ ./ignore-missing-includedirs.patch ]
-      ++ lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
+    patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
     postPatch = ''
       substituteInPlace tools/Makefile.in \
         --replace 'install-localstatelibDATA:' 'disabled:' \
diff --git a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch
deleted file mode 100644
index 2781f4ae3de5..000000000000
--- a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru -x '*~' dbus-1.2.24-orig/bus/config-parser.c dbus-1.2.24/bus/config-parser.c
---- dbus-1.2.24-orig/bus/config-parser.c	2010-03-23 20:01:27.000000000 +0100
-+++ dbus-1.2.24/bus/config-parser.c	2010-07-20 14:17:20.000000000 +0200
-@@ -2159,12 +2159,16 @@
- 
-   retval = FALSE;
-   
--  dir = _dbus_directory_open (dirname, error);
-+  dbus_error_init (&tmp_error);
-+  
-+  dir = _dbus_directory_open (dirname, &tmp_error);
- 
-   if (dir == NULL)
--    goto failed;
-+    {
-+      retval = TRUE;
-+      goto failed;
-+    }
- 
--  dbus_error_init (&tmp_error);
-   while (_dbus_directory_get_next_file (dir, &filename, &tmp_error))
-     {
-       DBusString full_path;
-- 
cgit 1.4.1