aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author宋文武 <iyzsong@gmail.com>2015-10-23 21:31:49 +0800
committer宋文武 <iyzsong@gmail.com>2015-10-23 22:23:34 +0800
commit6747de140d6ef714a7940bfa4cd0db544c9fe945 (patch)
treed6842c4f274b0a63f87ab3da5a9722fca3f27c5f
parent26909789d06b1e006ff45980aac59d3faa31436e (diff)
downloadpatches-6747de140d6ef714a7940bfa4cd0db544c9fe945.tar
patches-6747de140d6ef714a7940bfa4cd0db544c9fe945.tar.gz
gnu: bluez: Update to 5.35, fix test.
* gnu/packages/patches/bluez-tests.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/linux.scm (bluez): Update to 5.35. [source]: Add patch.
-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, 30 insertions, 2 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 3daec42e28..9bb537be33 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -411,6 +411,7 @@ 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/calibre-drop-unrar.patch \
gnu/packages/patches/calibre-no-updates-dialog.patch \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 474e914c13..2c2ebab2e4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2315,7 +2315,7 @@ applications.")
(define-public bluez
(package
(name "bluez")
- (version "5.30")
+ (version "5.35")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2323,7 +2323,9 @@ applications.")
version ".tar.xz"))
(sha256
(base32
- "0b1qbnq1xzcdw5rajg9yyg31bf21jnff0n6gnf1snz89bbdllfhy"))))
+ "1qphz25hganfnd5ipfscbj7s70anv5favmwqmi9ig2saciaf1zhs"))
+ (patches
+ (list (search-patch "bluez-tests.patch")))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
diff --git a/gnu/packages/patches/bluez-tests.patch b/gnu/packages/patches/bluez-tests.patch
new file mode 100644
index 0000000000..608ded9be2
--- /dev/null
+++ b/gnu/packages/patches/bluez-tests.patch
@@ -0,0 +1,25 @@
+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
+