* [bug#71954] [PATCH] gnu: xaos: Update to 4.3.2.
@ 2024-07-05 18:56 Artyom V. Poptsov
2024-07-10 14:11 ` bug#71954: " Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Artyom V. Poptsov @ 2024-07-05 18:56 UTC (permalink / raw)
To: 71954; +Cc: Artyom V. Poptsov, Andreas Enge, Eric Bavier, Sharlatan Hellseher
* 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
---
gnu/packages/maths.scm | 84 +++++++++++++++++++++---------------------
1 file changed, 42 insertions(+), 42 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index d39292e825..d00e12a084 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -7066,7 +7066,7 @@ (define-public wcalc
(define-public xaos
(package
(name "xaos")
- (version "4.2.1")
+ (version "4.3.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -7075,53 +7075,53 @@ (define-public xaos
(file-name (git-file-name name version))
(sha256
(base32
- "0maw5am6rrkyjrprfg113zjq37mqj0iaznkg4h2927ff7wrprc94"))))
+ "0a5n3g1xcsd8k65q5skm4xsdllr3mmkahh4vi59db1l0jv81v06q"))))
(build-system gnu-build-system)
(native-inputs `(("gettext" ,gettext-minimal)
- ("qtbase" ,qtbase-5)
- ("qttools-5" ,qttools-5)))
+ ("qtbase" ,qtbase)
+ ("qttools" ,qttools)))
(inputs (list libx11 zlib libpng gsl))
;; The upstream project file ("XaoS.pro") and the Makefile it generates are
;; not enough for this package to install properly. These phases fix that.
(arguments
- `(#:tests? #f ;no "check" target
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'make-qt-deterministic
- (lambda _
- ;; Make Qt deterministic.
- (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")
- #t))
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (substitute* "XaoS.pro"
- ;; The DESTDIR is originally set to install the xaos binary to
- ;; the "bin" folder inside the build directory. Setting make
- ;; flags doesn't seem to change this.
- (("DESTDIR.*$")
- (string-append "DESTDIR=" out "/bin"))
- ;; Set the correct path to the lrelease binary.
- (("lrelease-qt5") "lrelease"))
- (substitute* "src/include/config.h"
- (("/usr/share/XaoS")
- (string-append out "/share/XaoS")))
- (invoke "qmake"))))
- (add-after 'install 'install-data
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (share (string-append out "/share")))
- (mkdir-p share)
- (for-each
- (lambda (folder)
- (copy-recursively folder
- (string-append share "/XaoS/" folder)))
- '("catalogs" "examples" "tutorial"))
- (install-file "xdg/xaos.png"
- (string-append share "/pixmaps"))
- (install-file "xdg/xaos.desktop"
- (string-append share "/applications")))
- #t)))))
+ (list #:tests? #f ;no "check" target
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'make-qt-deterministic
+ (lambda _
+ ;; Make Qt deterministic.
+ (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")))
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "XaoS.pro"
+ ;; The DESTDIR is originally set to install the xaos binary to
+ ;; the "bin" folder inside the build directory. Setting make
+ ;; flags doesn't seem to change this.
+ (("DESTDIR.*$")
+ (string-append "DESTDIR=" out "/bin"))
+ (("/usr/local")
+ out)
+ ;; Set the correct path to the lrelease binary.
+ (("lrelease-qt6") "lrelease"))
+ (substitute* "src/include/config.h"
+ (("/usr/share/XaoS")
+ (string-append out "/share/XaoS")))
+ (invoke "qmake"))))
+ (add-after 'install 'install-data
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (share (string-append out "/share")))
+ (mkdir-p share)
+ (for-each
+ (lambda (folder)
+ (copy-recursively folder
+ (string-append share "/XaoS/" folder)))
+ '("catalogs" "examples" "tutorial"))
+ (install-file "xdg/xaos.png"
+ (string-append share "/pixmaps"))
+ (install-file "xdg/io.github.xaos_project.XaoS.desktop"
+ (string-append share "/applications"))))))))
(synopsis "Real-time fractal zoomer")
(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,
base-commit: 922e943059050f05532ac8274e55e25ebe711cf5
--
2.45.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#71954: [PATCH] gnu: xaos: Update to 4.3.2.
2024-07-05 18:56 [bug#71954] [PATCH] gnu: xaos: Update to 4.3.2 Artyom V. Poptsov
@ 2024-07-10 14:11 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2024-07-10 14:11 UTC (permalink / raw)
To: Artyom V. Poptsov
Cc: Andreas Enge, Eric Bavier, Sharlatan Hellseher, 71954-done
"Artyom V. Poptsov" <poptsov.artyom@gmail.com> skribis:
> * 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
Applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-10 14:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-05 18:56 [bug#71954] [PATCH] gnu: xaos: Update to 4.3.2 Artyom V. Poptsov
2024-07-10 14:11 ` bug#71954: " Ludovic Courtès
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).