From unknown Mon Jun 16 23:47:59 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#33820 <33820@debbugs.gnu.org> To: bug#33820 <33820@debbugs.gnu.org> Subject: Status: [PATCH 0/9] Adopt NixOS patches for KDE Frameworks Reply-To: bug#33820 <33820@debbugs.gnu.org> Date: Tue, 17 Jun 2025 06:47:59 +0000 retitle 33820 [PATCH 0/9] Adopt NixOS patches for KDE Frameworks reassign 33820 guix-patches submitter 33820 Hartmut Goebel severity 33820 normal tag 33820 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 21 05:01:58 2018 Received: (at submit) by debbugs.gnu.org; 21 Dec 2018 10:01:58 +0000 Received: from localhost ([127.0.0.1]:57123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHcz-000212-OB for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:01:58 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46063) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHcx-0001ve-F3 for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:01:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gaHck-0007Z2-Rl for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:01:48 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:33944) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gaHck-0007Yg-9m for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:01:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaHca-0006TI-Pz for guix-patches@gnu.org; Fri, 21 Dec 2018 05:01:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gaHcW-0007GF-6a for guix-patches@gnu.org; Fri, 21 Dec 2018 05:01:32 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:40804) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gaHcV-0007E9-Th for guix-patches@gnu.org; Fri, 21 Dec 2018 05:01:28 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43Lkfs1jmpz1qxJR for ; Fri, 21 Dec 2018 11:01:25 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43Lkfs1N6Gz1qsJc for ; Fri, 21 Dec 2018 11:01:25 +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 26YNmFCHBUdo for ; Fri, 21 Dec 2018 11:01:24 +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 ; Fri, 21 Dec 2018 11:01:24 +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 E93F660122 for ; Fri, 21 Dec 2018 11:08:44 +0100 (CET) From: Hartmut Goebel To: guix-patches@gnu.org Subject: [PATCH 0/9] Adopt NixOS patches for KDE Frameworks Date: Fri, 21 Dec 2018 11:08:44 +0100 Message-Id: <20181221100844.26733-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) I reviewed the patches NixOS aplies to KDE, like I did for Qt (see bug #30340). The changes in this series hold the result. I stepped over these when trying to make KDE Plasma work. Most changes are about using store-paths to other packages and for dynamically loaded libs. To ease future work, I also added comments about patches we do not need and why. Whenenver possible, the "patch" was implemented using `substitute`. Hartmut Goebel (9): gnu: kcmutils: Make QDirIterator follow symlinks. gnu: kcmutils: Print plugin name when loading fails. gnu: kconfigwidgets: Make QDirIterator follow symlinks. gnu: kdelibs4support: Add todo comment for a patch from NixOS. gnu: kio: Search 'smbd' on $PATH. gnu: kinit: Use the store paths for dynamically loaded libs. gnu: kinit: Use LIBRARY_PATH to search for dynamically loaded libs. gnu: kpackage: Transfer patches from NixOS. gnu: kservice: Transfer patches from NixOS. gnu/local.mk | 4 ++ gnu/packages/kde-frameworks.scm | 79 ++++++++++++++++++++-- .../patches/kinit-kdeinit-extra_libs.patch | 55 +++++++++++++++ gnu/packages/patches/kinit-kdeinit-libpath.patch | 37 ++++++++++ gnu/packages/patches/kio-search-smbd-on-PATH.patch | 30 ++++++++ .../patches/kpackage-allow-external-paths.patch | 13 ++++ 6 files changed, 212 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/kinit-kdeinit-extra_libs.patch create mode 100644 gnu/packages/patches/kinit-kdeinit-libpath.patch create mode 100644 gnu/packages/patches/kio-search-smbd-on-PATH.patch create mode 100644 gnu/packages/patches/kpackage-allow-external-paths.patch -- 2.13.7 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 21 05:03:38 2018 Received: (at 33820) by debbugs.gnu.org; 21 Dec 2018 10:03:38 +0000 Received: from localhost ([127.0.0.1]:57130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHec-0002co-6z for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:38 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:50427) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHeZ-0002cY-Dz for 33820@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:36 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43LkjL5swQz1qxJQ for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:34 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43LkjL3nzbz1qsJX for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:34 +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 wpeQPaBi9EpH for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:33 +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:33 +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 54E336019A for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:10:52 +0100 (CET) From: Hartmut Goebel To: 33820@debbugs.gnu.org Subject: [PATCH 2/9] gnu: kcmutils: Print plugin name when loading fails. Date: Fri, 21 Dec 2018 11:10:45 +0100 Message-Id: <20181221101052.26832-2-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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 33820 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Transfer the NixOS patch "kcmutils-debug-module-loader" for kcmutils as of 2018-02-17. * gnu/packages/kde-frameworks.scm(kcmutils): Add substitute for src/kcmoduleloader.cpp. --- gnu/packages/kde-frameworks.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index d508624e7..3f0eff292 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2119,6 +2119,10 @@ using the XBEL format.") ;; make QDirIterator follow symlinks (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) (string-append a " | QDirIterator::FollowSymlinks" b))) + (substitute* "src/kcmoduleloader.cpp" + ;; print plugin name when loading fails + (("^\\s*(qWarning\\(\\) << \"Error loading) (plugin:\")( << loader\\.errorString\\(\\);)" _ a b c) + (string-append a " KCM plugin\" << mod.service()->library() << \":\"" c))) #t))))) (inputs `(("kauth" ,kauth) -- 2.13.7 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 21 05:03:41 2018 Received: (at 33820) by debbugs.gnu.org; 21 Dec 2018 10:03:42 +0000 Received: from localhost ([127.0.0.1]:57134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHef-0002d9-G1 for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:41 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:40836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHeY-0002cV-4Y for 33820@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:36 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43LkjJ5zklz1qxQ3 for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:32 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43LkjJ4y8Tz1qsJh for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:32 +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 23AOsphBAJyb for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:31 +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:31 +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 38AEE60122 for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:10:52 +0100 (CET) From: Hartmut Goebel To: 33820@debbugs.gnu.org Subject: [PATCH 1/9] gnu: kcmutils: Make QDirIterator follow symlinks. Date: Fri, 21 Dec 2018 11:10:44 +0100 Message-Id: <20181221101052.26832-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 33820 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 21 05:03:42 2018 Received: (at 33820) by debbugs.gnu.org; 21 Dec 2018 10:03:42 +0000 Received: from localhost ([127.0.0.1]:57136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHef-0002dH-RS for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:42 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:34601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHeb-0002cg-GW for 33820@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:38 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43LkjN5zDGz1qxJj for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:36 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43LkjN5sdpz1qsJX for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:36 +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 e6x2HOHXqJX4 for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:35 +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:35 +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 6998A6022F for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:10:52 +0100 (CET) From: Hartmut Goebel To: 33820@debbugs.gnu.org Subject: [PATCH 3/9] gnu: kconfigwidgets: Make QDirIterator follow symlinks. Date: Fri, 21 Dec 2018 11:10:46 +0100 Message-Id: <20181221101052.26832-3-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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 33820 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Transfer the NixOS patch "qdiriterator-follow-symlinks" for kconfigwidgets as of 2018-02-17. * gnu/packages/kde-frameworks.scm(kconfigwidgets): New phase. --- gnu/packages/kde-frameworks.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 3f0eff292..3c8063799 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2174,6 +2174,13 @@ KCModules can be created with the KConfigWidgets framework.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "src/khelpclient.cpp" + ;; make QDirIterator follow symlinks + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))) + #t)) (add-before 'check 'check-setup (lambda _ ;; make Qt render "offscreen", required for tests -- 2.13.7 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 21 05:03:42 2018 Received: (at 33820) by debbugs.gnu.org; 21 Dec 2018 10:03:42 +0000 Received: from localhost ([127.0.0.1]:57138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHeg-0002dO-3i for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:42 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:33671) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHec-0002ci-L4 for 33820@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:39 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43LkjP6FTGz1qxJM for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:37 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43LkjP68csz1qsJX for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:37 +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 KuXWr7jdlJV9 for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:37 +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:37 +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 7E7B560248 for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:10:52 +0100 (CET) From: Hartmut Goebel To: 33820@debbugs.gnu.org Subject: [PATCH 4/9] gnu: kdelibs4support: Add todo comment for a patch from NixOS. Date: Fri, 21 Dec 2018 11:10:47 +0100 Message-Id: <20181221101052.26832-4-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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 33820 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/kde-frameworks.scm(kdelibs4support): Add comment. --- gnu/packages/kde-frameworks.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 3c8063799..c73527b43 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -3467,6 +3467,8 @@ workspace.") ("qtx11extras" ,qtx11extras))) ;; FIXME: Use GuixSD ca-bundle.crt in etc/xdg/ksslcalist and ;; share/kf5/kssl/ca-bundle.crt + ;; TODO: NixOS has nix-kde-include-dir.patch to change std-dir "include" + ;; into "@dev@/include/". Think about whether this is needed for us, too. (arguments `(#:phases (modify-phases %standard-phases -- 2.13.7 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 21 05:03:47 2018 Received: (at 33820) by debbugs.gnu.org; 21 Dec 2018 10:03:47 +0000 Received: from localhost ([127.0.0.1]:57144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHel-0002e3-EZ for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:47 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:50554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHee-0002d7-UQ for 33820@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:41 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43LkjS16D6z1qxJM for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:40 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43LkjS0zw3z1qsJd for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:40 +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 aqdjRLSu1yQn for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:38 +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:38 +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 939746027B for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:10:52 +0100 (CET) From: Hartmut Goebel To: 33820@debbugs.gnu.org Subject: [PATCH 5/9] gnu: kio: Search 'smbd' on $PATH. Date: Fri, 21 Dec 2018 11:10:48 +0100 Message-Id: <20181221101052.26832-5-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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 33820 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Transfer the remaining NixOS patch for kio as of 2018-02-17. * gnu/packages/patches/kio-search-smbd-on-PATH.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/kde-frameworks.scm(kio): Use it. --- gnu/local.mk | 1 + gnu/packages/kde-frameworks.scm | 6 ++--- gnu/packages/patches/kio-search-smbd-on-PATH.patch | 30 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/kio-search-smbd-on-PATH.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8e1ce88bc..0403f82ba 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -854,6 +854,7 @@ dist_patch_DATA = \ %D%/packages/patches/kiki-makefile.patch \ %D%/packages/patches/kiki-missing-includes.patch \ %D%/packages/patches/kiki-portability-64bit.patch \ + %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \ diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index c73527b43..435b55a49 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2595,7 +2595,8 @@ makes starting KDE applications faster and reduces memory consumption.") name "-" version ".tar.xz")) (sha256 (base32 - "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k")))) + "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k")) + (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs `(("kbookmarks" ,kbookmarks) @@ -2638,11 +2639,10 @@ makes starting KDE applications faster and reduces memory consumption.") (modify-phases %standard-phases (add-after 'unpack 'patch (lambda _ - ;; Better error message (taken from nix) + ;; Better error message (taken from NixOS) (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 _ diff --git a/gnu/packages/patches/kio-search-smbd-on-PATH.patch b/gnu/packages/patches/kio-search-smbd-on-PATH.patch new file mode 100644 index 000000000..47e20cfc0 --- /dev/null +++ b/gnu/packages/patches/kio-search-smbd-on-PATH.patch @@ -0,0 +1,30 @@ +Adopted from NixOS +pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch + +=================================================================== +--- kio-5.17.0.orig/src/core/ksambashare.cpp ++++ kio-5.17.0/src/core/ksambashare.cpp +@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate( + + bool KSambaSharePrivate::isSambaInstalled() + { +- if (QFile::exists(QStringLiteral("/usr/sbin/smbd")) +- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) { +- return true; ++ const QByteArray pathEnv = qgetenv("PATH"); ++ if (!pathEnv.isEmpty()) { ++ QLatin1Char pathSep(':'); ++ QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/smbd"); ++ if (QFile::exists(*it)) { ++ return true; ++ } ++ } + } + +- //qDebug() << "Samba is not installed!"; +- + return false; + } + -- 2.13.7 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 21 05:03:48 2018 Received: (at 33820) by debbugs.gnu.org; 21 Dec 2018 10:03:48 +0000 Received: from localhost ([127.0.0.1]:57146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHel-0002e7-TN for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:48 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:47555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHeg-0002dF-Bb for 33820@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:43 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43LkjT3rSnz1qxJp for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:41 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43LkjT3kgMz1qsJg for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:41 +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 cJ5_C8uHT69E for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:40 +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:40 +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 A8AF36027C for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:10:52 +0100 (CET) From: Hartmut Goebel To: 33820@debbugs.gnu.org Subject: [PATCH 6/9] gnu: kinit: Use the store paths for dynamically loaded libs. Date: Fri, 21 Dec 2018 11:10:49 +0100 Message-Id: <20181221101052.26832-6-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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 33820 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Transfer the NixOS "kdeinit-extra_libs" patch for kinit as of 2018-02-17. * gnu/packages/patches/kinit-kdeinit-extra_libs.patch: New filee. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/kde-frameworks.scm (kinit)[source]: Use it. : New phase. [inputs]: Add kparts, plasma-framework. --- gnu/local.mk | 1 + gnu/packages/kde-frameworks.scm | 18 ++++++- .../patches/kinit-kdeinit-extra_libs.patch | 55 ++++++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/kinit-kdeinit-extra_libs.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0403f82ba..783a7c624 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -854,6 +854,7 @@ dist_patch_DATA = \ %D%/packages/patches/kiki-makefile.patch \ %D%/packages/patches/kiki-missing-includes.patch \ %D%/packages/patches/kiki-portability-64bit.patch \ + %D%/packages/patches/kinit-kdeinit-extra_libs.patch \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 435b55a49..edc2587a9 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2548,8 +2548,22 @@ in applications using the KDE Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95")))) + "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95")) + ;; Use the store paths for other packages and dynamically loaded + ;; libs + (patches (search-patches "kinit-kdeinit-extra_libs.patch")))) (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Set patched-in values: + (substitute* "src/kdeinit/kinit.cpp" + (("GUIX_PKGS_KF5_KIO") (assoc-ref inputs "kio")) + (("GUIX_PKGS_KF5_PARTS") (assoc-ref inputs "kparts")) + (("GUIX_PKGS_KF5_PLASMA") (assoc-ref inputs "plasma-framework"))) + #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) @@ -2567,11 +2581,13 @@ in applications using the KDE Frameworks.") ("kitemviews" ,kitemviews) ("ki18n" ,ki18n) ("kjobwidgets" ,kjobwidgets) + ("kparts" ,kparts) ("kservice" ,kservice) ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) ("libcap" ,libcap) ; to install start_kdeinit with CAP_SYS_RESOURCE + ("plasma-framework" ,plasma-framework) ("qtbase" ,qtbase) ("solid" ,solid))) (home-page "https://community.kde.org/Frameworks") diff --git a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch new file mode 100644 index 000000000..8dcd4d3e9 --- /dev/null +++ b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch @@ -0,0 +1,55 @@ +Search the "extra libs" in GUIX_KF5INIT_LIB_PATH (which basically is a +collection of all /lib directories). We can not hard-code the full path to the +libsKF5Plasam, since adding palse-workspace + +Adopted from NixOS +pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch + +=================================================================== +--- kinit-5.32.0/src/kdeinit/kinit-5.32.0/src/kdeinit/.orig ++++ kinit-5.32.0/src/kdeinit/kinit.cpp +@@ -96,11 +96,9 @@ + "libKF5Parts.5.dylib", + "libKF5Plasma.5.dylib" + #else +- "libKF5KIOCore.so.5", +- "libKF5Parts.so.5", +-//#ifdef __KDE_HAVE_GCC_VISIBILITY // Removed for KF5, we'll see. +- "libKF5Plasma.so.5" +-//#endif ++ "GUIX_PKGS_KF5_KIO/lib/libKF5KIOCore.so.5", ++ "GUIX_PKGS_KF5_PARTS/lib/libKF5Parts.so.5", ++ "GUIX_PKGS_KF5_PLASMA/lib/libKF5Plasma.so.5" + #endif + }; + #endif +@@ -1533,20 +1531,6 @@ static int initXconnection() + } + #endif + +-#ifndef Q_OS_OSX +-// Find a shared lib in the lib dir, e.g. libkio.so. +-// Completely unrelated to plugins. +-static QString findSharedLib(const QString &lib) +-{ +- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib; +- if (QFile::exists(path)) { +- return path; +- } +- // We could also look in LD_LIBRARY_PATH, but really, who installs the main libs in different prefixes? +- return QString(); +-} +-#endif +- + extern "C" { + + static void secondary_child_handler(int) +@@ -1689,7 +1693,7 @@ + if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { + const int extrasCount = sizeof(extra_libs) / sizeof(extra_libs[0]); + for (int i = 0; i < extrasCount; i++) { +- const QString extra = findSharedLib(QString::fromLatin1(extra_libs[i])); ++ const QString extra = QString::fromLatin1(extra_libs[i]); + if (!extra.isEmpty()) { + QLibrary l(extra); + l.setLoadHints(QLibrary::ExportExternalSymbolsHint); -- 2.13.7 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 21 05:03:48 2018 Received: (at 33820) by debbugs.gnu.org; 21 Dec 2018 10:03:48 +0000 Received: from localhost ([127.0.0.1]:57148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHem-0002eE-6W for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:48 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:41931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHej-0002dk-46 for 33820@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:45 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43LkjX3KNmz1qxJM for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:44 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43LkjX3DBlz1qsJd for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:44 +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 BS1D5bdf3bPb for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:43 +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:43 +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 D2A1960350 for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:10:52 +0100 (CET) From: Hartmut Goebel To: 33820@debbugs.gnu.org Subject: [PATCH 8/9] gnu: kpackage: Transfer patches from NixOS. Date: Fri, 21 Dec 2018 11:10:51 +0100 Message-Id: <20181221101052.26832-8-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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 33820 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Transfer the NixOS patches for kpackage as of 2018-02-17: - Allow external paths. - Make QDirIterator follow symlinks. Decided to use a patch for one of the "allow external paths" changes since 'substitute*' seems not to be robust enough. * gnu/packages/patches/kpackage-allow-external-paths.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/kde-frameworks.scm(kpackage)[source]: Use it. : New phase. --- gnu/local.mk | 1 + gnu/packages/kde-frameworks.scm | 15 ++++++++++++++- gnu/packages/patches/kpackage-allow-external-paths.patch | 13 +++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/kpackage-allow-external-paths.patch diff --git a/gnu/local.mk b/gnu/local.mk index dd2a15b14..a7db95c20 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -858,6 +858,7 @@ dist_patch_DATA = \ %D%/packages/patches/kinit-kdeinit-libpath.patch \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kmod-module-directory.patch \ + %D%/packages/patches/kpackage-allow-external-paths.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \ %D%/packages/patches/kobodeluxe-const-charp-conversion.patch \ diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index c269c4758..65233f72e 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1848,7 +1848,10 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32 - "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd")))) + "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd")) + ;; Default to: external paths/symlinks can be followed by a + ;; package + (patches (search-patches "kpackage-allow-external-paths.patch")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1863,6 +1866,16 @@ covers feedback and persistent events.") `(#:tests? #f ; FIXME: 3/9 tests fail. #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + ;; Make QDirIterator follow symlinks + (substitute* '("src/kpackage/packageloader.cpp" + "src/kpackage/private/packagejobthread.cpp") + (("^\\s*(const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories)(;)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b)) + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))) + #t)) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) diff --git a/gnu/packages/patches/kpackage-allow-external-paths.patch b/gnu/packages/patches/kpackage-allow-external-paths.patch new file mode 100644 index 000000000..c1c9efde7 --- /dev/null +++ b/gnu/packages/patches/kpackage-allow-external-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp +index 5aec9fd..b15c933 100644 +--- a/src/kpackage/package.cpp ++++ b/src/kpackage/package.cpp +@@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate() + : QSharedData(), + fallbackPackage(nullptr), + metadata(nullptr), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { -- 2.13.7 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 21 05:03:48 2018 Received: (at 33820) by debbugs.gnu.org; 21 Dec 2018 10:03:48 +0000 Received: from localhost ([127.0.0.1]:57150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHem-0002eL-Ek for submit@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:48 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:51466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gaHeh-0002dh-Sh for 33820@debbugs.gnu.org; Fri, 21 Dec 2018 05:03:45 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43LkjW29cpz1qxPw for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:43 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43LkjW25rmz1qsJd for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:43 +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 EikFmMMfb4Up for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:03:42 +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:42 +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 BDC5A6029E for <33820@debbugs.gnu.org>; Fri, 21 Dec 2018 11:10:52 +0100 (CET) From: Hartmut Goebel To: 33820@debbugs.gnu.org Subject: [PATCH 7/9] gnu: kinit: Use LIBRARY_PATH to search for dynamically loaded libs. Date: Fri, 21 Dec 2018 11:10:50 +0100 Message-Id: <20181221101052.26832-7-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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 33820 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Transfer the NixOS "kdeinit-libpath" patch for kinit as of 2018-02-17. * gnu/packages/patches/kinit-kdeinit-libpath.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/kde-frameworks.scm (kinit)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/kde-frameworks.scm | 3 +- gnu/packages/patches/kinit-kdeinit-libpath.patch | 37 ++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/kinit-kdeinit-libpath.patch diff --git a/gnu/local.mk b/gnu/local.mk index 783a7c624..dd2a15b14 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -855,6 +855,7 @@ dist_patch_DATA = \ %D%/packages/patches/kiki-missing-includes.patch \ %D%/packages/patches/kiki-portability-64bit.patch \ %D%/packages/patches/kinit-kdeinit-extra_libs.patch \ + %D%/packages/patches/kinit-kdeinit-libpath.patch \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index edc2587a9..c269c4758 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2551,7 +2551,8 @@ in applications using the KDE Frameworks.") "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95")) ;; Use the store paths for other packages and dynamically loaded ;; libs - (patches (search-patches "kinit-kdeinit-extra_libs.patch")))) + (patches (search-patches "kinit-kdeinit-extra_libs.patch" + "kinit-kdeinit-libpath.patch")))) (build-system cmake-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/kinit-kdeinit-libpath.patch b/gnu/packages/patches/kinit-kdeinit-libpath.patch new file mode 100644 index 000000000..89cf1a941 --- /dev/null +++ b/gnu/packages/patches/kinit-kdeinit-libpath.patch @@ -0,0 +1,37 @@ +Search libraries in GUIX_KF5INIT_LIB_PATH. + +Based on an idea by NixOs +pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch + +=================================================================== +--- kinit-5.32.0/src/kdeinit/kinit.cpp.orig 2017-10-22 21:02:20.908765455 +0200 ++++ kinit-5.32.0/src/kdeinit/kinit.cpp 2017-10-22 21:03:25.312818248 +0200 +@@ -623,20 +623,18 @@ + if (libpath_relative) { + // NB: Because Qt makes the actual dlopen() call, the + // RUNPATH of kdeinit is *not* respected - see + // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 + // - so we try hacking it in ourselves +- QString install_lib_dir = QFile::decodeName( +- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); +- QString orig_libpath = libpath; +- libpath = install_lib_dir + libpath; +- l.setFileName(libpath); +- if (!l.load()) { +- libpath = orig_libpath; +- l.setFileName(libpath); +- l.load(); +- } ++ // Try to load the library relative to the active profiles. ++ QByteArrayList profiles = qgetenv("LIBRARY_PATH").split(':'); ++ for (const QByteArray &profile: profiles) { ++ if (!profile.isEmpty()) { ++ l.setFileName(QFile::decodeName(profile) + QStringLiteral("/") + libpath); ++ if (l.load()) break; ++ } ++ } + } else { + l.load(); + } + if (!l.isLoaded()) { + QString ltdlError(l.errorString()); -- 2.13.7 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 21 05:03:49 2018 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 To: 33820@debbugs.gnu.org Subject: [PATCH 9/9] gnu: kservice: Transfer patches from NixOS. 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 33820 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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)) -- 2.13.7 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 04 04:28:05 2019 Received: (at 33820-done) by debbugs.gnu.org; 4 Jan 2019 09:28:05 +0000 Received: from localhost ([127.0.0.1]:46217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gfLlt-0005Us-IC for submit@debbugs.gnu.org; Fri, 04 Jan 2019 04:28:05 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:44564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gfLls-0005Uk-Jm for 33820-done@debbugs.gnu.org; Fri, 04 Jan 2019 04:28:04 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43WKFw05vlz1r9m2 for <33820-done@debbugs.gnu.org>; Fri, 4 Jan 2019 10:28:03 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43WKFv6Wksz1qvX8 for <33820-done@debbugs.gnu.org>; Fri, 4 Jan 2019 10:28:03 +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 Z5abR-nvPa_4 for <33820-done@debbugs.gnu.org>; Fri, 4 Jan 2019 10:28:03 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-83-171-168-29.dynamic.mnet-online.de [83.171.168.29]) (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-done@debbugs.gnu.org>; Fri, 4 Jan 2019 10:28:03 +0100 (CET) Received: from [192.168.110.2] (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 2C4B2601C7 for <33820-done@debbugs.gnu.org>; Fri, 4 Jan 2019 10:31:28 +0100 (CET) From: Hartmut Goebel Subject: Re: bug#33820: Acknowledgement ([PATCH 0/9] Adopt NixOS patches for KDE Frameworks) To: 33820-done@debbugs.gnu.org References: <20181221100844.26733-1-h.goebel@crazy-compilers.com> Openpgp: preference=signencrypt Organization: crazy-compilers.com Message-ID: <07663dd1-46f1-b38a-4fd1-8f387286f4ad@crazy-compilers.com> Date: Fri, 4 Jan 2019 10:28:02 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: de-DE X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 33820-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Applied as fb0356d9564255b6a983960d06d274b3ee3a1903 From unknown Mon Jun 16 23:47:59 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 01 Feb 2019 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator