From c48f2ea27b719471698e904cb6a3235ebb90c38d Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Wed, 28 Sep 2022 11:22:15 +0200 Subject: [PATCH] gnu: QT: Remove trailing booleans. * gnu/packages/qt.scm (qite, grantlee, single-application-qt5, python-pyqt, python-pyqtwebengine, python-qscintilla, python-pyqt+qscintilla, qtsolutions, qwt, python-shiboken-2, python-shiboken-6, python-pyside-2, python-pyside-6 python-pyside-2-tools, kdsoap): Remove trailing booleans. Signed-off-by: Marius Bakke --- gnu/packages/qt.scm | 56 ++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c37e718ba1..faac5e75d4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -140,8 +140,7 @@ (define-public qite (modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ - (chdir "libqite") - #t))))) + (chdir "libqite")))))) (inputs (list qtbase-5 qtmultimedia-5)) (home-page "https://github.com/Ri0n/qite/") @@ -254,8 +253,7 @@ (define-public grantlee (add-before 'check 'check-setup (lambda _ ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://github.com/steveire/grantlee") (synopsis "Libraries for text templating with Qt") (description "Grantlee Templates can be used for theming and generation of @@ -2941,8 +2939,7 @@ (define-public single-application-qt5 (string-append source "/" file) (string-append out "/include"))) '("SingleApplication" - "singleapplication.h" "singleapplication_p.h")) - #t)))))) + "singleapplication.h" "singleapplication_p.h")))))))) (inputs (list qtbase-5)) (home-page "https://github.com/itay-grudev/SingleApplication") @@ -3088,9 +3085,7 @@ (define-public python-pyqt (let* ((qtbase (assoc-ref inputs "qtbase")) (qtprinter.h (string-append "\"" qtbase "/include/qt5/QtPrintSupport/qprinter.h\""))) (substitute* "sip/QtPrintSupport/qprinter.sip" - (("") - qtprinter.h)) - #t))) + (("") qtprinter.h))))) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -3215,8 +3210,7 @@ (define-public python-pyqtwebengine (lambda _ (display " from pkgutil import extend_path __path__ = extend_path(__path__, __name__) -"))) - #t)))))) +"))))))))) (home-page "https://www.riverbankcomputing.com/software/pyqtwebengine/intro") (synopsis "Python bindings for QtWebEngine") (description @@ -3376,8 +3370,7 @@ (define-public python-qscintilla (string-append out "/lib"))) ;; And fix the installed.txt file (substitute* "installed.txt" - (("/gnu/store/[^/]+") out))) - #t))))) + (("/gnu/store/[^/]+") out)))))))) (inputs `(("qscintilla" ,qscintilla) ("python" ,python) @@ -3405,8 +3398,7 @@ (define-public python-pyqt+qscintilla (match %build-inputs (((names . directories) ...) (union-build (assoc-ref %outputs "out") - directories) - #t))))) + directories)))))) (inputs `(("python-pyqt" ,python-pyqt) ("python-qscintilla" ,python-qscintilla))) @@ -3484,8 +3476,7 @@ (define-public qtsolutions (("#include \"qtlockedfile.*\\.cpp\"") "") ;; Unwrap namespace added in the vendoring process. (("QtLP_Private::QtLockedFile") - "QtLockedFile"))) - #t)))) + "QtLockedFile"))))))) (build-system gnu-build-system) (arguments `(#:tests? #f ; No target @@ -3509,8 +3500,7 @@ (define-public qtsolutions (("SUBDIRS\\+=examples") "")) ;; Fix deprecated functions. (substitute* "qtsoap/src/qtsoap.cpp" - (("toAscii") "toUtf8")) - #t)) + (("toAscii") "toUtf8")))) (replace 'configure (lambda _ (for-each (lambda (solution) @@ -3518,16 +3508,14 @@ (define-public qtsolutions (invoke "./configure" "-library") (invoke "qmake"))) '("qtlockedfile" "qtpropertybrowser" "qtservice" - "qtsingleapplication" "qtsoap")) - #t)) + "qtsingleapplication" "qtsoap")))) (replace 'build (lambda _ (for-each (lambda (solution) (with-directory-excursion solution (invoke "make"))) '("qtlockedfile" "qtpropertybrowser" "qtservice" - "qtsingleapplication" "qtsoap")) - #t)) + "qtsingleapplication" "qtsoap")))) (replace 'install (lambda args (for-each (lambda (solution) @@ -3607,8 +3595,7 @@ (define-public qwt ;; Remove some incomplete manual pages. (for-each delete-file (find-files "doc/man/man3" "^_tmp.*")) (mkdir-p man) - (copy-recursively "doc/man" man) - #t)))))) + (copy-recursively "doc/man" man))))))) (home-page "http://qwt.sourceforge.net") (synopsis "Qt widgets for plots, scales, dials and other technical software GUI components") @@ -3850,7 +3837,7 @@ (define-public python-shiboken-2 #:phases #~(modify-phases %standard-phases (add-after 'unpack 'use-shiboken-dir-only - (lambda _ (chdir "sources/shiboken2") #t)) + (lambda _ (chdir "sources/shiboken2"))) (add-before 'configure 'make-files-writable-and-update-timestamps (lambda _ ;; The build scripts need to modify some files in @@ -3861,13 +3848,11 @@ (define-public python-shiboken-2 (for-each (lambda (file) (make-file-writable file) (utime file circa-1980 circa-1980)) - (find-files "."))) - #t)) + (find-files "."))))) (add-before 'configure 'set-build-env (lambda _ (let ((llvm #$(this-package-input "clang-toolchain"))) - (setenv "CLANG_INSTALL_DIR" llvm) - #t)))))) + (setenv "CLANG_INSTALL_DIR" llvm))))))) (home-page "https://wiki.qt.io/Qt_for_Python") (synopsis "Shiboken generates bindings for C++ libraries using CPython source code") @@ -3905,7 +3890,7 @@ (define-public python-shiboken-6 ((#:phases p) #~(modify-phases #$p (replace 'use-shiboken-dir-only - (lambda _ (chdir "sources/shiboken6") #t)))) + (lambda _ (chdir "sources/shiboken6"))))) ((#:configure-flags flags) #~(cons* ;; The RUNPATH of shibokenmodule contains the entry in build @@ -3959,7 +3944,7 @@ (define-public python-pyside-2 #:phases #~(modify-phases %standard-phases (add-after 'unpack 'go-to-source-dir - (lambda _ (chdir "sources/pyside2") #t)) + (lambda _ (chdir "sources/pyside2"))) (add-after 'go-to-source-dir 'fix-qt-module-detection (lambda _ ;; Activate qt module support even if it not in the same @@ -4054,7 +4039,7 @@ (define-public python-pyside-6 #:phases #~(modify-phases %standard-phases (add-after 'unpack 'go-to-source-dir - (lambda _ (chdir "sources/pyside6") #t)) + (lambda _ (chdir "sources/pyside6"))) (add-after 'go-to-source-dir 'fix-qt-module-detection (lambda _ (substitute* "cmake/PySideHelpers.cmake" @@ -4114,7 +4099,7 @@ (define-public python-pyside-2-tools #:phases #~(modify-phases %standard-phases (add-after 'unpack 'go-to-source-dir - (lambda _ (chdir "sources/pyside2-tools") #t))))) + (lambda _ (chdir "sources/pyside2-tools")))))) (home-page "https://wiki.qt.io/Qt_for_Python") (synopsis "Command line tools for PySide2") @@ -4291,8 +4276,7 @@ (define-public kdsoap (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "ctest" "-E" ;; These tests try connect to the internet. - "(kdsoap-webcalls|kdsoap-webcalls_wsdl|kdsoap-test_calc)")) - #t))))) + "(kdsoap-webcalls|kdsoap-webcalls_wsdl|kdsoap-test_calc)"))))))) (home-page "https://www.kdab.com/development-resources/qt-tools/kd-soap/") (synopsis "Qt SOAP component") (description "KD SOAP is a tool for creating client applications for web