From patchwork Fri Dec 21 10:10:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 515 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4FBD6169B1; Fri, 21 Dec 2018 10:04:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTP id 4FEDC16933 for ; Fri, 21 Dec 2018 10:04:53 +0000 (GMT) Received: from localhost ([::1]:44693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaHfo-00087Y-Ru for patchwork@mira.cbaines.net; Fri, 21 Dec 2018 05:04:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaHf7-0007Yv-OJ 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 1gaHf6-00010X-54 for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:09 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gaHf4-0000y2-4a for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gaHf3-0002fy-VX for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33820] [PATCH 9/9] gnu: kservice: Transfer patches from NixOS. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Dec 2018 10:04:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33820 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33820@debbugs.gnu.org Received: via spool by 33820-submit@debbugs.gnu.org id=B33820.154538662910208 (code B ref 33820); Fri, 21 Dec 2018 10:04:05 +0000 Received: (at 33820) by debbugs.gnu.org; 21 Dec 2018 10:03:49 +0000 Received: from localhost ([127.0.0.1]:57152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHem-0002eT-Na for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:48 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:50356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHek-0002dm-5O for 33820@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:46 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43LkjY3jVPz1qxJG for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:45 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43LkjY3ZxKz1qsJg for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:45 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id qZFJCgZTu9fR for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:44 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-83-171-164-7.dynamic.mnet-online.de [83.171.164.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:44 +0100 (CET) Received: from hermia.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id E99846035A for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:10:52 +0100 (CET) From: Hartmut Goebel Date: Fri, 21 Dec 2018 11:10:52 +0100 Message-Id: <20181221101052.26832-9-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181221101052.26832-1-h.goebel@crazy-compilers.com> References: <20181221101052.26832-1-h.goebel@crazy-compilers.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Transfer the NixOS patches for kservice as of 2018-02-17. - Make QDirIterator follow symlinks. - Normalize path, but don't resolve symlinks. * gnu/packages/kde-frameworks.scm(kservice): New phase. --- gnu/packages/kde-frameworks.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 65233f72e..645252288 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -3000,6 +3000,20 @@ typed.") `(#:tests? #f ; FIXME: 6/10 tests fail. #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + ;; Adopted from NixOS' patches "qdiriterator-follow-symlinks" and + ;; "no-canonicalize-path". + (lambda _ + (substitute* "src/sycoca/kbuildsycoca.cpp" + ;; make QDirIterator follow symlinks + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))) + (substitute* "src/sycoca/vfolder_menu.cpp" + ;; Normalize path, but don't resolve symlinks (taken from + ;; NixOS) + (("^\\s*QString resolved = QDir\\(dir\\)\\.canonicalPath\\(\\);") + "QString resolved = QDir::cleanPath(dir);")) + #t)) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd))