[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge remote-tracking branch 'savannah/master' into core-updates
|
From: |
guix-commits |
|
Subject: |
02/02: Merge remote-tracking branch 'savannah/master' into core-updates |
|
Date: |
Fri, 19 Apr 2024 08:55:54 -0400 (EDT) |
cbaines pushed a commit to branch core-updates
in repository guix.
commit 5fec94f3a3d4c67b748f11847064ed60d67c5ade
Merge: 6931ca9baa 949f97f7f9
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Fri Apr 19 13:17:08 2024 +0100
Merge remote-tracking branch 'savannah/master' into core-updates
Change-Id: I4f15bcb3e575062c4dd3b6c07a48470300413f24
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/dictionaries.scm
gnu/packages/display-managers.scm
gnu/packages/engineering.scm
gnu/packages/geo.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/gnome-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/mail.scm
gnu/packages/patches/eudev-rules-directory.patch
gnu/packages/plotutils.scm
gnu/packages/sdl.scm
gnu/packages/syndication.scm
.dir-locals.el | 3 -
.guix-authorizations | 4 -
Makefile.am | 57 +-
NEWS | 4 +-
build-aux/xgettext.scm | 90 +
config-daemon.ac | 2 +-
doc/build.scm | 2 +-
doc/contributing.texi | 200 +
doc/guix-cookbook.texi | 18 +-
doc/guix.texi | 716 +-
doc/htmlxref.cnf | 6 +-
doc/images/bootstrap-graph.dot | 52 +-
doc/images/bootstrap-packages.dot | 32 +-
doc/images/coreutils-bag-graph.dot | 56 +-
doc/images/coreutils-graph.dot | 18 +-
doc/images/gcc-core-mesboot0-graph.dot | 28 +-
doc/images/service-graph.dot | 16 +-
doc/images/shepherd-graph.dot | 54 +-
doc/local.mk | 105 +-
etc/guix-install.sh | 175 +-
etc/news.scm | 99 +-
etc/teams.scm | 8 -
gnu/bootloader/u-boot.scm | 15 +
gnu/build/linux-modules.scm | 7 +-
gnu/ci.scm | 12 +-
gnu/home.scm | 5 +-
gnu/home/services/shells.scm | 4 +-
gnu/home/services/shepherd.scm | 7 +-
gnu/installer/newt/network.scm | 4 +-
gnu/installer/services.scm | 5 -
gnu/local.mk | 54 +-
gnu/packages/accessibility.scm | 10 +-
gnu/packages/admin.scm | 167 +-
gnu/packages/algebra.scm | 17 +-
gnu/packages/android.scm | 1 +
gnu/packages/animation.scm | 4 +-
gnu/packages/apl.scm | 2 +-
gnu/packages/arcan.scm | 83 +-
gnu/packages/astronomy.scm | 407 +-
gnu/packages/audio.scm | 22 +-
gnu/packages/aux-files/emacs/comp-integrity.el | 132 +
gnu/packages/aux-files/linux-libre/6.8-arm.conf | 11773 ++++++
gnu/packages/aux-files/linux-libre/6.8-arm64.conf | 11827 ++++++
gnu/packages/aux-files/linux-libre/6.8-i686.conf | 11899 ++++++
gnu/packages/aux-files/linux-libre/6.8-x86_64.conf | 12107 ++++++
gnu/packages/avr-xyz.scm | 2 -
gnu/packages/axoloti.scm | 497 +-
gnu/packages/backup.scm | 171 +-
gnu/packages/bioconductor.scm | 89 +-
gnu/packages/bioinformatics.scm | 40 +-
gnu/packages/bootloaders.scm | 4 +-
gnu/packages/browser-extensions.scm | 12 +-
gnu/packages/build-tools.scm | 23 +
gnu/packages/calendar.scm | 4 +-
gnu/packages/certs.scm | 16 +
gnu/packages/check.scm | 128 +-
gnu/packages/chez.scm | 1024 +-
gnu/packages/clifm.scm | 4 +-
gnu/packages/clojure.scm | 71 +-
gnu/packages/cmake.scm | 46 +-
gnu/packages/code.scm | 130 +-
gnu/packages/commencement.scm | 11 +-
gnu/packages/compression.scm | 27 +
gnu/packages/conky.scm | 5 +-
gnu/packages/containers.scm | 94 +-
gnu/packages/cpio.scm | 4 +-
gnu/packages/cpp.scm | 131 +-
gnu/packages/cran.scm | 460 +-
gnu/packages/crates-graphics.scm | 14 +-
gnu/packages/cross-base.scm | 25 +-
gnu/packages/cross-toolchain.scm | 5 +
gnu/packages/crypto.scm | 4 +-
gnu/packages/curl.scm | 2 +
gnu/packages/data-language.scm | 90 +
gnu/packages/databases.scm | 29 +-
gnu/packages/debian.scm | 34 +
gnu/packages/dictionaries.scm | 8 +-
gnu/packages/diffoscope.scm | 11 +-
gnu/packages/disk.scm | 113 +-
gnu/packages/display-managers.scm | 67 +-
gnu/packages/docker.scm | 4 +-
gnu/packages/documentation.scm | 125 +
gnu/packages/education.scm | 6 +-
gnu/packages/electronics.scm | 2 +-
gnu/packages/emacs-xyz.scm | 374 +-
gnu/packages/emacs.scm | 34 +-
gnu/packages/emulators.scm | 4 +-
gnu/packages/enchant.scm | 26 +-
gnu/packages/engineering.scm | 52 +-
gnu/packages/file-systems.scm | 1 +
gnu/packages/finance.scm | 31 +-
gnu/packages/firmware.scm | 117 +-
gnu/packages/flashing-tools.scm | 59 +-
gnu/packages/fltk.scm | 4 +-
gnu/packages/freedesktop.scm | 146 +-
gnu/packages/game-development.scm | 81 +-
gnu/packages/games.scm | 242 +-
gnu/packages/gcc.scm | 16 +-
gnu/packages/gdb.scm | 4 +-
gnu/packages/geo.scm | 155 +-
gnu/packages/gimp.scm | 47 +-
gnu/packages/gl.scm | 56 +-
gnu/packages/glib.scm | 537 +-
gnu/packages/gnome-xyz.scm | 670 +-
gnu/packages/gnome.scm | 2331 +-
gnu/packages/gnunet.scm | 101 +-
gnu/packages/gnupg.scm | 6 +-
gnu/packages/gnuzilla.scm | 13 +-
gnu/packages/golang-check.scm | 287 +-
gnu/packages/golang-compression.scm | 71 +-
gnu/packages/golang-crypto.scm | 161 +-
gnu/packages/golang-web.scm | 103 +-
gnu/packages/golang-xyz.scm | 1690 +-
gnu/packages/golang.scm | 582 +-
gnu/packages/gps.scm | 12 +-
gnu/packages/graph.scm | 6 +-
gnu/packages/graphics.scm | 279 +-
gnu/packages/gstreamer.scm | 32 +-
gnu/packages/gtk.scm | 245 +-
gnu/packages/guile-xyz.scm | 135 +-
gnu/packages/guile.scm | 4 +-
gnu/packages/hardware.scm | 64 +
gnu/packages/haskell-xyz.scm | 9 +-
gnu/packages/image-processing.scm | 130 +-
gnu/packages/image.scm | 25 +-
gnu/packages/ipfs.scm | 64 +-
gnu/packages/irc.scm | 5 +-
gnu/packages/jami.scm | 39 +-
gnu/packages/java-graphics.scm | 125 +-
gnu/packages/javascript.scm | 32 +-
gnu/packages/kde-frameworks.scm | 62 +-
gnu/packages/kde-games.scm | 2 +-
gnu/packages/kde-internet.scm | 2 +
gnu/packages/kde-multimedia.scm | 1 +
gnu/packages/kde-pim.scm | 5 +-
gnu/packages/kde-plasma.scm | 4 +-
gnu/packages/kde-utils.scm | 7 +-
gnu/packages/kde.scm | 82 +-
gnu/packages/language.scm | 6 +-
gnu/packages/libreoffice.scm | 18 +-
gnu/packages/librewolf.scm | 621 +
gnu/packages/libusb.scm | 144 +-
gnu/packages/linux.scm | 276 +-
gnu/packages/lisp-xyz.scm | 106 +-
gnu/packages/lisp.scm | 1 -
gnu/packages/llvm-meta.scm | 15 +
gnu/packages/llvm.scm | 56 +-
gnu/packages/loko.scm | 2 +-
gnu/packages/lua.scm | 219 +-
gnu/packages/machine-learning.scm | 76 +-
gnu/packages/magic-wormhole.scm | 160 +-
gnu/packages/mail.scm | 48 +-
gnu/packages/markup.scm | 135 +-
gnu/packages/mastodon.scm | 4 +-
gnu/packages/maths.scm | 72 +-
gnu/packages/messaging.scm | 68 +-
gnu/packages/mp3.scm | 1 +
gnu/packages/mpd.scm | 1 +
gnu/packages/mpi.scm | 6 +-
gnu/packages/multiprecision.scm | 4 +-
gnu/packages/music.scm | 327 +-
gnu/packages/netpbm.scm | 10 +-
gnu/packages/networking.scm | 48 +-
gnu/packages/nss.scm | 45 +
gnu/packages/ocaml.scm | 15 +-
gnu/packages/package-management.scm | 26 +-
gnu/packages/parallel.scm | 15 +-
gnu/packages/password-utils.scm | 40 +-
.../patches/accountsservice-extensions.patch | 5 +-
.../patches/appstream-force-reload-stemmer.patch | 89 +
.../patches/ath9k-htc-firmware-objcopy.patch | 14 -
.../patches/calls-disable-application-test.patch | 72 +
gnu/packages/patches/calls-disable-sip-test.patch | 44 +
.../patches/chez-scheme-backport-configure.patch | 463 +
gnu/packages/patches/chez-scheme-bin-sh.patch | 37 +-
.../patches/clang-18.0-libc-search-path.patch | 90 +
gnu/packages/patches/cogl-fix-double-free.patch | 32 +
gnu/packages/patches/duc-fix-test-sh.patch | 70 +
gnu/packages/patches/durden-shadow-arcan.patch | 42 +
.../patches/emacs-disable-jit-compilation.patch | 19 +
.../patches/emacs-native-comp-fix-filenames.patch | 338 +
.../patches/feedbackd-use-system-gmobile.patch | 42 +
.../ffmpeg-jami-pipewiregrab-source-filter.patch | 1451 +
.../patches/gcc-13-cross-system-header-dir.patch | 32 +
gnu/packages/patches/gdm-elogind-support.patch | 93 +-
.../patches/gegl-compatibility-old-librsvg.patch | 80 +
.../patches/gitg-fix-positional-argument.patch | 36 -
.../patches/glib-networking-gnutls-binding.patch | 21 -
gnu/packages/patches/glib-skip-failing-test.patch | 3 +-
.../patches/glslang-install-static-libs.patch | 61 -
.../patches/gmobile-make-it-installable.patch | 89 +
.../gnome-control-center-firmware-security.patch | 33 +
gnu/packages/patches/gtk2-harden-list-store.patch | 42 +
.../patches/gwenview-kimageannotator.patch | 29 +
.../patches/jami-qml-tests-discovery.patch | 15 -
gnu/packages/patches/jami-qwindowkit.patch | 37 +
.../jami-tests-qtwebengine-ifdef-to-if.patch | 26 +
.../patches/jami-unbundle-dependencies.patch | 6 +-
.../libarchive-remove-potential-backdoor.patch | 47 +
.../patches/libcall-ui-make-it-installable.patch | 81 +
.../patches/libgda-disable-data-proxy-test.patch | 59 +
.../patches/librecad-support-for-boost-1.76.patch | 17 -
.../patches/mm-common-reproducible-tarball.patch | 40 -
.../patches/mutter-fix-inverted-test.patch | 290 -
.../patches/nautilus-extension-search-path.patch | 64 +-
.../patches/opencolorio-fix-build-with-gcc11.patch | 37 -
...enssh-gcc-13-ppc64le-fzero-call-used-regs.patch | 61 -
.../orbit2-fix-array-allocation-32bit.patch | 40 +
.../patches/pdfpc-build-with-vala-0.56.patch | 40 +
.../patches/qtbase-find-tools-in-PATH.patch | 49 +
.../patches/qtbase-qmake-fix-includedir.patch | 29 +
.../qtbase-qmlimportscanner-qml-import-path.patch | 33 +
gnu/packages/patches/qtbase-use-TZDIR.patch | 141 -
.../patches/qtdeclarative-disable-qmlcache.patch | 27 +-
.../racket-backport-8.11-layered-docs.patch | 36 -
.../racket-backport-8.12-chez-configure.patch | 423 +
.../patches/racket-chez-scheme-bin-sh.patch | 21 +-
gnu/packages/patches/racket-rktio-bin-sh.patch | 17 +-
.../patches/shared-mime-info-xdgmime-path.patch | 22 +
.../patches/xgboost-use-system-dmlc-core.patch | 14 +-
.../patches/zathura-use-struct-initializers.patch | 68 +
.../{racket-zuo-bin-sh.patch => zuo-bin-sh.patch} | 33 +-
gnu/packages/patchutils.scm | 4 +-
gnu/packages/pcre.scm | 16 +-
gnu/packages/pdf.scm | 77 +-
gnu/packages/perl.scm | 43 +-
gnu/packages/plotutils.scm | 507 +-
gnu/packages/polkit.scm | 2 +-
gnu/packages/pretty-print.scm | 4 +-
gnu/packages/printers.scm | 66 +-
gnu/packages/profiling.scm | 4 +-
gnu/packages/prolog.scm | 45 +
gnu/packages/python-build.scm | 38 +-
gnu/packages/python-check.scm | 57 +-
gnu/packages/python-compression.scm | 103 +-
gnu/packages/python-crypto.scm | 58 +-
gnu/packages/python-science.scm | 54 +-
gnu/packages/python-web.scm | 26 +-
gnu/packages/python-xyz.scm | 585 +-
gnu/packages/python.scm | 78 +-
gnu/packages/qt.scm | 511 +-
gnu/packages/racket.scm | 143 +-
gnu/packages/radio.scm | 90 +-
gnu/packages/rsync.scm | 4 +-
gnu/packages/ruby.scm | 5 +-
gnu/packages/scheme.scm | 214 +-
gnu/packages/sdl.scm | 6 +-
gnu/packages/search.scm | 77 +-
gnu/packages/security-token.scm | 9 +-
gnu/packages/simulation.scm | 3 +-
gnu/packages/specifications.scm | 109 +
gnu/packages/speech.scm | 25 +-
gnu/packages/ssh.scm | 9 +-
gnu/packages/statistics.scm | 93 +-
gnu/packages/suckless.scm | 76 +-
gnu/packages/syncthing.scm | 98 -
gnu/packages/syndication.scm | 2 +-
gnu/packages/task-management.scm | 32 +-
gnu/packages/telegram.scm | 10 +-
gnu/packages/telephony.scm | 111 +-
gnu/packages/tex.scm | 10 +-
gnu/packages/text-editors.scm | 17 +-
gnu/packages/textutils.scm | 196 +-
gnu/packages/time.scm | 38 +-
gnu/packages/toolkits.scm | 49 +
gnu/packages/tor-browsers.scm | 33 +-
gnu/packages/tree-sitter.scm | 75 +-
gnu/packages/version-control.scm | 65 +-
gnu/packages/video.scm | 7 +-
gnu/packages/virtualization.scm | 83 +-
gnu/packages/vulkan.scm | 216 +-
gnu/packages/weather.scm | 3 +-
gnu/packages/web-browsers.scm | 72 +-
gnu/packages/web.scm | 6 +-
gnu/packages/wm.scm | 81 +-
gnu/packages/xdisorg.scm | 132 +-
gnu/packages/xfce.scm | 1 +
gnu/packages/xml.scm | 6 +-
gnu/packages/xorg.scm | 33 +-
gnu/services.scm | 19 +-
gnu/services/base.scm | 49 +-
gnu/services/databases.scm | 65 +-
gnu/services/dbus.scm | 37 +-
gnu/services/desktop.scm | 129 +-
gnu/services/guix.scm | 78 +-
gnu/services/xorg.scm | 2 +-
gnu/system.scm | 10 +-
gnu/system/examples/bare-bones.tmpl | 5 -
gnu/system/examples/desktop.tmpl | 4 +-
gnu/system/examples/lightweight-desktop.tmpl | 6 +-
gnu/system/examples/plasma.tmpl | 5 +-
gnu/system/examples/raspberry-pi-64-nfs-root.tmpl | 6 +-
gnu/system/examples/raspberry-pi-64.tmpl | 6 +-
gnu/system/examples/vm-image.tmpl | 4 +-
gnu/system/images/orangepi-r1-plus-lts-rk3328.scm | 4 +-
gnu/system/images/pine64.scm | 3 +-
gnu/system/install.scm | 5 +-
gnu/system/linux-initrd.scm | 36 +-
gnu/system/mapped-devices.scm | 19 +-
gnu/system/vm.scm | 47 +-
gnu/tests/guix.scm | 73 +
gnu/tests/reconfigure.scm | 15 +-
gnu/tests/sddm.scm | 112 +
guix/build-system/channel.scm | 7 +-
guix/build/emacs-build-system.scm | 85 +-
guix/build/emacs-utils.scm | 15 +-
guix/build/qt-utils.scm | 10 +-
guix/channels.scm | 70 +-
guix/derivations.scm | 6 +-
guix/discovery.scm | 4 +-
guix/download.scm | 4 +-
guix/gexp.scm | 19 +-
guix/git.scm | 52 +-
guix/import/github.scm | 7 +
guix/import/hackage.scm | 4 +-
guix/import/hexpm.scm | 7 +-
guix/import/opam.scm | 7 +-
guix/import/pypi.scm | 5 +-
guix/nar.scm | 8 +-
guix/packages.scm | 5 +-
manifest.scm => guix/platforms/xtensa.scm | 27 +-
guix/profiles.scm | 2 +-
guix/scripts.scm | 7 +-
guix/scripts/build.scm | 4 +-
guix/scripts/describe.scm | 4 +-
guix/scripts/offload.scm | 3 -
guix/scripts/substitute.scm | 88 +-
guix/scripts/system.scm | 31 +-
guix/scripts/system/reconfigure.scm | 4 +-
guix/ssh.scm | 6 +-
guix/store.scm | 18 +-
guix/store/database.scm | 239 +-
guix/ui.scm | 36 +-
guix/utils.scm | 17 +-
manifest.scm | 6 +-
po/doc/guix-cookbook.de.po | 2493 +-
po/doc/guix-cookbook.fr.po | 2492 +-
...{guix-cookbook.fr.po => guix-cookbook.pt_BR.po} | 5103 ++-
po/doc/guix-cookbook.sk.po | 6434 ++--
po/doc/guix-manual.de.po | 31732 ++++++++--------
po/doc/guix-manual.pt_BR.po | 36485 +++++++++++--------
po/doc/guix-manual.zh_CN.po | 34362 +++++++++--------
po/doc/local.mk | 17 +-
po/guix/LINGUAS | 1 +
po/guix/Makevars | 7 +-
po/guix/{zh_CN.po => ar.po} | 1751 +-
po/guix/fr.po | 266 +-
po/guix/it.po | 356 +-
po/guix/pt_BR.po | 3046 +-
po/guix/zh_CN.po | 24 +-
po/packages/Makevars | 10 +-
po/packages/fr.po | 18 +-
po/packages/pt_BR.po | 134 +-
tests/cpio.scm | 6 +-
tests/egg.scm | 5 +-
tests/gexp.scm | 31 +-
tests/opam.scm | 5 +-
tests/pack.scm | 2 +-
tests/publish.scm | 5 +-
tests/store-database.scm | 59 +-
tests/utils.scm | 3 +-
361 files changed, 136334 insertions(+), 65454 deletions(-)
diff --cc gnu/local.mk
index 872e8cb50e,2e0c6a5d3c..3a3be4f095
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1038,19 -1043,14 +1045,20 @@@ dist_patch_DATA =
%D%/packages/patches/clang-11.0-libc-search-path.patch \
%D%/packages/patches/clang-12.0-libc-search-path.patch \
%D%/packages/patches/clang-13.0-libc-search-path.patch \
+ %D%/packages/patches/clang-13-remove-crypt-interceptors.patch \
%D%/packages/patches/clang-14.0-libc-search-path.patch \
+ %D%/packages/patches/clang-14-remove-crypt-interceptors.patch \
%D%/packages/patches/clang-15.0-libc-search-path.patch \
%D%/packages/patches/clang-16.0-libc-search-path.patch \
+ %D%/packages/patches/clang-16-remove-crypt-interceptors.patch \
%D%/packages/patches/clang-17.0-libc-search-path.patch \
%D%/packages/patches/clang-17.0-link-dsymutil-latomic.patch \
+ %D%/packages/patches/clang-18.0-libc-search-path.patch \
%D%/packages/patches/clang-runtime-asan-build-fixes.patch \
%D%/packages/patches/clang-runtime-esan-build-fixes.patch \
+ %D%/packages/patches/clang-runtime-13-glibc-2.36-compat.patch \
+ %D%/packages/patches/clang-runtime-14-glibc-2.36-compat.patch \
+ %D%/packages/patches/clang-runtime-9-glibc-2.36-compat.patch
\
%D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \
%D%/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch
\
%D%/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch \
@@@ -1203,10 -1199,9 +1217,11 @@@
%D%/packages/patches/ffmpeg-jami-libopusdec-enable-FEC.patch \
%D%/packages/patches/ffmpeg-jami-libopusenc-enable-FEC.patch \
%D%/packages/patches/ffmpeg-jami-libopusenc-reload-packet-loss-at-encode.patch \
+ %D%/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch \
%D%/packages/patches/ffmpeg-jami-remove-mjpeg-log.patch \
%D%/packages/patches/ffmpeg-jami-screen-sharing-x11-fix.patch \
+ %D%/packages/patches/ffmpeg-remove-compressed_ten_bit_format.patch \
+ %D%/packages/patches/ffmpeg-4-binutils-2.41.patch \
%D%/packages/patches/fifengine-boost-compat.patch \
%D%/packages/patches/fifengine-python-3.9-compat.patch \
%D%/packages/patches/fifengine-swig-compat.patch \
@@@ -1300,14 -1292,11 +1315,15 @@@
%D%/packages/patches/gcc-9-strmov-store-file-names.patch \
%D%/packages/patches/gcc-12-strmov-store-file-names.patch \
%D%/packages/patches/gcc-10-cross-environment-variables.patch \
+ %D%/packages/patches/gcc-10-libsanitizer-no-crypt.patch \
%D%/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch \
%D%/packages/patches/gcc-12-cross-environment-variables.patch \
- %D%/packages/patches/gcc-10-tree-sra-union-handling.patch \
%D%/packages/patches/gcc-11-libstdc++-powerpc.patch \
+ %D%/packages/patches/gcc-12-libsanitizer-no-crypt.patch \
+ %D%/packages/patches/gcc-13-libsanitizer-no-crypt.patch \
+ %D%/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch \
+ %D%/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch \
+ %D%/packages/patches/gcc-13-cross-system-header-dir.patch \
%D%/packages/patches/gcolor3-update-libportal-usage.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-brect-bounds.patch \
@@@ -1339,12 -1328,8 +1355,10 @@@
%D%/packages/patches/ghostscript-no-header-uuid.patch \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
%D%/packages/patches/git-filter-repo-generate-doc.patch \
- %D%/packages/patches/gitg-fix-positional-argument.patch \
%D%/packages/patches/gklib-suitesparse.patch \
%D%/packages/patches/glib-appinfo-watch.patch \
+ %D%/packages/patches/glib-gerror-null-format.patch \
+ %D%/packages/patches/glib-networking-disable-connection-tls1.2-test.patch
\
- %D%/packages/patches/glib-networking-gnutls-binding.patch \
%D%/packages/patches/glib-skip-failing-test.patch \
%D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch \
%D%/packages/patches/glibc-CVE-2019-7309.patch \
@@@ -1622,8 -1623,6 +1643,7 @@@
%D%/packages/patches/libphonenumber-reproducible-build.patch \
%D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \
%D%/packages/patches/libquicktime-ffmpeg.patch \
- %D%/packages/patches/librecad-support-for-boost-1.76.patch \
+ %D%/packages/patches/libsepol-versioned-docbook.patch \
%D%/packages/patches/libtar-CVE-2013-4420.patch \
%D%/packages/patches/libtgvoip-disable-sse2.patch \
%D%/packages/patches/libtgvoip-disable-webrtc.patch \
@@@ -2259,10 -2238,13 +2279,12 @@@
%D%/packages/patches/xygrib-fix-finding-data.patch \
%D%/packages/patches/xygrib-newer-proj.patch \
%D%/packages/patches/yggdrasil-extra-config.patch \
+ %D%/packages/patches/zathura-use-struct-initializers.patch \
%D%/packages/patches/zig-0.9-riscv-support.patch \
- %D%/packages/patches/zig-do-not-link-against-librt.patch \
%D%/packages/patches/zig-use-baseline-cpu-by-default.patch \
%D%/packages/patches/zig-use-system-paths.patch \
- %D%/packages/patches/zsh-egrep-failing-test.patch
+ %D%/packages/patches/zsh-egrep-failing-test.patch \
+ %D%/packages/patches/zuo-bin-sh.patch
MISC_DISTRO_FILES = \
%D%/packages/ld-wrapper.in
diff --cc gnu/packages/bioinformatics.scm
index 35c5c4aff1,448ea5d6de..f4eeecb985
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@@ -8669,7 -8689,10 +8685,9 @@@ predicts the locations of structural un
(substitute* "Makefile"
(("INSTALLDIR=.*")
(string-append
- "INSTALLDIR=" (assoc-ref outputs "out") "/bin\n")))))
+ "INSTALLDIR=" (assoc-ref outputs "out") "/bin\n"))
+ (("-llapack -lblas")
- "-lopenblas"))
- #t))
++ "-lopenblas"))))
(add-before 'install 'make-install-directory
;; The install directory is not created during 'make install'.
(lambda* (#:key outputs #:allow-other-keys)
diff --cc gnu/packages/cross-base.scm
index 952904ceef,2cc5f52e47..2fa42bc01c
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@@ -116,10 -127,10 +127,10 @@@
;; to pick up native libs instead of target ones. In
;; practice the RUNPATH of target libs only refers to
;; target libs, not native libs, so this is safe.
- `(cons "--with-sysroot=/" ,flags)))))))
+ #~(cons "--with-sysroot=/" #$flags)))))))
- ;; For Xtensa, apply Qualcomm's patch.
- (cross (cond ((string-prefix? "xtensa-" target)
+ ;; For xtensa-ath9k-elf, apply Qualcomm's patch.
+ (cross (cond ((string=? target "xtensa-ath9k-elf")
(package-with-patches binutils
(search-patches
"ath9k-htc-firmware-binutils.patch")))
diff --cc gnu/packages/dictionaries.scm
index f29fd55eeb,9f493d91ad..8adacf6d6c
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@@ -268,22 -267,22 +268,22 @@@ and a Python library."
(fribidi (assoc-ref inputs "fribidi"))
(rlwrap (assoc-ref inputs "rlwrap")))
(wrap-program bin
- `("PATH" ":" prefix
- (,(string-append out "/bin:"
- curl "/bin:"
- fribidi "/bin:"
- rlwrap "/bin")))))))
+ `("PATH" ":" prefix
+ (,(string-append out "/bin:"
+ curl "/bin:"
+ fribidi "/bin:"
+ rlwrap "/bin")))))))
+ (add-after 'unpack 'emacs-make-autoloads
+ (assoc-ref emacs:%standard-phases 'make-autoloads))
(add-after 'install 'emacs-install
(assoc-ref emacs:%standard-phases 'install))
- (add-after 'emacs-install 'emacs-make-autoloads
- (assoc-ref emacs:%standard-phases 'make-autoloads))
- (add-after 'emacs-make-autoloads 'emacs-autoloads-compilation
- (assoc-ref emacs:%standard-phases 'enable-autoloads-compilation)))
+ (add-after 'emacs-install 'emacs-build
+ (assoc-ref emacs:%standard-phases 'build)))
#:make-flags (list (string-append "PREFIX=" %output)
"NETWORK_ACCESS=no test")
- #:imported-modules (,@%gnu-build-system-modules
- (guix build emacs-build-system)
- (guix build emacs-utils))
+ #:imported-modules (,@%default-gnu-imported-modules
+ (guix build emacs-build-system)
+ (guix build emacs-utils))
#:modules ((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
diff --cc gnu/packages/display-managers.scm
index fb73b4f5e1,e3381a1665..5bb4dacec2
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@@ -330,37 -330,37 +330,38 @@@ experience for your users, your family
"lightdm-vnc-ipv6.patch"))))
(build-system gnu-build-system)
(arguments
- '(#:parallel-tests? #f ; fails when run in parallel
- #:configure-flags
- (list "--localstatedir=/var"
- "--enable-gtk-doc"
- ;; Otherwise the test suite fails on such a warning.
- "CFLAGS=-Wno-error=missing-prototypes")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/shared-data-manager.c"
- (("/bin/rm")
- (search-input-file inputs "bin/rm")))
- (substitute* '("data/users.conf"
- "common/user-list.c")
- (("/bin/false")
- (search-input-file inputs "bin/false"))
- (("/usr/sbin/nologin")
- (search-input-file inputs "sbin/nologin")))
- (substitute* "src/seat.c"
- (("/bin/sh")
- (search-input-file inputs "bin/sh")))))
- (add-before 'check 'pre-check
- (lambda _
- (wrap-program "tests/src/test-python-greeter"
- #:sh (which "bash")
- `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))
- `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
- ;; Avoid printing locale warnings, which trip up the text
- ;; matching tests.
- (unsetenv "LC_ALL"))))))
+ (list
+ #:parallel-tests? #f ; fails when run in parallel
+ #:configure-flags
+ #~(list "--localstatedir=/var"
+ "--enable-gtk-doc"
+ ;; Otherwise the test suite fails on such a warning.
+ "CFLAGS=-Wno-error=missing-prototypes")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/shared-data-manager.c"
+ (("/bin/rm")
+ (search-input-file inputs "bin/rm")))
+ (substitute* '("data/users.conf"
+ "common/user-list.c")
+ (("/bin/false")
+ (search-input-file inputs "bin/false"))
+ (("/usr/sbin/nologin")
+ (search-input-file inputs "sbin/nologin")))
+ (substitute* "src/seat.c"
+ (("/bin/sh")
+ (search-input-file inputs "bin/sh")))))
+ (add-before 'check 'pre-check
+ (lambda _
+ (wrap-program "tests/src/test-python-greeter"
++ #:sh (which "bash")
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))
+ `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
+ ;; Avoid printing locale warnings, which trip up the text
+ ;; matching tests.
+ (unsetenv "LC_ALL"))))))
(inputs
(list audit
bash-minimal ;for cross-compilation
diff --cc gnu/packages/freedesktop.scm
index 826425f5f3,78443d6f5c..4cbe610d1e
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -1645,8 -1816,10 +1770,9 @@@ message bus."
docbook-xsl
gettext-minimal
`(,glib "bin") ; for gdbus-codegen, etc.
+ glibc-locales ;for tests
gobject-introspection
gtk-doc
- libxml2 ;for XML_CATALOG_FILES
libxslt
pkg-config
vala
diff --cc gnu/packages/gcc.scm
index 863b8c76b2,7be4cb9bb1..963e9862fa
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -982,13 -969,21 +982,21 @@@ using compilers other than GCC.
(if (and (target-ppc64le?)
(version>=? version "11")
(not (version>=? version "12")))
- #~((add-after 'unpack 'patch-powerpc
- (lambda* (#:key inputs #:allow-other-keys)
- (invoke "patch" "--force" "-p1" "-i"
- (assoc-ref inputs "powerpc64le-patch")))))
+ ;; TODO: Drop the 'else' branch below on next rebuild
+ ;; cycle.
+ (if (%current-target-system)
+ #~((add-after 'unpack 'patch-powerpc ;correct
+ (lambda* (#:key native-inputs inputs
#:allow-other-keys)
+ (invoke "patch" "--force" "-p1" "-i"
+ (assoc-ref (or native-inputs inputs)
+ "powerpc64le-patch")))))
+ #~((add-after 'unpack 'patch-powerpc ;wrong
+ (lambda* (#:key inputs #:allow-other-keys)
+ (invoke "patch" "--force" "-p1" "-i"
+ (assoc-ref inputs
"powerpc64le-patch"))))))
'()))
;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64.
- (add-before 'chdir 'fix-rs6000-libdir
+ (add-after 'unpack 'fix-rs6000-libdir
(lambda _
(when (file-exists? "gcc/config/rs6000")
(substitute* (find-files "gcc/config/rs6000")
diff --cc gnu/packages/glib.scm
index f4d4f27292,b11046f05d..73c53a166f
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@@ -272,14 -302,20 +302,25 @@@ information, refer to the @samp{dbus-da
(substitute* '("unix.c" "utils.c")
(("[ \t]*g_test_add_func.*;") "")))
(with-directory-excursion "gio/tests"
- (substitute* '("contenttype.c" "gdbus-address-get-session.c"
- "gdbus-peer.c" "appinfo.c"
"desktop-app-info.c")
+ (substitute* '("contenttype.c"
+ "gdbus-address-get-session.c"
+ "gdbus-server-auth.c"
+ "gdbus-peer.c"
+ "appinfo.c"
+ "desktop-app-info.c")
- (("[ \t]*g_test_add_func.*;") ""))
- (unless (which "update-desktop-database")
- (substitute* "file.c"
- (("[ \t]*g_test_add_func.*query-default-handler.*;") "")))
- (substitute* '("portal-support-snap.c")
- (("g_test_init .*")
- "return EXIT_SUCCESS;")))
+ (("[ \t]*g_test_add_func.*;") "")))
+ (substitute* "glib/tests/error.c"
+ ;; This test segfaults with glibc 2.38.
+ (("g_test_add_func.*new-valist/invalid.*" all)
+ (string-append "//" all "\n")))
+
++ (unless (which "update-desktop-database")
++ (substitute* "file.c"
++ (("[ \t]*g_test_add_func.*query-default-handler.*;") "")))
++ (substitute* '("portal-support-snap.c")
++ (("g_test_init .*")
++ "return EXIT_SUCCESS;"))
+
#$@(if (target-x86-32?)
;; Comment out parts of timer.c that fail on i686 due to
;; excess precision when building with GCC 10:
@@@ -1087,26 -1054,26 +1059,27 @@@ useful for C++."
(version-major+minor version)
"/pygobject-" version ".tar.xz"))
(sha256
- (base32 "1z6aagb46fhhdd0bb3zk6dfdw3s4y2fva0vv3jpwjj6mvar0hq22"))
+ (base32
+ "082dpm34a350bnhgmkdv8myxzjgnrflckkpn46vnvs36f7bbfdij"))
(modules '((guix build utils)))
(snippet
- '(begin
- ;; We disable these tests in a snippet so that they are inherited
- ;; by the Python 2 variant which is built differently.
- (with-directory-excursion "tests"
- ;; FIXME: These tests require Gdk and/or Gtk 4.
- (for-each delete-file
- '("test_atoms.py" "test_overrides_gtk.py")))))))
+ ;; We disable these tests in a snippet so that they are inherited
+ ;; by the Python 2 variant which is built differently.
+ #~(with-directory-excursion "tests"
+ ;; FIXME: These tests require Gdk and/or Gtk 4.
+ (for-each delete-file
+ '("test_atoms.py" "test_overrides_gtk.py"
+ "test_overrides_gdk.py"))))))
(build-system meson-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- ;; The default 90 seconds can be too low on slower machines.
- (invoke "meson" "test" "--timeout-multiplier" "5")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ ;; The default 90 seconds can be too low on slower machines.
+ (invoke "meson" "test" "--timeout-multiplier" "5")))))))
(native-inputs
(list `(,glib "bin")
pkg-config
diff --cc gnu/packages/gnome-xyz.scm
index 6a7145298a,e8f70f477e..a09c0befb0
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@@ -770,78 -739,77 +739,78 @@@ faster window switching."
(file-name (git-file-name name version))
(sha256
(base32
- "0vg87fdihs5kp7apgyd32ldjmwzmrxaimsc005yjyy8m3f65sjmr"))))
+ "158qbjl6m807g0fy15dvhwwwy6z8r0g7kh9gjyhm7n3y14v5p8wz"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ;; every test fails
- #:configure-flags
- (let* ((out (assoc-ref %outputs "out"))
- (name+version (strip-store-file-name out))
- (gschema-dir (string-append out
- "/share/gsettings-schemas/"
- name+version
- "/glib-2.0/schemas"))
- (gnome-shell (assoc-ref %build-inputs "gnome-shell"))
- (openssh (assoc-ref %build-inputs "openssh"))
- (openssl (assoc-ref %build-inputs "openssl")))
- (list
- (string-append "-Dgnome_shell_libdir=" gnome-shell "/lib")
- (string-append "-Dgsettings_schemadir=" gschema-dir)
- (string-append "-Dopenssl_path=" openssl "/bin/openssl")
- (string-append "-Dsshadd_path=" openssh "/bin/ssh-add")
- (string-append "-Dsshkeygen_path=" openssh "/bin/ssh-keygen")
- (string-append "-Dsession_bus_services_dir=" out
"/share/dbus-1/services")
- "-Dpost_install=true"))
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((glib (assoc-ref inputs "glib:bin"))
- (gapplication (string-append glib "/bin/gapplication"))
- (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
- (substitute*
"data/org.gnome.Shell.Extensions.GSConnect.desktop.in"
- (("gapplication") gapplication))
- (for-each
- (lambda (file)
- (substitute* file
- (("'use strict';")
- (string-append "'use strict';\n\n"
- "'" gi-typelib-path
"'.split(':').forEach("
- "path =>
imports.gi.GIRepository.Repository."
- "prepend_search_path(path));"))))
- '("src/extension.js" "src/prefs.js"))
- #t)))
- (add-after 'install 'wrap-daemons
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (service-dir
- (string-append out "/share/gnome-shell/extensions"
-
"/gsconnect@andyholmes.github.io/service"))
+ (list
+ #:tests? #f ;; every test fails
+ #:configure-flags
+ #~(let ((out #$output)
+ (gnome-shell #$(this-package-input "gnome-shell"))
+ (openssh #$(this-package-input "openssh"))
+ (openssl #$(this-package-input "openssl")))
+ (list
+ (string-append "-Dgnome_shell_libdir=" gnome-shell "/lib")
+ (string-append "-Dopenssl_path=" openssl "/bin/openssl")
+ (string-append "-Dsshadd_path=" openssh "/bin/ssh-add")
+ (string-append "-Dsshkeygen_path=" openssh "/bin/ssh-keygen")
+ (string-append "-Dsession_bus_services_dir=" out
"/share/dbus-1/services")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'skip-post-installation
+ (lambda _
+ (substitute* "meson.build"
+ (("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false")
+ (("update_desktop_database: true")
+ "update_desktop_database: false"))))
+ (add-before 'configure 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((gapplication (search-input-file inputs
"/bin/gapplication"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
- (wrap-program (string-append service-dir "/daemon.js")
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))
- #t))))))
+ (substitute*
"data/org.gnome.Shell.Extensions.GSConnect.desktop.in"
+ (("gapplication") gapplication))
+ (for-each
+ (lambda (file)
+ (substitute* file
+ (("'use strict';")
+ (string-append "'use strict';\n\n"
+ "'" gi-typelib-path
"'.split(':').forEach("
+ "path =>
imports.gi.GIRepository.Repository."
+ "prepend_search_path(path));"))))
+ '("src/extension.js" "src/prefs.js")))))
+ (add-after 'install 'wrap-daemons
+ (lambda _
+ (let* ((out #$output)
+ (service-dir
+ (string-append out "/share/gnome-shell/extensions"
+
"/gsconnect@andyholmes.github.io/service"))
+ (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
+ (wrap-program (string-append service-dir "/daemon.js")
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))))
(inputs
- `(("at-spi2-core" ,at-spi2-core)
- ("bash" ,bash-minimal) ; for wrap-program
- ("caribou" ,caribou)
- ("evolution-data-server" ,evolution-data-server)
- ("gjs" ,gjs)
- ("glib" ,glib)
- ("glib:bin" ,glib "bin")
- ("gsound" ,gsound)
- ("gnome-shell" ,gnome-shell)
- ("gtk+" ,gtk+)
- ("nautilus" ,nautilus)
- ("openssh" ,openssh)
- ("openssl" ,openssl)
- ("python-pygobject" ,python-pygobject)
- ("upower" ,upower)))
+ (list
+ at-spi2-core
++ bash-minimal
+ caribou
+ evolution-data-server
+ gjs
+ glib
+ `(,glib "bin") ;for /bin/gapplication
+ gsound
+ gnome-shell
+ gtk+
+ nautilus
+ openssh
+ openssl
+ python-pygobject
+ upower))
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("gobject-introspection" ,gobject-introspection)
- ("libxml2" ,libxml2)
- ("pkg-config" ,pkg-config)))
+ (list
+ gettext-minimal
+ gobject-introspection
+ libxml2
+ pkg-config))
(home-page
"https://github.com/GSConnect/gnome-shell-extension-gsconnect/wiki";)
(synopsis "Connect GNOME Shell with your Android phone")
(description "GSConnect is a complete implementation of KDE Connect
diff --cc gnu/packages/gnome.scm
index 576bccd4a1,489f23865b..b1061af611
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -3064,8 -3074,7 +3069,8 @@@ configuring CUPS."
name "-" version ".tar.xz"))
(sha256
(base32
- "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"))))
+ "1h7nn9pz797bfmpz3d0s46yjv4ydppnzwifzdx0d6shm8vwkx3zf"))))
+ (outputs '("out" "doc"))
(build-system meson-build-system)
(arguments
(list
@@@ -12082,8 -12292,8 +12289,9 @@@ higher level porcelain stuff."
(wrap-program prog
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
(inputs
- (list glib
+ (list bash-minimal
+ glib
+ gpgme
gsettings-desktop-schemas
gspell
gtk+
diff --cc gnu/packages/graphics.scm
index a565000180,3571a45b84..2a52362775
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@@ -899,48 -878,57 +892,48 @@@ exception-handling library."
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.com/inkscape/lib2geom.git";)
+ (url "https://gitlab.com/inkscape/lib2geom";)
(commit version)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "lib2geom" version))
(sha256
(base32
- "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8"))))
+ "1ypcn0yxk9ny7qg8s8h3px2wpimhfgkwk7x1548ky12iqmdjjmcn"))))
(build-system cmake-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ (list
+ #:imported-modules `((guix build python-build-system)
,@%cmake-build-system-modules)
- #:configure-flags '("-D2GEOM_BUILD_SHARED=ON"
- "-D2GEOM_BOOST_PYTHON=ON"
- ;; Compiling the Cython bindings fail (see:
- ;; https://gitlab.com/inkscape/lib2geom/issues/21).
- "-D2GEOM_CYTHON_BINDINGS=OFF")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-python-lib-install-path
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((python-version (@ (guix build python-build-system)
- python-version))
- (python-maj-min-version (python-version
- (assoc-ref inputs "python")))
- (site-package (string-append
- (assoc-ref outputs "out")
- "/lib/python" python-maj-min-version
- "/site-packages")))
- (substitute* '("src/cython/CMakeLists.txt"
- "src/py2geom/CMakeLists.txt")
- (("PYTHON_LIB_INSTALL \"[^\"]*\"")
- (format #f "PYTHON_LIB_INSTALL ~s" site-package))))))
- ,@(if (target-x86-32?)
- `((add-after 'unpack 'skip-faulty-test
- (lambda _
- ;; This test fails on i686 when comparing floating point
- ;; values, probably due to excess precision. However,
- ;; '-fexcess-precision' is not implemented for C++ in
- ;; GCC 10 so just skip it.
- (substitute* "tests/CMakeLists.txt"
- (("bezier-test") "")))))
- '()))))
- (native-inputs `(("python" ,python-wrapper)
- ("googletest" ,googletest)
- ("pkg-config" ,pkg-config)))
- (inputs `(("cairo" ,cairo)
- ("pycairo" ,python-pycairo)
- ("double-conversion" ,double-conversion)
- ("glib" ,glib)
- ("gsl" ,gsl)))
- (propagated-inputs
- (list boost)) ;referred to in 2geom/pathvector.h.
+ #:modules '((guix build cmake-build-system)
+ (guix build utils)
+ ((guix build python-build-system) #:prefix python:))
+ #:configure-flags
+ #~(list "-D2GEOM_BUILD_SHARED=ON"
+ "-D2GEOM_BOOST_PYTHON=ON"
+ ;; Compiling the Cython bindings fail (see:
+ ;; https://gitlab.com/inkscape/lib2geom/issues/21).
+ "-D2GEOM_CYTHON_BINDINGS=OFF")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-python-lib-install-path
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* '("src/cython/CMakeLists.txt"
+ "src/py2geom/CMakeLists.txt")
+ (("PYTHON_LIB_INSTALL \"[^\"]*\"")
+ (format #f "PYTHON_LIB_INSTALL ~s"
+ (python:site-packages inputs outputs))))))
+ #$@(if (target-x86-32?)
+ #~((add-after 'unpack 'skip-faulty-test
+ (lambda _
+ ;; This test fails on i686 when comparing floating
point
+ ;; values, probably due to excess precision. However,
+ ;; '-fexcess-precision' is not implemented for C++ in
+ ;; GCC 10 so just skip it.
+ (substitute* "tests/CMakeLists.txt"
+ (("bezier-test") "")))))
+ #~()))))
+ (native-inputs (list python-wrapper googletest pkg-config))
+ (inputs (list cairo python-pycairo double-conversion glib gsl))
+ (propagated-inputs (list boost)) ;included in 2geom/pathvector.h
(home-page "https://gitlab.com/inkscape/lib2geom/";)
(synopsis "C++ 2D graphics library")
(description "2geom is a C++ library of mathematics for paths, curves,
diff --cc gnu/packages/gtk.scm
index a0c037ee14,b0098e780e..dea7238613
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -174,34 -179,36 +180,35 @@@ such as mate-panel and xfce4-panel."
(base32 "0r0by563s75xyzz0d0j1nmjqmdrk2x9agk7r57p3v8vqp4v0ffi4"))))
(build-system meson-build-system)
(arguments
- ;; XXX: Building the tests fail with "test/ps2png.c:29:10: fatal error:
- ;; cairo.h: No such file or directory".
- (list #:configure-flags #~(list "-Dtests=disabled")))
+ `(#:tests? #f ; see
http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
+ #:glib-or-gtk? #t
+ #:configure-flags
+ (list "-Dtests=disabled")))
(native-inputs
- `(,@(if (target-hurd?)
- '()
- `(("gobject-introspection" ,gobject-introspection)))
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)))
+ (append (list pkg-config
+ python-wrapper)
+ (if (target-hurd?)
+ '()
+ (list gobject-introspection))))
(inputs
- `(("bash-minimal" ,bash-minimal) ;for glib-or-gtk-wrap
- ,@(if (target-hurd?)
- '()
- `(("drm" ,libdrm)))
- ("ghostscript" ,ghostscript)
- ("libspectre" ,libspectre)
- ,@(if (target-hurd?)
- '()
- `(("poppler" ,poppler)))))
+ (append
+ (list bash-minimal ;for glib-or-gtk-wrap
+ ghostscript
+ libspectre)
+ (if (target-hurd?)
+ '()
+ (list libdrm
+ poppler))))
(propagated-inputs
- `(("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("glib" ,glib)
- ("libpng" ,libpng)
- ("pixman" ,pixman)
- ("x11" ,libx11)
- ("xcb" ,libxcb)
- ("xext" ,libxext)
- ("xrender" ,libxrender)))
+ (list fontconfig
+ freetype
+ glib
+ libpng
+ pixman
+ libx11
+ libxcb
+ libxext
+ libxrender))
(synopsis "Multi-platform 2D graphics library")
(description "Cairo is a 2D graphics library with support for multiple
output
devices. Currently supported output targets include the X Window System (via
@@@ -707,9 -750,12 +750,12 @@@ highlighting and other features typica
(native-inputs
(list gettext-minimal
`(,glib "bin") ;glib-mkenums, etc.
+ gi-docgen
gobject-introspection ;g-ir-compiler, etc.
- perl
pkg-config
+
+ ;; For the documentation.
+ gi-docgen
python-docutils))
(native-search-paths
;; This file is produced by the gdk-pixbuf-loaders-cache-file
diff --cc gnu/packages/image-processing.scm
index ebcdfa97c6,6c199792f8..bc0d0a80b6
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@@ -52,7 -52,7 +52,8 @@@
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
diff --cc gnu/packages/kde.scm
index 0ca764dd2f,38992150c7..e7df38e858
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@@ -726,13 -758,21 +759,22 @@@ set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -f
qwt
vc))
(inputs
- (list boost
+ (list bash-minimal
+ boost
exiv2
- fftw
+ fontconfig
+ fftw-cmake
+ ;; fftw
+ ;; We use fftw-cmake since fftwm doesn't provide the required
+ ;; CMake files when build with gnu.
+ ;; See: https://bugzilla.redhat.com/show_bug.cgi?id=1729652#c5
+ freetype
+ fribidi
giflib
gsl
+ harfbuzz
imath
+ immer
karchive
kcompletion
kconfig
diff --cc gnu/packages/llvm.scm
index a604ef0d71,08ffb017a0..63c33d480e
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@@ -533,17 -549,16 +538,20 @@@ output), and Binutils."
'(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx")
("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2")
("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky")
- ("17.0.6" . "1a7rq3rgw5vxm8y39fyzr4kv7w97lli4a0c1qrkchwk8p0n07hgh")))
+ ("17.0.6" . "1a7rq3rgw5vxm8y39fyzr4kv7w97lli4a0c1qrkchwk8p0n07hgh")
+ ("18.1.2" . "06nfbn8yj8c65q4vamwdiqpxh0dggs6w781swd3285k4af0qwf62")))
(define %llvm-patches
- '(("14.0.6" . ("clang-14.0-libc-search-path.patch"))
- ("15.0.7" . ("clang-15.0-libc-search-path.patch"))
- ("16.0.6" . ("clang-16.0-libc-search-path.patch"))
+ '(("14.0.6" . ("clang-14.0-libc-search-path.patch"
+ "clang-runtime-14-glibc-2.36-compat.patch"
+ "clang-14-remove-crypt-interceptors.patch"))
+ ("15.0.7" . ("clang-15.0-libc-search-path.patch"
+ "clang-16-remove-crypt-interceptors.patch"))
+ ("16.0.6" . ("clang-16.0-libc-search-path.patch"
+ "clang-16-remove-crypt-interceptors.patch"))
("17.0.6" . ("clang-17.0-libc-search-path.patch"
+ "clang-17.0-link-dsymutil-latomic.patch"))
+ ("18.1.2" . ("clang-18.0-libc-search-path.patch"
"clang-17.0-link-dsymutil-latomic.patch"))))
(define (llvm-monorepo version)
diff --cc gnu/packages/maths.scm
index 8010a24f3a,361f2f7b68..3360ff9ea4
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@@ -7107,10 -7115,10 +7115,10 @@@ set."
texlive-xcolor
texlive-xypic))))
(inputs
- (list openblas lapack))
+ (list openblas))
(arguments
`(#:modules ((srfi srfi-1)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:configure-flags '("--enable-shared"
"--disable-fortran"
"--without-MPI"
diff --cc gnu/packages/pcre.scm
index 30c09b4a42,c7471169d9..6f31d3c1d7
--- a/gnu/packages/pcre.scm
+++ b/gnu/packages/pcre.scm
@@@ -100,8 -100,9 +100,9 @@@ POSIX regular expression API."
"/pcre2-" version ".tar.bz2"))
(sha256
(base32
- "0s4x2l6g0sb9piwkr3sxqwdswz2g6bk1hhwngv0kv4w38wybir0l"))))
+ "0h78np8h3dxlmvqvpnj558x67267n08n9zsqncmlqapans6csdld"))))
(build-system gnu-build-system)
+ (outputs '("out" "static"))
(inputs (list bzip2 readline zlib))
(arguments
(list #:configure-flags
diff --cc gnu/packages/sdl.scm
index 85a0cc97a8,d3a0e33b19..cc777cde5b
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@@ -68,48 -67,35 +68,48 @@@
#:use-module (gnu packages xorg)
#:export (sdl-union))
-(define-public sdl
+(define-public sdl2
(package
- (name "sdl")
- (version "1.2.15")
+ (name "sdl2")
- (version "2.28.5")
++ (version "2.30.1")
(source (origin
- (method url-fetch)
- (uri
- (string-append "https://libsdl.org/release/SDL-";
- version ".tar.gz"))
- (sha256
- (base32
- "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"))
- (patches (search-patches "sdl-libx11-1.6.patch"))))
+ (method url-fetch)
+ (uri
+ (string-append "https://libsdl.org/release/SDL2-";
+ version ".tar.gz"))
+ (sha256
+ (base32
- "1r36cspzv6h8abiqbbkrgm17g975p9wiziir2xabj3721dyv6b1k"))))
++ "0fj7gxc7rlzzrafnx9nmf7ws3paxy583fmx7bcbavi6gr3xmy881"))))
(build-system gnu-build-system)
+ ;; TODO: Remove 'append' and 'cons*', was used to avoid rebuilds.
(arguments
- '(;; Explicitly link against shared libraries instead of dlopening them.
- ;; For X11, ALSA, and PulseAudio.
- ;; OpenGL library is still dlopened at runtime.
- #:configure-flags '("--disable-alsa-shared"
- "--disable-pulseaudio-shared"
- "--disable-x11-shared"
- ;; Explicitly link with mesa.
- ;; This add mesa to libsdl's RUNPATH, to make
dlopen
- ;; finding the libGL from mesa at runtime.
- "LDFLAGS=-lGL")
-
- #:make-flags '("V=1") ;build verbosely
-
- #:tests? #f)) ; no check target
+ (list
+ #:tests? #f ;no check target
+ ;; Explicitly link against shared libraries instead of dlopening them.
+ ;; For X11, ALSA, and PulseAudio.
+ ;; OpenGL library is still dlopened at runtime.
+ #:configure-flags
+ #~(append
+ '("--disable-wayland-shared"
+ "--enable-video-kmsdrm"
+ "--disable-kmsdrm-shared")
+ '("--disable-alsa-shared"
+ "--disable-pulseaudio-shared"
+ "--disable-x11-shared"
+ ;; Explicitly link with mesa.
+ ;; This add mesa to libsdl's RUNPATH, to make dlopen
+ ;; finding the libGL from mesa at runtime.
+ "LDFLAGS=-lGL"))
+ #:make-flags
+ #~(cons*
+ ;; SDL dlopens libudev and libvulkan, so make sure they are in
+ ;; rpath. This overrides the LDFLAG set in sdl’s configure-flags,
+ ;; which isn’t necessary as sdl2 includes Mesa by default.
+ (string-append "LDFLAGS=-Wl,-rpath,"
+ #$(this-package-input "eudev") "/lib"
+ ",-rpath,"
+ #$(this-package-input "vulkan-loader") "/lib")
+ '("V=1")))) ;build verbosely
(propagated-inputs
;; SDL headers include X11 headers.
(list libx11
diff --cc gnu/packages/suckless.scm
index 0dd6180c97,39cf2e4cc5..9e60b779dc
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@@ -350,13 -352,13 +353,13 @@@ numbers of user-defined menu items effi
"0k8fvf9g27yyaqpyhk6apbkq6r4vjwxhff1qb9ignxx2yvxy7qdf"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no tests
- #:make-flags
- (list (string-append "CC=" ,(cc-for-target))
- (string-append "PREFIX=" %output))
- #:phases (modify-phases %standard-phases (delete 'configure))))
+ (list #:tests? #f ; no tests
+ #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "PREFIX=" #$output))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure))))
(inputs
- (list libx11 libxext libxinerama libxrandr))
+ (list libx11 libxcrypt libxext libxinerama libxrandr))
(home-page "https://tools.suckless.org/slock/";)
(synopsis "Simple X session lock")
(description
diff --cc gnu/packages/time.scm
index 6a8cfdba04,2612201c11..aeb90aecee
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@@ -22,8 -22,8 +22,9 @@@
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022 Pradana AUMARS <paumars@courrier.dev>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Liliana Marie Prikler <liliana.prikler@gmail.com>
+ ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/xorg.scm
index b2b004123a,74059a2691..800745263c
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -34,10 -34,9 +34,10 @@@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;; Copyright © 2021 Lu Hui <luhux76@gmail.com>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
- ;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
+ ;;; Copyright © 2023, 2024 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2023, 2024 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;;
;;; This file is part of GNU Guix.