aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2015-12-14 10:50:55 +0200
committerEfraim Flashner <efraim@flashner.co.il>2015-12-14 11:06:20 +0200
commit9c1c2a7f8d11fd90df6c7176bc38684e7ebe0e4f (patch)
tree69b3f7ce6e56402ba1098a5ee7510ac1c679b344
parentebacb0de4ce62d2c5fff3d3c769d46d2f46dbfc1 (diff)
downloadgnu-guix-9c1c2a7f8d11fd90df6c7176bc38684e7ebe0e4f.tar
gnu-guix-9c1c2a7f8d11fd90df6c7176bc38684e7ebe0e4f.tar.gz
gnu: bluez: Update to 5.36.
* gnu/packages/linux.scm (bluez): Update to 5.36. [source]: Remove patch. * gnu/packages/patches/bluez-tests.patch: Remove file. * gnu-system.am (dist_patch_DATA): Remove it.
-rw-r--r--gnu-system.am1
-rw-r--r--gnu/packages/linux.scm6
-rw-r--r--gnu/packages/patches/bluez-tests.patch25
3 files changed, 2 insertions, 30 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 8ffc671142..77a8b2e1c5 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -420,7 +420,6 @@ dist_patch_DATA = \
gnu/packages/patches/binutils-ld-new-dtags.patch \
gnu/packages/patches/binutils-loongson-workaround.patch \
gnu/packages/patches/bitlbee-configure-doc-fix.patch \
- gnu/packages/patches/bluez-tests.patch \
gnu/packages/patches/boost-mips-avoid-m32.patch \
gnu/packages/patches/byobu-writable-status.patch \
gnu/packages/patches/calibre-drop-unrar.patch \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3d17e9de44..4319ed93af 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2309,7 +2309,7 @@ applications.")
(define-public bluez
(package
(name "bluez")
- (version "5.35")
+ (version "5.36")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2317,9 +2317,7 @@ applications.")
version ".tar.xz"))
(sha256
(base32
- "1qphz25hganfnd5ipfscbj7s70anv5favmwqmi9ig2saciaf1zhs"))
- (patches
- (list (search-patch "bluez-tests.patch")))))
+ "1wkqwmi5krr37mxcqqlp5m2xnw7vw70v3ww7j09vvlskxcdflhx3"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
diff --git a/gnu/packages/patches/bluez-tests.patch b/gnu/packages/patches/bluez-tests.patch
deleted file mode 100644
index 608ded9be2..0000000000
--- a/gnu/packages/patches/bluez-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 484ad8c9263bb524051a999ce19a994960e69572 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
-Date: Fri, 23 Oct 2015 20:48:57 +0800
-Subject: [PATCH] unit/test-gobex-header: Fix duplicate test names
-
----
- unit/test-gobex-header.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unit/test-gobex-header.c b/unit/test-gobex-header.c
-index 6f49312..8705892 100644
---- a/unit/test-gobex-header.c
-+++ b/unit/test-gobex-header.c
-@@ -554,7 +554,7 @@ int main(int argc, char *argv[])
- test_header_encode_name_umlaut);
- g_test_add_func("/gobex/test_header_encode_body",
- test_header_encode_body);
-- g_test_add_func("/gobex/test_header_encode_connid",
-+ g_test_add_func("/gobex/test_header_encode_actionid",
- test_header_encode_actionid);
- g_test_add_func("/gobex/test_header_encode_apparam",
- test_header_encode_apparam);
---
-2.5.0
-