From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e0RZ7-0004d5-Q5 for guix-patches@gnu.org; Fri, 06 Oct 2017 08:17:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e0RZ1-0004Bt-G5 for guix-patches@gnu.org; Fri, 06 Oct 2017 08:17:17 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:43692) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e0RZ1-0004BY-BX for guix-patches@gnu.org; Fri, 06 Oct 2017 08:17:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e0RZ1-00077r-5D for guix-patches@gnu.org; Fri, 06 Oct 2017 08:17:11 -0400 Subject: [bug#28720] [PATCH 15/23] gnu: kio: Adopt a patch from Nix. Resent-Message-ID: From: Hartmut Goebel Date: Fri, 6 Oct 2017 14:16:28 +0200 Message-Id: <20171006121636.30904-16-h.goebel@crazy-compilers.com> In-Reply-To: <20171006121636.30904-1-h.goebel@crazy-compilers.com> References: <20171006121636.30904-1-h.goebel@crazy-compilers.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28720@debbugs.gnu.org * gnu/package/kde-frameworks.scm (kio)[arguments] <#:phases>'patch': New phase. --- 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 6c13e4647..50ed4391d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2445,6 +2445,14 @@ makes starting KDE applications faster and reduces memory consumption.") `(#:tests? #f ; FIXME: 41/50 tests fail. #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + ;; Better error message (taken from nix) + (substitute* "src/kiod/kiod_main.cpp" + (("(^\\s*qCWarning(KIOD_CATEGORY) << \"Error loading plugin:\")( << loader.errorString();)" _ a b) + (string-append a "<< name" b))) + ;; TODO: samba-search-path.patch from nix: search smbd on $PATH + #t)) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) -- 2.13.5