GNU bug report logs - #33820
[PATCH 0/9] Adopt NixOS patches for KDE Frameworks

Previous Next

Full log

Message #11 received at 33820 <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: 33820 <at> debbugs.gnu.org
Subject: [PATCH 1/9] gnu: kcmutils: Make QDirIterator follow symlinks.
Date: Fri, 21 Dec 2018 11:10:44 +0100

Transfer the NixOS patch "kcmutils-follow-symlinks" for kcmutils as of
2018-02-17.

* gnu/packages/kde-frameworks.scm(kcmutils)<patch>: 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 <andreas <at> enge.fr>
 ;;; Copyright © 2016 Efraim Flashner <efraim <at> flashner.co.il>
-;;; Copyright © 2016,2017 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
+;;; Copyright © 2016,2017,2018 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
 ;;; Copyright © 2016 David Craven <david <at> craven.ch>
 ;;; Copyright © 2017 Thomas Danckaert <post <at> thomasdanckaert.be>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
@@ -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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.