From fd007bebdd11577b438f67f6a2b4d6bbd3d05fb4 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 25 Jan 2019 15:20:53 +0100
Subject: gnu: infiniband-diags: Remove custom bootstrap phase.

* gnu/packages/fabric-management.scm (infiniband-diags)[arguments]: Remove
"autotools" phase.
---
 gnu/packages/fabric-management.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm
index ff6ad898b1..5422170dfe 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Dave Love <fx@gnu.org>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -120,9 +121,6 @@ running the opensm daemon.")
              "--disable-static")
        #:phases
        (modify-phases %standard-phases
-         (add-before 'configure 'autotools
-           (lambda _
-             (zero? (system "./autogen.sh"))))
          (add-after 'install 'licence
            (lambda _
              (let ((doc (string-append (assoc-ref %outputs "lib") "/share/doc")))
-- 
cgit v1.2.3


From 81cf0174b5cfb03fecaf183ad07217b80210ffe7 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 25 Jan 2019 15:35:07 +0100
Subject: gnu: kcoreaddons: Fix broken test.

* gnu/packages/kde-frameworks.scm (kcoreaddons)[arguments]: Add build phase
"fix-broken-test".
---
 gnu/packages/kde-frameworks.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 353f9e4528..3865bc1b2e 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -578,6 +579,13 @@ propagate their changes to their respective configuration files.")
                (lambda _
                  (display "[test_channels]\n*\n")))
              #t))
+         ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e
+         (add-after 'unpack 'fix-broken-test
+           (lambda _
+             (substitute* "autotests/kdirwatch_unittest.cpp"
+               (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m)
+                (string-append m "\nwaitUntilNewSecond();")))
+             #t))
          (add-before 'check 'check-setup
            (lambda _
              (setenv "HOME" (getcwd))
-- 
cgit v1.2.3