diff options
Diffstat (limited to 'gnu/packages')
42 files changed, 717 insertions, 1017 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 279fe9e3d8..c66ea5a187 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1336,7 +1336,7 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2019c") + (version "2020a") (source (origin (method url-fetch) (uri (string-append @@ -1344,7 +1344,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr")))) + "18lrp0zh8m931jjlrv8lvjas4ka5dfkzdbwnbw5lwd2dlbn62wal")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -1394,7 +1394,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn")))))) + "0sfnlqw1p93r7klny69rwr94fh22mz632h52phgzfgg01q9gfakx")))))) (home-page "https://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) @@ -1411,7 +1411,26 @@ and daylight-saving rules.") ;;; package. (define-public tzdata-for-tests (hidden-package - (package/inherit tzdata))) + (package + (inherit tzdata) + (version "2019c") + (source (origin + (method url-fetch) + (uri (string-append + "https://data.iana.org/time-zones/releases/tzdata" + version ".tar.gz")) + (sha256 + (base32 + "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr")))) + (inputs + `(("tzcode" ,(origin + (method url-fetch) + (uri (string-append + "https://data.iana.org/time-zones/releases/tzcode" + version ".tar.gz")) + (sha256 + (base32 + "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn"))))))))) (define-public libiconv (package diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 104d61148a..71b4827578 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -110,7 +110,7 @@ the <tz.h> library for handling time zones and leap seconds.") (define-public libical (package (name "libical") - (version "3.0.7") + (version "3.0.8") (source (origin (method url-fetch) (uri (string-append @@ -118,22 +118,7 @@ the <tz.h> library for handling time zones and leap seconds.") version "/libical-" version ".tar.gz")) (sha256 (base32 - "1z33wzaazbd7drl6qbh1750whd78xl2cg0gjnxyya9m83vgndgha")) - (patches - ;; Add a patch slated for 3.0.8 which preserves backwards- - ;; compatibility in the icalattach_new_from_data() function, - ;; which accidentally changed in 3.0.7 and could break some uses. - ;; https://gitlab.gnome.org/GNOME/evolution-data-server/issues/185 - ;; http://lists.infradead.org/pipermail/libical-devel/2020-January/000907.html - (list (origin - (method url-fetch) - (uri (string-append - "https://github.com/libical/libical/commit/" - "ae394010c889e4c185160da5e81527849f9de350.patch")) - (file-name "libical-3.0.7-preserve-icalattach-api.patch") - (sha256 - (base32 - "0v8qcxn8a6sh78grzxd61j9478928dx38l5mf8mkdrbxv47vmvvp"))))))) + "0vr8s7hn8204lyc4ys5bs3j5qss4lmc9ffly2m1a59avyz5cmzh9")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; test suite appears broken diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 2328012083..7f4dca5f56 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define-public nss-certs (package (name "nss-certs") - (version "3.50") + (version "3.52.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")))) + "0y4jb9095f7bbgw7d7kvzm4c3g4p5i6y68fwhb8wlkpb7b1imj5w")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index d4c039ac04..bd6e046452 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -58,7 +58,7 @@ `(("pkg-config" ,pkg-config))) (inputs `(("argon2" ,argon2) - ("json-c" ,json-c) + ("json-c" ,json-c-0.13) ;XXX update this for cryptsetup >= 2.3 ("libgcrypt" ,libgcrypt) ("lvm2" ,lvm2) ; device-mapper ("popt" ,popt) @@ -138,7 +138,7 @@ files). This assumes LIBRARY uses Libtool." (inherit (static-library libgcrypt)) (propagated-inputs `(("libgpg-error-host" ,(static-library libgpg-error))))))) - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("libgcrypt" ,libgcrypt-static) ("lvm2" ,lvm2-static) ("util-linux" ,util-linux "static") diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 0250f16db3..9381cb5794 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -59,7 +59,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.27.1") + (version "1.27.4") (source(origin (method url-fetch) (uri @@ -67,7 +67,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "0dpn4rkmrdprkhlnpih5dzrn4fxzj20k42d516kx4qx0g5l74lrm")) + "110b1xhb5vfpcx0zq9kkas7pj281skx5dpnnr22idx509jfdzj8b")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output @@ -125,12 +125,6 @@ (("/usr/local/lib/cups/filter") (string-append out "/lib/cups/filter"))) #t))) - (add-after 'unpack 'patch-for-poppler - (lambda _ - (substitute* "filter/pdf.cxx" - (("GooString \\*field_name;" m) - (string-append "const " m))) - #t)) (add-after 'install 'wrap-filters (lambda* (#:key inputs outputs #:allow-other-keys) ;; Some filters expect to find 'gs' in $PATH. We cannot @@ -187,9 +181,8 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") ;; satisfy this dependency. (define-public cups-minimal (package - (replacement cups-minimal-2.3.3) (name "cups-minimal") - (version "2.3.1") + (version "2.3.3") (source (origin (method url-fetch) @@ -197,7 +190,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") version "/cups-" version "-source.tar.gz")) (sha256 (base32 - "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv")))) + "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -250,19 +243,6 @@ device-specific programs to convert and print many types of files.") ;; CUPS is Apache 2.0 with exceptions, see the NOTICE file. (license license:asl2.0))) -(define-public cups-minimal-2.3.3 - (package - (inherit cups-minimal) - (version "2.3.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/apple/cups/releases/download/v" - version "/cups-" version "-source.tar.gz")) - (sha256 - (base32 - "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6")))))) - (define-public cups (package/inherit cups-minimal (name "cups") diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 3b1b9ed366..3f0ebc47a7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -679,7 +679,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.44") + (version "10.1.45") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.com/MariaDB" @@ -687,7 +687,7 @@ Language.") version ".tar.gz")) (sha256 (base32 - "0fah6d50hldq0farxwr8mj3jnniwdz0d1wsha07nx37fc79h7wi1")) + "1mfs0x4c0z7d306n128dxdawk3llk25vxif5zwl20fv1z5qhz3wx")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet @@ -959,14 +959,14 @@ developed in C/C++ to MariaDB and MySQL databases.") (define-public postgresql (package (name "postgresql") - (version "10.12") + (version "10.13") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "1rsab4zf4rx7pvvhlwhb04kb95aiad9cwazc4ksbvg2gij47z3rq")) + "1qal0yp7a90yzya7hl56gsmw5fvacplrdhpn7h9gnbyr1i2iyw2d")) (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 90154cbba9..0cfc410346 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -185,14 +185,14 @@ freedesktop.org project.") ;; Updating this will rebuild over 700 packages through libinput-minimal. (package (name "libinput") - (version "1.15.2") + (version "1.15.5") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "0ivpb4sghl80cs7jg3xrs53kckif6wy81cny3a8mry94nszky74p")))) + "15ww4jl3lcxyi8m8idg8canklbqv729gnwpkz7r98c1w8a7zq3m9")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 210cf8ab58..2cd92ee300 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5810,6 +5810,14 @@ some graphical niceities, and numerous bug-fixes and other improvements.") (string-append "LDFLAGS=-Wl,-rpath=" vulkanlib) "-CQuake")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-for-new-vulkan + (lambda _ + ;; Mimic upstream commit a869a22d9b51c68e for + ;; compatibility with newer vulkan-headers. + (substitute* "Quake/gl_rmisc.c" + (("VK_DYNAMIC_STATE_RANGE_SIZE") + "3")) + #t)) (delete 'configure) (add-after 'unpack 'fix-makefile-paths (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 6b7e7c1ae9..b27426c84f 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,7 +94,6 @@ ("ncurses" ,ncurses) ("guile" ,guile-2.0) ("python-wrapper" ,python-wrapper) - ("dejagnu" ,dejagnu) ("source-highlight" ,source-highlight) ;; Allow use of XML-formatted syscall information. This enables 'catch @@ -101,6 +101,7 @@ ("libxml2" ,libxml2))) (native-inputs `(("texinfo" ,texinfo) + ("dejagnu" ,dejagnu) ("pkg-config" ,pkg-config))) (home-page "https://www.gnu.org/software/gdb/") (synopsis "The GNU debugger") diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 23b8ed1a29..8a17f7dd65 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -233,7 +233,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.3.4") + (version "20.0.7") (source (origin (method url-fetch) @@ -245,7 +245,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1r4giqq7q7zqbn23lbw7v5vswagxx8qj6ij2w8bsb697mvk6g90x")) + "0y517qpdg6v6dsdgzb365p03m30511sbyh8pq0mcvhvjwy7javpy")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) @@ -270,10 +270,9 @@ also known as DXTn or DXTC) for Mesa.") ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") ;; Note: update the 'clang' input of mesa-opencl when bumping this. - `(("llvm" ,llvm-9))) + `(("llvm" ,llvm-10))) (_ `())) - ("makedepend" ,makedepend) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (native-inputs @@ -289,6 +288,7 @@ also known as DXTn or DXTC) for Mesa.") ("python" ,python-wrapper) ("python-mako" ,python-mako) ("which" ,(@ (gnu packages base) which)))) + (outputs '("out" "bin")) (arguments `(#:configure-flags '(,@(match (%current-system) @@ -347,32 +347,26 @@ also known as DXTn or DXTC) for Mesa.") (guix build meson-build-system)) #:phases (modify-phases %standard-phases - (add-after - 'unpack 'patch-create_test_cases - (lambda _ - (substitute* "src/intel/genxml/gen_pack_header.py" - (("/usr/bin/env python2") (which "python"))) - #t)) ,@(if (string-prefix? "i686" (or (%current-target-system) (%current-system))) ;; Disable new test from Mesa 19 that fails on i686. Upstream ;; report: <https://bugs.freedesktop.org/show_bug.cgi?id=110612>. `((add-after 'unpack 'disable-failing-test (lambda _ - (substitute* "src/gallium/tests/unit/meson.build" + (substitute* "src/util/tests/format/meson.build" (("'u_format_test',") "")) #t))) '()) - (add-before - 'configure 'fix-dlopen-libnames + (add-before 'configure 'fix-dlopen-libnames (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; Remain agnostic to .so.X.Y.Z versions while doing ;; the substitutions so we're future-safe. - (substitute* "src/glx/dri_common.c" - (("dlopen\\(\"libGL\\.so") - (string-append "dlopen(\"" out "/lib/libGL.so"))) - (substitute* "src/egl/drivers/dri2/egl_dri2.c" + (substitute* "src/glx/meson.build" + (("-DGL_LIB_NAME=\"lib@0@\\.so\\.@1@\"") + (string-append "-DGL_LIB_NAME=\"" out + "/lib/lib@0@.so.@1@\""))) + (substitute* "src/gbm/backends/dri/gbm_dri.c" (("\"libglapi\\.so") (string-append "\"" out "/lib/libglapi.so"))) (substitute* "src/gbm/main/backend.c" @@ -382,6 +376,26 @@ also known as DXTn or DXTC) for Mesa.") (("\"gbm_dri\\.so") (string-append "\"" out "/lib/dri/gbm_dri.so"))) #t))) + (add-after 'install 'split-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + ,@(match (%current-system) + ((or "i686-linux" "x86_64-linux") + ;; Install the Vulkan overlay control script to a separate + ;; output to prevent a reference on Python, saving ~70 MiB + ;; on the closure size. + '((copy-recursively (string-append out "/bin") + (string-append bin "/bin")) + (delete-file-recursively (string-append out "/bin")))) + (_ + ;; XXX: On architectures without the Vulkan overlay layer + ;; just create an empty file because outputs can not be + ;; added conditionally. + '((mkdir-p (string-append bin "/bin")) + (call-with-output-file (string-append bin "/bin/.empty") + (const #t))))) + #t))) (add-after 'install 'symlinks-instead-of-hard-links (lambda* (#:key outputs #:allow-other-keys) ;; All the drivers and gallium targets create hard links upon @@ -437,7 +451,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") `(("libclc" ,libclc) ,@(package-inputs mesa))) (native-inputs - `(("clang" ,clang-9) + `(("clang" ,clang-10) ,@(package-native-inputs mesa))))) (define-public mesa-opencl-icd @@ -457,6 +471,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") (propagated-inputs '()) (inputs '()) (native-inputs '()) + (outputs '("out")) (arguments '(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1745bf7906..feef08a5c0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4507,6 +4507,17 @@ throughout GNOME for API documentation).") "/lib/libGL.so")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-build-with-mesa-20 + (lambda _ + ;; Work around a problem with Mesa 20 where some macros used by + ;; Cogl went missing from eglext.h. This can likely be removed + ;; for newer versions of Cogl or Mesa. + ;; https://gitlab.gnome.org/GNOME/cogl/-/merge_requests/19 + (substitute* '("configure" + "cogl/winsys/cogl-winsys-egl-kms.c") + (("#include <EGL/eglext.h>" all) + (string-append all "\n#include <EGL/eglmesaext.h>\n"))) + #t)) (add-before 'check 'start-xorg-server (lambda* (#:key tests? inputs #:allow-other-keys) (if tests? @@ -6094,7 +6105,21 @@ to display dialog boxes from the commandline and shell scripts.") ;; the remaining flags are needed for the bundled cogl (string-append "-Dopengl_libname=" (assoc-ref %build-inputs "mesa") - "/lib/libGL.so")))) + "/lib/libGL.so")) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-build-with-mesa-20 + (lambda _ + ;; Mimic upstream commit a444a4c5f58ea516ad for + ;; compatibility with Mesa 20. Remove for 3.36. + (substitute* '("src/backends/meta-egl-ext.h" + "src/backends/meta-egl.c" + "src/backends/meta-egl.h") + (("#include <EGL/eglext\\.h>" all) + (string-append all "\n#include <EGL/eglmesaext.h>"))) + (substitute* "cogl/cogl/meson.build" + (("#include <EGL/eglext\\.h>" all) + (string-append all "\\n#include <EGL/eglmesaext.h>"))) + #t))))) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 6e91d45503..815a35a974 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,7 +98,6 @@ ("gts" ,gts) ("gd" ,gd) ; FIXME: Our GD is too old ("guile" ,guile-2.0) ;Guile bindings - ("swig" ,swig) ("pango" ,pango) ("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -108,6 +108,7 @@ ("libpng" ,libpng))) (native-inputs `(("bison" ,bison) + ("swig" ,swig) ("pkg-config" ,pkg-config))) (outputs '("out" "doc")) ; 5 MiB of html + pdfs (home-page "http://www.graphviz.org/") diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 7596796d68..69fb1d8ae4 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -104,6 +104,17 @@ arrays of data.") ;; under the 3-clause BSD license, the rest is under 2-clause BSD license. (license (list license:bsd-2 license:bsd-3)))) +;; Increase the test timeouts to accommodate slow or busy machines. +(define %common-gstreamer-phases + '((add-after 'unpack 'increase-test-timeout + (lambda _ + (substitute* "tests/check/meson.build" + (("'CK_DEFAULT_TIMEOUT', '20'") + "'CK_DEFAULT_TIMEOUT', '60'") + (("timeout ?: 3 \\* 60") + "timeout: 9 * 60")) + #t)))) + (define-public gstreamer (package (name "gstreamer") @@ -122,6 +133,7 @@ arrays of data.") (arguments `(#:phases (modify-phases %standard-phases + ,@%common-gstreamer-phases ;; FIXME: Since switching to the meson-build-system, two tests ;; started failing on i686. See ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/499>. @@ -220,12 +232,13 @@ This package provides the core library and elements.") ("gobject-introspection" ,gobject-introspection) ("python-wrapper" ,python-wrapper))) (arguments - '(#:configure-flags '("-Dgl=disabled" + `(#:configure-flags '("-Dgl=disabled" ;; FIXME: Documentation fails to build without ;; enabling GL above, which causes other problems. "-Ddoc=false") #:phases (modify-phases %standard-phases + ,@%common-gstreamer-phases (add-before 'configure 'patch (lambda _ (substitute* "tests/check/libs/pbutils.c" @@ -284,6 +297,7 @@ for the GStreamer multimedia library.") (arguments `(#:phases (modify-phases %standard-phases + ,@%common-gstreamer-phases ,@(if (string-prefix? "arm" (or (%current-target-system) (%current-system))) ;; FIXME: These tests started failing on armhf after switching to Meson. @@ -332,6 +346,7 @@ developers consider to have good quality code and correct functionality.") (arguments `(#:phases (modify-phases %standard-phases + ,@%common-gstreamer-phases ,@(if (string-prefix? "arm" (or (%current-target-system) (%current-system))) ;; Disable test that fails on ARMv7. @@ -421,6 +436,9 @@ par compared to the rest.") (base32 "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m")))) (build-system meson-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ,@%common-gstreamer-phases))) (inputs `(("gst-plugins-base" ,gst-plugins-base) ("liba52" ,liba52) @@ -492,7 +510,9 @@ compression formats through the use of the libav library.") (build-system meson-build-system) (arguments ;; FIXME: 16/22 failing tests. - `(#:tests? #f)) + `(#:tests? #f + #:phases (modify-phases %standard-phases + ,@%common-gstreamer-phases))) (inputs `(("gst-plugins-base" ,gst-plugins-base) ("libxml2" ,libxml2))) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 385e4e97e4..350eb8445b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -758,7 +758,7 @@ application suites.") (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.24.14") + (version "3.24.20") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -766,7 +766,7 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w")) + "1wqxkd3xnqwihcawncp9mkf9bv5a5fg5i4ahm6klpl782vvnkb1d")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (propagated-inputs @@ -1287,7 +1287,7 @@ printing and other features typical of a source code editor.") (define-public python-pycairo (package (name "python-pycairo") - (version "1.19.0") + (version "1.19.1") (source (origin (method url-fetch) @@ -1295,7 +1295,7 @@ printing and other features typical of a source code editor.") version "/pycairo-" version ".tar.gz")) (sha256 (base32 - "176i283glkpycka8wwyndwld0zp1yn9xj9rpvllqgja698vsjnsg")))) + "111fav9m1iagw3nh2ws2vzkjh34r97yl7rdlpvsngsqg521k251c")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 12a8d6758f..0793635b7d 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Meiyo Peng <meiyo@disroot.org> ;;; Copyright © 2020 kanichos <kanichos@yandex.ru> +;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -140,7 +141,6 @@ ("gconf" ,gconf) ("gtk2" ,gtk+-2) ("gtk+" ,gtk+) - ("gettext" ,gnu-gettext) ("json-glib" ,json-glib) ("libnotify" ,libnotify) ("libx11" ,libx11) @@ -152,6 +152,7 @@ ("python" ,python))) (native-inputs `(("glib" ,glib "bin") ; for glib-genmarshal + ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler ("ucd" ,ucd) ("unicode-emoji" ,unicode-emoji) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 6fc7e6d201..ccc0cfb493 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,14 +48,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.10-95") + (version "6.9.11-11") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "0fcbcad95wn0q0pdfl0qgycm30f3a7xhskc0r5icldq6v6l4b3is")))) + "1b67rrppvm04aqr76qky5h2a0j2d161h8kwa04fv611w5xwandr2")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 0c31709329..f2b794df52 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> +;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,7 +81,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -89,7 +90,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "14h7519bfkwzh58lxgxrj5jlfhfnrakhjcm6lmhafnkg5h56m4kr")))) + "10c5xs5shk0dcshpdxg564ay5y8hgmvfvmlhmhjf0dy79kcah3c3")))) (build-system cmake-build-system) (native-inputs `(("qtbase" ,qtbase))) ; For tests (needs qmake) @@ -224,7 +225,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") (define-public attica (package (name "attica") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -233,7 +234,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0dvsjwl2c3liiicv2m8p1m7hlc3fcapsj5pfirmdm1l38wcayr60")))) + "1njw1sifykyqldb5idaywdzi3xg7a6bvzkrvazwmyixd0npq12dx")))) (build-system cmake-build-system) (arguments `(#:phases @@ -264,7 +265,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (define-public bluez-qt (package (name "bluez-qt") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -273,7 +274,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") name "-" version ".tar.xz")) (sha256 (base32 - "179am9czhb9mcirmja5bxjmqil3qg81v56n8rmkkp5q50qpln4dh")))) + "1kqhps4qyvqm0qmk7fb3w41bib898amipchf8csdzacw4bzpri9k")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -297,7 +298,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -306,7 +307,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") name "-" version ".tar.xz")) (sha256 (base32 - "17kil9dlh8w5r29arrjbv47b7jxz45kqzpg06zw3vz70bdgbb995")))) + "0lqglrjgjb4ralgmr7lb9k7acmn8q4jm18s4p3gbgd9iswyqgsbm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -326,7 +327,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") (define-public kapidox (package (name "kapidox") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -335,7 +336,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0cwprhpz731bqqhr6vra6lc76k5i4pm3m9j0q21km9wm2djfmk19")))) + "1irl25pf60frzrmm1ksgjq6y8kn3rd5snliq69l4c42yznl9qv1j")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; has no test target @@ -368,7 +369,7 @@ documentation.") (define-public karchive (package (name "karchive") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -377,7 +378,7 @@ documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "0ypykybxl9dz57rgsfihx4rfhzhphidypb2f5nwrw1f6vlqkawzs")))) + "0z8asn357pdbv4g9g0x18p72wskca1qanxljyix7wzc5rsi63wzm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -402,7 +403,7 @@ GZip format, via a subclass of QIODevice.") (define-public kcalendarcore (package (name "kcalendarcore") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -411,7 +412,7 @@ GZip format, via a subclass of QIODevice.") name "-" version ".tar.xz")) (sha256 (base32 - "1cqqwpd6faz7sd6jrda564xxvwr231b175h2w3ilxx6hvz9yrps3")))) + "1y1f8gc1g9yn9kgmn53f1zvkizasfs667dfin3fyci657r5qwpw2")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -463,7 +464,7 @@ and the older vCalendar.") (define-public kcodecs (package (name "kcodecs") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -472,7 +473,7 @@ and the older vCalendar.") name "-" version ".tar.xz")) (sha256 (base32 - "0w5q37lqdzyl84723kg9sh9xxn2g2wv0xfxpy3218hmc9364s89h")))) + "0y9n2a5n18pasdmrp0xb84hla9l27yj2x3k4p1c041sd9nkwixpk")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -499,7 +500,7 @@ Internet).") (define-public kconfig (package (name "kconfig") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -508,7 +509,7 @@ Internet).") name "-" version ".tar.xz")) (sha256 (base32 - "1ya0fvrrfiw4a5wkydcjpnkkyq3ampxy5h210dm04qim6a9x8rb1")))) + "1s3h4hfpw7c0894cifj66bj1yhx8g94ckvl71jm7qqsb5x5h6y9n")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -564,7 +565,7 @@ propagate their changes to their respective configuration files.") (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -573,7 +574,7 @@ propagate their changes to their respective configuration files.") name "-" version ".tar.xz")) (sha256 (base32 - "1w658wfksxglr0fjpa2p8gmjbvpd2knzhk3byk2s9dwil7i7cvjd")))) + "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -621,7 +622,7 @@ many more.") (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -630,7 +631,7 @@ many more.") name "-" version ".tar.xz")) (sha256 (base32 - "11zwr89v0k4m1235rzr39z4cbfdwn5zg34abs62nfnr8vmba62qv")) + "1vz2hg5p8wvfk0pi8v25zqzcn8yj7ykakxjyipmadvi02c1h8gic")) (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (build-system cmake-build-system) (native-inputs @@ -666,7 +667,7 @@ as well as an API to create KDED modules.") (define-public kdnssd (package (name "kdnssd") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -675,7 +676,7 @@ as well as an API to create KDED modules.") name "-" version ".tar.xz")) (sha256 (base32 - "1bn9c6ii1n6ns478i3lp7yzga7dbcqvdb43rfzmz7gndnmh853gm")))) + "0wadknnf472rqg2xnqzs5v23qzqfr336wj6d96yg2ayqm0chbppy")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -694,7 +695,7 @@ infrastructure.") (define-public kguiaddons (package (name "kguiaddons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -703,7 +704,7 @@ infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "0k22kargqxf0j09wzk1x90b526npj8a0210ilk0n1k6spc8xa6mr")))) + "1yndjdhb9zzlhh74xccpys38balm5dma56sx6bwwfrga1phq0g5l")))) (build-system qt-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, @@ -724,7 +725,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (define-public kholidays (package (name "kholidays") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -732,7 +733,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1035kh0na4hwp4pnsi8p1nd7r114d4bgdnjr0g2hwmy868vx0a67")))) + (base32 "1rifx51yk24sk578h08s1bwpqb61rnyyks33zpl82lcdnl1ljp26")))) (build-system cmake-build-system) (arguments `(#:phases @@ -759,7 +760,7 @@ other special events for a geographical region.") (define-public ki18n (package (name "ki18n") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -768,7 +769,7 @@ other special events for a geographical region.") name "-" version ".tar.xz")) (sha256 (base32 - "1fdp0bdvqbqzbxynbg3bcdridr8j3qnm9spyrrdg5q95sz99a4s9")))) + "1f952488492sm904i1iwgjp2gc7z07312mlshw4ckh2801y0qclc")))) (build-system cmake-build-system) (propagated-inputs `(("gettext" ,gettext-minimal) @@ -802,7 +803,7 @@ translation scripting.") (define-public kidletime (package (name "kidletime") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -811,7 +812,7 @@ translation scripting.") name "-" version ".tar.xz")) (sha256 (base32 - "0zd51lsz23rqwk4lnzs5653sanprgr80p33yk8gmgsihgyfbjv0r")))) + "0vbxs80a8kh2xbxclx8zwl7acynsasa7i0cs171fxr26d0dmmhm5")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -833,7 +834,7 @@ or user activity.") ;; plasma-framework which is tier 3. (package (name "kirigami") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -842,7 +843,7 @@ or user activity.") "kirigami2-" version ".tar.xz")) (sha256 (base32 - "1v76d1xgmi9kkxiwq4y6rzaxs1hwwm95pw490m09rgqhli7180yv")))) + "0akkyif6n9l7hw4cj6nkf1zwgnd7vqi1gyiqmn588rspgl91zf1w")))) (properties `((upstream-name . "kirigami2"))) (build-system cmake-build-system) (native-inputs @@ -869,7 +870,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (define-public kitemmodels (package (name "kitemmodels") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -878,7 +879,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") name "-" version ".tar.xz")) (sha256 (base32 - "10bhg0db9gdg2hlc02ngg1i2q7a99862d5973hxqzf620d28p5rd")))) + "0x7y5shg2pp490hvmkz81b8j01cha9j1001q34m7pnyf0n3zknzc")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -920,7 +921,7 @@ model to observers (define-public kitemviews (package (name "kitemviews") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -929,7 +930,7 @@ model to observers name "-" version ".tar.xz")) (sha256 (base32 - "15h0w16wgj94kxz4vgjb34i3pyx5w1f2npj86j4d2sa0mxxpmqyz")))) + "04vlmkvc3y5h7cpb6kdv9gha5axxkimhqh44mdg2ncyn4sas6j68")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -946,7 +947,7 @@ to flat and hierarchical lists.") (define-public kplotting (package (name "kplotting") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -955,7 +956,7 @@ to flat and hierarchical lists.") name "-" version ".tar.xz")) (sha256 (base32 - "11kpq34j37c1gsvj5nxhkc31bw8gw2n7nkqsfx87jw9f4v2vhmr9")))) + "1wj4n2a8iz9ml1y0012xkpsx3dfp5gl2dn80sifrzvkxjxrhwach")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -974,7 +975,7 @@ pixel units.") (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -983,7 +984,7 @@ pixel units.") "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "08y0m4wcq1sbxvlga3w72waj5xckh5jra5x7rvnp87dl38qxhacs")))) + "12jn7lqsp86329spai7n1n8i65nwhxh8gp33wkq543h7w3i2a3jb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1023,7 +1024,7 @@ integration with a custom editor as well as a ready-to-use (define-public kwayland (package (name "kwayland") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1032,13 +1033,14 @@ integration with a custom editor as well as a ready-to-use name "-" version ".tar.xz")) (sha256 (base32 - "03z8hiw0mrhl3f0y7ypc46ic0w5vlp56prbqbk448jin5hakkkdg")))) + "0hrpbfzixjpnfy9q5x66q1fff0p7n80rrs127zzdv68pyi6456ry")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) (inputs `(("qtbase" ,qtbase) + ("qtwayland" ,qtwayland) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (arguments @@ -1063,7 +1065,7 @@ represented by a QPoint or a QSize.") (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1072,7 +1074,7 @@ represented by a QPoint or a QSize.") name "-" version ".tar.xz")) (sha256 (base32 - "1nzgv3v3kyq5jm2b9xri6qjawspr9ycxhskfvj8kkgr46dr35qyc")))) + "03l37lh219np7pqfa56r2v7n5s5xg4rjq005qng4b5izd95ri56j")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1104,7 +1106,7 @@ configuration pages, message boxes, and password requests.") (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1113,7 +1115,7 @@ configuration pages, message boxes, and password requests.") name "-" version ".tar.xz")) (sha256 (base32 - "0nbkb8pkrbbp1s892ndzhakzri3qxpw48kibgb0rqz6i0azfxrz8")))) + "0a68cj0bsl5a9sxfd969khznycrn9p6grp2b08hqacxqdknzs0wh")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1167,7 +1169,7 @@ lower level classes for interaction with the X Windowing System.") (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1176,7 +1178,7 @@ lower level classes for interaction with the X Windowing System.") name "-" version ".tar.xz")) (sha256 (base32 - "0yv5q71cyyy04051ny5lr7n35pw391gxr6l324n6c0z7kgc560ad")))) + "0ydq1l823jgp0yrrpqi1zdk5dsg65ydk1x082qwsa9a0vzs0np3x")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1205,7 +1207,7 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1214,7 +1216,7 @@ messages.") name "-" version ".tar.xz")) (sha256 (base32 - "0ydfz6ikya1h8gg9c716y8lmy45iqnx0gaghkm0vz3c3ckx99l9g")))) + "1h2kdw5vs7mn3n7bvqwm36a48ra9iap6384kanz14zjbankj04c1")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1244,7 +1246,7 @@ which are used in DBus communication.") (define-public oxygen-icons (package (name "oxygen-icons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1253,7 +1255,7 @@ which are used in DBus communication.") name "5" "-" version ".tar.xz")) (sha256 (base32 - "0rh9bysiisnpz3c92hyba98f58dlmwf9zhbbb4vmab0qvm5d3q9g")))) + "1rjsnz0g7zyzgii26sk370adb6jcyvr2lm8qi23fvqimifngqm2c")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1269,7 +1271,7 @@ which are used in DBus communication.") (define-public prison (package (name "prison") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -1277,7 +1279,7 @@ which are used in DBus communication.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0spkm5j2qmwl374xrbm054rjv4rcqwsz0wl5v2nyrfq2ma4bzzw5")))) + (base32 "1qflivvb593d2npc218xkdn3w5zvl7x8v1b52ydnggsxzbgkqvb4")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1294,7 +1296,7 @@ provides uniform access to generation of barcodes with data.") (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1303,7 +1305,7 @@ provides uniform access to generation of barcodes with data.") name "-" version ".tar.xz")) (sha256 (base32 - "1sz2735fn5665pyb5v70y2fmw2mkziq83di4h06pwday9vf2r6l5")))) + "1n47cl082zqdw6ykil04rw6bws4fn1m8wfx4vxv1aqj9warbdks3")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1328,7 +1330,7 @@ feel.") (define-public solid (package (name "solid") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1337,7 +1339,7 @@ feel.") name "-" version ".tar.xz")) (sha256 (base32 - "0i124kyhd1hfnajp0hnqma35ycr3bh60z39gc6byhxb75p59swnl")))) + "0alng7ciw6xji0s2zrk8dsx1p0p9shrrfzl8wnkwygc5chnhysz7")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1367,7 +1369,7 @@ system.") (define-public sonnet (package (name "sonnet") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1376,7 +1378,7 @@ system.") name "-" version ".tar.xz")) (sha256 (base32 - "0gqxmyxmwn2rs9f8x2z8pfmbx0mvkyh7nalnsmfqkph8f0fja9ig")))) + "0b88h5fw1n8zyrg0vq3lj2jbjjyh0mk64lj6ab3643kxzqxbn30w")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1396,7 +1398,7 @@ ASpell and HUNSPELL.") (define-public threadweaver (package (name "threadweaver") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1405,7 +1407,7 @@ ASpell and HUNSPELL.") name "-" version ".tar.xz")) (sha256 (base32 - "0z2906nmamvcg85jip98wq834rjs3nc1qlv3q182gw1cnh4nbdag")))) + "0y1q0wy073lf11g4jrp4bdw4kpj4ibqfscsxj6zlh8ban9zlf389")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1426,7 +1428,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (define-public kactivities (package (name "kactivities") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1435,7 +1437,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." name "-" version ".tar.xz")) (sha256 (base32 - "03h5r7z2a449hfvaj3zk1n7dhpj49liy5q60fb4nxz4yjkgca27s")))) + "1whsp0f87lrcn61s9rfhy0aj68hm6zgfa38mq6frlkcjksi0z1vn")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1471,7 +1473,7 @@ with other frameworks.") (define-public kauth (package (name "kauth") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1480,7 +1482,7 @@ with other frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "08gkgmxaxqpavsqdmcgs4i8j63pg5qld7agd58irpw29pgq1fj9c")))) + "0nmdz7ra3hpg0air4lfkzilv7cwx3zxs29k7sh8l3i1fs3qpjwxm")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -1518,7 +1520,7 @@ utilities.") (define-public kcompletion (package (name "kcompletion") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1527,7 +1529,7 @@ utilities.") name "-" version ".tar.xz")) (sha256 (base32 - "10ggypg09acc19gkvxsigfsaq8s5vqv64ada307blpzy8j74bisb")))) + "1pjgya8wi28jx63hcdi9v5f5487gzbkw2j1iganhd7bhcb8s7zpy")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1546,7 +1548,7 @@ integrated it into your application's other widgets.") (define-public kcontacts (package (name "kcontacts") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1555,7 +1557,7 @@ integrated it into your application's other widgets.") name "-" version ".tar.xz")) (sha256 (base32 - "0xs5c5l4vck5i6879jax1nf93if02f9hyfkn60l36cxbphnbpw0h")))) + "182ma11z3kqxq3cwy7kwprfqkb9bcmn44w7k9vixbid4pv5wa0lb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1590,7 +1592,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. (define-public kcrash (package (name "kcrash") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1599,7 +1601,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. name "-" version ".tar.xz")) (sha256 (base32 - "1xl3bzxfchfafcplil3g07gq1a3fnwx1i40bxp4jfsgb8d8slfwc")))) + "11sy9hrjpvybqi53qjrnncy9mzifrb3vqxi2d12ldjzqyqd8pirp")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1617,7 +1619,7 @@ application crashes.") (define-public kdoctools (package (name "kdoctools") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1626,7 +1628,7 @@ application crashes.") name "-" version ".tar.xz")) (sha256 (base32 - "1zna9szii2r9agwfqbglk904zzpr3fyrz6x5v2rxrm3c9m110sm4")))) + "0g0k83np2xaxk05spf14h5fvzy0n7kbcwx1sa9wjh570f6jx87am")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1674,7 +1676,7 @@ from DocBook files.") (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1683,7 +1685,7 @@ from DocBook files.") name "-" version ".tar.xz")) (sha256 (base32 - "11wvddb7nqdyi5rin3xa0p32lmvc62yw47hwcdzc01lkfbxdn050")))) + "18n1a5857090a1c1rxzd07sxs652gl6wr3n99sp8rxmvkghn9zsj")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1728,7 +1730,7 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1737,7 +1739,7 @@ by applications to write metadata.") name "-" version ".tar.xz")) (sha256 (base32 - "15y339by7jvsbmfqb33s3ain7sfhx3789xy2xjpkh5f2f9v29r2b")))) + "0pk4b725wapzdxv1mm6ddqcl6z8ffcpr32i5vrhrin8awi5gx13s")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1782,7 +1784,7 @@ formats.") (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1791,7 +1793,7 @@ formats.") name "-" version ".tar.xz")) (sha256 (base32 - "0pg055ampm69yr1vn03s1ys3p18raj8f5pcg0hg9hb4sjkyrr3pn")))) + "13kdczzyyh17hf6vlhh4li5bn4yq5bab5xa8mm63r9rynxihgclf")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1810,7 +1812,7 @@ asynchronous jobs.") (define-public knotifications (package (name "knotifications") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1819,7 +1821,7 @@ asynchronous jobs.") name "-" version ".tar.xz")) (sha256 (base32 - "1rknfn50kq6ng7gclgg0n4qyhv2grc7xcf3gcax3bbyy46gajsl8")))) + "01bn23xw2n53h9nl99lm3cjnqs8s66bmwkzf6fkpg9rzkykizbyc")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1856,7 +1858,7 @@ covers feedback and persistent events.") (define-public kpackage (package (name "kpackage") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1865,7 +1867,7 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32 - "1h57kicsjkisysd2mmd5q9q5m421xqcv3p8vkjlqxkph5sa7y2q5")) + "03rp7p7i8ihz5wg58gjs638jk7xbszknfiy2j3r979snc57g95mv")) ;; Default to: external paths/symlinks can be followed by a ;; package (patches (search-patches "kpackage-allow-external-paths.patch")))) @@ -1917,7 +1919,7 @@ were traditional plugins.") (define-public kpty (package (name "kpty") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1926,7 +1928,7 @@ were traditional plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "10v61016kd1q41n4dwac1nsiixji64i5y501nx0hphpjkjbaklkr")))) + "1hp6iilr2asf2269linfazjv4yjg7rsi8wydxx53yyr99r0bgmah")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1954,7 +1956,7 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1963,7 +1965,7 @@ and communicating with them using a pty.") name "-" version ".tar.xz")) (sha256 (base32 - "0yzq2jxja9wnhz91cyli2mnw32xynnzbf1lr0hk6vi8a1w2mkrzz")))) + "0sp4gfzpf40cdi0xnff9sn7b75z88j0589svz4rv77q5m137cgnn")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1991,7 +1993,7 @@ gallons).") (define-public syndication (package (name "syndication") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2000,7 +2002,7 @@ gallons).") name "-" version ".tar.xz")) (sha256 (base32 - "1d0k6x11giylfkr183sm307n4v6rjpwkqp7y9wfhimjrcprwf2g6")))) + "1n3x8s1z4kd30xirfr07hi87vwhk4rilb5kslcjcgp5n9c0imcpv")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2024,7 +2026,7 @@ between feed formats.") (define-public baloo (package (name "baloo") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2033,7 +2035,7 @@ between feed formats.") name "-" version ".tar.xz")) (sha256 (base32 - "1qhqv19glg98146cyc7ykq02b5b9m936xcml1w1p8fx32cp2zbch")))) + "1cf5pp9hn3pqypwyzh63ksasap3n7qz6n3y2xgb83ss3fra90pjf")))) (build-system cmake-build-system) (propagated-inputs `(("kcoreaddons" ,kcoreaddons) @@ -2074,11 +2076,15 @@ between feed formats.") (display "[testMoveFile]\n*\n"))) #t)) (add-after 'unpack 'remove-failing-test - ;; This test fails on i686 and aarch64 (lambda _ + ;; FIXME: kinotifytest broke in 5.70.0 with commit 73183acf00 and + ;; seems like an oversight. Reverting the commit makes it pass, + ;; but causes other problems. Since just the test file names are + ;; broken, disabling it should be safe. Try enabling for > 5.70.0. (substitute* "autotests/unit/file/CMakeLists.txt" - (("^\\s*ecm_add_test\\(.* TEST_NAME metadatamovertest .*" line) - (string-append "# " line))) + ;; The test only runs on GNU/Linux, piggy-back on the check. + (("CMAKE_SYSTEM_NAME MATCHES \"Linux\"" all) + (string-append all " AND NOT TRUE"))) #t)) (replace 'check (lambda _ @@ -2094,7 +2100,7 @@ maintaining an index of the contents of your files.") (define-public kactivities-stats (package (name "kactivities-stats") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2103,7 +2109,7 @@ maintaining an index of the contents of your files.") name "-" version ".tar.xz")) (sha256 (base32 - "187fyl92pnkn317pi1pkmf7bv5z6aqdhqa6b8531xgl06gyigy45")))) + "1cnfdnxkw9hwbqdzdygp2vzwxqwqhxyipzwdcgar0clgnf7zi7wx")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2124,7 +2130,7 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2133,7 +2139,7 @@ by which applications, and what documents have been linked to which activity.") name "-" version ".tar.xz")) (sha256 (base32 - "011r2ms57ycz5kma0q35cji4isj0lskrxrambk11jibs1xjdis2v")))) + "1i5vcyvyc9whmflbcg2kc562ch93yscfic1c1n9z347g26jmgras")))) (build-system cmake-build-system) (propagated-inputs `(("kwidgetsaddons" ,kwidgetsaddons))) @@ -2167,7 +2173,7 @@ using the XBEL format.") (define-public kcmutils (package (name "kcmutils") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2176,7 +2182,7 @@ using the XBEL format.") name "-" version ".tar.xz")) (sha256 (base32 - "1q12n9sfgrm2f8bspsl5i9gbv4jwl25w5id9m9rnnr87hck35g68")))) + "08f4yr546brl1dppp0khvsw9ihmh9a7rp505913pdhi0sklaiimz")))) (build-system cmake-build-system) (propagated-inputs `(("kconfigwidgets" ,kconfigwidgets) @@ -2203,6 +2209,7 @@ using the XBEL format.") ("kconfig" ,kconfig) ("kcoreaddons" ,kcoreaddons) ("kdeclarative" ,kdeclarative) + ("kguiaddons" ,kguiaddons) ("kiconthemes" ,kiconthemes) ("kitemviews" ,kitemviews) ("ki18n" ,ki18n) @@ -2220,7 +2227,7 @@ KCModules can be created with the KConfigWidgets framework.") (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2229,7 +2236,7 @@ KCModules can be created with the KConfigWidgets framework.") name "-" version ".tar.xz")) (sha256 (base32 - "098xdfvnyz9bdkc6iyq5r2s4vkfdhbrri4015yzbs73j4f2wcxz5")))) + "195dw7nyr3fp78y3vfnyjh0hwgwk46f80wdcm8dck5rkscl3v9xz")))) (build-system qt-build-system) (propagated-inputs `(("kauth" ,kauth) @@ -2267,7 +2274,7 @@ their settings.") (define-public kdeclarative (package (name "kdeclarative") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2276,7 +2283,7 @@ their settings.") name "-" version ".tar.xz")) (sha256 (base32 - "027wnrmr79fxkf4jpdpfhp7smdai2wn9y71l1h4kgqgwfq8anwy8")))) + "1vq9pkrb0zsphi2sfx7cyy1kb6pklzjkmqdf5202z8vydlkc4549")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -2330,7 +2337,7 @@ that offer bindings to some of the Frameworks.") (define-public kded (package (name "kded") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2339,7 +2346,7 @@ that offer bindings to some of the Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "0kjr6ff1g6xyas5si9b7zilcqcx4mgfkzfpq2c59fz1wd8q8fl05")))) + "0zqd33vy4ny7g9as3bhd75qi1chz1nlqq133pgw8kjanvghwwnk9")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2363,7 +2370,7 @@ started on demand.") (define-public kdesignerplugin (package (name "kdesignerplugin") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2372,7 +2379,7 @@ started on demand.") name "-" version ".tar.xz")) (sha256 (base32 - "1w7glszd82iyw6kxzmp0568rm3qfadi7vw7gfxg4c15w5ikkvxn9")))) + "0dr6gcag2yzx8fvxis4x403jrcisywds95cywmiyz3pb5727cak2")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2406,7 +2413,7 @@ ini-style description files.") (define-public kdesu (package (name "kdesu") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2415,7 +2422,7 @@ ini-style description files.") name "-" version ".tar.xz")) (sha256 (base32 - "038m0sdpnsy50m3g78sfg7wk26933rh3578qsnapw2cyimx8ypxx")))) + "17k29g7jwgqj5xdmr509438b9sq65zx8khdr4viybjf5xpi0cf5m")))) (build-system cmake-build-system) (propagated-inputs `(("kpty" ,kpty))) @@ -2437,7 +2444,7 @@ with su and ssh respectively.") (define-public kdewebkit (package (name "kdewebkit") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2446,7 +2453,7 @@ with su and ssh respectively.") name "-" version ".tar.xz")) (sha256 (base32 - "1s3bmn1ck7xvc7a6gv7ywv9161hdahiiw20aq88s4qkm2s5wyy6v")))) + "0y9ja3znkvzdbjfs91dwr4cmvl9fk97zpz2lkf0f9zhm2nw6q008")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2470,7 +2477,7 @@ engine WebKit via QtWebKit.") (define-public kemoticons (package (name "kemoticons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2479,7 +2486,7 @@ engine WebKit via QtWebKit.") name "-" version ".tar.xz")) (sha256 (base32 - "0li1lz5kqlczvgq6b2x3nkr0hl96a337ab83fq9wxp5sx440d6sd")))) + "11v1srn3nii4j7cn4f19qvdw96pczwxhanzxlg4a9gf8kmnp5gxr")))) (build-system cmake-build-system) (propagated-inputs `(("kservice" ,kservice))) @@ -2510,7 +2517,7 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2519,7 +2526,7 @@ emoticons coming from different providers.") name "-" version ".tar.xz")) (sha256 (base32 - "1xpfvwnrj81mk3di02n37b469gxzmnk89icmcz6wwyk54m86fw76")))) + "0hmqigc8myiwwh7m6y2cm4vn0d3kmrhia179hyb84vpvvn3lm93z")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2546,7 +2553,7 @@ window does not need focus for them to be activated.") (define-public kiconthemes (package (name "kiconthemes") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2555,7 +2562,7 @@ window does not need focus for them to be activated.") name "-" version ".tar.xz")) (sha256 (base32 - "18p4np4chykpy2ck8c76999nh8gdj75hjfakg1pakdqhlash9q6w")))) + "09bqpf3drqyfc81vgab9bsh1wm5qbzdwqjlczhax38660nnvh0r9")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2594,7 +2601,7 @@ in applications using the KDE Frameworks.") (define-public kinit (package (name "kinit") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2603,7 +2610,7 @@ in applications using the KDE Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "06p0i9674nzam0f4ac2jrl9pgkycz0lc0kdn24ds2rlh85cqvjwx")) + "1x4whs8p1daxjfp4ksf70rxrv7fx3w17s5wh6446039wzz9bv6ki")) ;; Use the store paths for other packages and dynamically loaded ;; libs (patches (search-patches "kinit-kdeinit-extra_libs.patch" @@ -2636,6 +2643,7 @@ in applications using the KDE Frameworks.") ("kconfigwidgets" ,kconfigwidgets) ("kcoreaddons" ,kcoreaddons) ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) ("kdoctools" ,kdoctools) ("kio" ,kio) ("kitemviews" ,kitemviews) @@ -2663,7 +2671,7 @@ consumption.") (define-public kio (package (name "kio") - (version "5.63.0") + (version "5.70.1") (source (origin (method url-fetch) (uri (string-append @@ -2672,7 +2680,7 @@ consumption.") name "-" version ".tar.xz")) (sha256 (base32 - "048gq6j8di6nzsacpr8j40kw6y5607zgwqr21ahcnnb0gd2sly4l")) + "1f33jdjjx6k1d5fab35x8xakc4ny9fyfrgkbib60xncc82lz2h5l")) (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs @@ -2683,6 +2691,7 @@ consumption.") ("kitemviews" ,kitemviews) ("kjobwidgets" ,kjobwidgets) ("kservice" ,kservice) + ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) ("solid" ,solid))) (native-inputs @@ -2705,7 +2714,6 @@ consumption.") ("ktextwidgets" ,ktextwidgets) ("kwallet" ,kwallet) ("kwidgetsaddons" ,kwidgetsaddons) - ("kwindowsystem" ,kwindowsystem) ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("qtbase" ,qtbase) @@ -2757,7 +2765,7 @@ KIO enabled infrastructure.") (define-public knewstuff (package (name "knewstuff") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2766,7 +2774,7 @@ KIO enabled infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "0pkm7qapkd9xypmhsjfwlgq0l4nfgya5b23lv3zkci8lrbssaqsv")))) + "1hpxj4nawh57w8l64gjplb5mk5fpxiffm4x49kg75m637rxy19fq")))) (build-system cmake-build-system) (propagated-inputs `(("attica" ,attica) @@ -2813,7 +2821,7 @@ specification.") (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2822,7 +2830,7 @@ specification.") name "-" version ".tar.xz")) (sha256 (base32 - "1d90gsnxy3kqd6f1bkhflrdwwx3w65sw4c7nfpkdxxhlqhzc9zr4")))) + "1d483qrgyamwsqvcl70klv1g8744hn8z1h2j3qfydcvlwz8jy0gj")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2855,7 +2863,7 @@ notifications which can be embedded in your application.") (define-public kparts (package (name "kparts") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2864,8 +2872,18 @@ notifications which can be embedded in your application.") name "-" version ".tar.xz")) (sha256 (base32 - "0md0349r4mdm2r04p5s3pgm17v4w40r3kz58lzp6qfcw25b969nw")))) + "1gfaxr856zrsjxzdxw1sj12s6aib6r703jgf7yvsl8kilg8l2gsk")))) (build-system qt-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-partloader-test + (lambda _ + (substitute* "autotests/CMakeLists.txt" + ;; XXX: PartLoaderTest wants to create a .desktop file + ;; in the common locations and test that MIME types work. + ;; The setup required for this is extensive, skip for now. + (("partloadertest\\.cpp") "")) + #t))))) (propagated-inputs `(("kio" ,kio) ("ktextwidgets" ,ktextwidgets) @@ -2899,7 +2917,7 @@ widgets with a user-interface defined in terms of actions.") (define-public kpeople (package (name "kpeople") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2908,7 +2926,7 @@ widgets with a user-interface defined in terms of actions.") name "-" version ".tar.xz")) (sha256 (base32 - "1q2hh2i8hd638p907g0srdxmxm9h2ay91dmhslqzcgwnlhln4gfl")))) + "1dhvly19pj9lx78g7mc89scibzmra1vhv4zz33222zidkbrf9ryl")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2935,7 +2953,7 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2944,12 +2962,15 @@ to easily extend the contacts collection.") name "-" version ".tar.xz")) (sha256 (base32 - "0gjqwzsg865gha8k7hda28hsrbfzhw9jz610lkqff5713lqbcn5a")))) + "0fhb26vi9z1mky79kq12qq4g4ghz3530cx84n5l3sdgkd6nfsyqf")))) (build-system cmake-build-system) (propagated-inputs `(("plasma-framework" ,plasma-framework))) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) + `(("extra-cmake-modules" ,extra-cmake-modules) + + ;; For tests. + ("dbus" ,dbus))) (inputs `(("kauth" ,kauth) ("kbookmarks" ,kbookmarks) @@ -2993,7 +3014,10 @@ to easily extend the contacts collection.") (lambda _ (display "[testMatch]\n*\n") (display "[testMulti]\n*\n"))) - #t))))) + #t)) + (replace 'check + (lambda _ + (invoke "dbus-launch" "ctest" ".")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Framework for Plasma runners") (description "The Plasma workspace provides an application called KRunner @@ -3005,7 +3029,7 @@ typed.") (define-public kservice (package (name "kservice") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3014,7 +3038,7 @@ typed.") name "-" version ".tar.xz")) (sha256 (base32 - "1rdapw9wirfq6pyaza0k7sg6q21rv3cfyalpzrwfrk5gkgpqxzwk")))) + "0g49p5331f7dl46rvi43akmjm1jx70w9797j6d17jy7z9s9sqikw")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3064,7 +3088,7 @@ types or handled by application specific code.") (define-public ktexteditor (package (name "ktexteditor") - (version "5.63.0") + (version "5.70.1") (source (origin (method url-fetch) (uri (string-append @@ -3073,7 +3097,7 @@ types or handled by application specific code.") "ktexteditor-" version ".tar.xz")) (sha256 (base32 - "0vfl6rr3624n8v29z07z5c0nh5af5kfg28cnp5ksfvfnssxfzfqa")))) + "0k10yj1ia1w1mznj4g5nvp65p226zcvgwxc85ycn2w8lbkknidf7")))) (build-system cmake-build-system) (propagated-inputs `(("kparts" ,kparts))) @@ -3145,7 +3169,7 @@ library.") (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3154,7 +3178,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "1qb1mad5bg19xwykzpwk2b3s505ka4jkg0fsi56ri57wq8gv4qha")))) + "1609rlwba674kr9whawk93vb1b14b5ly7wvir7kjyjp4j715f47w")))) (build-system qt-build-system) (propagated-inputs `(("ki18n" ,ki18n) @@ -3185,7 +3209,7 @@ It supports rich text as well as plain text.") (define-public kwallet (package (name "kwallet") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3194,7 +3218,7 @@ It supports rich text as well as plain text.") name "-" version ".tar.xz")) (sha256 (base32 - "1dp3mrgl0h6wqp4wcqpvnvkacwkrrn5lrv6bdl008kx1y594s28g")))) + "1ps6ywcirv7xcisvwfcpvk53wm7m8y5lrz4nhkm36rizrdglw19r")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -3227,7 +3251,7 @@ the passwords on KDE work spaces.") (define-public kxmlgui (package (name "kxmlgui") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3236,7 +3260,7 @@ the passwords on KDE work spaces.") name "-" version ".tar.xz")) (sha256 (base32 - "0x0mfapgl8w4xal8lamh3v27a9kdb7qyaxdn48gja4x85pkvi87i")))) + "0cvzcq2dcz89c0ffhvfb820hfmqa87mfdbjvrqjwdysc9lr8zx8f")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3280,7 +3304,7 @@ descriptions for integrating actions from plugins.") (define-public kxmlrpcclient (package (name "kxmlrpcclient") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3289,7 +3313,7 @@ descriptions for integrating actions from plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "0k82cyxjipqpky7gs0zb5s1bc6jf22d5vwpwyiqjy32da63mc89c")))) + "1cmfv2w9yfi8jhj5nawfz7kw8jbr1k5cr3n5xv3z59pg2vazsx8b")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio))) @@ -3323,7 +3347,7 @@ setUrl, setUserAgent and call.") (define-public plasma-framework (package (name "plasma-framework") - (version "5.63.0") + (version "5.70.1") (source (origin (method url-fetch) (uri (string-append @@ -3332,7 +3356,7 @@ setUrl, setUserAgent and call.") name "-" version ".tar.xz")) (sha256 (base32 - "0p0ziqw70lklx59d0nij3p9yi1vdacdfyrrp7zf74iwxd7598hci")))) + "06cxajsxj62g3c37ssrrcaxb9a12zbyp2kvrjqym329k5vd89272")))) (build-system cmake-build-system) (propagated-inputs `(("kpackage" ,kpackage) @@ -3393,7 +3417,7 @@ script engines.") (define-public purpose (package (name "purpose") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3402,7 +3426,7 @@ script engines.") name "-" version ".tar.xz")) (sha256 (base32 - "1mc5z131z9da6qjhlxqz64ys4fgq38iryna58f8l04x8f9igjn8f")))) + "1pxlx2hgj42zsisws8f486n8sg0vn5a5mhb85prifwkaw0rqzgah")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -3459,7 +3483,7 @@ need.") (define-public kde-frameworkintegration (package (name "kde-frameworkintegration") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3468,7 +3492,7 @@ need.") "frameworkintegration-" version ".tar.xz")) (sha256 (base32 - "0n8n6lnzswi2q848qy2b4rcvkd0y1dywlk6hdmcnn8dfbxy6b050")))) + "1lvccvhhkzdv1hw627kw3ds18gfq4bxdhlvh959piqxq5gh9d2n0")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3516,7 +3540,7 @@ workspace.") (define-public kdelibs4support (package (name "kdelibs4support") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -3525,7 +3549,7 @@ workspace.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "17mywcmgp1yzdipwwaypbkxiyybk1w0sps50jv1bl0f23ya19mlc")))) + (base32 "0imkibjlfc0jshdzr05fz5dy2xmfhvgsfan9b1r35spwsn5qkawx")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -3632,7 +3656,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (define-public khtml (package (name "khtml") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -3641,7 +3665,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "15f77r6dxkkvi2vxvxlwa7qz3whmz229g79bgadiwffmzxja0ywd")))) + (base32 "1jh0g6xv57hyclnh54x0f72lby1gvlisan23y7mzlqf67aky52s5")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3683,7 +3707,7 @@ technology and using KJS for JavaScript support.") (define-public kjs (package (name "kjs") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -3692,7 +3716,7 @@ technology and using KJS for JavaScript support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "16zsan9c8kba5m70h34y544id7gig2bcbcs4s90s27pckijkkarp")))) + (base32 "0s3n0pdz59p5v967zrxcas3lb94k5bv9vi8058fi0l20nwwlcgh5")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3716,7 +3740,7 @@ support.") (define-public kjsembed (package (name "kjsembed") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -3725,7 +3749,7 @@ support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "00sr6lv1nai2y6aawvqwnx4pbx8pw9b1jrpa0klc014gc42l6i7b")))) + (base32 "0976faazhxhhi1wpvpcs8hwb2knz0z7j44v3ay3hw73rq4p3bipm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3745,7 +3769,7 @@ QObjects, so you can script your applications.") (define-public kmediaplayer (package (name "kmediaplayer") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -3754,7 +3778,7 @@ QObjects, so you can script your applications.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "19v53h3lkys3ryrjacrdng9ak91g03b9s986xhnw1r84zy242kdm")))) + (base32 "0lrm4y727nhwaivl37zpmnrwx048gfhyjw19m6q5z9p37lk43jja")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3783,7 +3807,7 @@ KParts instead.") (define-public kross (package (name "kross") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -3792,7 +3816,7 @@ KParts instead.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0paipgkxbm6vwgqj38rlr37vgmf1rx0cl2mka8zdbndl76ng5hgc")))) + (base32 "12b527l12rcf421p613ydbacilp9v9iy90ma35w21sdf9a15k675")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index da0c9dcf47..36f6e5ece6 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -77,13 +77,13 @@ conversions for values passed between the two languages.") (define-public python-cffi (package (name "python-cffi") - (version "1.13.2") + (version "1.14.0") (source (origin (method url-fetch) (uri (pypi-uri "cffi" version)) (sha256 - (base32 "0iikq5rn9a405n94c7s2j6kq3jv5qs9q4xyik8657b2py27ix6jr")))) + (base32 "1dn279gw5ql8i5n3s5v4rnv96rhhjjfn7xq729qbl5bs2954yf1d")))) (build-system python-build-system) (inputs `(("libffi" ,libffi))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0a154fd6cc..a2893b2a4c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2934,7 +2935,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") (define-public kmod (package (name "kmod") - (version "26") + (version "27") (source (origin (method url-fetch) (uri @@ -2942,7 +2943,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") "kmod-" version ".tar.xz")) (sha256 (base32 - "17dvrls70nr3b3x1wm8pwbqy4r8a5c20m0dhys8mjhsnpg425fsp")) + "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1")) (patches (search-patches "kmod-module-directory.patch")))) (build-system gnu-build-system) (native-inputs @@ -2951,10 +2952,18 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") `(("xz" ,xz) ("zlib" ,zlib))) (arguments - `(#:tests? #f ; FIXME: Investigate test failures - #:configure-flags '("--with-xz" "--with-zlib") + `(#:configure-flags '("--with-xz" "--with-zlib" + "--disable-test-modules") #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-tests + (lambda _ + ;; XXX: These tests need '--sysconfdir=/etc' to pass. + (substitute* "Makefile.in" + (("testsuite/test-modprobe") "") + (("testsuite/test-depmod") "") + (("testsuite/test-blacklist") "")) + #t)) (add-after 'install 'install-modprobe&co (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4253,7 +4262,7 @@ arrays when needed.") ;; For tests. ("cmocka" ,cmocka))) (inputs - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("libaio" ,libaio) ("liburcu" ,liburcu) ("lvm2" ,lvm2) @@ -4375,16 +4384,15 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.53") + (version "5.54") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/bluetooth/bluez-" version ".tar.xz")) - (patches (search-patches "bluez-CVE-2020-0556.patch")) (sha256 (base32 - "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq")))) + "1p2ncvjz6alr9n3l5wvq2arqgc7xjs6dqyar1l9jp0z8cfgapkb8")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ce542ad4f4..36730bef3e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1845,7 +1845,7 @@ QMatrixClient project.") (define-public mtxclient (package (name "mtxclient") - (version "0.2.1") + (version "0.3.0") (source (origin (method git-fetch) @@ -1854,7 +1854,7 @@ QMatrixClient project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0pycznrvj57ff6gbwfn1xj943d2dr4vadl79hii1z16gn0nzxpmj")))) + (base32 "0vf5xmn6yfi5lvskfgrdmnalvclzrapcrml92bj9qaa8vq8mfsf2")))) (arguments `(#:configure-flags (list @@ -1865,7 +1865,7 @@ QMatrixClient project.") (add-before 'configure 'disable-network-tests (lambda _ (substitute* "CMakeLists.txt" - (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encryption)") + (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encryption|Pushrules)") "# add_test")) #t)) (add-before 'configure 'set-home @@ -1895,7 +1895,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (define-public nheko (package (name "nheko") - (version "0.6.4") + (version "0.7.1") (source (origin (method git-fetch) @@ -1904,7 +1904,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm")))) + (base32 "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady")))) (arguments `(#:tests? #f ;no test target #:configure-flags @@ -1934,8 +1934,11 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") ("mtxclient" ,mtxclient) ("openssl" ,openssl) ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) + ("qtquickcontrols2" ,qtquickcontrols2) + ("qtsvg" ,qtsvg) ("spdlog" ,spdlog) ("tweeny" ,tweeny) ("zlib" ,zlib))) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index e423bdd3a2..b19ad7e1e9 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -72,7 +72,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.50") + (version "3.52.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -83,7 +83,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")) + "0y4jb9095f7bbgw7d7kvzm4c3g4p5i6y68fwhb8wlkpb7b1imj5w")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")) diff --git a/gnu/packages/patches/bluez-CVE-2020-0556.patch b/gnu/packages/patches/bluez-CVE-2020-0556.patch deleted file mode 100644 index 7c34459a3a..0000000000 --- a/gnu/packages/patches/bluez-CVE-2020-0556.patch +++ /dev/null @@ -1,180 +0,0 @@ -Fix CVE-2020-0556: - -https://lore.kernel.org/linux-bluetooth/20200310023516.209146-1-alainm@chromium.org/ -https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0556 - -Patches copied from upstream source repository: - -https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=3cccdbab2324086588df4ccf5f892fb3ce1f1787 -https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=8cdbd3b09f29da29374e2f83369df24228da0ad1 - -From 3cccdbab2324086588df4ccf5f892fb3ce1f1787 Mon Sep 17 00:00:00 2001 -From: Alain Michaud <alainm@chromium.org> -Date: Tue, 10 Mar 2020 02:35:18 +0000 -Subject: [PATCH] HID accepts bonded device connections only. - -This change adds a configuration for platforms to choose a more secure -posture for the HID profile. While some older mice are known to not -support pairing or encryption, some platform may choose a more secure -posture by requiring the device to be bonded and require the -connection to be encrypted when bonding is required. - -Reference: -https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html ---- - profiles/input/device.c | 23 ++++++++++++++++++++++- - profiles/input/device.h | 1 + - profiles/input/input.conf | 8 ++++++++ - profiles/input/manager.c | 13 ++++++++++++- - 4 files changed, 43 insertions(+), 2 deletions(-) - -diff --git a/profiles/input/device.c b/profiles/input/device.c -index 2cb3811c8..d89da2d7c 100644 ---- a/profiles/input/device.c -+++ b/profiles/input/device.c -@@ -92,6 +92,7 @@ struct input_device { - - static int idle_timeout = 0; - static bool uhid_enabled = false; -+static bool classic_bonded_only = false; - - void input_set_idle_timeout(int timeout) - { -@@ -103,6 +104,11 @@ void input_enable_userspace_hid(bool state) - uhid_enabled = state; - } - -+void input_set_classic_bonded_only(bool state) -+{ -+ classic_bonded_only = state; -+} -+ - static void input_device_enter_reconnect_mode(struct input_device *idev); - static int connection_disconnect(struct input_device *idev, uint32_t flags); - -@@ -970,8 +976,18 @@ static int hidp_add_connection(struct input_device *idev) - if (device_name_known(idev->device)) - device_get_name(idev->device, req->name, sizeof(req->name)); - -+ /* Make sure the device is bonded if required */ -+ if (classic_bonded_only && !device_is_bonded(idev->device, -+ btd_device_get_bdaddr_type(idev->device))) { -+ error("Rejected connection from !bonded device %s", dst_addr); -+ goto cleanup; -+ } -+ - /* Encryption is mandatory for keyboards */ -- if (req->subclass & 0x40) { -+ /* Some platforms may choose to require encryption for all devices */ -+ /* Note that this only matters for pre 2.1 devices as otherwise the */ -+ /* device is encrypted by default by the lower layers */ -+ if (classic_bonded_only || req->subclass & 0x40) { - if (!bt_io_set(idev->intr_io, &gerr, - BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, - BT_IO_OPT_INVALID)) { -@@ -1203,6 +1219,11 @@ static void input_device_enter_reconnect_mode(struct input_device *idev) - DBG("path=%s reconnect_mode=%s", idev->path, - reconnect_mode_to_string(idev->reconnect_mode)); - -+ /* Make sure the device is bonded if required */ -+ if (classic_bonded_only && !device_is_bonded(idev->device, -+ btd_device_get_bdaddr_type(idev->device))) -+ return; -+ - /* Only attempt an auto-reconnect when the device is required to - * accept reconnections from the host. - */ -diff --git a/profiles/input/device.h b/profiles/input/device.h -index 51a9aee18..3044db673 100644 ---- a/profiles/input/device.h -+++ b/profiles/input/device.h -@@ -29,6 +29,7 @@ struct input_conn; - - void input_set_idle_timeout(int timeout); - void input_enable_userspace_hid(bool state); -+void input_set_classic_bonded_only(bool state); - - int input_device_register(struct btd_service *service); - void input_device_unregister(struct btd_service *service); -diff --git a/profiles/input/input.conf b/profiles/input/input.conf -index 3e1d65aae..166aff4a4 100644 ---- a/profiles/input/input.conf -+++ b/profiles/input/input.conf -@@ -11,3 +11,11 @@ - # Enable HID protocol handling in userspace input profile - # Defaults to false (HIDP handled in HIDP kernel module) - #UserspaceHID=true -+ -+# Limit HID connections to bonded devices -+# The HID Profile does not specify that devices must be bonded, however some -+# platforms may want to make sure that input connections only come from bonded -+# device connections. Several older mice have been known for not supporting -+# pairing/encryption. -+# Defaults to false to maximize device compatibility. -+#ClassicBondedOnly=true -diff --git a/profiles/input/manager.c b/profiles/input/manager.c -index 1d31b0652..5cd27b839 100644 ---- a/profiles/input/manager.c -+++ b/profiles/input/manager.c -@@ -96,7 +96,7 @@ static int input_init(void) - config = load_config_file(CONFIGDIR "/input.conf"); - if (config) { - int idle_timeout; -- gboolean uhid_enabled; -+ gboolean uhid_enabled, classic_bonded_only; - - idle_timeout = g_key_file_get_integer(config, "General", - "IdleTimeout", &err); -@@ -114,6 +114,17 @@ static int input_init(void) - input_enable_userspace_hid(uhid_enabled); - } else - g_clear_error(&err); -+ -+ classic_bonded_only = g_key_file_get_boolean(config, "General", -+ "ClassicBondedOnly", &err); -+ -+ if (!err) { -+ DBG("input.conf: ClassicBondedOnly=%s", -+ classic_bonded_only ? "true" : "false"); -+ input_set_classic_bonded_only(classic_bonded_only); -+ } else -+ g_clear_error(&err); -+ - } - - btd_profile_register(&input_profile); --- -2.25.1 - -From 8cdbd3b09f29da29374e2f83369df24228da0ad1 Mon Sep 17 00:00:00 2001 -From: Alain Michaud <alainm@chromium.org> -Date: Tue, 10 Mar 2020 02:35:16 +0000 -Subject: [PATCH] HOGP must only accept data from bonded devices. - -HOGP 1.0 Section 6.1 establishes that the HOGP must require bonding. - -Reference: -https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.htm ---- - profiles/input/hog.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/profiles/input/hog.c b/profiles/input/hog.c -index 83c017dcb..dfac68921 100644 ---- a/profiles/input/hog.c -+++ b/profiles/input/hog.c -@@ -186,6 +186,10 @@ static int hog_accept(struct btd_service *service) - return -EINVAL; - } - -+ /* HOGP 1.0 Section 6.1 requires bonding */ -+ if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) -+ return -ECONNREFUSED; -+ - /* TODO: Replace GAttrib with bt_gatt_client */ - bt_hog_attach(dev->hog, attrib); - --- -2.25.1 - diff --git a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch index c3c4ce1161..1271f3df7d 100644 --- a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch +++ b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch @@ -42,12 +42,12 @@ pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch extern "C" { static void secondary_child_handler(int) -@@ -1689,7 +1693,7 @@ +@@ -1673,7 +1673,7 @@ + #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { - const int extrasCount = sizeof(extra_libs) / sizeof(extra_libs[0]); - for (int i = 0; i < extrasCount; i++) { -- const QString extra = findSharedLib(QString::fromLatin1(extra_libs[i])); -+ const QString extra = QString::fromLatin1(extra_libs[i]); + for (const char *extra_lib : extra_libs) { +- const QString extra = findSharedLib(QString::fromLatin1(extra_lib)); ++ const QString extra = QString::fromLatin1(extra_lib); if (!extra.isEmpty()) { QLibrary l(extra); l.setLoadHints(QLibrary::ExportExternalSymbolsHint); diff --git a/gnu/packages/patches/libdrm-realpath-virtio.patch b/gnu/packages/patches/libdrm-realpath-virtio.patch new file mode 100644 index 0000000000..b7d85160b4 --- /dev/null +++ b/gnu/packages/patches/libdrm-realpath-virtio.patch @@ -0,0 +1,42 @@ +Only check for for relative path on virtio devices. Otherwise it could +break driver loading in some circumstances, notably the IceCat sandbox. + +https://gitlab.freedesktop.org/mesa/drm/-/issues/39 + +Taken from upstream: +https://gitlab.freedesktop.org/mesa/drm/-/commit/57df07572ce45a1b60bae6fb89770388d3abd6dd + +diff --git a/xf86drm.c b/xf86drm.c +--- a/xf86drm.c ++++ b/xf86drm.c +@@ -3103,15 +3103,18 @@ static int drmParseSubsystemType(int maj, int min) + int subsystem_type; + + snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device", maj, min); +- if (!realpath(path, real_path)) +- return -errno; +- snprintf(path, sizeof(path), "%s", real_path); + + subsystem_type = get_subsystem_type(path); ++ /* Try to get the parent (underlying) device type */ + if (subsystem_type == DRM_BUS_VIRTIO) { ++ /* Assume virtio-pci on error */ ++ if (!realpath(path, real_path)) ++ return DRM_BUS_VIRTIO; + strncat(path, "/..", PATH_MAX); + subsystem_type = get_subsystem_type(path); +- } ++ if (subsystem_type < 0) ++ return DRM_BUS_VIRTIO; ++ } + return subsystem_type; + #elif defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) + return DRM_BUS_PCI; +@@ -3920,6 +3923,7 @@ process_device(drmDevicePtr *device, const char *d_name, + + switch (subsystem_type) { + case DRM_BUS_PCI: ++ case DRM_BUS_VIRTIO: + return drmProcessPciDevice(device, node, node_type, maj, min, + fetch_deviceinfo, flags); + case DRM_BUS_USB: diff --git a/gnu/packages/patches/libdrm-symbol-check.patch b/gnu/packages/patches/libdrm-symbol-check.patch deleted file mode 100644 index 0a77763a4f..0000000000 --- a/gnu/packages/patches/libdrm-symbol-check.patch +++ /dev/null @@ -1,215 +0,0 @@ -Augment the list of expected symbols to fix the symbol-check tests on -mips64el-linux, armhf-linux and aarch64-linux. - ---- libdrm-2.4.65/freedreno/freedreno-symbol-check.orig 2015-09-04 11:07:40.000000000 -0400 -+++ libdrm-2.4.65/freedreno/freedreno-symbol-check 2015-10-18 23:57:15.288416229 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.sources/LIBDRM_FREEDRENO_H_FILES - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_freedreno.so} | awk '{print $3}'| while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - fd_bo_cpu_fini - fd_bo_cpu_prep - fd_bo_del ---- libdrm-2.4.65/nouveau/nouveau-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/nouveau/nouveau-symbol-check 2015-10-18 23:55:26.078327118 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.sources/LIBDRM_NOUVEAU_H_FILES - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_nouveau.so} | awk '{print $3}'| while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - nouveau_bo_map - nouveau_bo_name_get - nouveau_bo_name_ref ---- libdrm-2.4.65/libkms/kms-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/libkms/kms-symbol-check 2015-10-18 23:46:10.683869471 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.sources/LIBKMS_H_FILES - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libkms.so} | awk '{print $3}'| while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - kms_bo_create - kms_bo_destroy - kms_bo_get_prop ---- libdrm-2.4.65/intel/intel-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/intel/intel-symbol-check 2015-10-18 23:55:53.309558508 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.sources/LIBDRM_INTEL_H_FILES - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_intel.so} | awk '{print $3}' | while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - drm_intel_bo_alloc - drm_intel_bo_alloc_for_render - drm_intel_bo_alloc_tiled ---- libdrm-2.4.65/amdgpu/amdgpu-symbol-check.orig 2015-08-17 10:08:11.000000000 -0400 -+++ libdrm-2.4.65/amdgpu/amdgpu-symbol-check 2015-10-18 23:56:10.606917723 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.am/libdrm_amdgpuinclude_HEADERS - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_amdgpu.so} | awk '{print $3}' | while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - amdgpu_bo_alloc - amdgpu_bo_cpu_map - amdgpu_bo_cpu_unmap ---- libdrm-2.4.65/exynos/exynos-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/exynos/exynos-symbol-check 2015-10-18 23:56:32.025486153 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.am/libdrm_exynos*_HEADERS - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_exynos.so} | awk '{print $3}'| while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - exynos_bo_create - exynos_bo_destroy - exynos_bo_from_name ---- libdrm-2.4.65/omap/omap-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/omap/omap-symbol-check 2015-10-18 23:56:44.834438626 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.am/libdrm_omap*HEADERS - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_omap.so} | awk '{print $3}'| while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - omap_bo_cpu_fini - omap_bo_cpu_prep - omap_bo_del ---- libdrm-2.4.65/tegra/tegra-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/tegra/tegra-symbol-check 2015-10-18 23:57:00.756759698 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first nine) are taken from tegra.h. -+# The following symbols (past the first 12) are taken from tegra.h. - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do - ( grep -q "^$func$" || echo $func ) <<EOF -@@ -9,6 +9,9 @@ - __bss_start - __end__ - _bss_end__ -+_fbss -+_fdata -+_ftext - _edata - _end - _fini ---- libdrm-2.4.65/radeon/radeon-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/radeon/radeon-symbol-check 2015-10-18 23:57:00.756759698 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.sources/LIBDRM_RADEON_H_FILES - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - radeon_bo_debug - radeon_bo_get_handle - radeon_bo_get_src_domain diff --git a/gnu/packages/patches/qtbase-QTBUG-81715.patch b/gnu/packages/patches/qtbase-QTBUG-81715.patch deleted file mode 100644 index 70b83b97d2..0000000000 --- a/gnu/packages/patches/qtbase-QTBUG-81715.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8a3fde00bf53d99e9e4853e8ab97b0e1bcf74915 Mon Sep 17 00:00:00 2001 -From: Joerg Bornemann <joerg.bornemann@qt.io> -Date: Wed, 29 Jan 2020 11:06:35 +0100 -Subject: [PATCH] Fix qt5_make_output_file macro for paths containing dots - -Commit 89bd5a7e broke CMake projects that use dots in their build -paths, because the used regular expression matches the directory part -of the path as well. - -The regex wants to achieve the same as get_filename_component(... -NAME_WLE) which is available since CMake 3.14. Re-implement the -NAME_WLE functionality for older CMake versions by using multiple -get_filename_component calls. - -Fixes: QTBUG-81715 -Task-number: QTBUG-80295 -Change-Id: I2ef053300948f6e1b2c0c5eafac35105f193d4e6 -Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> ---- - -diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 7735e51..b3da640 100644 ---- a/src/corelib/Qt5CoreMacros.cmake -+++ b/src/corelib/Qt5CoreMacros.cmake -@@ -59,7 +59,14 @@ - set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}") - string(REPLACE ".." "__" _outfile ${_outfile}) - get_filename_component(outpath ${_outfile} PATH) -- string(REGEX REPLACE "\\.[^.]*$" "" _outfile ${_outfile}) -+ if(CMAKE_VERSION VERSION_LESS "3.14") -+ get_filename_component(_outfile_ext ${_outfile} EXT) -+ get_filename_component(_outfile_ext ${_outfile_ext} NAME_WE) -+ get_filename_component(_outfile ${_outfile} NAME_WE) -+ string(APPEND _outfile ${_outfile_ext}) -+ else() -+ get_filename_component(_outfile ${_outfile} NAME_WLE) -+ endif() - file(MAKE_DIRECTORY ${outpath}) - set(${outfile} ${outpath}/${prefix}${_outfile}.${ext}) - endmacro() diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch index 11c737d844..b6c377b133 100644 --- a/gnu/packages/patches/qtbase-use-TZDIR.patch +++ b/gnu/packages/patches/qtbase-use-TZDIR.patch @@ -4,8 +4,8 @@ important to be able to update it fast. Based on a patch fron NixOS. =================================================================== ---- qtbase-opensource-src-5.9.4.orig/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qtbase-opensource-src-5.9.4/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz.cpp ++++ qtbase-opensource-src-5.15.2/src/corelib/time/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index ce2a6e91db..ab48168567 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -89,14 +89,14 @@ POSIX regular expression API.") (define-public pcre2 (package (name "pcre2") - (version "10.34") + (version "10.35") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcre/pcre2/" version "/pcre2-" version ".tar.bz2")) (sha256 (base32 - "1jlqnzcz2yi70dm40wyfa9w8is9z2kh4dl8zjnv3vqd9mgzp7i3l")))) + "04s6kmk9qdd4rjz477h547j4bx7hfz0yalpvrm381rqc5ghaijww")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) ("readline" ,readline) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6121fe650d..0ad1263812 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -749,14 +749,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (define-public qpdf (package (name "qpdf") - (version "9.1.1") + (version "10.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "0dj27wb9xg6pg95phbflfvy9rwxn1gh3kc4n175g0pf41r0zrim2")))) + "0yw2cpw7ygfd6jlgpwbi8vsnvv9p55zxp9h17x77z2qq733pf8jx")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,perl) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index fc451e83ef..9934abbf31 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -448,14 +448,15 @@ risk.") (define-public python-certifi (package (name "python-certifi") - (version "2019.3.9") + (version "2020.4.5.1") (source (origin (method url-fetch) (uri (pypi-uri "certifi" version)) (sha256 (base32 - "1bnpw7hrf9i1l9gfxjnzi45hkrvzz0pyn9ia8m4mw7sxhgb08qdj")))) + "06b5gfs7wmmipln8f3z928d2mmx2j4b3x7pnqmj6cvmyfh8v7z2i")))) (build-system python-build-system) + (arguments '(#:tests? #f)) ;no tests (home-page "https://certifi.io/") (synopsis "Python CA certificate bundle") (description @@ -469,14 +470,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "2.7") + (version "2.9.2") (source (origin (method url-fetch) (uri (pypi-uri "cryptography_vectors" version)) (sha256 (base32 - "1g38zw90510azyfrj6mxbslx2gp9yrnv5dac0w2819k9ssdznbgi")))) + "1d4iykcv7cn9j399hczlxm5pzxmqy6d80h3j16dkjwlmv3293b4r")))) (build-system python-build-system) (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") @@ -491,14 +492,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography (package (name "python-cryptography") - (version "2.7") + (version "2.9.2") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "1inlnr36kl36551c9rcad99jmhk81v33by3glkadwdcgmi17fd76")))) + "0af25w5mkd6vwns3r6ai1w5ip9xp0ms9s261zzssbpadzdr05hx0")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) @@ -540,14 +541,14 @@ message digests and key derivation functions.") (define-public python-pyopenssl (package (name "python-pyopenssl") - (version "19.0.0") + (version "19.1.0") (source (origin (method url-fetch) (uri (pypi-uri "pyOpenSSL" version)) (sha256 (base32 - "007j40y7x3k8xj54dy2qnij9lldfp71k9mkflhd9vqbdiwrndjmf")))) + "01wmsq6w0frzbr3zps4ga9kmqjidp2h317jwpq1g9ah24r5lj94s")))) (build-system python-build-system) (arguments '(#:phases diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index cd8ce8a83f..379062c078 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1458,13 +1458,13 @@ WebSocket usage in Python programs.") (define-public python-requests (package (name "python-requests") - (version "2.22.0") + (version "2.23.0") (source (origin (method url-fetch) (uri (pypi-uri "requests" version)) (sha256 (base32 - "1d5ybh11jr5sm7xp6mz8fyc7vrp4syifds91m7sj60xalal0gq0i")))) + "1rhpg0jb08v0gd7f19jjiwlcdnxpmqi1fhvw7r4s9avddi4kvx5k")))) (build-system python-build-system) (propagated-inputs `(("python-certifi" ,python-certifi) @@ -1671,14 +1671,14 @@ authenticated session objects providing things like keep-alive.") (define-public python-urllib3 (package (name "python-urllib3") - (version "1.25.3") + (version "1.25.9") (source (origin (method url-fetch) (uri (pypi-uri "urllib3" version)) (sha256 (base32 - "0cij8qcvvpj62g1q8n785qjkdymfh4b7vf45si4sw64l41rr3rfv")))) + "09rmjqm5syhhc8fx3v06h3yv6cqy0b1081jg8wm5grpwpr72j61h")))) (build-system python-build-system) (arguments `(#:tests? #f)) (propagated-inputs diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4cbf20ebcd..1418c19813 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3019,14 +3019,14 @@ for Python.") (define-public python-jinja2 (package (name "python-jinja2") - (version "2.11.1") + (version "2.11.2") (source (origin (method url-fetch) (uri (pypi-uri "Jinja2" version)) (sha256 (base32 - "0l72c11n959yzb8d3ankckb6yhjhm6x729zm7rkpk040qzxpy64k")))) + "1c1v3djnr0ymp5xpy1h3h60abcaqxdlm4wsqmls9rxby88av5al9")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -3995,14 +3995,14 @@ provides additional functionality on the produced Mallard documents.") (define-public python-cython (package (name "python-cython") - (version "0.29.16") + (version "0.29.17") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 (base32 - "01gs10myw0rw4jsikvqs0859fg7gficxhv508cxvnb4l9wl5a9r3")))) + "1wnaz40hdw4mg5acz5gqb6bhjhn4cvfxg0xdzfy7aa6qn665hqb3")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so @@ -5316,14 +5316,14 @@ a general image processing tool.") (define-public python-pycparser (package (name "python-pycparser") - (version "2.19") + (version "2.20") (source (origin (method url-fetch) (uri (pypi-uri "pycparser" version)) (sha256 (base32 - "1cr5dcj9628lkz1qlwq3fv97c25363qppkmcayqvd05dpy573259")))) + "1w0m3xvlrzq4lkbvd1ngfm8mdw64r1yxy6n7djlw6qj5d0km6ird")))) (outputs '("out" "doc")) (build-system python-build-system) (native-inputs @@ -8464,14 +8464,14 @@ versions of Python.") (define-public python-idna (package (name "python-idna") - (version "2.8") + (version "2.9") (source (origin (method url-fetch) (uri (pypi-uri "idna" version)) (sha256 (base32 - "01rlkigdxg17sf9yar1jl8n18ls59367wqh59hnawlyg53vb6my3")))) + "1jxp2pdi8y4asi7ka1zhx3yx09kv8kzj533f0ds7viz49b0x323m")))) (build-system python-build-system) (home-page "https://github.com/kjd/idna") (synopsis "Internationalized domain names in applications") @@ -10128,14 +10128,14 @@ python-xdo for newer bindings.)") (define-public python-mako (package (name "python-mako") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (pypi-uri "Mako" version)) (sha256 (base32 - "193mds7lv91pphnvn6c1n55rhjkgq94asdzgrsb2fiqx7rrsd119")))) + "17bd6r9ynp4hyfckkia0bb8gpd98f42jfl5rmzdpbld59bbcaf9i")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c312efa1f9..d22c84fcf3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -16,6 +16,8 @@ ;;; Copyright © 2020 Mike Rosset <mike.rosset@gmail.com> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net> +;;; Copyright © 2020 TomZ <tomz@freedommail.ch> +;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -352,7 +354,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtbase (package (name "qtbase") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -361,11 +363,10 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32 - "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di")) + "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch" - "qtbase-moc-ignore-gcc-macro.patch" - "qtbase-QTBUG-81715.patch")) + "qtbase-moc-ignore-gcc-macro.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 @@ -571,14 +572,6 @@ developers using C++ or QML, a CSS & JavaScript like language.") "src/network/kernel/qhostinfo_unix.cpp") (("^\\s*(lib.setFileName\\(QLatin1String\\(\")(resolv\"\\)\\);)" _ a b) (string-append a glibc "/lib/lib" b)))) - ;; X11/locale (compose path) - (substitute* "src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp" - ;; Don't search in /usr/…/X11/locale, … - (("^\\s*m_possibleLocations.append\\(QStringLiteral\\(\"/usr/.*/X11/locale\"\\)\\);" line) - (string-append "// " line)) - ;; … but use libx11's path - (("^\\s*(m_possibleLocations.append\\(QStringLiteral\\()X11_PREFIX \"(/.*/X11/locale\"\\)\\);)" _ a b) - (string-append a "\"" (assoc-ref inputs "libx11") b))) ;; libGL (substitute* "src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp" (("^\\s*(QLibrary lib\\(QLatin1String\\(\")(GL\"\\)\\);)" _ a b) @@ -618,7 +611,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -627,7 +620,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32 - "1f3vqv3s83gjillhgi0wghyf3825fgy1ffhvkxhdk673shb0kxjb")))) + "18dmfc8s428fzbk7k5vl3212b25455ayrz7s716nwyiy3ahgmmy7")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -693,7 +686,7 @@ HostData=lib/qt5 (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -702,7 +695,7 @@ HostData=lib/qt5 version ".tar.xz")) (sha256 (base32 - "02zpcbx71dz6xvga07dnzqwdfz9pjmy673n706fj8pxq9zi9xlcv")) + "132g4rlm61pdcpcrclr1rwpbrxn7va4wjfb021mh8pn1cl0wlgkk")) (modules '((guix build utils))) (snippet '(begin @@ -724,7 +717,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -733,7 +726,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) version ".tar.xz")) (sha256 (base32 - "15hb90n47khsp3qnzyjd3mh8gi9qvy07dqdr4qspiww43r5mz293")))) + "0njlh6d327nll7d8qaqrwr5x15m9yzgyar2j45qigs1f7ah896my")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -748,7 +741,7 @@ from within Qt 5."))) (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -757,7 +750,7 @@ from within Qt 5."))) version ".tar.xz")) (sha256 (base32 - "0ys1kf0zdn8gak1ik9p7i7bdyfz2frvklcyz013s9wm1550h20lh")))) + "1dyg1z4349k04yyzn8xbp4f5qjgm60gz6wgzp80khpilcmk8g6i1")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f) ; TODO: Enable the tests @@ -779,7 +772,7 @@ xmlpatternsvalidator."))) (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -788,16 +781,28 @@ xmlpatternsvalidator."))) version ".tar.xz")) (sha256 (base32 - "1gg9xbv8ah4p55ws97brwn0csl0k3j1x6zdknrrsnh7j6nh0bp2w")))) + "0l0nhc2si6dl9r4s1bs45z90qqigs8jnrsyjjdy38q4pvix63i53")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests + ((#:tests? _ #f) #f) ;TODO: Enable the tests + ((#:phases phases) + `(modify-phases ,phases + (add-after 'build 'fix-qt5core-install-prefix + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen + ;; is provided by qtdeclarative. + (substitute* + "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" + (("\\$\\{_qt5Core_install_prefix\\}") out))) + #t)))))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python) ("python-wrapper" ,python-wrapper) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg) + ("vulkan-headers" ,vulkan-headers))) (inputs `(("mesa" ,mesa) ("qtbase" ,qtbase))) @@ -811,7 +816,7 @@ with JavaScript and C++."))) (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -820,7 +825,7 @@ with JavaScript and C++."))) version ".tar.xz")) (sha256 (base32 - "06h71pd5w5prh722mcbgmx7l71xvh5xpjrlbg17yblx0n6wlhwb4")))) + "0a5wzin635b926b8prdwfazgy1vhyf8m6an64wp2lpkp78z7prmb")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -835,7 +840,7 @@ with Bluetooth and NFC."))) (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -844,7 +849,7 @@ with Bluetooth and NFC."))) version ".tar.xz")) (sha256 (base32 - "05rv52pp5zg4g14zh7c6jc77l426056b8xyr40ps6cpmb0jkrlbg")))) + "116amx4mnv50k0fpswgpr5x8wjny8nbffrjmld01pzhkhfqn4vph")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -862,7 +867,7 @@ consume data received from the server, or both."))) (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -871,7 +876,7 @@ consume data received from the server, or both."))) version ".tar.xz")) (sha256 (base32 - "0h77h34rn6cgy5qiqq163pj3bhbka1ydkfgjcx01ns1g9sgym6ib")))) + "0qccpgbhyg9k4x5nni7xm0pyvaqia3zrcd42cn7ksf5h21lwmkxw")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -895,7 +900,7 @@ recognition API for devices."))) (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -904,7 +909,7 @@ recognition API for devices."))) version ".tar.xz")) (sha256 (base32 - "07fvnjywn3hkrxfbxasmy83jr6jq9lf1grasfwij54hz6y0smg98")) + "1sczzcvk3c5gczz53yvp8ma6gp8aixk5pcq7wh344c9md3g8xkbs")) (modules '((guix build utils))) (snippet '(begin @@ -946,7 +951,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -955,7 +960,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) version ".tar.xz")) (sha256 (base32 - "1ib61zh6jrab3yz592p47ldfgphi4i184kqf14vhwn31akibh6pw")) + "0al3yypy3fin62n8d1859jh0mn0fbpa161l7f37hgd4gf75365nk")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -966,13 +971,21 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) `(modify-phases ,phases - (add-before 'check 'set-ld-library-path - ;; <https://lists.gnu.org/archive/html/guix-devel/2017-09/msg00019.html> - ;; - ;; Make the uninstalled libQt5WaylandClient.so.5 available to the - ;; wayland platform plugin. + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; FIXME: tst_seatv4::animatedCursor() fails for no good + ;; reason and breaks these two tests. + (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp" + (((string-append "QVERIFY\\(!cursorSurface\\(\\)->" + "m_waitingFrameCallbacks\\.empty\\(\\)\\);")) + "") + (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);") + "")) + #t)) + (add-before 'check 'set-test-environment (lambda _ - (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/lib")) + ;; Do not fail just because /etc/machine-id is missing. + (setenv "DBUS_FATAL_WARNINGS" "0") #t)))))) (native-inputs `(("glib" ,glib) @@ -998,7 +1011,7 @@ compositor libraries."))) (define-public qtserialport (package (inherit qtsvg) (name "qtserialport") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1007,7 +1020,7 @@ compositor libraries."))) version ".tar.xz")) (sha256 (base32 - "07vjv3p7n7n5v15wdpi8x5sbnvyjqdh85qfzf9mz8l6ppqp2hk12")))) + "08ga9a1lwj83872nxablk602z1dq0la6jqsiicvd7m1sfbfpgnd6")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase) @@ -1032,7 +1045,7 @@ interacting with serial ports from within Qt."))) (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1041,7 +1054,7 @@ interacting with serial ports from within Qt."))) version ".tar.xz")) (sha256 (base32 - "1bkyk1v7bcq657n88a6675lj55vl9y8v46h4kf27v58yjzgiw842")))) + "14bahg82jciciqkl74q9hvf3a8kp3pk5v731vp2416k4b8bn4xqb")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -1053,7 +1066,7 @@ and others."))) (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1062,7 +1075,7 @@ and others."))) version ".tar.xz")) (sha256 (base32 - "0xff3fbbpcl0kkq0rg9npj127ycirygicbkxlf0v593sjpjp5bmh")))) + "0x7q66994pw6cd0f505bmirw1sssqs740zaw8lyqqqr32m2ch7bx")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1077,7 +1090,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1086,7 +1099,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) version ".tar.xz")) (sha256 (base32 - "0fswnmhb8fm7wqgzv8cjy1j2sgb5mhx80jl411laawn7bf2ysjg0")))) + "05rl657848fsprsnabdqb5z363c6drjc32k59223vl351f8ihhgb")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1100,7 +1113,8 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) `(("mesa" ,mesa) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) - ("qtwebsockets" ,qtwebsockets))) + ("qtwebsockets" ,qtwebsockets) + ("zlib" ,zlib))) (synopsis "QPA plugin for running an application via a browser using streamed WebGL commands") (description "Qt back end that uses WebGL for rendering. It allows Qt @@ -1112,7 +1126,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (define-public qtwebview (package (inherit qtsvg) (name "qtwebview") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1121,7 +1135,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) version ".tar.xz")) (sha256 (base32 - "1rvvkg6dl34hklllnlzlcffik746f15lzxdnwggc97dmx8n2vy6k")))) + "0jzzcm7z5njkddzfhmyjz4dbbzq8h93980cci4479zc4xq9r47y6")))) (native-inputs `(("perl" ,perl))) (inputs @@ -1135,7 +1149,7 @@ native APIs where it makes sense."))) (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1144,7 +1158,7 @@ native APIs where it makes sense."))) version ".tar.xz")) (sha256 (base32 - "07vq4aycayq2bg8yi4awidb25xyvws2ajbnrmad3rnpg1fw0bsfi")))) + "1k3m8zhbv04yrqvj7jlnh8f9xczdsmla59j9gcwsqvbg76y0hxy3")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1165,7 +1179,7 @@ positioning and geolocation plugins."))) (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1174,7 +1188,7 @@ positioning and geolocation plugins."))) version ".tar.xz")) (sha256 (base32 - "0j1rl368sjknsmwp2f7bwqcb0sx13l3l4dxbm70873si9l8rf2l6")))) + "1iakl3hlyg51ri1czmis8mmb257b0y1zk2a2knybd3mq69wczc2v")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1193,7 +1207,7 @@ that helps in Qt development."))) (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1202,7 +1216,7 @@ that helps in Qt development."))) version ".tar.xz")) (sha256 (base32 - "06a02230mj4bd8qvjaf2q97grzbj1c1rq36x7236fnhjsikbq7fa")) + "1zlvg3hc6h70d789g3kv6dxbwswzkskkm00bdgl01grwrdy4izg9")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1217,7 +1231,7 @@ ECMAScript and Qt."))) (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1226,7 +1240,7 @@ ECMAScript and Qt."))) version ".tar.xz")) (sha256 (base32 - "1rar337vv0dx52r2gxwiwy1axn0fpy79rka09xizjlxsdg3vnf0h")))) + "0qa4dlhn3iv9yvaic8hw86v6h8rn9sgq8xjfdaym04pfshfyypfm")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1241,7 +1255,7 @@ can be used to build complete interfaces in Qt Quick."))) (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1250,7 +1264,7 @@ can be used to build complete interfaces in Qt Quick."))) version ".tar.xz")) (sha256 (base32 - "0dx2jag6l5a80220fvmf49z1psliqf1ijqx6jsvvzv81mpjjd59s")))) + "0q0mk2mjlf9ll0gdrdzxy8096s6g9draaqiwrlvdpa7lv14x7xzs")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1266,7 +1280,7 @@ not available."))) (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1275,7 +1289,7 @@ not available."))) version ".tar.xz")) (sha256 (base32 - "1knapc14a80cn2f5bbfj7lhq9flr3v0gwjg9ka7xl8y642235w02")))) + "03xmwhapv0b2qj661iaqqrvhxc7qiid0acrp6rj85824ha2pyyj8")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1293,7 +1307,7 @@ coloring, and many more."))) (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1302,7 +1316,7 @@ coloring, and many more."))) version ".tar.xz")) (sha256 (base32 - "150y7bc755l9y8w7nkg3gfw5n6rlj9hhq0ibc9g1xgllpr18qqq7")))) + "00wd3h465waxdghg2vdhs5pkj0xikwjn88l12477dksm8zdslzgp")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1323,7 +1337,7 @@ and mobile applications targeting TV-like form factors."))) (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1332,7 +1346,7 @@ and mobile applications targeting TV-like form factors."))) version ".tar.xz")) (sha256 (base32 - "1dpvjkvwc3fj86vay8q8vzym73cix7ri2ianx87ck0gqjny51adg")) + "141pfschv6zmcvvn3pi7f5vb4nf96zpngy80f9bly1sn58syl303")) (modules '((guix build utils))) (snippet '(begin @@ -1354,7 +1368,7 @@ also contains functionality to support data models and executable content."))) (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1363,7 +1377,7 @@ also contains functionality to support data models and executable content."))) version ".tar.xz")) (sha256 (base32 - "0xjsn7p629ni68vk4xlw2cvcs53ipcqv1pa4hck0nabddcgcnzkg")))) + "0lg8x7g7dkf95xwxq8b4yw4ypdz68igkscya96xwbklg3q08gc39")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1371,49 +1385,10 @@ also contains functionality to support data models and executable content."))) (description "The Qt Purchasing module provides and in-app API for purchasing goods and services."))) -(define-public qtcanvas3d - (package (inherit qtsvg) - (name "qtcanvas3d") - (version "5.12.7") - (source (origin - (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) - (sha256 - (base32 - "0l0c1p6jwz5rygyxslfw7jw3wbd23w5n9zg04aqlh5g15qx52fmn")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "examples/canvas3d/3rdparty") - #t)))) - (arguments - (substitute-keyword-arguments (package-arguments qtsvg) - ;; Building the tests depends on the bundled 3rd party javascript files, - ;; and the test phase fails to import QtCanvas3D, causing the phase to - ;; fail, so we skip building them for now. - ((#:phases phases) - `(modify-phases ,phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "qmake" "QT_BUILD_PARTS = libs tools" - (string-append "PREFIX=" out))))))) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests - (native-inputs `()) - (inputs - `(("qtbase" ,qtbase) - ("qtdeclarative" ,qtdeclarative))) - (synopsis "Qt Canvas 3D module") - (description "The Qt Canvas 3D module provides a way to make WebGL-like 3D -drawing calls from Qt Quick JavaScript."))) - (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1422,7 +1397,7 @@ drawing calls from Qt Quick JavaScript."))) version ".tar.xz")) (sha256 (base32 - "0pyg2lpxmhf4amj57zihp5ry0y9m39xq5hbcx4hqj78bdm96ah23")))) + "1drvm15i6n10b6a1acgarig120ppvqh3r6fqqdn8i3blx81m5cmd")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1440,7 +1415,7 @@ selecting one of the charts themes.") (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1449,7 +1424,7 @@ selecting one of the charts themes.") version ".tar.xz")) (sha256 (base32 - "09wbv4g29sq5z2fphk2910albr3iv3l14nch3ml77w6drw9mgzq7")))) + "080fkpxg70m3c697wfnkjhca58b7r1xsqd559jzb21985pdh6g3j")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1467,7 +1442,7 @@ customized by using themes or by adding custom items and labels to them.") (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1476,7 +1451,7 @@ customized by using themes or by adding custom items and labels to them.") version ".tar.xz")) (sha256 (base32 - "0sspni7zllhspk70yjj2d0li9r4rs3iflnksj8mvjx2yl9qpryyb")))) + "0pi6p7bq54kzij2p69cgib7n55k69jsq0yqq09yli645s4ym202g")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1496,7 +1471,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1505,7 +1480,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) version ".tar.xz")) (sha256 (base32 - "03qjj7l63wn1zqkmlja9yrnc38rf6b3apnmsn0kw0h61x72awskd")))) + "1mhlws5w0igf5hw0l90p6dz6k7w16dqfbnk2li0zxdmayk2039m6")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1516,6 +1491,10 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (substitute* "tests/auto/qml/qml.pro" (("integration") "# integration") (("usertypes") "# usertypes")) + ;; disable failing tests: they need network + (substitute* "tests/auto/auto.pro" + (("integration_multiprocess proxy_multiprocess integration_external restart") + "integration_multiprocess")) #t)))))) (inputs `(("qtbase" ,qtbase) @@ -1529,7 +1508,7 @@ processes or computers."))) (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1538,7 +1517,7 @@ processes or computers."))) version ".tar.xz")) (sha256 (base32 - "0q30m9l28zsdzdmny7wjskd2fjfrgh1l595wir6bhwhil95g3i0c")))) + "1nn6kspbp8hfkz1jhzc1qx1m9z7r1bgkdqgi9n4vl1q25yk8x7jy")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) @@ -1573,7 +1552,7 @@ message."))) version ".tar.xz")) (sha256 (base32 - "1yj6pcj945fpbc7nihav0plxpx8ikylmxjy7wqdv5znslgf59dw3")) + "0iy9lsl6zxlkca6x2p1506hbj3wmhnaipg23z027wfccbnkxcsg1")) (modules '((ice-9 ftw) (ice-9 match) (srfi srfi-1) @@ -1582,7 +1561,8 @@ message."))) (snippet '(begin (let ((preserved-third-party-files - '("base/third_party/dmg_fp" + '("base/third_party/cityhash" + "base/third_party/dmg_fp" "base/third_party/dynamic_annotations" "base/third_party/icu" "base/third_party/libevent" @@ -1591,23 +1571,31 @@ message."))) "base/third_party/symbolize" "base/third_party/xdg_mime" "base/third_party/xdg_user_dirs" - "net/third_party/http2" "net/third_party/mozilla_security_manager" "net/third_party/nss" - "net/third_party/spdy" - "net/third_party/quic" + "net/third_party/quiche" + "net/third_party/uri_template" "third_party/abseil-cpp" "third_party/angle" "third_party/angle/src/common/third_party/base" "third_party/angle/src/common/third_party/smhasher" + "third_party/angle/src/common/third_party/xxhash" "third_party/angle/src/third_party/compiler" + "third_party/axe-core" "third_party/blink" "third_party/boringssl" "third_party/boringssl/src/third_party/fiat" + "third_party/boringssl/src/third_party/sike" + "third_party/boringssl/linux-x86_64/crypto/third_party/sike" + "third_party/boringssl/linux-aarch64/crypto/third_party/sike" "third_party/breakpad" "third_party/brotli" "third_party/ced" + "third_party/cld_3" "third_party/crc32c" + "third_party/dav1d" + "third_party/dawn" + "third_party/emoji-segmenter" "third_party/ffmpeg" "third_party/googletest" "third_party/hunspell" @@ -1615,11 +1603,13 @@ message."))) "third_party/icu" "third_party/inspector_protocol" "third_party/jinja2" + "third_party/jsoncpp" "third_party/jstemplate" "third_party/khronos" "third_party/leveldatabase" "third_party/libaddressinput" "third_party/libjingle_xmpp" + "third_party/libjpeg" "third_party/libpng" "third_party/libsrtp" "third_party/libsync" @@ -1632,11 +1622,15 @@ message."))) "third_party/libyuv" "third_party/lss" "third_party/markupsafe" - "third_party/mesa" + "third_party/mesa_headers" "third_party/metrics_proto" "third_party/modp_b64" + "third_party/nasm" + "third_party/one_euro_filter" "third_party/opus" "third_party/ots" + "third_party/perfetto" + "third_party/pffft" "third_party/ply" "third_party/polymer" "third_party/protobuf" @@ -1644,14 +1638,25 @@ message."))) "third_party/re2" "third_party/rnnoise" "third_party/skia" + "third_party/skia/include/third_party/skcms/skcms.h" + "third_party/skia/include/third_party/vulkan" "third_party/skia/third_party/gif" "third_party/skia/third_party/skcms" + "third_party/skia/third_party/vulkanmemoryallocator" "third_party/smhasher" "third_party/snappy" "third_party/sqlite" + "third_party/usb_ids" "third_party/usrsctp" "third_party/web-animations-js" "third_party/webrtc" + "third_party/webrtc/common_audio/third_party/fft4g" + "third_party/webrtc/common_audio/third_party/spl_sqrt_floor" + "third_party/webrtc/modules/third_party/fft" + "third_party/webrtc/modules/third_party/g711" + "third_party/webrtc/modules/third_party/g722" + "third_party/webrtc/rtc_base/third_party/base64" + "third_party/webrtc/rtc_base/third_party/sigslot" "third_party/webrtc_overrides" "third_party/widevine/cdm/widevine_cdm_common.h" "third_party/widevine/cdm/widevine_cdm_version.h" @@ -1661,7 +1666,8 @@ message."))) "url/third_party/mozilla" "v8/src/third_party/utf8-decoder" "v8/src/third_party/valgrind" - "v8/third_party/antlr4" + "v8/src/third_party/siphash" + "v8/third_party/v8/builtins" "v8/third_party/inspector_protocol")) (protected (make-regexp "\\.(gn|gyp)i?$"))) (define preserved-club @@ -1690,9 +1696,9 @@ message."))) (list (string-join (list-head dirs delim) "/")) (list-tail dirs delim)))) (define (remove-loudly file) - (format #t "deleting ~a...~%" file) - (force-output) - (delete-file file)) + (format #t "deleting ~a...~%" file) + (force-output) + (delete-file file)) (define (delete-unwanted-files child stat flag base level) (match flag ((or 'regular 'symlink 'stale-symlink) @@ -1733,6 +1739,12 @@ message."))) (substitute* "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h" (("third_party/curl") "curl")) + (substitute* + '("components/viz/common/gpu/vulkan_context_provider.h" + "components/viz/common/resources/resource_format_utils.h" + "gpu/config/gpu_util.cc") + (("third_party/vulkan/include/") + "")) ;; Replace Google Analytics bundle with an empty file and hope ;; no one notices. @@ -1741,9 +1753,8 @@ message."))) "third_party/analytics/google-analytics-bundle.js" (lambda (port) (const #t))))) - ;; Do not enable support for loading the Widevine DRM plugin. - (substitute* "src/core/config/common.pri" + (substitute* "src/buildtools/config/common.pri" (("enable_widevine=true") "enable_widevine=false")) #t))))) @@ -1774,8 +1785,6 @@ message."))) ("libgcrypt" ,libgcrypt) ("libjpeg" ,libjpeg-turbo) ("libvpx" ,libvpx) - ;; FIXME: configure does not find system lcms - ;; ("lcms" ,lcms) ("libwebp" ,libwebp) ("libx11" ,libx11) ("libxcb" ,libxcb) @@ -1806,6 +1815,7 @@ message."))) ("snappy" ,snappy) ("udev" ,eudev) ("valgrind" ,valgrind) + ("vulkan-headers" ,vulkan-headers) ("xcb-util" ,xcb-util))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 5d0521a216..132a17810c 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -245,18 +245,8 @@ provides defaults for 80% of the use cases.") (install-file manpage (string-append (assoc-ref outputs "out") "/share/man/man1")))) - #t)) - (replace 'install - ;; Adapted from (guix build cargo-build-system). The flags need to - ;; be passed to `cargo install' too, as otherwise it will build - ;; another binary, without the features. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p out) - (setenv "CARGO_TARGET_DIR" "./target") - (invoke "cargo" "install" "--path" "." "--root" out - "--features" "pcre2"))))) - #:cargo-build-flags '("--release" "--features" "pcre2"))) + #t))) + #:features '("pcre2"))) (native-inputs `(("asciidoc" ,asciidoc) ("pcre2" ,pcre2) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 62d2591254..d139657f39 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1183,4 +1183,4 @@ move around." (generate-all-checksums "vendor") #t))))))))) -(define-public rust rust-1.37) +(define-public rust rust-1.39) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index e1df075bf3..8f9f2ed2a4 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -357,7 +357,7 @@ and other operations. It includes a library and a command-line tool.") (assoc-ref %outputs "out") "/lib/udev/rules.d")))) (inputs - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("libusb" ,libusb) ;; The library "libyubikey" is also known as "yubico-c". ("libyubikey" ,libyubikey))) @@ -457,7 +457,7 @@ PCSC API Python wrapper module.") "/xml/dtd/docbook/docbookx.dtd"))) #t))))) (inputs - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("hidapi" ,hidapi))) (native-inputs `(("help2man" ,help2man) @@ -497,7 +497,7 @@ operations.") (list "--enable-gtk-doc" "--enable-tests"))) (inputs - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("libressl" ,libressl))) (native-inputs `(("autoconf" ,autoconf) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 3d33ee521f..b14d76d9fa 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -58,7 +58,7 @@ ("asciidoc" ,asciidoc))) (inputs `(("curl" ,curl) - ("json-c" ,json-c) + ("json-c" ,json-c-0.13) ("libxml2" ,libxml2) ("ncurses" ,ncurses) ("stfl" ,stfl) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e541016010..1314c459f5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -840,7 +840,7 @@ libebml is a C++ library to read and write EBML files.") (define-public libva (package (name "libva") - (version "2.6.1") + (version "2.7.1") (source (origin (method url-fetch) @@ -852,7 +852,7 @@ libebml is a C++ library to read and write EBML files.") (string-append "https://www.freedesktop.org/software/vaapi/releases/" "libva/libva-" version "/libva-" version ".tar.bz2"))) (sha256 - (base32 "19df3r02k1p4cbyvifkdjyc8q7hi23f5b3x3390z52l25mjfnmvc")))) + (base32 "014av7ayyc624xfmr63xhbgg7nw8fynsswj1g2wmk4lnkyfz23x0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6a2c219aac..d5f5be6816 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,7 +43,7 @@ (define-public spirv-headers (package (name "spirv-headers") - (version "1.3.7") + (version "1.5.3") (source (origin (method git-fetch) @@ -51,18 +52,11 @@ (commit version))) (sha256 (base32 - "0m56smanfcczjfif4yfcqhjj4d4sc088kwg6dgia8fwdsjavdm4d")) - (file-name (git-file-name name version)))) + "069sivqajp7z4p44lmrz23lvf237xpkjxd4lzrg27836pwqcz9bj")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;; No tests - #:phases (modify-phases %standard-phases - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "cmake" "-E" "copy_directory" - "../source/include/spirv" - (string-append (assoc-ref outputs "out") - "/include/spirv"))))))) + `(#:tests? #f)) ;no tests (home-page "https://github.com/KhronosGroup/SPIRV-Headers") (synopsis "Machine-readable files from the SPIR-V Registry") (description @@ -81,7 +75,7 @@ and for the GLSL.std.450 extended instruction set. (define-public spirv-tools (package (name "spirv-tools") - (version "2019.2") + (version "2020.2") (source (origin (method git-fetch) @@ -89,13 +83,14 @@ and for the GLSL.std.450 extended instruction set. (url "https://github.com/KhronosGroup/SPIRV-Tools") (commit (string-append "v" version)))) (sha256 - (base32 "0zwz6qg8g8165h7cw52agryjrdb29gbmsbziw3pwiddfkyma8vvg")) + (base32 "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; FIXME: Tests fail. - #:configure-flags (list (string-append "-DSPIRV-Headers_SOURCE_DIR=" - (assoc-ref %build-inputs "spirv-headers"))))) + `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" + (string-append + "-DSPIRV-Headers_SOURCE_DIR=" + (assoc-ref %build-inputs "spirv-headers"))))) (inputs `(("spirv-headers" ,spirv-headers))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) @@ -110,7 +105,7 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (define-public glslang (package (name "glslang") - (version "7.11.3214") + (version "8.13.3743") (source (origin (method git-fetch) @@ -119,21 +114,15 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (commit version))) (sha256 (base32 - "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins")) + "0d20wfpp2fmbnz1hnsjr9xc62lxpj86ik2qyviqbni0pqj212cry")) (file-name (string-append name "-" version "-checkout")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;; No tests - ;; glslang tries to set CMAKE_INSTALL_PREFIX manually. Remove the - ;; offending line. - #:phases (modify-phases %standard-phases - (add-after 'patch-source-shebangs 'fix-cmakelists - (lambda _ - (substitute* "CMakeLists.txt" - (("set.*CMAKE_INSTALL_PREFIX.*") "")) - #t))))) - (native-inputs `(("bison" ,bison) - ("pkg-config" ,pkg-config))) + '(#:tests? #f ;FIXME: requires bundled SPIRV-Tools + #:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python))) (home-page "https://github.com/KhronosGroup/glslang") (synopsis "OpenGL and OpenGL ES shader front end and validator") (description @@ -149,7 +138,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.121") + (version "1.2.141") (source (origin (method git-fetch) @@ -159,7 +148,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "0hbgbdxj7lrm37phb0pkq5zgss3h21znj3mivnyva5f60i2wgr73")))) + "10nmx6y4llllfcczyfz76amd0vkqv09dj952d19zkzmmgcval7zq")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. @@ -173,7 +162,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-loader (package (name "vulkan-loader") - (version (package-version vulkan-headers)) + (version "1.2.140") (source (origin (method git-fetch) @@ -183,26 +172,32 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "1gbrppfxrncvva30fikgzm7f15xs527sb4lf1sswdyxj3h5cw741")))) + "0rhyz0qgp0i7pcx6wlvgwy7j33d4cs0xx39f0b6igpfk0vk70r1w")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-spirv-tools-commit-id - (lambda* (#:key inputs #:allow-other-keys) - ;; Remove lines trying to build in a git commit id. - (substitute* "CMakeLists.txt" ((".*spirv_tools_commit_id.h.*") "")) - #t))) - #:configure-flags (list - "-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest' submodule. - (string-append "-DCMAKE_INSTALL_LIBDIR=" - (assoc-ref %outputs "out") "/lib")))) - (native-inputs `(("libxrandr" ,libxrandr) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("vulkan-headers" ,vulkan-headers) - ("wayland" ,wayland))) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'unpack-googletest + (lambda* (#:key inputs #:allow-other-keys) + (let ((gtest (assoc-ref inputs "googletest:source"))) + (when gtest + (copy-recursively gtest "external/googletest")) + #t))) + (add-after 'unpack 'disable-loader-tests + (lambda _ + ;; Many tests require a Vulkan driver. Skip those. + (substitute* "tests/loader_validation_tests.cpp" + ((".*= vkCreateInstance.*" all) + (string-append "GTEST_SKIP();\n" all)) + (("TEST_F.*InstanceExtensionEnumerated.*" all) + (string-append all "\nGTEST_SKIP();\n"))) + #t))))) + (native-inputs + `(("googletest:source" ,(package-source googletest)) + ("libxrandr" ,libxrandr) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("vulkan-headers" ,vulkan-headers) + ("wayland" ,wayland))) (home-page "https://github.com/KhronosGroup/Vulkan-Loader") (synopsis "Khronos official ICD loader and validation layers for Vulkan") @@ -221,7 +216,7 @@ and the ICD.") (define-public vulkan-tools (package (name "vulkan-tools") - (version (package-version vulkan-headers)) + (version "1.2.140") (source (origin (method git-fetch) @@ -231,7 +226,7 @@ and the ICD.") (file-name (git-file-name name version)) (sha256 (base32 - "1jndlz3n35zlz44p1b4cgl2alvsmgrqnkxdn5mpahg0zb8dgwmm8")))) + "08dk0q77kpycn4vv19jh3ig73gbq3psan246a7fss0nfxpiddg0j")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) @@ -243,7 +238,7 @@ and the ICD.") ("python" ,python) ("vulkan-headers" ,vulkan-headers))) (arguments - `(#:tests? #f ; No tests. + `(#:tests? #f ;no tests #:configure-flags (list (string-append "-DGLSLANG_INSTALL_DIR=" (assoc-ref %build-inputs "glslang"))))) (home-page @@ -258,7 +253,7 @@ API.") (define-public shaderc (package (name "shaderc") - (version "2019.0") + (version "2020.0") (source (origin (method git-fetch) @@ -268,56 +263,42 @@ API.") (file-name (git-file-name name version)) (sha256 (base32 - "1l5mmyxhzsbp0a6y2d86i8jmf46c6bjgjkdgkr5l8hmhflmm7gi2")))) - (build-system meson-build-system) + "1kqqvsvib01bsmfbdy3fbwwpvkcdlfb6k71kjvzb3crql7w0rxff")))) + (build-system cmake-build-system) (arguments - `(#:tests? #f ; FIXME: Tests fail. + `(;; FIXME: Skip most of the tests, because enabling system gtest breaks + ;; the build: <https://github.com/google/shaderc/issues/470>. + #:configure-flags '("-DSHADERC_SKIP_TESTS=ON") #:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Remove various lines and touch build-version.inc or - ;; configuring won't work. - (invoke "touch" "glslc/src/build-version.inc") - (substitute* "CMakeLists.txt" (("..PYTHON_EXE..*") "")) - (substitute* "CMakeLists.txt" - ((".*update_build_version.py..*") "")) - (substitute* "CMakeLists.txt" - ((".*add_custom_target.build-version.*") "")) - (substitute* "CMakeLists.txt" - ((".*spirv-tools_SOURCE_DIR.*glslang_SOURCE_DIR.*") - "")) - (substitute* "CMakeLists.txt" - ((".*Update build-version.inc.*") "")) - (substitute* "CMakeLists.txt" ((".*--check.*") "")) - (substitute* "glslc/src/main.cc" ((".*build-version.inc.*") - "\"1\"")) - (invoke "cmake" "-GNinja" "-DCMAKE_BUILD_TYPE=Release" - "-DSHADERC_SKIP_TESTS=ON" - "-DCMAKE_INSTALL_LIBDIR=lib" - (string-append "-DCMAKE_INSTALL_PREFIX=" - out))))) - (add-after 'unpack 'unpack-sources - (lambda* (#:key inputs #:allow-other-keys) - (let ((spirv-tools-source (assoc-ref inputs "spirv-tools-source")) - (spirv-headers-source (assoc-ref inputs "spirv-headers-source")) - (glslang-source (assoc-ref inputs "glslang-source"))) - (copy-recursively spirv-tools-source "third_party/spirv-tools") - (copy-recursively spirv-headers-source - (string-append "third_party/spirv-tools" - "/external/spirv-headers")) - (copy-recursively glslang-source "third_party/glslang") - #t)))))) + (add-after 'unpack 'do-not-look-for-bundled-sources + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(third_party\\)") + "")) + + (substitute* "glslc/test/CMakeLists.txt" + (("\\$<TARGET_FILE:spirv-dis>") + (which "spirv-dis"))) + + ;; Do not attempt to use git to encode version information. + (substitute* "glslc/CMakeLists.txt" + (("add_dependencies\\(glslc_exe build-version\\)") + "")) + (call-with-output-file "glslc/src/build-version.inc" + (lambda (port) + (format port "\"~a\"\n\"~a\"\n\"~a\"~%" + ,version + ,(package-version spirv-tools) + ,(package-version glslang)))) + #t))))) (inputs - `(("googletest" ,googletest) - ("python" ,python))) + `(("glslang" ,glslang) + ("python" ,python) + ("spirv-headers" ,spirv-headers) + ("spirv-tools" ,spirv-tools))) (native-inputs - `(("cmake" ,cmake-minimal) - ("glslang-source" ,(package-source glslang)) - ("pkg-config" ,pkg-config) - ("spirv-headers-source" ,(package-source spirv-headers)) - ("spirv-tools-source" ,(package-source spirv-tools)))) + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/google/shaderc") (synopsis "Tools for shader compilation") (description "Shaderc is a collection of tools, libraries, and tests for @@ -341,7 +322,16 @@ shader compilation.") (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-spirv-tools"))) + `(#:configure-flags '("--with-spirv-tools") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-for-new-vulkan + (lambda _ + ;; Mimic upstream commit 8e7bf8a5c3e0047 for + ;; compatibility with newer vulkan-headers. + (substitute* "libs/vkd3d/vkd3d_private.h" + (("VK_PIPELINE_BIND_POINT_RANGE_SIZE") + "2u")) + #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index 1ec07675ab..934a6d9e38 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +40,7 @@ (define-public w3m (package (name "w3m") - (version "0.5.3+git20190105") + (version "0.5.3+git20200502") (source (origin (method git-fetch) ;; Debian's fork of w3m is the only one that is still maintained. @@ -49,7 +50,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1fbg2p8qh2gvi3g4iz4q6vc0k70pf248r4yndi5lcn2m3mzvjx0i")))) + "0yyfhwcwy1dvdbirj6zqwk4gl8z9npfavs0k7ipcg5fd16vnx7mi")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 64671842a7..9b7dba991c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -769,7 +769,7 @@ data.") (define-public json-c (package (name "json-c") - (version "0.13.1") + (version "0.14") (source (origin (method url-fetch) (uri (string-append @@ -777,7 +777,29 @@ data.") version ".tar.gz")) (sha256 (base32 - "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq")) + "0w381krr99q5a2rypx4g437fa7gzgl82i64sgnrs6g5jr44dwxxk")))) + (build-system cmake-build-system) + (home-page "https://github.com/json-c/json-c/wiki") + (synopsis "JSON implementation in C") + (description + "JSON-C implements a reference counting object model that allows you to +easily construct JSON objects in C, output them as JSON-formatted strings and +parse JSON-formatted strings back into the C representation of JSON objects. +It aims to conform to RFC 7159.") + (license license:x11))) + +;; TODO: Remove these old versions when all dependents have been updated. +(define-public json-c-0.13 + (package + (inherit json-c) + (version "0.13.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://s3.amazonaws.com/json-c_releases/releases/json-c-" + version ".tar.gz")) + (sha256 + (base32 "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq")) (modules '((guix build utils))) (snippet '(begin @@ -787,20 +809,11 @@ data.") (set-file-time "config.h.in" (stat "aclocal.m4")) #t)))) - (build-system gnu-build-system) - (home-page "https://github.com/json-c/json-c/wiki") - (synopsis "JSON implementation in C") - (description - "JSON-C implements a reference counting object model that allows you to -easily construct JSON objects in C, output them as JSON-formatted strings and -parse JSON-formatted strings back into the C representation of JSON objects. -It aims to conform to RFC 7159.") - (license license:x11))) + (build-system gnu-build-system))) -;; TODO: remove this old version when all dependents have been updated. (define-public json-c-0.12 (package - (inherit json-c) + (inherit json-c-0.13) (version "0.12.1") (source (origin (method url-fetch) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 1325fbc821..b1aa2439a1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -487,18 +487,16 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.100") - (source - (origin - (method url-fetch) - (uri (string-append - "https://dri.freedesktop.org/libdrm/libdrm-" - version - ".tar.bz2")) - (sha256 - (base32 - "0p8a1l3a3s40i81mawm8nhrbk7p97ss05qkawp1yx73c30lchz67")) - (patches (search-patches "libdrm-symbol-check.patch")))) + (version "2.4.101") + (source (origin + (method url-fetch) + (uri (string-append + "https://dri.freedesktop.org/libdrm/libdrm-" + version ".tar.xz")) + (sha256 + (base32 + "19vqbhqljhln0lrpnv3s7y3lkhsdcp76dl8bhqj3cis9ism1pwyx")) + (patches (search-patches "libdrm-realpath-virtio.patch")))) (build-system meson-build-system) (arguments `(#:configure-flags |