amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Restore gnu-build-system phases.

Browse source 
* gnu/packages/bioinformatics.scm (bandage),
* gnu/packages/education.scm (openboard),
* gnu/packages/emulators.scm (qtmips),
* gnu/packages/games.scm (chessx),
* gnu/packages/kde-systemtools.scm (spectacle-ocr-screenshot),
* gnu/packages/qt.scm (pyotherside, qtwidgetanimationframework)
<#:phases>: Restore build phase.

* gnu/packages/admin.scm (wpa-supplicant-gui),
* gnu/packages/finance.scm (kitsas)
[arguments]<#:tests?>: Disable.
<#:phases>: Restore build phase.

* gnu/packages/engineering.scm (librecad)
[arguments]<#:test-target>: Delete.
<#:phases>: Restore build and check phases.

* gnu/packages/music.scm (samplebrain)
<#:phases>: Restore build, check, and install phases.

* gnu/packages/password-utils.scm (qtpass)
[arguments]<#:test-target>: Delete.
<#:phases>: Restore build, check, and install phases.

* gnu/packages/ebook.scm (inkbox),
* gnu/packages/engineering.scm (qelectrotech),
* gnu/packages/games.scm (doom-runner, moonlight-qt, pokerth,
qcheckers),
* gnu/packages/gps.scm (gpxsee),
* gnu/packages/hardware.scm (openrgb),
* gnu/packages/image-viewers.scm (qview),
* gnu/packages/pdf.scm (qpdfview),
* gnu/packages/qt.scm (signond),
* gnu/packages/radio.scm (dream)
<#:phases>: Restore build and install phases.

* gnu/packages/disk.scm (qdirstat),
* gnu/packages/pdf.scm (sioyek),
* gnu/packages/qt.scm (signon-plugin-oauth2),
* gnu/packages/radio.scm (qsstv, wfview),
* gnu/packages/security-token.scm (yubikey-manager-qt),
* gnu/packages/tex.scm (texmaker),
* gnu/packages/video.scm (smplayer)
[arguments]<#:tests?>: Disable.
<#:phases>: Restore build and install phases.

* gnu/packages/task-management.scm (timewarrior)
<#:phases>: Restore check phase.

* gnu/packages/audio.scm (supercollider)
<#:phases>: Restore install phase.

* 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
This commit is contained in:
Greg Hogan 2025-05-07 19:32:39 +00:00
parent 27e0cb7eda
commit f4ce754028
No known key found for this signature in database
GPG key ID: EF6EB27413CFEEF3
26 changed files with 322 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1716,7 +1716,6 @@ dist_patch_DATA = \
%D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \
%D%/packages/patches/kismet-unbundle-boost.patch \ %D%/packages/patches/kismet-unbundle-boost.patch \
%D%/packages/patches/kitty-fix-wayland-protocols.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/kmod-module-directory.patch \
%D%/packages/patches/kmscon-runtime-keymap-switch.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \
%D%/packages/patches/knot-remove-runtime-deps.patch \ %D%/packages/patches/knot-remove-runtime-deps.patch \

6
gnu/packages/admin.scm
View file

@ -2689,16 +2689,20 @@ command.")
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
(list (list
#:tests? #f ; no tests
;; Make sure the (rarely updated) package 'imagemagick/stable' ;; Make sure the (rarely updated) package 'imagemagick/stable'
;; does not end up in the closure. ;; does not end up in the closure.
#:disallowed-references (list imagemagick/stable) #: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 #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
(lambda _ (chdir "wpa_supplicant/wpa_gui-qt4"))) (lambda _ (chdir "wpa_supplicant/wpa_gui-qt4")))
(replace 'configure (replace 'configure
(lambda _ (invoke "qmake" "wpa_gui.pro"))) (lambda _ (invoke "qmake" "wpa_gui.pro")))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(add-after 'build 'build-icons (add-after 'build 'build-icons
(lambda _ (lambda _
;; Inkscape complains (but works) without a writable $HOME. ;; Inkscape complains (but works) without a writable $HOME.

4
gnu/packages/audio.scm
View file

@ -4221,6 +4221,9 @@ link REQUIRED)"))))))
"-DFORTIFY=ON" "-DFORTIFY=ON"
"-DLIBSCSYNTH=ON" "-DLIBSCSYNTH=ON"
"-DSC_EL=OFF") ;scel is packaged individually as emacs-scel "-DSC_EL=OFF") ;scel is packaged individually as emacs-scel
#:modules '((guix build cmake-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
;; HOME must be defined otherwise supercollider throws a "ERROR: ;; HOME must be defined otherwise supercollider throws a "ERROR:
@ -4248,6 +4251,7 @@ link REQUIRED)"))))))
(lambda _ (lambda _
(system "Xvfb &") (system "Xvfb &")
(setenv "DISPLAY" ":0"))) (setenv "DISPLAY" ":0")))
(replace 'install (assoc-ref gnu:%standard-phases 'install))
(add-before 'install 'install-ide (add-before 'install 'install-ide
(lambda _ (lambda _
(let* ((ide #$output:ide) (let* ((ide #$output:ide)

4
gnu/packages/bioinformatics.scm
View file

@ -18821,6 +18821,9 @@ Thus the per-base error rate is similar to the raw input reads.")
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
(list (list
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
;; TODO: Once <https://issues.guix.gnu.org/47475> is fixed, ;; TODO: Once <https://issues.guix.gnu.org/47475> is fixed,
;; consider uncommenting the following: ;; consider uncommenting the following:
;; ;;
@ -18841,6 +18844,7 @@ Thus the per-base error rate is similar to the raw input reads.")
(with-directory-excursion "tests" (with-directory-excursion "tests"
(setenv "XDG_RUNTIME_DIR" (getcwd)) (setenv "XDG_RUNTIME_DIR" (getcwd))
(invoke "./bandage_command_line_tests.sh"))))) (invoke "./bandage_command_line_tests.sh")))))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (replace 'install
(lambda _ (lambda _
(install-file "Bandage" (string-append #$output "/bin"))))))) (install-file "Bandage" (string-append #$output "/bin")))))))

6
gnu/packages/disk.scm
View file

@ -1809,11 +1809,17 @@ wrapper for disk usage querying and visualisation.")
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
(list (list
#:tests? #f
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda _ (lambda _
(system* "qmake" (string-append "INSTALL_PREFIX=" #$output)))) (system* "qmake" (string-append "INSTALL_PREFIX=" #$output))))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install))
(add-after 'install 'wrap (add-after 'install 'wrap
(lambda _ (lambda _
(wrap-program (string-append #$output (wrap-program (string-append #$output

7
gnu/packages/ebook.scm
View file

@ -405,6 +405,9 @@ accessing and converting various ebook file formats.")
#:tests? #f ; no test suite #:tests? #f ; no test suite
#:make-flags #:make-flags
#~(list (string-append "PREFIX=" #$output)) #~(list (string-append "PREFIX=" #$output))
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'prefix-opt (add-after 'unpack 'prefix-opt
@ -414,7 +417,9 @@ accessing and converting various ebook file formats.")
#$output)))) #$output))))
(replace 'configure (replace 'configure
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke (cons "qmake" make-flags))))))) (apply invoke (cons "qmake" make-flags))))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(native-inputs (native-inputs
(list qtbase-5)) (list qtbase-5))
(synopsis "EBook reader") (synopsis "EBook reader")

4
gnu/packages/education.scm
View file

@ -514,6 +514,9 @@ specialized device.")
(arguments (arguments
(list (list
#:tests? #f ;no tests #:tests? #f ;no tests
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'set-initial-values (add-after 'unpack 'set-initial-values
@ -542,6 +545,7 @@ specialized device.")
(replace 'configure (replace 'configure
(lambda _ (lambda _
(invoke "qmake" "OpenBoard.pro"))) (invoke "qmake" "OpenBoard.pro")))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (replace 'install
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((share (string-append #$output "/share")) (let* ((share (string-append #$output "/share"))

71
gnu/packages/emulators.scm
View file

@ -873,39 +873,44 @@ emulate a serial nullmodem over TCP/IP.")
"1fal7a8y5g0rqqjrk795jh1l50ihz01ppjnrfjrk9vkjbd59szbp")))) "1fal7a8y5g0rqqjrk795jh1l50ihz01ppjnrfjrk9vkjbd59szbp"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
'(#:phases (list
(modify-phases %standard-phases #:modules '((guix build qt-build-system)
(replace 'configure ((guix build gnu-build-system) #:prefix gnu:)
(lambda* (#:key outputs #:allow-other-keys) (guix build utils))
(invoke "qmake" #:phases
(string-append "PREFIX=" (assoc-ref outputs "out")) #~(modify-phases %standard-phases
"qtmips.pro"))) (replace 'configure
(replace 'check (lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key tests? #:allow-other-keys) (invoke "qmake"
(substitute* "tests/test.sh" (string-append "PREFIX=" (assoc-ref outputs "out"))
(("qtchooser.*") "")) "qtmips.pro")))
(substitute* '("tests/cpu_trap/test.sh" (replace 'build (assoc-ref gnu:%standard-phases 'build))
"tests/registers/test.sh") (replace 'check
(("sub-qtmips_cli") "qtmips_cli")) (lambda* (#:key tests? #:allow-other-keys)
(if tests? (substitute* "tests/test.sh"
(invoke "tests/run-all.sh") (("qtchooser.*") ""))
#t))) (substitute* '("tests/cpu_trap/test.sh"
(replace 'install "tests/registers/test.sh")
;; There is no install target. (("sub-qtmips_cli") "qtmips_cli"))
(lambda* (#:key outputs #:allow-other-keys) (if tests?
(let* ((out (assoc-ref outputs "out")) (invoke "tests/run-all.sh")
(bin (string-append out "/bin")) #t)))
(apps (string-append out "/share/applications")) (replace 'install
(icons (string-append out "/share/icons/hicolor"))) ;; There is no install target.
(install-file "qtmips_gui/qtmips_gui" bin) (lambda* (#:key outputs #:allow-other-keys)
(install-file "qtmips_cli/qtmips_cli" bin) (let* ((out (assoc-ref outputs "out"))
(install-file "data/qtmips.desktop" apps) (bin (string-append out "/bin"))
(install-file "data/icons/qtmips_gui.svg" (apps (string-append out "/share/applications"))
(string-append icons "/scalable/apps")) (icons (string-append out "/share/icons/hicolor")))
(install-file "data/icons/qtmips_gui.png" (install-file "qtmips_gui/qtmips_gui" bin)
(string-append icons "/48x48/apps")) (install-file "qtmips_cli/qtmips_cli" bin)
#t)))) (install-file "data/qtmips.desktop" apps)
#:tests? #f)) ; test suite wants mips toolchain (install-file "data/icons/qtmips_gui.svg"
(string-append icons "/scalable/apps"))
(install-file "data/icons/qtmips_gui.png"
(string-append icons "/48x48/apps"))
#t))))
#:tests? #f)) ; test suite wants mips toolchain
(inputs (inputs
(list elfutils qtbase-5 qtwayland-5)) (list elfutils qtbase-5 qtwayland-5))
(home-page "https://github.com/cvut/QtMips") (home-page "https://github.com/cvut/QtMips")

29
gnu/packages/engineering.scm
View file

@ -311,21 +311,25 @@ their devices.")
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
(list (list
#:test-target "check" #:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda _ (lambda _
(system* "qmake" (string-append "BOOST_DIR=" (system* "qmake" (string-append "BOOST_DIR="
#$(this-package-input "boost"))))) #$(this-package-input "boost")))))
(replace 'install (replace 'build (assoc-ref gnu:%standard-phases 'build))
(lambda* (#:key outputs #:allow-other-keys) (replace 'check (assoc-ref gnu:%standard-phases 'check))
(let ((bin (string-append #$output "/bin")) (replace 'install
(share (string-append #$output "/share/librecad"))) (lambda* (#:key outputs #:allow-other-keys)
(mkdir-p bin) (let ((bin (string-append #$output "/bin"))
(install-file "unix/librecad" bin) (share (string-append #$output "/share/librecad")))
(mkdir-p share) (mkdir-p bin)
(copy-recursively "unix/resources" share))))))) (install-file "unix/librecad" bin)
(mkdir-p share)
(copy-recursively "unix/resources" share)))))))
(inputs (inputs
(list bash-minimal boost muparser freetype qtbase-5 qtsvg-5)) (list bash-minimal boost muparser freetype qtbase-5 qtsvg-5))
(native-inputs (native-inputs
@ -906,6 +910,9 @@ required for Fritzing app.")
;; XXX: tests are built for the CMake build option but it seems to be ;; XXX: tests are built for the CMake build option but it seems to be
;; broken in 0.8.0. ;; broken in 0.8.0.
(list #:tests? #f (list #:tests? #f
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -913,7 +920,9 @@ required for Fritzing app.")
;; Patch hardcoded path before running qmake. ;; Patch hardcoded path before running qmake.
(substitute* "qelectrotech.pro" (substitute* "qelectrotech.pro"
(("\\/usr\\/local") #$output)) (("\\/usr\\/local") #$output))
(invoke "qmake")))))) (invoke "qmake")))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(native-inputs (native-inputs
(list pkg-config qttools-5)) (list pkg-config qttools-5))
(inputs (inputs

5
gnu/packages/finance.scm
View file

@ -1359,8 +1359,10 @@ agent.")
(inputs (list libzip qtsvg qtwebengine qt5compat)) (inputs (list libzip qtsvg qtwebengine qt5compat))
(arguments (arguments
(list #:tests? #f ; tests do not even build with Qt6 anymore (list #:tests? #f ; tests do not even build with Qt6 anymore
#:test-target "check"
#:qtbase qtbase ; use Qt6 #:qtbase qtbase ; use Qt6
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -1372,6 +1374,7 @@ agent.")
(substitute* "kitsasproject.pro" (substitute* "kitsasproject.pro"
((" *(unittest|testit).*") "") ((" *(unittest|testit).*") "")
(("\\\\") "")))) (("\\\\") ""))))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (replace 'install
(lambda* _ (lambda* _
(install-file "kitsas/kitsas" (install-file "kitsas/kitsas"

85
gnu/packages/games.scm
View file

@ -1554,6 +1554,9 @@ practise.")
(arguments (arguments
(list (list
#:tests? #f ;no tests #:tests? #f ;no tests
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -1563,6 +1566,8 @@ practise.")
#$output)) #$output))
(invoke "qmake" "DoomRunner.pro" "-spec" "linux-g++" (invoke "qmake" "DoomRunner.pro" "-spec" "linux-g++"
"\"CONFIG+=release\""))) "\"CONFIG+=release\"")))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install))
(add-after 'install 'install-xdg (add-after 'install 'install-xdg
(lambda _ (lambda _
(with-directory-excursion "Install/XDG" (with-directory-excursion "Install/XDG"
@ -7183,6 +7188,9 @@ colors, pictures, and sounds.")
(arguments (arguments
(list (list
#:tests? #f ;no test suite #:tests? #f ;no test suite
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -7198,7 +7206,9 @@ colors, pictures, and sounds.")
((" h264bitstream.*\n") "") ((" h264bitstream.*\n") "")
((" app \\\\") " app") ((" app \\\\") " app")
(("app.depends") "INCLUDEPATH +=")) (("app.depends") "INCLUDEPATH +="))
(invoke "qmake" (string-append "PREFIX=" #$output))))))) (invoke "qmake" (string-append "PREFIX=" #$output))))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(native-inputs (list pkg-config qttools-5)) (native-inputs (list pkg-config qttools-5))
(inputs (list ffmpeg (inputs (list ffmpeg
h264bitstream h264bitstream
@ -11831,12 +11841,17 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
(arguments (arguments
(list (list
#:tests? #f #:tests? #f
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda _ (lambda _
(invoke "qmake" (invoke "qmake"
(string-append "PREFIX=" #$output))))))) (string-append "PREFIX=" #$output))))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(inputs (list qtbase-5 qtsvg-5)) (inputs (list qtbase-5 qtsvg-5))
(home-page "https://portnov.github.io/qcheckers/") (home-page "https://portnov.github.io/qcheckers/")
(synopsis "Qt-based checkers boardgame") (synopsis "Qt-based checkers boardgame")
@ -12023,35 +12038,36 @@ and chess engines.")
(inputs (inputs
(list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib)) (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib))
(arguments (arguments
`(#:tests? #f (list
#:phases #:tests? #f
(modify-phases %standard-phases #:modules '((guix build qt-build-system)
(add-after 'unpack 'fix-paths ((guix build gnu-build-system) #:prefix gnu:)
(lambda* (#:key inputs #:allow-other-keys) (guix build utils))
(substitute* "chessx.pro" #:phases
(("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") #~(modify-phases %standard-phases
(search-input-file inputs "/bin/lrelease"))))) (add-after 'unpack 'fix-paths
(add-after 'fix-paths 'make-qt-deterministic (lambda* (#:key inputs #:allow-other-keys)
(lambda _ (substitute* "chessx.pro"
(setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease")
#t)) (search-input-file inputs "/bin/lrelease")))))
(add-after 'make-qt-deterministic 'disable-versioncheck (add-after 'fix-paths 'make-qt-deterministic
(lambda _ (lambda _
(substitute* "src/database/settings.cpp" (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")))
(("\"/General/onlineVersionCheck\", true") (add-after 'make-qt-deterministic 'disable-versioncheck
"\"/General/onlineVersionCheck\", false")) (lambda _
#t)) (substitute* "src/database/settings.cpp"
(replace 'configure (("\"/General/onlineVersionCheck\", true")
(lambda _ "\"/General/onlineVersionCheck\", false"))))
(invoke "qmake") (replace 'configure
#t)) (lambda _
(replace 'install (invoke "qmake")))
(lambda* (#:key outputs #:allow-other-keys) (replace 'build (assoc-ref gnu:%standard-phases 'build))
(let ((out (assoc-ref outputs "out"))) (replace 'install
(install-file "release/chessx" (string-append out "/bin")) (lambda* (#:key outputs #:allow-other-keys)
(install-file "unix/chessx.desktop" (let ((out (assoc-ref outputs "out")))
(string-append out "/share/applications"))) (install-file "release/chessx" (string-append out "/bin"))
#t))))) (install-file "unix/chessx.desktop"
(string-append out "/share/applications"))))))))
(synopsis "Chess game database") (synopsis "Chess game database")
(description (description
"ChessX is a chess database. With ChessX you can operate on your "ChessX is a chess database. With ChessX you can operate on your
@ -12425,6 +12441,9 @@ game.") ;thanks to Debian for description
(arguments (arguments
(list (list
#:tests? #f ; No test suite #:tests? #f ; No test suite
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-paths (add-after 'unpack 'fix-paths
@ -12447,7 +12466,9 @@ game.") ;thanks to Debian for description
(replace 'configure (replace 'configure
(lambda _ (lambda _
(invoke "qmake" "pokerth.pro" "CONFIG+=client" (invoke "qmake" "pokerth.pro" "CONFIG+=client"
(string-append "PREFIX=" #$output))))))) (string-append "PREFIX=" #$output))))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(home-page "https://www.pokerth.net") (home-page "https://www.pokerth.net")
(synopsis "Texas holdem poker game") (synopsis "Texas holdem poker game")
(description (description

7
gnu/packages/gps.scm
View file

@ -220,6 +220,9 @@ coordinates as well as partial support for adjustments in global coordinate syst
(list (list
#:qtbase qtbase #:qtbase qtbase
#:tests? #f ; no tests #: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 #:phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
;; Use lrelease to convert TS translation files into QM files. ;; Use lrelease to convert TS translation files into QM files.
@ -227,7 +230,9 @@ coordinates as well as partial support for adjustments in global coordinate syst
(apply invoke "lrelease" (apply invoke "lrelease"
(find-files "lang" "\\.ts")) (find-files "lang" "\\.ts"))
(invoke "qmake" (invoke "qmake"
(string-append "PREFIX=" #$output))))))) (string-append "PREFIX=" #$output))))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(inputs (list libxkbcommon qtbase qtpositioning qtserialport qtsvg)) (inputs (list libxkbcommon qtbase qtpositioning qtserialport qtsvg))
(native-inputs (list qttools)) (native-inputs (list qttools))
(home-page "https://www.gpxsee.org") (home-page "https://www.gpxsee.org")

7
gnu/packages/hardware.scm
View file

@ -1149,6 +1149,9 @@ technology, such as head mounted displays with built in head tracking.")
#:tests? #f ; doesn't have tests #:tests? #f ; doesn't have tests
#:make-flags #:make-flags
#~(list (string-append "INSTALL_ROOT=" #$output )) #~(list (string-append "INSTALL_ROOT=" #$output ))
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'unbundle (add-after 'unpack 'unbundle
@ -1167,7 +1170,9 @@ technology, such as head mounted displays with built in head tracking.")
"/bin/chmod"))))) "/bin/chmod")))))
;; Call qmake instead of configure to create a Makefile. ;; Call qmake instead of configure to create a Makefile.
(replace 'configure (replace 'configure
(lambda _ (invoke "qmake" "PREFIX=/" "OpenRGB.pro")))))) (lambda _ (invoke "qmake" "PREFIX=/" "OpenRGB.pro")))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(inputs (inputs
(list coreutils (list coreutils
hidapi hidapi

7
gnu/packages/image-viewers.scm
View file

@ -822,6 +822,9 @@ Poppler-Qt5 binding, PDF documents.")
(list (list
#:qtbase qtbase #:qtbase qtbase
#:tests? #f ; test code doesn't compile #:tests? #f ; test code doesn't compile
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -836,7 +839,9 @@ Poppler-Qt5 binding, PDF documents.")
(lambda _ (lambda _
(substitute* "src/qvaboutdialog.cpp" (substitute* "src/qvaboutdialog.cpp"
(("qvApp->checkUpdates\\(\\);") "") (("qvApp->checkUpdates\\(\\);") "")
(("updateText\\(\\);") ""))))))) (("updateText\\(\\);") ""))))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(native-inputs (native-inputs
(list qttools)) (list qttools))
(inputs (inputs

4
gnu/packages/kde-systemtools.scm
View file

@ -402,11 +402,15 @@ This package is part of the KDE administration module.")
(arguments (arguments
(list #:qtbase qtbase (list #:qtbase qtbase
#:tests? #f ;no tests #:tests? #f ;no tests
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda _ (lambda _
(invoke "qmake" (string-append "PREFIX=" #$output)))) (invoke "qmake" (string-append "PREFIX=" #$output))))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (replace 'install
(lambda _ (lambda _
(install-file "spectacle-ocr-screenshot" (install-file "spectacle-ocr-screenshot"

8
gnu/packages/music.scm
View file

@ -8249,13 +8249,19 @@ Renoise, VCV Rack, or SuperCollider.")
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
(list #:tests? #f ;no tests (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 #:phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda _ (lambda _
(substitute* "samplebrain.pro" (substitute* "samplebrain.pro"
(("\\/usr") (("\\/usr")
#$output)) #$output))
(invoke "qmake")))))) (invoke "qmake")))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'check (assoc-ref gnu:%standard-phases 'check))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(inputs (list fftw liblo libsndfile portaudio)) (inputs (list fftw liblo libsndfile portaudio))
(home-page "https://thentrythis.org/projects/samplebrain/") (home-page "https://thentrythis.org/projects/samplebrain/")
(synopsis "Sample mashing synthesizer designed by Aphex Twin") (synopsis "Sample mashing synthesizer designed by Aphex Twin")

7
gnu/packages/password-utils.scm
View file

@ -1079,7 +1079,9 @@ key URIs using the standard otpauth:// scheme.")
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
(list (list
#:test-target "check" #:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -1088,9 +1090,12 @@ key URIs using the standard otpauth:// scheme.")
"QMAKE_LRELEASE=lrelease" "QMAKE_LRELEASE=lrelease"
"QMAKE_LUPDATE=lupdate" "QMAKE_LUPDATE=lupdate"
(string-append "PREFIX=" #$output)))) (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 (add-before 'check 'pre-check
;; Fontconfig needs a writable cache. ;; Fontconfig needs a writable cache.
(lambda _ (setenv "HOME" "/tmp"))) (lambda _ (setenv "HOME" "/tmp")))
(replace 'install (assoc-ref gnu:%standard-phases 'install))
(add-after 'install 'install-auxilliary (add-after 'install 'install-auxilliary
;; Install man-page, icon and .desktop file. ;; Install man-page, icon and .desktop file.
(lambda _ (lambda _

40
gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch
View file

@ -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 <mgautier@kymeria.fr>
Date: Thu, 9 Feb 2023 09:47:47 +0100
Subject: [PATCH] With last version of libkiwix, Downloader now return
shared_ptr<Download>.
---
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<kiwix::Download> 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<kiwix::Download> download;
try {
std::pair<std::string, std::string> downloadDir("dir", downloadPath.toStdString());
const std::vector<std::pair<std::string, std::string>> options = { downloadDir };
--
2.41.0

16
gnu/packages/pdf.scm
View file

@ -1066,13 +1066,18 @@ program capable of converting PDF into other formats.")
qtsvg-5)) qtsvg-5))
(arguments (arguments
(list #:tests? #f ; no tests (list #:tests? #f ; no tests
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda _ (lambda _
(substitute* "qpdfview.pri" (substitute* "qpdfview.pri"
(("/usr") #$output)) (("/usr") #$output))
(invoke "qmake" "qpdfview.pro")))))) (invoke "qmake" "qpdfview.pro")))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(home-page "https://launchpad.net/qpdfview") (home-page "https://launchpad.net/qpdfview")
(synopsis "Tabbed document viewer") (synopsis "Tabbed document viewer")
(description "@command{qpdfview} is a document viewer for PDF, PS and DJVU (description "@command{qpdfview} is a document viewer for PDF, PS and DJVU
@ -1853,9 +1858,12 @@ Keywords: html2pdf, htmltopdf")
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list
#:tests? #f ; no tests
#:configure-flags #:configure-flags
#~(list (string-append "PREFIX=" #$output)) #~(list (string-append "PREFIX=" #$output))
#:test-target "check" #:modules '((guix build cmake-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-paths (add-after 'unpack 'patch-paths
@ -1868,7 +1876,9 @@ Keywords: html2pdf, htmltopdf")
(replace 'configure (replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys) (lambda* (#:key configure-flags #:allow-other-keys)
(apply invoke "qmake" configure-flags))) (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 _ (lambda _
(install-file "resources/sioyek.1" (install-file "resources/sioyek.1"
(string-append #$output "/share/man/man1"))))))) (string-append #$output "/share/man/man1")))))))

22
gnu/packages/qt.scm
View file

@ -4132,6 +4132,9 @@ instances.")
(arguments (arguments
(list (list
#:qtbase qtbase #:qtbase qtbase
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-installation-prefix (add-after 'unpack 'fix-installation-prefix
@ -4146,6 +4149,7 @@ instances.")
(replace 'configure (replace 'configure
(lambda _ (lambda _
(invoke "qmake"))) (invoke "qmake")))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
@ -5241,6 +5245,9 @@ programming paradigm.")
(arguments (arguments
(list #:qtbase qtbase (list #:qtbase qtbase
#:tests? #f ;no tests #:tests? #f ;no tests
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
;; This project does not have any build rule but its demo has ;; This project does not have any build rule but its demo has
@ -5257,6 +5264,7 @@ programming paradigm.")
(replace 'configure (replace 'configure
(lambda _ (lambda _
(invoke "qmake"))) (invoke "qmake")))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
;; No install rule exists. ;; No install rule exists.
(replace 'install (replace 'install
(lambda _ (lambda _
@ -6119,6 +6127,9 @@ a secure way.")))
(inputs (list dbus glib libaccounts-glib)) (inputs (list dbus glib libaccounts-glib))
(arguments (arguments
(list #:tests? #f ; Figure out how to run tests (list #:tests? #f ; Figure out how to run tests
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -6141,7 +6152,9 @@ a secure way.")))
(string-append "PREFIX=" #$output) (string-append "PREFIX=" #$output)
(string-append "LIBDIR=" #$output "/lib") (string-append "LIBDIR=" #$output "/lib")
(string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath,"
#$output "/lib -Wl,-rpath,"))))))) #$output "/lib -Wl,-rpath,"))))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(home-page "https://accounts-sso.gitlab.io/signond/index.html") (home-page "https://accounts-sso.gitlab.io/signond/index.html")
(synopsis "Perform user authentication over D-Bus") (synopsis "Perform user authentication over D-Bus")
(description "This package provides a D-Bus service which performs user (description "This package provides a D-Bus service which performs user
@ -6191,6 +6204,9 @@ authentication on behalf of its clients.")
(inputs (list signond)) (inputs (list signond))
(arguments (arguments
(list #:tests? #f ;no tests (list #:tests? #f ;no tests
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -6202,7 +6218,9 @@ authentication on behalf of its clients.")
(string-append "PREFIX=" #$output) (string-append "PREFIX=" #$output)
(string-append "LIBDIR=" #$output "/lib") (string-append "LIBDIR=" #$output "/lib")
(string-append "SIGNON_PLUGINS_DIR=" #$output (string-append "SIGNON_PLUGINS_DIR=" #$output
"/lib/signon"))))))) "/lib/signon"))))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(synopsis "OAuth 2 plugin for signon") (synopsis "OAuth 2 plugin for signon")
(description (description
"This plugin for the Accounts-SSO SignOn daemon handles the OAuth "This plugin for the Accounts-SSO SignOn daemon handles the OAuth

89
gnu/packages/radio.scm
View file

@ -2288,13 +2288,19 @@ NanoVNA vector network analyzers.")
qtbase-5 qtbase-5
v4l-utils)) v4l-utils))
(arguments (arguments
`(#:tests? #f ; No test suite. (list
#:phases #:tests? #f ; No test suite.
(modify-phases %standard-phases #:modules '((guix build qt-build-system)
(replace 'configure ((guix build gnu-build-system) #:prefix gnu:)
(lambda* (#:key outputs #:allow-other-keys) (guix build utils))
(invoke "qmake" #:phases
(string-append "PREFIX=" (assoc-ref outputs "out")))))))) #~(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)))))
(home-page "http://users.telenet.be/on4qz/qsstv/") (home-page "http://users.telenet.be/on4qz/qsstv/")
(synopsis "Program for receiving and transmitting SSTV and HAMDRM") (synopsis "Program for receiving and transmitting SSTV and HAMDRM")
(description (description
@ -2650,34 +2656,40 @@ sinks and sources.")
speexdsp speexdsp
zlib)) zlib))
(arguments (arguments
`(#:tests? #f (list
#:phases #:tests? #f
(modify-phases %standard-phases #:modules '((guix build qt-build-system)
(add-after 'unpack 'fix-paths ((guix build gnu-build-system) #:prefix gnu:)
(lambda* (#:key inputs outputs #:allow-other-keys) (guix build utils))
(substitute* "dream.pro" #:phases
(("target\\.path = /usr/bin") #~(modify-phases %standard-phases
(string-append "target.path = " (add-after 'unpack 'fix-paths
(assoc-ref outputs "out") "/bin")) (lambda* (#:key inputs outputs #:allow-other-keys)
(("documentation\\.path = /usr/share/man/man1") (substitute* "dream.pro"
(string-append "documentation.path = " (("target\\.path = /usr/bin")
(assoc-ref outputs "out") (string-append "target.path = "
"/share/man/man1")) (assoc-ref outputs "out") "/bin"))
(("/usr/include/pulse") (("documentation\\.path = /usr/share/man/man1")
(search-input-directory inputs "/include/pulse")) (string-append "documentation.path = "
(("/usr/include/sndfile\\.h") (assoc-ref outputs "out")
(search-input-file inputs "/include/sndfile.h")) "/share/man/man1"))
(("/usr/include/opus") (("/usr/include/pulse")
(search-input-directory inputs "/include/opus")) (search-input-directory inputs "/include/pulse"))
(("/usr/include/speex") (("/usr/include/sndfile\\.h")
(search-input-directory inputs "/include/speex")) (search-input-file inputs "/include/sndfile.h"))
(("/usr/include/qwt") (("/usr/include/opus")
(search-input-directory inputs "/include/qwt")) (search-input-directory inputs "/include/opus"))
(("\\$\\$OUT_PWD/include/neaacdec\\.h") (("/usr/include/speex")
(search-input-file inputs "/include/neaacdec.h"))))) (search-input-directory inputs "/include/speex"))
(replace 'configure (("/usr/include/qwt")
(lambda _ (search-input-directory inputs "/include/qwt"))
(invoke "qmake")))))) (("\\$\\$OUT_PWD/include/neaacdec\\.h")
(search-input-file inputs "/include/neaacdec.h")))))
(replace 'configure
(lambda _
(invoke "qmake")))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(home-page "https://sourceforge.net/projects/drm/") (home-page "https://sourceforge.net/projects/drm/")
(synopsis "Digital Radio Mondiale receiver") (synopsis "Digital Radio Mondiale receiver")
(description (description
@ -3166,6 +3178,9 @@ software-defined radio receivers.")
(arguments (arguments
(list (list
#:tests? #f ; No test suite. #:tests? #f ; No test suite.
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-paths (add-after 'unpack 'fix-paths
@ -3190,7 +3205,9 @@ software-defined radio receivers.")
(chdir "build") (chdir "build")
(invoke "qmake" (invoke "qmake"
(string-append "PREFIX=" #$output) (string-append "PREFIX=" #$output)
"../wfview.pro")))))) "../wfview.pro")))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(inputs (inputs
(list eigen (list eigen
eudev eudev

5
gnu/packages/security-token.scm
View file

@ -888,6 +888,9 @@ an unprivileged user.")
(arguments (arguments
(list (list
#:tests? #f ;no test suite #:tests? #f ;no test suite
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-paths (add-after 'unpack 'patch-paths
@ -898,6 +901,8 @@ an unprivileged user.")
(replace 'configure (replace 'configure
(lambda _ (lambda _
(invoke "qmake"))) (invoke "qmake")))
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install))
(add-after 'install 'install-desktop-resources (add-after 'install 'install-desktop-resources
(lambda _ (lambda _
(let ((datadir (string-append #$output "/share"))) (let ((datadir (string-append #$output "/share")))

7
gnu/packages/task-management.scm
View file

@ -267,6 +267,9 @@ execution, and libreadline support.")
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list
#:modules '((guix build cmake-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-cmake-shell (add-after 'patch-source-shebangs 'patch-cmake-shell
@ -282,6 +285,10 @@ execution, and libreadline support.")
(substitute* "doc/man7/CMakeLists.txt" (substitute* "doc/man7/CMakeLists.txt"
(("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}") (("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}")
"${CMAKE_CURRENT_SOURCE_DIR}")))) "${CMAKE_CURRENT_SOURCE_DIR}"))))
(replace 'check
(lambda* (#:rest args)
(apply (assoc-ref gnu:%standard-phases 'check)
#:test-target "test" args)))
(add-after 'install 'install-completions (add-after 'install 'install-completions
(lambda _ (lambda _
(let ((bash-completion-install-dir (let ((bash-completion-install-dir

32
gnu/packages/tex.scm
View file

@ -77468,19 +77468,25 @@ PDF documents.")
"1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx")))) "1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:test-target "check" (list
#:phases #:tests? #f ; no tests
(modify-phases %standard-phases #:modules '((guix build qt-build-system)
;; Qt has its own configuration utility. ((guix build gnu-build-system) #:prefix gnu:)
(replace 'configure (guix build utils))
(lambda* (#:key outputs #:allow-other-keys) #:phases
(let ((out (assoc-ref outputs "out"))) #~(modify-phases %standard-phases
(invoke "qmake" ;; Qt has its own configuration utility.
(string-append "PREFIX=" out) (replace 'configure
(string-append "DESKTOPDIR=" out "/share/applications") (lambda* (#:key outputs #:allow-other-keys)
(string-append "ICONDIR=" out "/share/pixmaps") (let ((out (assoc-ref outputs "out")))
(string-append "METAINFODIR=" out "/share/metainfo") (invoke "qmake"
"texmaker.pro"))))))) (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 (inputs
(list poppler-qt5 qtbase-5 qtwayland-5 qtscript-5 zlib)) (list poppler-qt5 qtbase-5 qtwayland-5 qtscript-5 zlib))
(native-inputs (native-inputs

5
gnu/packages/video.scm
View file

@ -2833,9 +2833,14 @@ projects while introducing many more.")
(list #:tests? #false ; no tests (list #:tests? #false ; no tests
#:make-flags #~(list (string-append "PREFIX=" #$output) #:make-flags #~(list (string-append "PREFIX=" #$output)
(string-append "CC=" #+(cc-for-target))) (string-append "CC=" #+(cc-for-target)))
#:modules '((guix build qt-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install (assoc-ref gnu:%standard-phases 'install))
(add-after 'install 'wrap-executable (add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))

39
gnu/packages/web.scm
View file

@ -9602,7 +9602,7 @@ grepping the list.")
(define-public libzim (define-public libzim
(package (package
(name "libzim") (name "libzim")
(version "8.2.1") (version "9.3.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -9610,7 +9610,7 @@ grepping the list.")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"1g735aqw0vlxqgyjv02lvq24dr5shydp4y8mqianf8720s5fs73f")) "1il1vc1hs954s3vnwhr337165dxbykvrldrvbilp5jxbkmwqb60d"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
@ -9636,7 +9636,7 @@ for ZIM files.")
(define-public kiwix-lib (define-public kiwix-lib
(package (package
(name "kiwix-lib") (name "kiwix-lib")
(version "13.0.0") (version "14.0.0")
(home-page "https://github.com/kiwix/kiwix-lib/") (home-page "https://github.com/kiwix/kiwix-lib/")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -9645,7 +9645,7 @@ for ZIM files.")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"0mvlppbj0mqn4ka3cfaaj1pvn062cxbgz01c0nq04x0mzq1xwh5w")) "099arjsx1wgz5jhvzn49859wh0v8n3ya33kmnqaw69h55mjvgza0"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
@ -9681,7 +9681,7 @@ It contains the code shared by all Kiwix ports.")
(define-public kiwix-desktop (define-public kiwix-desktop
(package (package
(name "kiwix-desktop") (name "kiwix-desktop")
(version "2.3.1") (version "2.4.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -9690,18 +9690,23 @@ It contains the code shared by all Kiwix ports.")
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0hlk05gcb3fmnxhwj6gan51v98rdq3iv2lklwbpmm1bazmz8i7br")) "1vkmk9j2jii7ri4lcayr0dr5b2w3dc24lyqmm3g4234834b1f4wl"))))
(patches (search-patches "kiwix-desktop-newer-libkiwix.patch"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:test-target "check" (list
#:phases #:tests? #f ; no tests
(modify-phases %standard-phases #:modules '((guix build qt-build-system)
(replace 'configure ((guix build gnu-build-system) #:prefix gnu:)
(lambda* (#:key outputs #:allow-other-keys) (guix build utils))
(invoke "qmake" #:phases
(string-append "PREFIX=" #~(modify-phases %standard-phases
(assoc-ref outputs "out")))))))) (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)))))
(inputs (inputs
(list bash-minimal (list bash-minimal
curl curl
@ -9730,14 +9735,14 @@ offline (such as Wikipedia), without any access to Internet.")
(define-public kiwix-tools (define-public kiwix-tools
(package (package
(name "kiwix-tools") (name "kiwix-tools")
(version "3.5.0") (version "3.7.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.kiwix.org/release/" (uri (string-append "https://download.kiwix.org/release/"
"kiwix-tools/kiwix-tools-" version ".tar.xz")) "kiwix-tools/kiwix-tools-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0q6b7viy1jr212q0glqid2hqxnsd2mxsx5gzcalkc4gb0bzgj32d")))) "032lzzgn3hicai4lx701cs6h731cs29x1h59j9gggcgrp1n4wxks"))))
(build-system meson-build-system) (build-system meson-build-system)
(inputs (inputs
(list curl (list curl