From f349fa02def606e20e8e33e76b847b13038612c6 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Thu, 10 Oct 2013 10:32:15 +0000 Subject: gnu: Add GNU acct. * gnu/packages/acct.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 37a174cbca..0132187062 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -22,6 +22,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages.scm \ + gnu/packages/acct.scm \ gnu/packages/acl.scm \ gnu/packages/algebra.scm \ gnu/packages/apr.scm \ -- cgit v1.2.3 From 8ab00475fba76b665ebe2ca0a6566fcb6af5373d Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 12 Oct 2013 23:34:22 +0200 Subject: gnu: qt: Add patch to distribution. * gnu-system.am (dist_patch_DATA): Add qt patch. --- gnu-system.am | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 0132187062..227415e7d1 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -237,6 +237,7 @@ dist_patch_DATA = \ gnu/packages/patches/procps-make-3.82.patch \ gnu/packages/patches/python-fix-dbm.patch \ gnu/packages/patches/qemu-multiple-smb-shares.patch \ + gnu/packages/patches/qt4-tests.patch \ gnu/packages/patches/readline-link-ncurses.patch \ gnu/packages/patches/ripperx-libm.patch \ gnu/packages/patches/scheme48-tests.patch \ -- cgit v1.2.3 From 973d9f1d1cf58b181064b6a2f14fd6dd00d36ddd Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 13 Oct 2013 18:16:36 +0200 Subject: gnu: kde: Add module and automoc4 package. * gnu/packages/kde.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 1 + gnu/packages/kde.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 gnu/packages/kde.scm (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 227415e7d1..9f5a89700a 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -93,6 +93,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/imagemagick.scm \ gnu/packages/indent.scm \ gnu/packages/irssi.scm \ + gnu/packages/kde.scm \ gnu/packages/ld-wrapper.scm \ gnu/packages/less.scm \ gnu/packages/lesstif.scm \ diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm new file mode 100644 index 0000000000..3da261ccd1 --- /dev/null +++ b/gnu/packages/kde.scm @@ -0,0 +1,46 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Andreas Enge +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages kde) + #:use-module ((guix licenses) #:select (bsd-2)) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system cmake) + #:use-module (gnu packages qt)) + +(define-public automoc4 + (package + (name "automoc4") + (version "0.9.88") + (source (origin + (method url-fetch) + (uri (string-append "http://download.kde.org/stable/" name + "/" version "/" name "-" + version ".tar.bz2")) + (sha256 + (base32 + "0jackvg0bdjg797qlbbyf9syylm0qjs55mllhn11vqjsq3s1ch93")))) + (build-system cmake-build-system) + (inputs + `(("qt" ,qt-4))) + (arguments + `(#:tests? #f)) ; no check target + (home-page "http://techbase.kde.org/Development/Tools/Automoc4") + (synopsis "build tool for KDE") + (description "KDE desktop environment") + (license bsd-2))) -- cgit v1.2.3 From d911258976690671d3b3ffe93994a6c5e2d72eed Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Mon, 14 Oct 2013 12:55:53 -0500 Subject: gnu: Add autogen package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/package/autogen.scm: New file * gnu-system.am: Add it Signed-off-by: Ludovic Courtès --- gnu-system.am | 1 + gnu/packages/autogen.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 gnu/packages/autogen.scm (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 9f5a89700a..076cd0da4e 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -28,6 +28,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/apr.scm \ gnu/packages/aspell.scm \ gnu/packages/attr.scm \ + gnu/packages/autogen.scm \ gnu/packages/autotools.scm \ gnu/packages/avahi.scm \ gnu/packages/base.scm \ diff --git a/gnu/packages/autogen.scm b/gnu/packages/autogen.scm new file mode 100644 index 0000000000..3109c2bf0b --- /dev/null +++ b/gnu/packages/autogen.scm @@ -0,0 +1,63 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Eric Bavier +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages autogen) + #:use-module (guix packages) + #:use-module (guix licenses) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages which) + #:use-module (gnu packages guile)) + +(define-public autogen + (package + (name "autogen") + (version "5.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/autogen/rel" + version "/autogen-" + version ".tar.gz")) + (sha256 + (base32 + "0k0gkr5inr9wb3ws30q6bbiqg3qm3ryvl9cznym2xis4lm216d53")))) + (build-system gnu-build-system) + (inputs `(("which" ,which) + ("guile" ,guile-2.0))) + (arguments + '(#:phases (alist-cons-before + 'patch-source-shebangs 'patch-test-scripts + (lambda _ + (let ((sh (which "sh"))) + (substitute* + (append (find-files "agen5/test" "\\.test$") + (find-files "autoopts/test" "\\.(test|in)$")) + (("/bin/sh") sh) + (("/usr/bin/tr") "tr")))) + %standard-phases))) + (home-page "http://www.gnu.org/software/autogen/") + (synopsis "Automated program generator") + (description + "AutoGen is a program to ease the maintenance of programs that contain +large amounts of repetitive text. It automates the construction of these +sections of the code, simplifying the task of keeping the text in sync. It +also includes an add-on package called AutoOpts, which is specialized for the +maintenance and documentation of program options.") + (license gpl3+))) -- cgit v1.2.3 From 93a3d8f6099a733c05295a0e8d8358db1d930937 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 17 Oct 2013 23:50:11 +0200 Subject: gnu: glib: Work around test failure in 'gio/tests/network-address.c'. * gnu/packages/patches/glib-tests-newnet.patch: New file. * gnu/packages/glib.scm (glib): Use it. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + gnu/packages/glib.scm | 3 ++- gnu/packages/patches/glib-tests-newnet.patch | 30 ++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glib-tests-newnet.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 076cd0da4e..4ba110624c 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -218,6 +218,7 @@ dist_patch_DATA = \ gnu/packages/patches/gcc-cross-environment-variables.patch \ gnu/packages/patches/glib-tests-desktop.patch \ gnu/packages/patches/glib-tests-homedir.patch \ + gnu/packages/patches/glib-tests-newnet.patch \ gnu/packages/patches/glib-tests-prlimit.patch \ gnu/packages/patches/glibc-bootstrap-system.patch \ gnu/packages/patches/glibc-ldd-x86_64.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2fbc46892b..61ba0b944e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -117,7 +117,8 @@ (define glib (base32 "0cpzqadqk6z6bmb79p04pykxc8x57rvshh33414cnk41bvgaf4vm")) (patches (list (search-patch "glib-tests-homedir.patch") (search-patch "glib-tests-desktop.patch") - (search-patch "glib-tests-prlimit.patch"))))) + (search-patch "glib-tests-prlimit.patch") + (search-patch "glib-tests-newnet.patch"))))) (build-system gnu-build-system) (outputs '("out" ; everything "doc")) ; 20 MiB of GTK-Doc reference diff --git a/gnu/packages/patches/glib-tests-newnet.patch b/gnu/packages/patches/glib-tests-newnet.patch new file mode 100644 index 0000000000..324b8ae68f --- /dev/null +++ b/gnu/packages/patches/glib-tests-newnet.patch @@ -0,0 +1,30 @@ +Since guix-daemon runs in a separate networking name space, the only +interface available is "lo". However its index is incremented by one +at each build, so it can end up being greater than 255, leading to an +assertion failure in 'find_ifname_and_index'. + +Work around that by directly querying the index of "lo". + +--- glib-2.38.0/gio/tests/network-address.c 2013-09-17 20:47:14.000000000 +0200 ++++ glib-2.38.0/gio/tests/network-address.c 2013-10-16 21:52:42.000000000 +0200 +@@ -117,7 +117,7 @@ test_parse_host (gconstpointer d) + #define SCOPE_ID_TEST_PORT 99 + + #ifdef HAVE_IF_INDEXTONAME +-static char SCOPE_ID_TEST_IFNAME[IF_NAMESIZE]; ++static char SCOPE_ID_TEST_IFNAME[] = "lo"; + static int SCOPE_ID_TEST_INDEX; + #else + #define SCOPE_ID_TEST_IFNAME "1" +@@ -131,11 +131,7 @@ find_ifname_and_index (void) + return; + + #ifdef HAVE_IF_INDEXTONAME +- for (SCOPE_ID_TEST_INDEX = 1; SCOPE_ID_TEST_INDEX < 255; SCOPE_ID_TEST_INDEX++) { +- if (if_indextoname (SCOPE_ID_TEST_INDEX, SCOPE_ID_TEST_IFNAME)) +- break; +- } +- g_assert_cmpstr (SCOPE_ID_TEST_IFNAME, !=, ""); ++ SCOPE_ID_TEST_INDEX = if_nametoindex (SCOPE_ID_TEST_IFNAME); + #endif + } -- cgit v1.2.3 From fa58ca4376a696205c9039a2562217d1a418ef36 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Mon, 21 Oct 2013 18:05:25 -0500 Subject: gnu: Add Pem. * gnu/packages/pem.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Andreas Enge --- gnu-system.am | 1 + gnu/packages/pem.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 gnu/packages/pem.scm (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 4ba110624c..b26fcc9ec1 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -142,6 +142,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/patchelf.scm \ gnu/packages/pcre.scm \ gnu/packages/pdf.scm \ + gnu/packages/pem.scm \ gnu/packages/perl.scm \ gnu/packages/pkg-config.scm \ gnu/packages/plotutils.scm \ diff --git a/gnu/packages/pem.scm b/gnu/packages/pem.scm new file mode 100644 index 0000000000..324ed607c7 --- /dev/null +++ b/gnu/packages/pem.scm @@ -0,0 +1,48 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Eric Bavier +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages pem) + #:use-module (guix packages) + #:use-module (guix licenses) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages perl)) + +(define-public pem + (package + (name "pem") + (version "0.7.9") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/pem/pem-" + version ".tar.gz")) + (sha256 + (base32 + "03iqcki1lakkck1akdyvljjapgqda3l0rh38id7jhrac9kcxqgg2")))) + (build-system gnu-build-system) + (inputs `(("perl" ,perl))) + (home-page "http://www.gnu.org/software/pem/") + (synopsis "Personal expenses manager") + (description + "GNU Pem is a simple tool for tracking personal income and +expenses. It operates from the command line and it stores its data +in a basic text format in your home directory. It can easily print +reports of your spending on different expenses via a basic search +feature.") + (license gpl3+))) -- cgit v1.2.3 From c3c516ea00bf1abc4ce1f412eaa8e73fbed903a0 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Mon, 21 Oct 2013 19:50:01 -0400 Subject: gnu: Add libmikmod. * gnu/packages/sdl.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Andreas Enge --- gnu-system.am | 1 + gnu/packages/sdl.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 gnu/packages/sdl.scm (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index b26fcc9ec1..3b5384f354 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -160,6 +160,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/samba.scm \ gnu/packages/scheme.scm \ gnu/packages/screen.scm \ + gnu/packages/sdl.scm \ gnu/packages/shishi.scm \ gnu/packages/skribilo.scm \ gnu/packages/smalltalk.scm \ diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm new file mode 100644 index 0000000000..ceb21735bc --- /dev/null +++ b/gnu/packages/sdl.scm @@ -0,0 +1,49 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 David Thompson +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages sdl) + #:use-module (gnu packages) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages linux) + #:use-module (gnu packages xorg) + #:export (libmikmod)) + +(define libmikmod + (package + (name "libmikmod") + (version "3.3.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/mikmod/libmikmod/" + version "/libmikmod-" version ".tar.gz")) + (sha256 + (base32 + "0dr4kgvhq9wf2riibh178c2al996spwwak6zffpv5n5bqmw29w3r")))) + (build-system gnu-build-system) + (inputs `(("alsa-lib" ,alsa-lib) + ("libx11" ,libx11))) + (synopsis "Library for module sound formats.") + (description + "MikMod is able to play a wide range of module formats, as well as +digital sound files. It can take advantage of particular features of your +system, such as sound redirection over the network.") + (license lgpl2.1) + (home-page "http://mikmod.sourceforge.net/"))) -- cgit v1.2.3 From f506ed920cdc105f090507e3cf8fc447f61756dc Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 30 Oct 2013 22:06:57 +0100 Subject: gnu: Add gstreamer-0.10. * gnu/packages/gstreamer.scm (gstreamer-0.10): New variable. * gnu/packages/patches/gstreamer-0.10-bison3.patch, gnu/packages/patches/gstreamer-0.10-silly-test.patch: New files. * gnu-system.am (dist_patch_DATA): Add patches. --- gnu-system.am | 2 ++ gnu/packages/gstreamer.scm | 27 +++++++++++++++++- gnu/packages/patches/gstreamer-0.10-bison3.patch | 32 ++++++++++++++++++++++ .../patches/gstreamer-0.10-silly-test.patch | 14 ++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gstreamer-0.10-bison3.patch create mode 100644 gnu/packages/patches/gstreamer-0.10-silly-test.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index 3b5384f354..f77bb03da7 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -226,6 +226,8 @@ dist_patch_DATA = \ gnu/packages/patches/glibc-ldd-x86_64.patch \ gnu/packages/patches/glibc-no-ld-so-cache.patch \ gnu/packages/patches/grub-gets-undeclared.patch \ + gnu/packages/patches/gstreamer-0.10-bison3.patch \ + gnu/packages/patches/gstreamer-0.10-silly-test.patch \ gnu/packages/patches/guile-1.8-cpp-4.5.patch \ gnu/packages/patches/guile-default-utf8.patch \ gnu/packages/patches/guile-linux-syscalls.patch \ diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 7478dc3188..ffdb4b83ad 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -21,12 +21,14 @@ (define-module (gnu packages gstreamer) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages glib) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python)) + #:use-module (gnu packages python) + #:use-module (gnu packages xml)) (define-public gstreamer (package @@ -64,6 +66,29 @@ (define-public gstreamer This package provides the core library and elements.") (license lgpl2.0+))) +(define-public gstreamer-0.10 + (package (inherit gstreamer) + (version "0.10.36") + (source + (origin + (method url-fetch) + (uri (string-append "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-" + version ".tar.xz")) + (sha256 + (base32 + "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci")) + (patches + (list (search-patch "gstreamer-0.10-bison3.patch") + (search-patch "gstreamer-0.10-silly-test.patch"))))) + (inputs + `(("bison" ,bison) + ("flex" ,flex) + ("glib" ,glib) + ("libxml2" ,libxml2) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-2))))) + (define-public gst-plugins-base (package (name "gst-plugins-base") diff --git a/gnu/packages/patches/gstreamer-0.10-bison3.patch b/gnu/packages/patches/gstreamer-0.10-bison3.patch new file mode 100644 index 0000000000..f6eb90cb02 --- /dev/null +++ b/gnu/packages/patches/gstreamer-0.10-bison3.patch @@ -0,0 +1,32 @@ +See https://bugzilla.gnome.org/show_bug.cgi?id=706462 + +Subject: [PATCH] Make grammar.y work with Bison 3 + +YYLEX_PARAM is no longer supported in Bison 3. +--- + gst/parse/grammar.y | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y +index 8a9019c..f533389 100644 +--- a/gst/parse/grammar.y ++++ b/gst/parse/grammar.y +@@ -26,7 +26,6 @@ + */ + + #define YYERROR_VERBOSE 1 +-#define YYLEX_PARAM scanner + + #define YYENABLE_NLS 0 + +@@ -659,6 +658,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s); + %right '.' + %left '!' '=' + ++%lex-param { void *scanner } + %parse-param { void *scanner } + %parse-param { graph_t *graph } + %pure-parser +-- +1.8.3.4 + diff --git a/gnu/packages/patches/gstreamer-0.10-silly-test.patch b/gnu/packages/patches/gstreamer-0.10-silly-test.patch new file mode 100644 index 0000000000..678dd7b122 --- /dev/null +++ b/gnu/packages/patches/gstreamer-0.10-silly-test.patch @@ -0,0 +1,14 @@ +See http://lists.freedesktop.org/archives/gstreamer-bugs/2013-January/098461.html + +diff -ru gstreamer-0.10.36.orig/tests/check/Makefile.in gstreamer-0.10.36/tests/check/Makefile.in +--- gstreamer-0.10.36.orig/tests/check/Makefile.in 2012-02-20 23:48:29.000000000 +0100 ++++ gstreamer-0.10.36/tests/check/Makefile.in 2013-10-30 21:55:48.000000000 +0100 +@@ -42,7 +42,7 @@ + gst/gstbus$(EXEEXT) gst/gstcaps$(EXEEXT) $(am__EXEEXT_2) \ + gst/gstdatetime$(EXEEXT) gst/gstinfo$(EXEEXT) \ + gst/gstiterator$(EXEEXT) gst/gstmessage$(EXEEXT) \ +- gst/gstminiobject$(EXEEXT) gst/gstobject$(EXEEXT) \ ++ gst/gstminiobject$(EXEEXT) \ + gst/gstpad$(EXEEXT) gst/gstparamspecs$(EXEEXT) \ + gst/gstpoll$(EXEEXT) gst/gstsegment$(EXEEXT) \ + gst/gstsystemclock$(EXEEXT) gst/gstclock$(EXEEXT) \ -- cgit v1.2.3 From b645425f71a5a777e7658bbdac0e22e134d44db5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 31 Oct 2013 23:05:27 -0400 Subject: gnu: pulseaudio: increase timeout of thread test. * gnu/packages/patches/pulseaudio-test-timeouts.patch: New file. * gnu/packages/pulseaudio.scm (pulseaudio): Add patch. * gnu-system.am (dist_patch_DATA): Add patch. --- gnu-system.am | 1 + gnu/packages/patches/pulseaudio-test-timeouts.patch | 19 +++++++++++++++++++ gnu/packages/pulseaudio.scm | 4 +++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/pulseaudio-test-timeouts.patch (limited to 'gnu-system.am') diff --git a/gnu-system.am b/gnu-system.am index f77bb03da7..4a8414951b 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -242,6 +242,7 @@ dist_patch_DATA = \ gnu/packages/patches/perl-no-sys-dirs.patch \ gnu/packages/patches/plotutils-libpng-jmpbuf.patch \ gnu/packages/patches/procps-make-3.82.patch \ + gnu/packages/patches/pulseaudio-test-timeouts.patch \ gnu/packages/patches/python-fix-dbm.patch \ gnu/packages/patches/qemu-multiple-smb-shares.patch \ gnu/packages/patches/qt4-tests.patch \ diff --git a/gnu/packages/patches/pulseaudio-test-timeouts.patch b/gnu/packages/patches/pulseaudio-test-timeouts.patch new file mode 100644 index 0000000000..ab818ad0aa --- /dev/null +++ b/gnu/packages/patches/pulseaudio-test-timeouts.patch @@ -0,0 +1,19 @@ +Increase the timeout of the thread test. Hydra was intermittedly +failing this test due to premature timeout, and slower machines +consistently fail. + +Patch by Mark H Weaver . + +--- pulseaudio/src/tests/thread-test.c.orig 2012-09-26 07:27:01.000000000 -0400 ++++ pulseaudio/src/tests/thread-test.c 2013-10-31 22:53:23.224000184 -0400 +@@ -152,6 +152,10 @@ + s = suite_create("Thread"); + tc = tcase_create("thread"); + tcase_add_test(tc, thread_test); ++ /* the default timeout is too small, ++ * set it to a reasonable large one. ++ */ ++ tcase_set_timeout(tc, 60 * 60); + suite_add_tcase(s, tc); + + sr = srunner_create(s); diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 6318ca5882..1c579bfb2c 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -22,6 +22,7 @@ (define-module (gnu packages pulseaudio) #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'l:)) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages linux) #:use-module (gnu packages oggvorbis) #:use-module (gnu packages pkg-config) @@ -141,7 +142,8 @@ (define pulseaudio version ".tar.xz")) (sha256 (base32 - "1bndz4l8jxyq3zq128gzp3gryxl6yjs66j2y1d7yabw2n5mv7kim")))) + "1bndz4l8jxyq3zq128gzp3gryxl6yjs66j2y1d7yabw2n5mv7kim")) + (patches (list (search-patch "pulseaudio-test-timeouts.patch"))))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var" ;"--sysconfdir=/etc" -- cgit v1.2.3