From 73f46fc691c56ceb6c5915b54e48e65cc5f5000f Mon Sep 17 00:00:00 2001 From: Hugo Buddelmeijer Date: Wed, 1 Oct 2025 11:20:06 +0200 Subject: [PATCH] gnu: texmaker: Update to 6.0.1. * gnu/packages/tex.scm (texmaker): Update to 6.0.1. [source]: Switch to https. [arguments]<#:phases>: Remove replaced phases. [inputs]: Remove poppler-qt5, qtbase-5, qtwayland-5, and qtscript-5; add poppler-qt6, qtbase, qtwayland, qt5compat, qtdeclarative, qttools, and qtwebengine. [properties]: Add release-monitoring-url. Change-Id: I900f550c96d3b6addea26ec279a4bdb411bcc6a8 Reviewed-by: Nicolas Goaziou Signed-off-by: Sharlatan Hellseher --- gnu/packages/tex.scm | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 5a0534f1b16..ce89ebc8818 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2023 Dominik Delgado Steuter ;;; Copyright © 2023 Timothy Sample ;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen +;;; Copyright © 2025 Hugo Buddelmeijer ;;; ;;; This file is part of GNU Guix. ;;; @@ -77459,40 +77460,36 @@ PDF documents.") (define-public texmaker (package (name "texmaker") - (version "5.0.4") + (version "6.0.1") + ;; TODO: Remove "3rdparty" directory contents: + ;; encodingprober, hunspell, pdfium, singleapp, and synctex + ;; as at least some of those are packaged by Guix directly. + ;; Those libraries seem to also have been included in texmaker 5.*, but were + ;; not isolated in a designated directory and therefor probably not noticed. (source (origin (method url-fetch) - (uri (string-append "http://www.xm1math.net/texmaker/texmaker-" + (uri (string-append "https://www.xm1math.net/texmaker/texmaker-" version ".tar.bz2")) (sha256 (base32 - "1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx")))) + "1xna8qp0x3qvg2093slx98jv0qri6vpbblvhrla7gzfq1kgkbhmq")))) (build-system qt-build-system) (arguments - (list - #:tests? #f ; no tests - #:modules '((guix build qt-build-system) - ((guix build gnu-build-system) #:prefix gnu:) - (guix build utils)) - #:phases - #~(modify-phases %standard-phases - ;; Qt has its own configuration utility. - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "qmake" - (string-append "PREFIX=" out) - (string-append "DESKTOPDIR=" out "/share/applications") - (string-append "ICONDIR=" out "/share/pixmaps") - (string-append "METAINFODIR=" out "/share/metainfo") - "texmaker.pro")))) - (replace 'build (assoc-ref gnu:%standard-phases 'build)) - (replace 'install (assoc-ref gnu:%standard-phases 'install))))) + (list #:tests? #f)) ; no tests (inputs - (list poppler-qt5 qtbase-5 qtwayland-5 qtscript-5 zlib)) + (list poppler-qt6 + qt5compat + qtbase + qtdeclarative + qttools ;for Qt6LinguistTool + qtwayland + qtwebengine + zlib)) (native-inputs (list pkg-config)) (home-page "https://www.xm1math.net/texmaker/") + (properties '((release-monitoring-url + . "https://www.xm1math.net/texmaker/download.html"))) (synopsis "LaTeX editor") (description "Texmaker is a program that integrates many tools needed to develop documents with LaTeX, in a single application.")