From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaHf7-0007Yb-9w for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gaHf3-0000xL-V7 for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:09 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52895) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gaHf0-0000uV-Ju for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gaHf0-0002f8-Ei for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:02 -0500 Subject: [bug#33820] [PATCH 1/9] gnu: kcmutils: Make QDirIterator follow symlinks. References: <20181221100844.26733-1-h.goebel@crazy-compilers.com> In-Reply-To: <20181221100844.26733-1-h.goebel@crazy-compilers.com> Resent-Message-ID: From: Hartmut Goebel Date: Fri, 21 Dec 2018 11:10:44 +0100 Message-Id: <20181221101052.26832-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 33820@debbugs.gnu.org Transfer the NixOS patch "kcmutils-follow-symlinks" for kcmutils as of 2018-02-17. * gnu/packages/kde-frameworks.scm(kcmutils): New phase. --- gnu/packages/kde-frameworks.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 29f954293..d508624e7 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2016,2017 Hartmut Goebel +;;; Copyright © 2016,2017,2018 Hartmut Goebel ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -2110,6 +2110,16 @@ using the XBEL format.") ("kservice" ,kservice))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "src/kpluginselector.cpp" + ;; make QDirIterator follow symlinks + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))) + #t))))) (inputs `(("kauth" ,kauth) ("kcodecs" ,kcodecs) -- 2.13.7