From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaHf7-0007Yd-A2 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 1gaHf5-00010I-NL for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:09 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52900) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gaHf3-0000w5-4Z for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gaHf2-0002fj-Vs for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:05 -0500 Subject: [bug#33820] [PATCH 8/9] gnu: kpackage: Transfer patches from NixOS. Resent-Message-ID: From: Hartmut Goebel Date: Fri, 21 Dec 2018 11:10:51 +0100 Message-Id: <20181221101052.26832-8-h.goebel@crazy-compilers.com> In-Reply-To: <20181221101052.26832-1-h.goebel@crazy-compilers.com> References: <20181221101052.26832-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: 33820@debbugs.gnu.org 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