From: Morgan.J.Smith@outlook.com
To: 56901@debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith@outlook.com>
Subject: [bug#56901] [PATCH] gnu: qt5ct: Fix build
Date: Tue, 2 Aug 2022 22:00:02 -0400 [thread overview]
Message-ID: <DM5PR03MB3163B409BDD90A99B6B2F4CCC59C9@DM5PR03MB3163.namprd03.prod.outlook.com> (raw)
From: Morgan Smith <Morgan.J.Smith@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
next reply other threads:[~2022-08-03 2:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-03 2:00 Morgan.J.Smith [this message]
2022-08-03 3:14 ` bug#56901: [PATCH] gnu: qt5ct: Fix build 宋文武 via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DM5PR03MB3163B409BDD90A99B6B2F4CCC59C9@DM5PR03MB3163.namprd03.prod.outlook.com \
--to=morgan.j.smith@outlook.com \
--cc=56901@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).