GNU bug report logs - #56901
[PATCH] gnu: qt5ct: Fix build

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 56901 in the body.
You can then email your comments to 56901 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

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

From: Morgan.J.Smith <at> outlook.com
To: guix-patches <at> gnu.org
Cc: Morgan Smith <Morgan.J.Smith <at> outlook.com>
Subject: [PATCH] gnu: qt5ct: Fix build
Date: Tue,  2 Aug 2022 22:00:02 -0400

From: Morgan Smith <Morgan.J.Smith <at> outlook.com>

* gnu/packages/qt.scm (qt5ct)
[build-system]: Change to qt-build-system
[phases]: Replace
[inputs]: Remove qtbase-5
[modules]: Removed
[impoorted-modules]: Removed
---
 gnu/packages/qt.scm | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f74f84f2ac..86f5d11714 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -159,37 +159,22 @@ (define-public qt5ct
         (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2"))
        (sha256
         (base32 "14742vs32m98nbfb5mad0i8ciff5f45gfcb5v03p4hh2dvhhqgfn"))))
-    (build-system gnu-build-system)
+    (build-system qt-build-system)
     (arguments
-     `(#:tests? #f                      ; No target
-       #:imported-modules
-       (,@%qt-build-system-modules)
-       #:modules
-       ((guix build gnu-build-system)
-        ((guix build qt-build-system)
-         #:prefix qt:)
-        (guix build utils))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "qt5ct.pro"
-               (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease")
-                (search-input-file inputs "/bin/lrelease")))))
-         (replace 'configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out")))
-               (invoke "qmake"
-                       (string-append "PREFIX=" out)
-                       (string-append "BINDIR=" out "/bin")
-                       (string-append "DATADIR=" out "/share")
-                       (string-append "PLUGINDIR=" out "/lib/qt5/plugins")))))
-         (add-after 'install 'qt-wrap
-           (assoc-ref qt:%standard-phases 'qt-wrap)))))
+     (list
+      #:tests? #f                      ; No target
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch
+            (lambda _
+              (substitute* '("src/qt5ct-qtplugin/CMakeLists.txt"
+                             "src/qt5ct-style/CMakeLists.txt")
+                (("\\$\\{PLUGINDIR\\}")
+                 (string-append #$output "/lib/qt5/plugins"))))))))
     (native-inputs
      (list qttools-5))
     (inputs
-     (list qtbase-5 qtsvg-5))
+     (list qtsvg-5))
     (synopsis "Qt5 Configuration Tool")
     (description "Qt5CT is a program that allows users to configure Qt5
 settings (such as icons, themes, and fonts) in desktop environments or
-- 
2.37.1

Message #10 received at 56901-done <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: Morgan.J.Smith <at> outlook.com
Cc: 56901-done <at> debbugs.gnu.org
Subject: Re: bug#56901: [PATCH] gnu: qt5ct: Fix build
Date: Wed, 03 Aug 2022 11:14:04 +0800

Morgan.J.Smith <at> outlook.com writes:

> From: Morgan Smith <Morgan.J.Smith <at> outlook.com>
>
> * gnu/packages/qt.scm (qt5ct)
> [build-system]: Change to qt-build-system

Applied with some simplify for commit message, thank you!

Previous Next

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