me
/
guix
Archived
1
0
Fork 0

gnu: xaos: Update to 4.3.2.

* gnu/packages/maths.scm (xaos): Update to 4.3.2.
[native-inputs]: Remove qtbase-5 and qttools-5; add qtbase and qttools.
[arguments]: Use gexps.  Fix "PREFIX" variable in "XaoS.pro" during
"configure" phase.

Change-Id: Ifae9890309368ee4131b531c9ea7b155a3cf693c
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Artyom V. Poptsov 2024-07-05 21:56:27 +03:00 committed by Ludovic Courtès
parent e8347bc177
commit ab54f8c514
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 42 additions and 42 deletions

View File

@ -7067,7 +7067,7 @@ evaluates expressions using the standard order of operations.")
(define-public xaos (define-public xaos
(package (package
(name "xaos") (name "xaos")
(version "4.2.1") (version "4.3.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -7076,23 +7076,22 @@ evaluates expressions using the standard order of operations.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0maw5am6rrkyjrprfg113zjq37mqj0iaznkg4h2927ff7wrprc94")))) "0a5n3g1xcsd8k65q5skm4xsdllr3mmkahh4vi59db1l0jv81v06q"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("gettext" ,gettext-minimal) (native-inputs `(("gettext" ,gettext-minimal)
("qtbase" ,qtbase-5) ("qtbase" ,qtbase)
("qttools-5" ,qttools-5))) ("qttools" ,qttools)))
(inputs (list libx11 zlib libpng gsl)) (inputs (list libx11 zlib libpng gsl))
;; The upstream project file ("XaoS.pro") and the Makefile it generates are ;; The upstream project file ("XaoS.pro") and the Makefile it generates are
;; not enough for this package to install properly. These phases fix that. ;; not enough for this package to install properly. These phases fix that.
(arguments (arguments
`(#:tests? #f ;no "check" target (list #:tests? #f ;no "check" target
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'configure 'make-qt-deterministic (add-before 'configure 'make-qt-deterministic
(lambda _ (lambda _
;; Make Qt deterministic. ;; Make Qt deterministic.
(setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")))
#t))
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
@ -7102,8 +7101,10 @@ evaluates expressions using the standard order of operations.")
;; flags doesn't seem to change this. ;; flags doesn't seem to change this.
(("DESTDIR.*$") (("DESTDIR.*$")
(string-append "DESTDIR=" out "/bin")) (string-append "DESTDIR=" out "/bin"))
(("/usr/local")
out)
;; Set the correct path to the lrelease binary. ;; Set the correct path to the lrelease binary.
(("lrelease-qt5") "lrelease")) (("lrelease-qt6") "lrelease"))
(substitute* "src/include/config.h" (substitute* "src/include/config.h"
(("/usr/share/XaoS") (("/usr/share/XaoS")
(string-append out "/share/XaoS"))) (string-append out "/share/XaoS")))
@ -7120,9 +7121,8 @@ evaluates expressions using the standard order of operations.")
'("catalogs" "examples" "tutorial")) '("catalogs" "examples" "tutorial"))
(install-file "xdg/xaos.png" (install-file "xdg/xaos.png"
(string-append share "/pixmaps")) (string-append share "/pixmaps"))
(install-file "xdg/xaos.desktop" (install-file "xdg/io.github.xaos_project.XaoS.desktop"
(string-append share "/applications"))) (string-append share "/applications"))))))))
#t)))))
(synopsis "Real-time fractal zoomer") (synopsis "Real-time fractal zoomer")
(description "GNU XaoS is a graphical program that generates fractal (description "GNU XaoS is a graphical program that generates fractal
patterns and allows you to zoom in and out of them infinitely in a fluid, patterns and allows you to zoom in and out of them infinitely in a fluid,