[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#64273] [PATCH 2/2] gnu: qbittorrent{, -nox}: Use qt-build-system.
From: |
Timotej Lazar |
Subject: |
[bug#64273] [PATCH 2/2] gnu: qbittorrent{, -nox}: Use qt-build-system. |
Date: |
Sat, 24 Jun 2023 21:27:32 +0200 |
CMake is now upstream’s preferred build system.
* gnu/packages/bittorrent.scm (qbittorrent)[build-system]: Use qt-build-system.
[arguments]: Drop custom wrap phase. (Re-)enable tests.
[inputs]: Remove input labels. Drop qtbase-5.
[native-inputs]: Drop pkg-config.
(qbittorrent-nox)[arguments]: Adjust configure-flags. Keep the wrap-qt phase
since the non-GUI version is also a QT program.
---
gnu/packages/bittorrent.scm | 44 ++++++++++---------------------------
1 file changed, 12 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 3e40720730..0495d2dc6a 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -40,6 +40,7 @@ (define-module (gnu packages bittorrent)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
+ #:use-module (guix build-system qt)
#:use-module (guix build-system glib-or-gtk)
#:use-module ((guix licenses) #:prefix l:)
#:use-module (guix gexp)
@@ -461,36 +462,19 @@ (define-public qbittorrent
(file-name (git-file-name name version))
(sha256
(base32 "1r4vqlwmvg7b0ibq53m7ascyykv3v66qxlwfi0zmmi1ig7rlkxkk"))))
- (build-system gnu-build-system)
+ (build-system qt-build-system)
(arguments
- `(#:configure-flags
- (list (string-append "--with-boost-libdir="
- (assoc-ref %build-inputs "boost")
- "/lib")
- "--enable-debug"
- "QMAKE_LRELEASE=lrelease")
- #:modules ((guix build gnu-build-system)
- (guix build qt-utils)
- (guix build utils))
- #:imported-modules (,@%gnu-build-system-modules
- (guix build qt-utils))
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'wrap-qt
- (lambda* (#:key outputs inputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-qt-program "qbittorrent" #:output out #:inputs inputs))
- #t)))))
+ (list #:configure-flags #~(list "-DTESTING=ON")
+ #:test-target "check"))
(native-inputs
- (list pkg-config qttools-5))
+ (list qttools-5))
(inputs
- `(("boost" ,boost)
- ("libtorrent-rasterbar" ,libtorrent-rasterbar)
- ("openssl" ,openssl)
- ("python" ,python-wrapper)
- ("qtbase" ,qtbase-5)
- ("qtsvg-5" ,qtsvg-5)
- ("zlib" ,zlib)))
+ (list boost
+ libtorrent-rasterbar
+ openssl
+ python-wrapper
+ qtsvg-5
+ zlib))
(home-page "https://www.qbittorrent.org/")
(synopsis "Graphical BitTorrent client")
(description
@@ -510,11 +494,7 @@ (define-public qbittorrent-nox
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:configure-flags configure-flags)
- #~(append #$configure-flags
- (list "--disable-gui")))
- ((#:phases phases)
- #~(modify-phases #$phases
- (delete 'wrap-qt)))))
+ #~(cons "-DGUI=OFF" #$configure-flags))))
(inputs
(modify-inputs (package-inputs base)
(delete "qtsvg-5"))))))
--
2.40.1