From a7f83b51f337426ce2c527dbf84a46bf66290671 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 7 May 2025 19:32:39 +0000 Subject: [PATCH] gnu: Restore gnu-build-system phases. * gnu/packages/admin.scm (wpa-supplicant-gui) [arguments]<#:tests?>: Disable. <#:phases>: Restore build phase. * gnu/packages/engineering.scm (librecad) [arguments]<#:test-target>: Delete. <#:phases>: Restore build and check phases. * gnu/packages/finance.scm (kitsas) [arguments]<#:test-target>: Delete. <#:phases>: Restore build phase. * gnu/packages/password-utils.scm (qtpass) [arguments]<#:test-target>: Delete. <#:phases>: Restore build, check, and install phases. * gnu/packages/pdf.scm (sioyek)[arguments]<#:tests?>: Disable. <#:phases>: Restore build and install phases. * gnu/packages/tex.scm (texmaker)[arguments]<#:tests?>: Disable. <#:phases>: Restore build and install phases. * gnu/packages/web.scm (libzim): Update to 9.3.0. (kiwix-lib): Update to 14.0.0. (kiwix-desktop): Update to 2.4.1. [source](patches): Delete. [arguments]<#:test-target>: Delete. [arguments]<#:tests?>: Disable. <#:phases>: Restore build and install phases. (kiwix-tools): Update to 3.7.0. * gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch: Delete. * gnu/local.mk: Update accordingly. Change-Id: Ia5162ec190fc21334bbc516dcc01056d599f2891 --- gnu/local.mk | 1 - gnu/packages/admin.scm | 6 +- gnu/packages/engineering.scm | 22 +++++--- gnu/packages/finance.scm | 5 +- gnu/packages/password-utils.scm | 7 ++- .../kiwix-desktop-newer-libkiwix.patch | 40 -------------- gnu/packages/pdf.scm | 9 ++- gnu/packages/tex.scm | 32 ++++++----- gnu/packages/web.scm | 55 ++++++++++--------- 9 files changed, 84 insertions(+), 93 deletions(-) delete mode 100644 gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 778967b8cb..40839cc000 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1704,7 +1704,6 @@ dist_patch_DATA = \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kismet-unbundle-boost.patch \ %D%/packages/patches/kitty-fix-wayland-protocols.patch \ - %D%/packages/patches/kiwix-desktop-newer-libkiwix.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ %D%/packages/patches/knot-remove-runtime-deps.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 292f9d6eb7..ee15afec31 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2683,16 +2683,20 @@ command.") (build-system qt-build-system) (arguments (list + #:tests? #f ; no tests ;; Make sure the (rarely updated) package 'imagemagick/stable' ;; does not end up in the closure. #:disallowed-references (list imagemagick/stable) - #:test-target "check" + #:modules '((guix build qt-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ (chdir "wpa_supplicant/wpa_gui-qt4"))) (replace 'configure (lambda _ (invoke "qmake" "wpa_gui.pro"))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) (add-after 'build 'build-icons (lambda _ ;; Inkscape complains (but works) without a writable $HOME. diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 7c59337111..fd2716fed7 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -308,21 +308,25 @@ their devices.") (build-system qt-build-system) (arguments (list - #:test-target "check" + #:modules '((guix build qt-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (replace 'configure (lambda _ (system* "qmake" (string-append "BOOST_DIR=" #$(this-package-input "boost"))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append #$output "/bin")) - (share (string-append #$output "/share/librecad"))) - (mkdir-p bin) - (install-file "unix/librecad" bin) - (mkdir-p share) - (copy-recursively "unix/resources" share))))))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'check (assoc-ref gnu:%standard-phases 'check)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append #$output "/bin")) + (share (string-append #$output "/share/librecad"))) + (mkdir-p bin) + (install-file "unix/librecad" bin) + (mkdir-p share) + (copy-recursively "unix/resources" share))))))) (inputs (list bash-minimal boost muparser freetype qtbase-5 qtsvg-5)) (native-inputs diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index b0bf4ab87b..d5c8e37dea 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1359,8 +1359,10 @@ agent.") (inputs (list libzip qtsvg qtwebengine qt5compat)) (arguments (list #:tests? #f ; tests do not even build with Qt6 anymore - #:test-target "check" #:qtbase qtbase ; use Qt6 + #:modules '((guix build qt-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (replace 'configure @@ -1372,6 +1374,7 @@ agent.") (substitute* "kitsasproject.pro" ((" *(unittest|testit).*") "") (("\\\\") "")))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) (replace 'install (lambda* _ (install-file "kitsas/kitsas" diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 0353590c68..041df97fe7 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1076,7 +1076,9 @@ key URIs using the standard otpauth:// scheme.") (build-system qt-build-system) (arguments (list - #:test-target "check" + #:modules '((guix build qt-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (replace 'configure @@ -1085,9 +1087,12 @@ key URIs using the standard otpauth:// scheme.") "QMAKE_LRELEASE=lrelease" "QMAKE_LUPDATE=lupdate" (string-append "PREFIX=" #$output)))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'check (assoc-ref gnu:%standard-phases 'check)) (add-before 'check 'pre-check ;; Fontconfig needs a writable cache. (lambda _ (setenv "HOME" "/tmp"))) + (replace 'install (assoc-ref gnu:%standard-phases 'install)) (add-after 'install 'install-auxilliary ;; Install man-page, icon and .desktop file. (lambda _ diff --git a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch b/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch deleted file mode 100644 index a5bee60ac2..0000000000 --- a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch +++ /dev/null @@ -1,40 +0,0 @@ -Description: Fix building kiwix-desktop with libkiwix-12.1.0 -Bug: https://github.com/kiwix/kiwix-desktop/issues/964 -Origin: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65 -Applied-Upstream: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65 ---- -From 1b322d8f01c787846546a6473f153cf1daa41e65 Mon Sep 17 00:00:00 2001 -From: Matthieu Gautier -Date: Thu, 9 Feb 2023 09:47:47 +0100 -Subject: [PATCH] With last version of libkiwix, Downloader now return - shared_ptr. - ---- - src/contentmanager.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp -index c2f4ff9..d4db50a 100644 ---- a/src/contentmanager.cpp -+++ b/src/contentmanager.cpp -@@ -173,7 +173,7 @@ QStringList ContentManager::updateDownloadInfos(QString id, const QStringList &k - return values; - } - auto& b = mp_library->getBookById(id); -- kiwix::Download* d; -+ std::shared_ptr d; - try { - d = mp_downloader->getDownload(b.getDownloadId()); - } catch(...) { -@@ -270,7 +270,7 @@ QString ContentManager::downloadBook(const QString &id) - for (auto b : booksList) - if (b.toStdString() == book.getId()) - return ""; -- kiwix::Download *download; -+ std::shared_ptr download; - try { - std::pair downloadDir("dir", downloadPath.toStdString()); - const std::vector> options = { downloadDir }; --- -2.41.0 - diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 18c9f1bf52..d7b1ae4c33 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1857,9 +1857,12 @@ Keywords: html2pdf, htmltopdf") (build-system qt-build-system) (arguments (list + #:tests? #f ; no tests #:configure-flags #~(list (string-append "PREFIX=" #$output)) - #:test-target "check" + #:modules '((guix build qt-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths @@ -1872,7 +1875,9 @@ Keywords: html2pdf, htmltopdf") (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) (apply invoke "qmake" configure-flags))) - (add-after 'install 'instal-man-page + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'install (assoc-ref gnu:%standard-phases 'install)) + (add-after 'install 'install-man-page (lambda _ (install-file "resources/sioyek.1" (string-append #$output "/share/man/man1"))))))) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index fe94ac8049..210003dd27 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -77506,19 +77506,25 @@ PDF documents.") "1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx")))) (build-system qt-build-system) (arguments - `(#:test-target "check" - #: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"))))))) + (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))))) (inputs (list poppler-qt5 qtbase-5 qtwayland-5 qtscript zlib)) (native-inputs diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ff139d9c8a..0266da7a9f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9546,7 +9546,7 @@ of Geminispace, but it defaults to a specific domain.") (define-public libzim (package (name "libzim") - (version "8.2.1") + (version "9.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -9554,7 +9554,7 @@ of Geminispace, but it defaults to a specific domain.") (commit version))) (sha256 (base32 - "1g735aqw0vlxqgyjv02lvq24dr5shydp4y8mqianf8720s5fs73f")) + "1il1vc1hs954s3vnwhr337165dxbykvrldrvbilp5jxbkmwqb60d")) (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments @@ -9580,7 +9580,7 @@ for ZIM files.") (define-public kiwix-lib (package (name "kiwix-lib") - (version "13.0.0") + (version "14.0.0") (home-page "https://github.com/kiwix/kiwix-lib/") (source (origin (method git-fetch) @@ -9589,7 +9589,7 @@ for ZIM files.") (commit version))) (sha256 (base32 - "0mvlppbj0mqn4ka3cfaaj1pvn062cxbgz01c0nq04x0mzq1xwh5w")) + "099arjsx1wgz5jhvzn49859wh0v8n3ya33kmnqaw69h55mjvgza0")) (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments @@ -9625,7 +9625,7 @@ It contains the code shared by all Kiwix ports.") (define-public kiwix-desktop (package (name "kiwix-desktop") - (version "2.3.1") + (version "2.4.1") (source (origin (method url-fetch) (uri (string-append @@ -9634,26 +9634,31 @@ It contains the code shared by all Kiwix ports.") ".tar.gz")) (sha256 (base32 - "0hlk05gcb3fmnxhwj6gan51v98rdq3iv2lklwbpmm1bazmz8i7br")) - (patches (search-patches "kiwix-desktop-newer-libkiwix.patch")))) + "1vkmk9j2jii7ri4lcayr0dr5b2w3dc24lyqmm3g4234834b1f4wl")))) (build-system qt-build-system) (arguments - `(#:test-target "check" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (invoke "qmake" - (string-append "PREFIX=" - (assoc-ref outputs "out"))))) - (add-after 'install 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/kiwix-desktop")) - (qt-process-path (search-input-file - inputs "/lib/qt5/libexec/QtWebEngineProcess"))) - (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (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 + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (invoke "qmake" + (string-append "PREFIX=" + (assoc-ref outputs "out"))))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'install (assoc-ref gnu:%standard-phases 'install)) + (add-after 'install 'wrap-qt-process-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/kiwix-desktop")) + (qt-process-path (search-input-file + inputs "/lib/qt5/libexec/QtWebEngineProcess"))) + (wrap-program bin + `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) (inputs (list bash-minimal curl @@ -9682,14 +9687,14 @@ offline (such as Wikipedia), without any access to Internet.") (define-public kiwix-tools (package (name "kiwix-tools") - (version "3.5.0") + (version "3.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.kiwix.org/release/" "kiwix-tools/kiwix-tools-" version ".tar.xz")) (sha256 (base32 - "0q6b7viy1jr212q0glqid2hqxnsd2mxsx5gzcalkc4gb0bzgj32d")))) + "032lzzgn3hicai4lx701cs6h731cs29x1h59j9gggcgrp1n4wxks")))) (build-system meson-build-system) (inputs (list curl