GNU bug report logs - #64798
[PATCH 000/209] update kde package and add plasme desktop

Previous Next

Full log

View this message in rfc822 format

From: Zheng Junjie <873216071 <at> qq.com>
To: 64798 <at> debbugs.gnu.org
Subject: [bug#64798] [PATCH 050/209] gnu: kpackage: use G-expressions.
Date: Sun, 23 Jul 2023 16:44:30 +0800

* gnu/packages/kde-frameworks.scm (kpackage)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/kde-frameworks.scm | 55 ++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index c18bf4e1d7..98e2a5bb72 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1928,31 +1928,36 @@ (define-public kpackage
            ki18n
            qtbase-5))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda _
-             (substitute* "src/kpackage/package.cpp"
-               (("externalPaths.false.") "externalPaths(true)"))
-             ;; Make QDirIterator follow symlinks
-             (substitute* '("src/kpackage/packageloader.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)))))
-         (add-after 'unpack 'patch-tests
-           (lambda _
-             ;; /bin/ls doesn't exist in the build-container use /etc/passwd
-             (substitute* "autotests/packagestructuretest.cpp"
-               (("(addDirectoryDefinition\\(\")bin(\".*\")bin(\".*\")bin\""
-                 _ a b c)
-                (string-append a "etc" b "etc" c "etc\""))
-               (("filePath\\(\"bin\", QStringLiteral\\(\"ls\"))")
-                "filePath(\"etc\", QStringLiteral(\"passwd\"))")
-               (("\"/bin/ls\"") "\"/etc/passwd\""))))
-         (add-before 'check 'check-setup
-           (lambda _
-             (setenv "HOME" (getcwd)))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda _
+              (substitute* "src/kpackage/package.cpp"
+                (("externalPaths.false.")
+                 "externalPaths(true)"))
+              ;; Make QDirIterator follow symlinks
+              (substitute* '("src/kpackage/packageloader.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)))))
+          (add-after 'unpack 'patch-tests
+            (lambda _
+              ;; /bin/ls doesn't exist in the build-container use /etc/passwd
+              (substitute* "autotests/packagestructuretest.cpp"
+                (("(addDirectoryDefinition\\(\")bin(\".*\")bin(\".*\")bin\""
+                  _ a b c)
+                 (string-append a "etc" b "etc" c "etc\""))
+                (("filePath\\(\"bin\", QStringLiteral\\(\"ls\"))")
+                 "filePath(\"etc\", QStringLiteral(\"passwd\"))")
+                (("\"/bin/ls\"")
+                 "\"/etc/passwd\""))))
+          (add-before 'check 'check-setup
+            (lambda _
+              (setenv "HOME" (getcwd)))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Installation and loading of additional content as packages")
     (description "The Package framework lets the user install and load packages
-- 
2.41.0

Previous Next

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