diff options
-rw-r--r-- | gnu/local.mk | 2 | ||||
-rw-r--r-- | gnu/packages/admin.scm | 1 | ||||
-rw-r--r-- | gnu/packages/apr.scm | 4 | ||||
-rw-r--r-- | gnu/packages/databases.scm | 19 | ||||
-rw-r--r-- | gnu/packages/freedesktop.scm | 16 | ||||
-rw-r--r-- | gnu/packages/glib.scm | 9 | ||||
-rw-r--r-- | gnu/packages/gnome.scm | 25 | ||||
-rw-r--r-- | gnu/packages/gnupg.scm | 13 | ||||
-rw-r--r-- | gnu/packages/gstreamer.scm | 231 | ||||
-rw-r--r-- | gnu/packages/gtk.scm | 157 | ||||
-rw-r--r-- | gnu/packages/linux.scm | 14 | ||||
-rw-r--r-- | gnu/packages/password-utils.scm | 1 | ||||
-rw-r--r-- | gnu/packages/patches/farstream-gupnp.patch | 140 | ||||
-rw-r--r-- | gnu/packages/patches/json-c-CVE-2020-12762.patch | 193 | ||||
-rw-r--r-- | gnu/packages/pdf.scm | 4 | ||||
-rw-r--r-- | gnu/packages/pulseaudio.scm | 32 | ||||
-rw-r--r-- | gnu/packages/python-xyz.scm | 21 | ||||
-rw-r--r-- | gnu/packages/rust.scm | 2 | ||||
-rw-r--r-- | gnu/packages/sdl.scm | 4 | ||||
-rw-r--r-- | gnu/packages/sphinx.scm | 4 | ||||
-rw-r--r-- | gnu/packages/video.scm | 1 | ||||
-rw-r--r-- | gnu/packages/w3m.scm | 13 | ||||
-rw-r--r-- | gnu/packages/web-browsers.scm | 1 | ||||
-rw-r--r-- | gnu/packages/web.scm | 5 | ||||
-rw-r--r-- | gnu/packages/wget.scm | 5 | ||||
-rw-r--r-- | gnu/packages/xorg.scm | 5 |
26 files changed, 497 insertions, 425 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index d415b892e9..5f19ead240 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1028,6 +1028,7 @@ dist_patch_DATA = \ %D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/extempore-unbundle-external-dependencies.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ + %D%/packages/patches/farstream-gupnp.patch \ %D%/packages/patches/farstream-make.patch \ %D%/packages/patches/fastcap-mulGlobal.patch \ %D%/packages/patches/fastcap-mulSetup.patch \ @@ -1287,7 +1288,6 @@ dist_patch_DATA = \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/isc-dhcp-gcc-compat.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ - %D%/packages/patches/json-c-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/jacal-fix-texinfo.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 22e053800c..93a1d354c4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -820,6 +820,7 @@ hostname.") '(,@(if (hurd-target?) '() '("--with-libpam")) + "shadow_cv_logdir=/var/log" "ac_cv_func_setpgrp_void=yes") #:phases diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm index 1a4a1c6304..5ef1488218 100644 --- a/gnu/packages/apr.scm +++ b/gnu/packages/apr.scm @@ -30,14 +30,14 @@ (define-public apr (package (name "apr") - (version "1.6.5") + (version "1.7.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/apr/apr-" version ".tar.bz2")) (sha256 (base32 - "01d1n1ql66bxsjx0wyzazmkqdqdmr0is6a7lwyy5kzy4z7yajz56")) + "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2")) (patches (search-patches "apr-skip-getservbyname-test.patch")) (patch-flags '("-p0")))) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b519aa91fb..3487b2cec2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1074,15 +1074,14 @@ and high-availability (HA).") (define-public postgresql-13 (package (name "postgresql") - (replacement postgresql-13.3) - (version "13.1") + (version "13.3") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "07z6zwr58dckaa97yl9ml240z83d1lhgaxw9aq49i8lsp21mqd0j")) + "18dliq7h2l8irffhyyhdmfwx3si515q6gds3cxdjb9n7m17lbn9w")) (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments @@ -1123,20 +1122,6 @@ TIMESTAMP. It also supports storage of binary large objects, including pictures, sounds, or video.") (license (license:x11-style "file://COPYRIGHT")))) -(define-public postgresql-13.3 - (package - (inherit postgresql-13) - (name "postgresql") - (version "13.3") - (source (origin - (method url-fetch) - (uri (string-append "https://ftp.postgresql.org/pub/source/v" - version "/postgresql-" version ".tar.bz2")) - (sha256 - (base32 - "18dliq7h2l8irffhyyhdmfwx3si515q6gds3cxdjb9n7m17lbn9w")) - (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))))) - (define-public postgresql-11 (package (inherit postgresql-13) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 514125977b..caad0613ca 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -220,12 +220,13 @@ application-centers for distributions.") (sha256 (base32 "1sd8syldyq6bphfdm129s3gq554vfv7vh1vcwzk48gjryf101awk")) (patches - (search-patches "farstream-make.patch")))) + (search-patches + "farstream-gupnp.patch" ;for test 'transmitter/rawudp' + "farstream-make.patch")))) (build-system glib-or-gtk-build-system) (outputs '("out" "doc")) (arguments - `(#:tests? #f ; https://gitlab.freedesktop.org/farstream/farstream/-/issues/18 - #:configure-flags + `(#:configure-flags (list "--enable-gtk-doc" "--enable-glib-asserts" @@ -241,6 +242,15 @@ application-centers for distributions.") (assoc-ref %build-inputs "common") "common") #t)) + (add-after 'unpack 'disable-timeout-tests + (lambda _ + (substitute* "tests/check/Makefile.am" + ;; This test timeouts despite changing + ;; the value of 'CK_DEFAULT_TIMEOUT' to 600, + ;; as per %common-gstreamer-phases. + ;; Reported to upstream: + ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20 + (("[ \t]*transmitter/nice.*$") "")))) (add-after 'unpack 'patch-docbook-xml (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "docs" diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 8ed1e3a944..79d2930101 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -790,7 +790,7 @@ useful for C++.") (define-public python-pygobject (package (name "python-pygobject") - (version "3.34.0") + (version "3.40.1") (source (origin (method url-fetch) @@ -799,7 +799,7 @@ useful for C++.") "/pygobject-" version ".tar.xz")) (sha256 (base32 - "06i7ynnbvgpz0gw09zsjbvhgcp5qz4yzdifw27qjwdazg2mckql7")) + "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0")) (modules '((guix build utils))) (snippet '(begin @@ -814,7 +814,8 @@ useful for C++.") (native-inputs `(("glib-bin" ,glib "bin") ("pkg-config" ,pkg-config) - ("python-pytest" ,python-pytest))) + ("python-pytest" ,python-pytest) + ("python-wrapper" ,python-wrapper))) ; For patching shebangs (inputs `(("python" ,python) ("python-pycairo" ,python-pycairo) @@ -1086,7 +1087,7 @@ Some codes examples can be find at: ("pkg-config" ,pkg-config))) (propagated-inputs `(("gcab" ,gcab) ; for .pc file - ("gdk-pixbuf" ,gdk-pixbuf) ; for .pc file + ("gdk-pixbuf" ,gdk-pixbuf+svg) ; for .pc file ("libuuid" ,util-linux "lib"))) ; for .pc file (inputs `(("glib" ,glib) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a311a379c..4df79bb442 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3063,7 +3063,7 @@ configuring CUPS.") #t))))) (propagated-inputs `(;; In Requires of libnotify.pc. - ("gdk-pixbuf" ,gdk-pixbuf) + ("gdk-pixbuf" ,gdk-pixbuf+svg) ("glib" ,glib))) (inputs `(("gtk+" ,gtk+) @@ -3286,11 +3286,11 @@ XML/CSS rendering engine.") ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser))) (inputs - `(("zlib" ,zlib) + `(("gdk-pixbuf" ,gdk-pixbuf) + ("zlib" ,zlib) ("bzip2" ,bzip2))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) + `(("glib" ,glib) ("libxml2" ,libxml2))) (home-page "https://www.gnome.org/projects/libgsf") (synopsis "GNOME's Structured File Library") @@ -3314,6 +3314,7 @@ dealing with different structured file formats.") (base32 "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp")))) (build-system gnu-build-system) + (outputs '("out" "debug")) (arguments `(#:configure-flags (list "--disable-static" @@ -3356,11 +3357,11 @@ dealing with different structured file formats.") ("libcroco" ,libcroco) ("bzip2" ,bzip2) ("libgsf" ,libgsf) + ("gdk-pixbuf" ,gdk-pixbuf) ("libxml2" ,libxml2))) (propagated-inputs ;; librsvg-2.0.pc refers to all of that. `(("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib))) (home-page "https://wiki.gnome.org/LibRsvg") (synopsis "Render SVG files using Cairo") @@ -3371,7 +3372,7 @@ library.") (define-public librsvg-next (package - (name "librsvg") + (name "librsvg-next") (version "2.50.3") (source (origin (method url-fetch) @@ -3386,7 +3387,7 @@ library.") '(begin (delete-file-recursively "vendor") #t)))) (build-system cargo-build-system) - (outputs '("out" "doc")) + (outputs '("out" "debug" "doc")) (arguments `(#:install-source? #f #:modules @@ -3535,6 +3536,7 @@ library.") `(("bzip2" ,bzip2) ("fontconfig" ,fontconfig) ("freetype" ,freetype) + ("gdk-pixbuf" ,gdk-pixbuf) ("harfbuzz" ,harfbuzz) ("libcroco" ,libcroco) ("libgsf" ,libgsf) @@ -3542,7 +3544,6 @@ library.") ("pango" ,pango))) (propagated-inputs `(("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib))) (synopsis "SVG rendering library") (description "Librsvg is a library to render SVG images to Cairo surfaces. @@ -5445,7 +5446,7 @@ service via the system message bus.") ;; gweather-3.0.pc refers to GTK+, GDK-Pixbuf, GLib/GObject, libxml, and ;; libsoup. `(("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf) + ("gdk-pixbuf" ,gdk-pixbuf+svg) ("libxml2" ,libxml2) ("libsoup" ,libsoup) ("geocode-glib" ,geocode-glib))) @@ -5710,7 +5711,7 @@ throughout GNOME for API documentation).") ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib) - ("gdk-pixbuf" ,gdk-pixbuf) + ("gdk-pixbuf" ,gdk-pixbuf+svg) ("libx11" ,libx11) ("libxext" ,libxext) ("libxfixes" ,libxfixes) @@ -7383,7 +7384,7 @@ to display dialog boxes from the commandline and shell scripts.") ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these: ("atk" ,atk) ("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf) + ("gdk-pixbuf" ,gdk-pixbuf+svg) ("glib" ,glib) ("json-glib" ,json-glib) ("libinput" ,libinput) @@ -10483,7 +10484,7 @@ photo-booth-like software, such as Cheese.") ("clutter-gst" ,clutter-gst) ("clutter-gtk" ,clutter-gtk) ("libcanberra" ,libcanberra) - ("gdk-pixbuf" ,gdk-pixbuf) + ("gdk-pixbuf" ,gdk-pixbuf+svg) ("glib" ,glib) ("gstreamer" ,gstreamer))) (inputs diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index ebd89a2009..127945fdc3 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -262,7 +262,7 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.2.29") + (version "2.2.30") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version @@ -270,7 +270,7 @@ compatible to GNU Pth.") (patches (search-patches "gnupg-default-pinentry.patch")) (sha256 (base32 - "1j8cpp08zlz9a9n4g9z6352m1bvl369r94p4pjg8z0948pdprl1r")))) + "1111ry31gaxv76miqsy6l0kwxwlx8sz0jk41jhyrjwx649p6sqyc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -299,14 +299,12 @@ compatible to GNU Pth.") (substitute* "scd/scdaemon.c" (("\"(libpcsclite\\.so[^\"]*)\"" _ name) (string-append "\"" (assoc-ref inputs "pcsc-lite") - "/lib/" name "\""))) - #t)) + "/lib/" name "\""))))) (add-after 'build 'patch-scheme-tests (lambda _ (substitute* (find-files "tests" ".\\.scm$") (("/usr/bin/env gpgscm") - (string-append (getcwd) "/tests/gpgscm/gpgscm"))) - #t)) + (string-append (getcwd) "/tests/gpgscm/gpgscm"))))) (add-before 'build 'patch-test-paths (lambda _ (substitute* '("tests/inittests" @@ -318,8 +316,7 @@ compatible to GNU Pth.") (substitute* "common/t-exectool.c" (("/bin/cat") (which "cat")) (("/bin/true") (which "true")) - (("/bin/false") (which "false"))) - #t))))) + (("/bin/false") (which "false")))))))) (home-page "https://gnupg.org/") (synopsis "GNU Privacy Guard") (description diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index c734d0c74e..1b3e114f4b 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -37,9 +37,11 @@ #:use-module (guix build-system trivial) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages aidc) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages cdrom) #:use-module (gnu packages curl) @@ -49,6 +51,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -57,16 +60,22 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages image-processing) #:use-module (gnu packages iso-codes) #:use-module (gnu packages java) #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages maths) #:use-module (gnu packages mp3) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages music) #:use-module (gnu packages ncurses) + #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ocr) #:use-module (gnu packages perl) + #:use-module (gnu packages photo) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages qt) #:use-module (gnu packages rdf) @@ -84,6 +93,8 @@ #:use-module (gnu packages telephony) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages vulkan) + #:use-module (gnu packages webkit) #:use-module (gnu packages assembly) #:use-module (gnu packages xml)) @@ -461,16 +472,16 @@ the GStreamer multimedia framework.") (define-public gstreamer (package (name "gstreamer") - (version "1.18.2") + (version "1.18.4") (source (origin - (method url-fetch) - (uri (string-append - "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-" - version ".tar.xz")) - (sha256 - (base32 - "0ijlmvr660m8zn09xlmnq1ajrziqsivp2hig5a9mabhcjx7ypkb6")))) + (method url-fetch) + (uri (string-append + "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-" + version ".tar.xz")) + (sha256 + (base32 + "1igv9l4hm21kp1jmlwlagzs7ly1vaxv1sbda29q8247372dwkvls")))) (build-system meson-build-system) (arguments `(#:phases @@ -487,24 +498,37 @@ the GStreamer multimedia framework.") (("tcase_add_test \\(tc_chain, test_stress_cleanup_unschedule.*") "") (("tcase_add_test \\(tc_chain, test_stress_reschedule.*") - "")) + "")) #t))) '())))) - (propagated-inputs `(("glib" ,glib))) ; required by gstreamer-1.0.pc. + (propagated-inputs + ;; In gstreamer-1.0.pc: + ;; Requires: glib-2.0, gobject-2.0 + ;; Requires.private: gmodule-no-export-2.0 libunwind libdw + `(("elfutils" ,elfutils) ; libdw + ("glib" ,glib) + ("libunwind" ,libunwind))) (native-inputs - `(("bison" ,bison) + `(("bash-completion" ,bash-completion) + ("bison" ,bison) ("flex" ,flex) + ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper))) + (inputs + `(("gmp" ,gmp) + ("libcap" ,libcap) + ;; For tests. + ("gsl" ,gsl))) (native-search-paths (list (search-path-specification (variable "GST_PLUGIN_SYSTEM_PATH") (files '("lib/gstreamer-1.0"))))) (home-page "https://gstreamer.freedesktop.org/") - (synopsis "Multimedia library") + (synopsis "Multimedia framework") (description "GStreamer is a library for constructing graphs of media-handling components. The applications it supports range from simple Ogg/Vorbis @@ -521,7 +545,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.18.2") + (version "1.18.4") (source (origin (method url-fetch) @@ -530,7 +554,7 @@ This package provides the core library and elements.") (patches (search-patches "gst-plugins-base-fix-id3v2-invalid-read.patch")) (sha256 (base32 - "1b05kg46azrxxvq42c71071lfsnc34pw4vynnkczdqi6g0gzn16x")))) + "08w3ivbc6n4vdds2ap6q7l8zdk9if8417nznyqidf0adm0lk5r99")))) (build-system meson-build-system) (propagated-inputs `(("glib" ,glib) ;required by gstreamer-sdp-1.0.pc @@ -544,6 +568,7 @@ This package provides the core library and elements.") '() `(("orc" ,orc))))) ;required by gstreamer-audio-1.0.pc (inputs + ;; TODO: Add libvorbisidec `(("cdparanoia" ,cdparanoia) ("pango" ,pango) ("libogg" ,libogg) @@ -554,25 +579,43 @@ This package provides the core library and elements.") ("libXext" ,libxext) ("libxv" ,libxv) ("alsa-lib" ,alsa-lib) - ;; XXX Don't build with opus on 32-bit systems: - ;; <https://bugs.gnu.org/32360> - ,@(if (target-64bit?) - `(("opus" ,opus)) - '()))) + ("opus" ,opus) + ("graphene" ,graphene) + ("iso-codes" ,iso-codes) + ("libgudev" ,libgudev) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libvisual" ,libvisual) + ("mesa" ,mesa) + ("wayland-protocols" ,wayland-protocols) + ("wayland" ,wayland))) (native-inputs - `(("pkg-config" ,pkg-config) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("python-wrapper" ,python-wrapper))) + `(("pkg-config" ,pkg-config) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("python-wrapper" ,python-wrapper) + ("gettext" ,gettext-minimal) + ("xorg-server" ,xorg-server-for-tests))) (arguments - `(#:configure-flags '("-Dgl=disabled") - #:phases + `(#:phases (modify-phases %standard-phases ,@%common-gstreamer-phases (add-before 'configure 'patch (lambda _ (substitute* "tests/check/libs/pbutils.c" (("/bin/sh") (which "sh"))) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") #t))))) (home-page "https://gstreamer.freedesktop.org/") (synopsis @@ -584,7 +627,7 @@ for the GStreamer multimedia library.") (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.18.2") + (version "1.18.4") (source (origin (method url-fetch) @@ -596,7 +639,7 @@ for the GStreamer multimedia library.") "gst-plugins-good-CVE-2021-3497.patch" "gst-plugins-good-CVE-2021-3498.patch")) (sha256 - (base32 "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp")))) + (base32 "1c1rpq709cy8maaykyn1n0kckj9c6fl3mhvixkk6xmdwkcx0xrdn")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas @@ -677,7 +720,7 @@ model to base your own plug-in on, here it is.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.18.2") + (version "1.18.4") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" @@ -685,10 +728,11 @@ model to base your own plug-in on, here it is.") (patches (search-patches "gst-plugins-bad-fix-overflow.patch")) (sha256 (base32 - "06ildd4rl6cynirv3p00d2ddf5is9svj4i7mkahldzhq24pq5mca")))) + "0py8k4pbalm9mxkpjbjxis0gp7g74wg5g4yax5q8rccmany0ds3l")))) (build-system meson-build-system) (arguments - `(#:phases + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases ,@%common-gstreamer-phases ,@(if (string-prefix? "arm" (or (%current-target-system) @@ -713,6 +757,10 @@ model to base your own plug-in on, here it is.") (string-append "'GST_PLUGIN_SYSTEM_PATH_1_0', '" gst-plugins-good "/lib/gstreamer-1.0'")) + ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1136 + ((".*elements/msdkh264enc\\.c.*") "") + ((".*elements/svthevcenc\\.c.*") "") + ;; FIXME: Why is this failing. ((".*elements/dash_mpd\\.c.*") "") @@ -721,61 +769,130 @@ model to base your own plug-in on, here it is.") ((".*elements/curlhttpsrc\\.c.*") "") ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412 ((".*elements/dtls\\.c.*") "")) - #t)))))) + #t))) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t))))) (propagated-inputs - `(("gst-plugins-base" ,gst-plugins-base))) + `(("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gst-plugins-good" ,gst-plugins-good) ;for tests + ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python))) + ("python" ,python-wrapper) + ("xorg-server" ,xorg-server-for-tests))) (inputs - ;; XXX: The following dependencies are missing: - ;; vo-amrwbenc, vo-aacenc, bs2b, chromaprint, directfb, daala, libdts, - ;; faac, flite, libgsm, libde265, libmms, libmimic, mjpegtools, - ;; mpeg2enc, libofa, opencv, openh264, openni2, libtimemmgr, wildmidi, - ;; openspc, gme, sbc, schroedinger, zbar, librtmp, spandsp `(("bluez" ,bluez) + ("bzip2" ,bzip2) + ("cairo" ,cairo) + ;; ("ccextractor" ,ccextractor) + ("chromaprint" ,chromaprint) ("curl" ,curl) + ("directfb" ,directfb) + ;;("dssim" ,dssim) + ("faac" ,faac) ("faad2" ,faad2) + ("flite" ,flite) ("fluidsynth" ,fluidsynth) + ("glib" ,glib) + ("glib-networking" ,glib-networking) + ("glu" ,glu) + ("gsm" ,gsm) ("gtk+" ,gtk+) + ("iqa" ,iqa) ("ladspa" ,ladspa) + ("lcms" ,lcms) + ("libaom" ,libaom) ("libass" ,libass) + ("libbs2b" ,libbs2b) + ("libdc1394" ,libdc1394) + ("libdca" ,libdca) + ("libde265" ,libde265) + ("libdrm" ,libdrm) ("libdvdnav" ,libdvdnav) ("libdvdread" ,libdvdread) + ("libexif" ,libexif) + ("libfdk" ,libfdk) ("libgcrypt" ,libgcrypt) + ("libgme" ,libgme) ("libgudev" ,libgudev) ("libkate" ,libkate) + ("libmfx" ,mediasdk) + ("libmms" ,libmms) ("libmodplug" ,libmodplug) + ("libmpcdec" ,libmpcdec) ("libnice" ,libnice) + ("libofa" ,libofa) + ("libopenmpt" ,libopenmpt) ("librsvg" ,librsvg) ("libsndfile" ,libsndfile) ("libsrtp" ,libsrtp) ("libssh2" ,libssh2) + ("libtiff" ,libtiff) ("libusb" ,libusb) + ("libva" ,libva) ("libvdpau" ,libvdpau) ("libwebp" ,libwebp) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxext" ,libxext) + ("libxkbcommon" ,libxkbcommon) ("libxml2" ,libxml2) + ("libxshm" ,libxshmfence) + ("lilv" ,lilv) ("lrdf" ,lrdf) + ("lv2" ,lv2) ("mesa" ,mesa) + ("mjpegtools" ,mjpegtools) ("neon" ,neon) + ("nettle" ,nettle) ("openal" ,openal) + ;; ("opencv" ,opencv) ("openexr" ,openexr) + ("openh264" ,openh264) ("openjpeg" ,openjpeg) + ;; ("openni2" ,openni2) + ("opensles" ,opensles) ("openssl" ,openssl) ("opus" ,opus) ("orc" ,orc) - ;("qtbase" ,qtbase-5) - ;("qtdeclarative" ,qtdeclarative) - ;("qtx11extras" ,qtx11extras) + ("pango" ,pango) + ("rtmp" ,rtmpdump) + ("sbc" ,sbc) + ("sctp" ,lksctp-tools) ("soundtouch" ,soundtouch) - ;; GStreamer is not yet compatible with srt > 1.4.1. - ("srt" ,srt-1.4.1) + ("spandsp" ,spandsp) + ("srt" ,srt) + ("svthevcenc" ,svt-hevc) + ("tinyalsa" ,tinyalsa) + ("transcode" ,transcode) + ("v4l" ,v4l-utils) + ("voaacenc", vo-aacenc) + ("voamrwbenc" ,vo-amrwbenc) + ("vulkan-headers" ,vulkan-headers) + ("vulkan-loader" ,vulkan-loader) ("x265" ,x265) - ("webrtc-audio-processing" ,webrtc-audio-processing) - ("wayland" ,wayland))) + ("wayland" ,wayland) + ("webrtcdsp" ,webrtc-audio-processing) + ("wildmidi" ,wildmidi) + ("wpebackend-fdo" ,wpebackend-fdo) + ;; ("wpewebkit" ,wpewebkit) + ("zbar" ,zbar) + ("zxing" ,zxing-cpp))) (home-page "https://gstreamer.freedesktop.org/") (synopsis "Plugins for the GStreamer multimedia library") (description @@ -786,7 +903,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.18.2") + (version "1.18.4") (source (origin (method url-fetch) @@ -795,7 +912,7 @@ par compared to the rest.") name "/" name "-" version ".tar.xz")) (patches (search-patches "gst-plugins-ugly-fix-out-of-bound-reads.patch")) (sha256 - (base32 "1nwbcv5yaib3d8icvyja3zf6lyjf5zf1hndbijrhj8j7xlia0dx3")))) + (base32 "0g6i4db1883q3j0l2gdv46fcqwiiaw63n6mhvsfcms1i1p7g1391")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas @@ -846,7 +963,7 @@ think twice about shipping them.") (define-public gst-libav (package (name "gst-libav") - (version "1.18.2") + (version "1.18.4") (source (origin (method url-fetch) @@ -856,7 +973,7 @@ think twice about shipping them.") name "-" version ".tar.xz")) (patches (search-patches "gst-libav-64channels-stack-corruption.patch")) (sha256 - (base32 "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in")))) + (base32 "15n3x3vhshqa3icw93g4vqmqd46122anzqvfxwn6q8famlxlcjil")))) (build-system meson-build-system) (native-inputs `(("perl" ,perl) @@ -877,7 +994,7 @@ decoders, muxers, and demuxers provided by FFmpeg.") (define-public gst-editing-services (package (name "gst-editing-services") - (version "1.18.2") + (version "1.18.4") (source (origin (method url-fetch) (uri (string-append @@ -885,15 +1002,21 @@ decoders, muxers, and demuxers provided by FFmpeg.") "gst-editing-services-" version ".tar.xz")) (sha256 (base32 - "0pv2k8zlpn3vv2sdlspi3m63ixcwzi90pjly2ypbkg59ab97rb15")))) + "010xg960qsh5dwmf0y9l1q13h0cymmrgapzla2zsw66ylxqbi1s6")))) (build-system meson-build-system) (arguments ;; FIXME: 16/22 failing tests. `(#:tests? #f + #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:phases (modify-phases %standard-phases ,@%common-gstreamer-phases))) + (propagated-inputs + `(("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base))) (inputs - `(("gst-plugins-base" ,gst-plugins-base) + `(("glib" ,glib) + ("glib-networking" ,glib-networking) + ("gtk+" ,gtk+) ("libxml2" ,libxml2))) (native-inputs `(("flex" ,flex) @@ -903,7 +1026,7 @@ decoders, muxers, and demuxers provided by FFmpeg.") ("gst-plugins-good" ,gst-plugins-good) ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python))) + ("python" ,python-wrapper))) (home-page "https://gstreamer.freedesktop.org/") (synopsis "GStreamer library for non-linear editors") (description diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7a2bd55f36..905dd9f1d7 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> -;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2021 Simon Streit <simon@netpanic.org> ;;; @@ -560,67 +560,75 @@ highlighting and other features typical of a source code editor.") (define-public gdk-pixbuf (package - (name "gdk-pixbuf") - (version "2.40.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (patches (search-patches "gdk-pixbuf-CVE-2020-29385.patch")) - (sha256 - (base32 - "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm")))) - (build-system meson-build-system) - (arguments - `(#:configure-flags '("-Dinstalled_tests=false") - #:phases - (modify-phases %standard-phases - (add-after - 'unpack 'disable-failing-tests - (lambda _ - (substitute* "tests/meson.build" - ;; XXX FIXME: This test fails on armhf machines with: - ;; SKIP Not enough memory to load bitmap image - ;; ERROR: cve-2015-4491 - too few tests run (expected 4, got 2) - ((".*'cve-2015-4491'.*") "") - ;; XXX FIXME: This test fails with: - ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag: - ;; assertion failed (error == NULL): Data differ - ;; (gdk-pixbuf-error-quark, 0) - ((".*'pixbuf-jpeg'.*") "")) - #t)) - ;; The slow tests take longer than the specified timeout. - ,@(if (any (cute string=? <> (%current-system)) - '("armhf-linux" "aarch64-linux")) - '((replace 'check - (lambda _ - (invoke "meson" "test" "--timeout-multiplier" "5")))) - '())))) - (propagated-inputs - `(;; Required by gdk-pixbuf-2.0.pc - ("glib" ,glib) - ("libpng" ,libpng) - ;; Used for testing and required at runtime. - ("shared-mime-info" ,shared-mime-info))) - (inputs - `(("libjpeg" ,libjpeg-turbo) - ("libtiff" ,libtiff) - ("libx11" ,libx11))) - (native-inputs + (name "gdk-pixbuf") + (version "2.40.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (patches (search-patches "gdk-pixbuf-CVE-2020-29385.patch")) + (sha256 + (base32 + "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm")))) + (build-system meson-build-system) + (outputs '("out" "debug")) + (arguments + `(#:configure-flags '("-Dinstalled_tests=false") + #:modules ((guix build meson-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "tests/meson.build" + ;; XXX FIXME: This test fails on armhf machines with: + ;; SKIP Not enough memory to load bitmap image + ;; ERROR: cve-2015-4491 - too few tests run (expected 4, got 2) + ((".*'cve-2015-4491'.*") "") + ;; XXX FIXME: This test fails with: + ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag: + ;; assertion failed (error == NULL): Data differ + ;; (gdk-pixbuf-error-quark, 0) + ((".*'pixbuf-jpeg'.*") "")))) + (replace 'shrink-runpath + ;; Workaround until core-updates is merged (this is fixed in commit + ;; ca080b3efb). + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (apply (assoc-ref %standard-phases 'shrink-runpath) + `(,@args #:outputs ,(alist-delete "debug" outputs))))) + ;; The slow tests take longer than the specified timeout. + ,@(if (any (cute string=? <> (%current-system)) + '("armhf-linux" "aarch64-linux")) + '((replace 'check + (lambda _ + (invoke "meson" "test" "--timeout-multiplier" "5")))) + '())))) + (propagated-inputs + `( ;; Required by gdk-pixbuf-2.0.pc + ("glib" ,glib) + ("libpng" ,libpng) + ;; Used for testing and required at runtime. + ("shared-mime-info" ,shared-mime-info))) + (inputs + `(("libjpeg" ,libjpeg-turbo) + ("libtiff" ,libtiff) + ("libx11" ,libx11))) + (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. - (synopsis "GNOME image loading and manipulation library") - (description - "GdkPixbuf is a library for image loading and manipulation developed + (synopsis "GNOME image loading and manipulation library") + (description + "GdkPixbuf is a library for image loading and manipulation developed in the GNOME project.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/gdk-pixbuf/"))) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/gdk-pixbuf/"))) ;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends -;; on gdk-pixbuf, so this new varibale. Also, librsvg adds 90MiB to the +;; on gdk-pixbuf, so this new variable. Also, librsvg adds 90MiB to the ;; closure size. (define-public gdk-pixbuf+svg (package/inherit gdk-pixbuf @@ -629,24 +637,21 @@ in the GNOME project.") `(("librsvg" ,librsvg) ,@(package-inputs gdk-pixbuf))) (arguments - '(#:configure-flags '("-Dinstalled-tests=false") - #:tests? #f ; tested by the gdk-pixbuf package already - #:phases - (modify-phases %standard-phases - (add-after 'install 'register-svg-loader - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (librsvg (assoc-ref inputs "librsvg")) - (loaders - (append - (find-files out "^libpixbufloader-.*\\.so$") - (find-files librsvg "^libpixbufloader-.*\\.so$"))) - (gdk-pixbuf-query-loaders - (string-append out "/bin/gdk-pixbuf-query-loaders"))) - (apply invoke - gdk-pixbuf-query-loaders - "--update-cache" - loaders))))))) + (substitute-keyword-arguments (package-arguments gdk-pixbuf) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'register-svg-loader + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (librsvg (assoc-ref inputs "librsvg")) + (loaders + (append + (find-files out "^libpixbufloader-.*\\.so$") + (find-files librsvg "^libpixbufloader-.*\\.so$"))) + (gdk-pixbuf-query-loaders + (string-append out "/bin/gdk-pixbuf-query-loaders"))) + (apply invoke gdk-pixbuf-query-loaders + "--update-cache" loaders)))))))) (synopsis "GNOME image loading and manipulation library, with SVG support"))) @@ -792,7 +797,7 @@ is part of the GNOME accessibility project.") "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" "gtk2-theme-paths.patch")))) (build-system gnu-build-system) - (outputs '("out" "bin" "doc")) + (outputs '("out" "bin" "doc" "debug")) (propagated-inputs `(("atk" ,atk) ("gdk-pixbuf" ,gdk-pixbuf+svg) @@ -1461,7 +1466,7 @@ printing and other features typical of a source code editor.") (define-public python-pycairo (package (name "python-pycairo") - (version "1.19.1") + (version "1.20.0") (source (origin (method url-fetch) @@ -1469,7 +1474,7 @@ printing and other features typical of a source code editor.") version "/pycairo-" version ".tar.gz")) (sha256 (base32 - "111fav9m1iagw3nh2ws2vzkjh34r97yl7rdlpvsngsqg521k251c")))) + "1326aa2ybhhhrvz3n4p22z5sic25m016ddb5yq0hvbprnw6a35an")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 564cd77ecb..5bb9bc9004 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -50,6 +50,7 @@ ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2020 David Dashyan <mail@davie.li> ;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net> +;;; Copyright © 2021 Solene Rapenne <solene@perso.pw> ;;; Copyright © 2021 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru> ;;; @@ -2175,7 +2176,7 @@ module.") (define-public e2fsprogs (package (name "e2fsprogs") - (version "1.45.6") + (version "1.46.2") (source (origin (method url-fetch) (uri (string-append @@ -2184,7 +2185,7 @@ module.") "e2fsprogs-" version ".tar.xz")) (sha256 (base32 - "0mj2yizwygs7xww8jfy5mxjn8ww4pvc0b1hg1p2vsnirailsx9zz")))) + "0s216nn0lv7s278v933a44fv1ibi900c94743gpp2kn9jlr0kai3")))) (build-system gnu-build-system) (inputs `(("util-linux" ,util-linux "lib"))) (native-inputs `(("pkg-config" ,pkg-config) @@ -2888,7 +2889,7 @@ Linux-based operating systems.") (define-public libcap (package (inherit libcap-2.31) - (version "2.45") + (version "2.46") (source (origin (method url-fetch) (uri (string-append @@ -2896,7 +2897,7 @@ Linux-based operating systems.") "libcap2/libcap-" version ".tar.xz")) (sha256 (base32 - "11ijmi7jik9iw6pdszc6bylhggghr8cza03bcrbhbqf0cpvkjrnn")))) + "1d6q447wf0iagiyzhfdqcj4cv0dmzc49i0czwikrcv7s2cad3lsf")))) (arguments (substitute-keyword-arguments (package-arguments libcap-2.31) ((#:phases phases) @@ -5187,7 +5188,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.55") + (version "5.59") (source (origin (method url-fetch) (uri (string-append @@ -5195,7 +5196,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "124v9s4y1s7s6klx5vlmzpk1jlr4x84ch7r7scm7x2f42dqp2qw8")))) + "05kk8zdh3msf5j88jbai8m877rvya6fpkzhicfhv5gyhhsrrasq4")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -5240,6 +5241,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") #t)))))) (native-inputs `(("pkg-config" ,pkg-config) + ("rst2man" ,python-docutils) ("gettext" ,gettext-minimal))) (inputs `(("glib" ,glib) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index a867fe1d94..915c19fb3c 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2020 Jean-Baptiste Note <jean-baptiste.note@m4x.org> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> +;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> diff --git a/gnu/packages/patches/farstream-gupnp.patch b/gnu/packages/patches/farstream-gupnp.patch new file mode 100644 index 0000000000..f46170ab26 --- /dev/null +++ b/gnu/packages/patches/farstream-gupnp.patch @@ -0,0 +1,140 @@ +From e70dcd0a9f89efbdaa011c20737ad550635ea580 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com> +Date: Tue, 20 Oct 2020 19:51:22 -0400 +Subject: [PATCH] rawudp-upnp test: Also build against new GUPnP 1.2 library if + present + +Update the configure test to match +--- + configure.ac | 17 +++++++++++++++++ + tests/check/Makefile.am | 7 +++---- + tests/check/transmitter/rawudp-upnp.c | 16 ++++++++++++++-- + tests/check/transmitter/rawudp.c | 4 ++-- + 4 files changed, 36 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 03afc96b..1efed132 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -370,8 +370,25 @@ fi + + if test "x$HAVE_GUPNP" = "xyes"; then + AC_DEFINE(HAVE_GUPNP,,[Have the GUPnP IGD library]) ++ ++ PKG_CHECK_MODULES(GUPNP_CORE, [ gupnp-1.2 ], ++ [ HAVE_GUPNP_CORE_12=yes ], ++ [ HAVE_GUPNP_CORE_12=no ++ PKG_CHECK_MODULES(GUPNP_CORE, [ gupnp-1.0 ], ++ [ HAVE_GUPNP_CORE_10=yes ], ++ [ HAVE_GUPNP_CORE_10=no ]) ++ ]) ++ ++ if test "x$HAVE_GUPNP_CORE_10" = "xyes"; then ++ AC_DEFINE(HAVE_GUPNP_CORE_10,,[Have the GUPnP 1.0 library]) ++ fi ++ ++ if test "x$HAVE_GUPNP_CORE_12" = "xyes"; then ++ AC_DEFINE(HAVE_GUPNP_CORE_12,,[Have the GUPnP 1.2 library]) ++ fi + fi + ++ + dnl build static plugins or not + AC_MSG_CHECKING([whether to build static plugins or not]) + AC_ARG_ENABLE( +diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am +index d50fc264..d21687d7 100644 +--- a/tests/check/Makefile.am ++++ b/tests/check/Makefile.am +@@ -76,9 +76,9 @@ base_fscodec_SOURCES = \ + + + transmitter_rawudp_CFLAGS = $(AM_CFLAGS) \ +- $(GUPNP_CFLAGS) $(GIO_CFLAGS) $(NICE_CFLAGS) ++ $(GUPNP_CORE_CFLAGS) $(GIO_CFLAGS) $(NICE_CFLAGS) + transmitter_rawudp_LDADD = $(LDADD) \ +- $(GUPNP_LIBS) \ ++ $(GUPNP_CORE_LIBS) \ + $(GIO_LIBS) \ + $(NICE_LIBS) + transmitter_rawudp_SOURCES = \ +@@ -113,9 +113,8 @@ transmitter_nice_SOURCES = \ + transmitter_nice_LDADD = $(LDADD) $(GST_BASE_LIBS) + + +-transmitter_shm_CFLAGS = $(AM_CFLAGS) $(GUPNP_CFLAGS) $(NICE_CFLAGS) ++transmitter_shm_CFLAGS = $(AM_CFLAGS) $(NICE_CFLAGS) + transmitter_shm_LDADD = $(LDADD) \ +- $(GUPNP_LIBS) \ + $(NICE_LIBS) + transmitter_shm_SOURCES = \ + check-threadsafe.h \ +diff --git a/tests/check/transmitter/rawudp-upnp.c b/tests/check/transmitter/rawudp-upnp.c +index 4818cd28..9ccf85d8 100644 +--- a/tests/check/transmitter/rawudp-upnp.c ++++ b/tests/check/transmitter/rawudp-upnp.c +@@ -37,7 +37,7 @@ get_vars (gboolean *out_got_address, + } + + +-#ifdef HAVE_GUPNP ++#if defined(HAVE_GUPNP_CORE_10) || defined(HAVE_GUPNP_CORE_12) + + #include <libgupnp/gupnp.h> + +@@ -126,8 +126,14 @@ start_upnp_server (void) + GUPnPDeviceInfo *subdev1; + GUPnPDeviceInfo *subdev2; + const gchar *upnp_xml_path; ++ GError *gerr = NULL; + +- context = gupnp_context_new (NULL, NULL, 0, NULL); ++#ifdef HAVE_GUPNP_CORE_12 ++ context = gupnp_context_new (NULL, 0, &gerr); ++#else ++ context = gupnp_context_new (NULL, NULL, 0, &gerr); ++#endif ++ g_assert_no_error (gerr); + ts_fail_if (context == NULL, "Can't get gupnp context"); + + if (g_getenv ("UPNP_XML_PATH")) +@@ -137,8 +143,14 @@ start_upnp_server (void) + + gupnp_context_host_path (context, upnp_xml_path, ""); + ++#ifdef HAVE_GUPNP_CORE_12 ++ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", ++ upnp_xml_path, &gerr); ++ g_assert_no_error (gerr); ++#else + dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", + upnp_xml_path); ++#endif + ts_fail_if (dev == NULL, "could not get root dev"); + + subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev), +diff --git a/tests/check/transmitter/rawudp.c b/tests/check/transmitter/rawudp.c +index e1936ac0..d803f347 100644 +--- a/tests/check/transmitter/rawudp.c ++++ b/tests/check/transmitter/rawudp.c +@@ -637,7 +637,7 @@ GST_START_TEST (test_rawudptransmitter_stop_stream) + } + GST_END_TEST; + +-#ifdef HAVE_GUPNP ++#if defined(HAVE_GUPNP_CORE_10) || defined (HAVE_GUPNP_CORE_12) + + GST_START_TEST (test_rawudptransmitter_run_upnp_discovery) + { +@@ -967,7 +967,7 @@ rawudptransmitter_suite (void) + tcase_add_test (tc_chain, test_rawudptransmitter_stop_stream); + suite_add_tcase (s, tc_chain); + +-#ifdef HAVE_GUPNP ++#if defined(HAVE_GUPNP_CORE_10) || defined (HAVE_GUPNP_CORE_12) + if (g_getenv ("UPNP")) { + gchar *multicast_addr; + +-- +GitLab + diff --git a/gnu/packages/patches/json-c-CVE-2020-12762.patch b/gnu/packages/patches/json-c-CVE-2020-12762.patch deleted file mode 100644 index 80daa475e9..0000000000 --- a/gnu/packages/patches/json-c-CVE-2020-12762.patch +++ /dev/null @@ -1,193 +0,0 @@ -https://github.com/json-c/json-c/pull/608 -https://github.com/json-c/json-c/commit/5d6fa331418d49f1bd488553fd1cfa9ab023fabb.patch - -From 5d6fa331418d49f1bd488553fd1cfa9ab023fabb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org> -Date: Thu, 14 May 2020 12:32:30 +0200 -Subject: [PATCH] Fix CVE-2020-12762. - -This commit is a squashed backport of the following commits -on the master branch: - - * 099016b7e8d70a6d5dd814e788bba08d33d48426 - * 77d935b7ae7871a1940cd827e850e6063044ec45 - * d07b91014986900a3a75f306d302e13e005e9d67 - * 519dfe1591d85432986f9762d41d1a883198c157 - * a59d5acfab4485d5133114df61785b1fc633e0c6 - * 26f080997d41cfdb17beab65e90c82217d0ac43b ---- - arraylist.c | 3 +++ - linkhash.c | 9 ++++++++- - printbuf.c | 18 ++++++++++++++++-- - tests/test4.c | 29 +++++++++++++++++++++++++++++ - tests/test4.expected | 1 + - 5 files changed, 57 insertions(+), 3 deletions(-) - -diff --git a/arraylist.c b/arraylist.c -index 12ad8af6d3..e5524aca75 100644 ---- a/arraylist.c -+++ b/arraylist.c -@@ -136,6 +136,9 @@ int array_list_del_idx(struct array_list *arr, size_t idx, size_t count) - { - size_t i, stop; - -+ /* Avoid overflow in calculation with large indices. */ -+ if (idx > SIZE_T_MAX - count) -+ return -1; - stop = idx + count; - if (idx >= arr->length || stop > arr->length) - return -1; -diff --git a/linkhash.c b/linkhash.c -index 7ea58c0abf..b021ef10b0 100644 ---- a/linkhash.c -+++ b/linkhash.c -@@ -12,6 +12,7 @@ - - #include "config.h" - -+#include <assert.h> - #include <limits.h> - #include <stdarg.h> - #include <stddef.h> -@@ -499,6 +500,8 @@ struct lh_table *lh_table_new(int size, lh_entry_free_fn *free_fn, lh_hash_fn *h - int i; - struct lh_table *t; - -+ /* Allocate space for elements to avoid divisions by zero. */ -+ assert(size > 0); - t = (struct lh_table *)calloc(1, sizeof(struct lh_table)); - if (!t) - return NULL; -@@ -578,8 +581,12 @@ int lh_table_insert_w_hash(struct lh_table *t, const void *k, const void *v, con - unsigned long n; - - if (t->count >= t->size * LH_LOAD_FACTOR) -- if (lh_table_resize(t, t->size * 2) != 0) -+ { -+ /* Avoid signed integer overflow with large tables. */ -+ int new_size = (t->size > INT_MAX / 2) ? INT_MAX : (t->size * 2); -+ if (t->size == INT_MAX || lh_table_resize(t, new_size) != 0) - return -1; -+ } - - n = h % t->size; - -diff --git a/printbuf.c b/printbuf.c -index 976c12dde5..f9b15b1191 100644 ---- a/printbuf.c -+++ b/printbuf.c -@@ -15,6 +15,7 @@ - - #include "config.h" - -+#include <limits.h> - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -@@ -66,9 +67,16 @@ static int printbuf_extend(struct printbuf *p, int min_size) - if (p->size >= min_size) - return 0; - -- new_size = p->size * 2; -- if (new_size < min_size + 8) -+ /* Prevent signed integer overflows with large buffers. */ -+ if (min_size > INT_MAX - 8) -+ return -1; -+ if (p->size > INT_MAX / 2) - new_size = min_size + 8; -+ else { -+ new_size = p->size * 2; -+ if (new_size < min_size + 8) -+ new_size = min_size + 8; -+ } - #ifdef PRINTBUF_DEBUG - MC_DEBUG("printbuf_memappend: realloc " - "bpos=%d min_size=%d old_size=%d new_size=%d\n", -@@ -83,6 +91,9 @@ static int printbuf_extend(struct printbuf *p, int min_size) - - int printbuf_memappend(struct printbuf *p, const char *buf, int size) - { -+ /* Prevent signed integer overflows with large buffers. */ -+ if (size > INT_MAX - p->bpos - 1) -+ return -1; - if (p->size <= p->bpos + size + 1) - { - if (printbuf_extend(p, p->bpos + size + 1) < 0) -@@ -100,6 +111,9 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len) - - if (offset == -1) - offset = pb->bpos; -+ /* Prevent signed integer overflows with large buffers. */ -+ if (len > INT_MAX - offset) -+ return -1; - size_needed = offset + len; - if (pb->size < size_needed) - { -diff --git a/tests/test4.c b/tests/test4.c -index bd964ec789..288cec1792 100644 ---- a/tests/test4.c -+++ b/tests/test4.c -@@ -3,12 +3,15 @@ - */ - - #include "config.h" -+#include <assert.h> - #include <stdio.h> -+#include <stdlib.h> - #include <string.h> - - #include "json_inttypes.h" - #include "json_object.h" - #include "json_tokener.h" -+#include "snprintf_compat.h" - - void print_hex(const char *s) - { -@@ -24,6 +27,29 @@ void print_hex(const char *s) - putchar('\n'); - } - -+static void test_lot_of_adds(void); -+static void test_lot_of_adds() -+{ -+ int ii; -+ char key[50]; -+ json_object *jobj = json_object_new_object(); -+ assert(jobj != NULL); -+ for (ii = 0; ii < 500; ii++) -+ { -+ snprintf(key, sizeof(key), "k%d", ii); -+ json_object *iobj = json_object_new_int(ii); -+ assert(iobj != NULL); -+ if (json_object_object_add(jobj, key, iobj)) -+ { -+ fprintf(stderr, "FAILED to add object #%d\n", ii); -+ abort(); -+ } -+ } -+ printf("%s\n", json_object_to_json_string(jobj)); -+ assert(json_object_object_length(jobj) == 500); -+ json_object_put(jobj); -+} -+ - int main(void) - { - const char *input = "\"\\ud840\\udd26,\\ud840\\udd27,\\ud800\\udd26,\\ud800\\udd27\""; -@@ -52,5 +78,8 @@ int main(void) - retval = 1; - } - json_object_put(parse_result); -+ -+ test_lot_of_adds(); -+ - return retval; - } -diff --git a/tests/test4.expected b/tests/test4.expected -index 68d4336d90..cb2744012b 100644 ---- a/tests/test4.expected -+++ b/tests/test4.expected -@@ -1,3 +1,4 @@ - input: "\ud840\udd26,\ud840\udd27,\ud800\udd26,\ud800\udd27" - JSON parse result is correct: 𠄦,𠄧,𐄦,𐄧 - PASS -+{ "k0": 0, "k1": 1, "k2": 2, "k3": 3, "k4": 4, "k5": 5, "k6": 6, "k7": 7, "k8": 8, "k9": 9, "k10": 10, "k11": 11, "k12": 12, "k13": 13, "k14": 14, "k15": 15, "k16": 16, "k17": 17, "k18": 18, "k19": 19, "k20": 20, "k21": 21, "k22": 22, "k23": 23, "k24": 24, "k25": 25, "k26": 26, "k27": 27, "k28": 28, "k29": 29, "k30": 30, "k31": 31, "k32": 32, "k33": 33, "k34": 34, "k35": 35, "k36": 36, "k37": 37, "k38": 38, "k39": 39, "k40": 40, "k41": 41, "k42": 42, "k43": 43, "k44": 44, "k45": 45, "k46": 46, "k47": 47, "k48": 48, "k49": 49, "k50": 50, "k51": 51, "k52": 52, "k53": 53, "k54": 54, "k55": 55, "k56": 56, "k57": 57, "k58": 58, "k59": 59, "k60": 60, "k61": 61, "k62": 62, "k63": 63, "k64": 64, "k65": 65, "k66": 66, "k67": 67, "k68": 68, "k69": 69, "k70": 70, "k71": 71, "k72": 72, "k73": 73, "k74": 74, "k75": 75, "k76": 76, "k77": 77, "k78": 78, "k79": 79, "k80": 80, "k81": 81, "k82": 82, "k83": 83, "k84": 84, "k85": 85, "k86": 86, "k87": 87, "k88": 88, "k89": 89, "k90": 90, "k91": 91, "k92": 92, "k93": 93, "k94": 94, "k95": 95, "k96": 96, "k97": 97, "k98": 98, "k99": 99, "k100": 100, "k101": 101, "k102": 102, "k103": 103, "k104": 104, "k105": 105, "k106": 106, "k107": 107, "k108": 108, "k109": 109, "k110": 110, "k111": 111, "k112": 112, "k113": 113, "k114": 114, "k115": 115, "k116": 116, "k117": 117, "k118": 118, "k119": 119, "k120": 120, "k121": 121, "k122": 122, "k123": 123, "k124": 124, "k125": 125, "k126": 126, "k127": 127, "k128": 128, "k129": 129, "k130": 130, "k131": 131, "k132": 132, "k133": 133, "k134": 134, "k135": 135, "k136": 136, "k137": 137, "k138": 138, "k139": 139, "k140": 140, "k141": 141, "k142": 142, "k143": 143, "k144": 144, "k145": 145, "k146": 146, "k147": 147, "k148": 148, "k149": 149, "k150": 150, "k151": 151, "k152": 152, "k153": 153, "k154": 154, "k155": 155, "k156": 156, "k157": 157, "k158": 158, "k159": 159, "k160": 160, "k161": 161, "k162": 162, "k163": 163, "k164": 164, "k165": 165, "k166": 166, "k167": 167, "k168": 168, "k169": 169, "k170": 170, "k171": 171, "k172": 172, "k173": 173, "k174": 174, "k175": 175, "k176": 176, "k177": 177, "k178": 178, "k179": 179, "k180": 180, "k181": 181, "k182": 182, "k183": 183, "k184": 184, "k185": 185, "k186": 186, "k187": 187, "k188": 188, "k189": 189, "k190": 190, "k191": 191, "k192": 192, "k193": 193, "k194": 194, "k195": 195, "k196": 196, "k197": 197, "k198": 198, "k199": 199, "k200": 200, "k201": 201, "k202": 202, "k203": 203, "k204": 204, "k205": 205, "k206": 206, "k207": 207, "k208": 208, "k209": 209, "k210": 210, "k211": 211, "k212": 212, "k213": 213, "k214": 214, "k215": 215, "k216": 216, "k217": 217, "k218": 218, "k219": 219, "k220": 220, "k221": 221, "k222": 222, "k223": 223, "k224": 224, "k225": 225, "k226": 226, "k227": 227, "k228": 228, "k229": 229, "k230": 230, "k231": 231, "k232": 232, "k233": 233, "k234": 234, "k235": 235, "k236": 236, "k237": 237, "k238": 238, "k239": 239, "k240": 240, "k241": 241, "k242": 242, "k243": 243, "k244": 244, "k245": 245, "k246": 246, "k247": 247, "k248": 248, "k249": 249, "k250": 250, "k251": 251, "k252": 252, "k253": 253, "k254": 254, "k255": 255, "k256": 256, "k257": 257, "k258": 258, "k259": 259, "k260": 260, "k261": 261, "k262": 262, "k263": 263, "k264": 264, "k265": 265, "k266": 266, "k267": 267, "k268": 268, "k269": 269, "k270": 270, "k271": 271, "k272": 272, "k273": 273, "k274": 274, "k275": 275, "k276": 276, "k277": 277, "k278": 278, "k279": 279, "k280": 280, "k281": 281, "k282": 282, "k283": 283, "k284": 284, "k285": 285, "k286": 286, "k287": 287, "k288": 288, "k289": 289, "k290": 290, "k291": 291, "k292": 292, "k293": 293, "k294": 294, "k295": 295, "k296": 296, "k297": 297, "k298": 298, "k299": 299, "k300": 300, "k301": 301, "k302": 302, "k303": 303, "k304": 304, "k305": 305, "k306": 306, "k307": 307, "k308": 308, "k309": 309, "k310": 310, "k311": 311, "k312": 312, "k313": 313, "k314": 314, "k315": 315, "k316": 316, "k317": 317, "k318": 318, "k319": 319, "k320": 320, "k321": 321, "k322": 322, "k323": 323, "k324": 324, "k325": 325, "k326": 326, "k327": 327, "k328": 328, "k329": 329, "k330": 330, "k331": 331, "k332": 332, "k333": 333, "k334": 334, "k335": 335, "k336": 336, "k337": 337, "k338": 338, "k339": 339, "k340": 340, "k341": 341, "k342": 342, "k343": 343, "k344": 344, "k345": 345, "k346": 346, "k347": 347, "k348": 348, "k349": 349, "k350": 350, "k351": 351, "k352": 352, "k353": 353, "k354": 354, "k355": 355, "k356": 356, "k357": 357, "k358": 358, "k359": 359, "k360": 360, "k361": 361, "k362": 362, "k363": 363, "k364": 364, "k365": 365, "k366": 366, "k367": 367, "k368": 368, "k369": 369, "k370": 370, "k371": 371, "k372": 372, "k373": 373, "k374": 374, "k375": 375, "k376": 376, "k377": 377, "k378": 378, "k379": 379, "k380": 380, "k381": 381, "k382": 382, "k383": 383, "k384": 384, "k385": 385, "k386": 386, "k387": 387, "k388": 388, "k389": 389, "k390": 390, "k391": 391, "k392": 392, "k393": 393, "k394": 394, "k395": 395, "k396": 396, "k397": 397, "k398": 398, "k399": 399, "k400": 400, "k401": 401, "k402": 402, "k403": 403, "k404": 404, "k405": 405, "k406": 406, "k407": 407, "k408": 408, "k409": 409, "k410": 410, "k411": 411, "k412": 412, "k413": 413, "k414": 414, "k415": 415, "k416": 416, "k417": 417, "k418": 418, "k419": 419, "k420": 420, "k421": 421, "k422": 422, "k423": 423, "k424": 424, "k425": 425, "k426": 426, "k427": 427, "k428": 428, "k429": 429, "k430": 430, "k431": 431, "k432": 432, "k433": 433, "k434": 434, "k435": 435, "k436": 436, "k437": 437, "k438": 438, "k439": 439, "k440": 440, "k441": 441, "k442": 442, "k443": 443, "k444": 444, "k445": 445, "k446": 446, "k447": 447, "k448": 448, "k449": 449, "k450": 450, "k451": 451, "k452": 452, "k453": 453, "k454": 454, "k455": 455, "k456": 456, "k457": 457, "k458": 458, "k459": 459, "k460": 460, "k461": 461, "k462": 462, "k463": 463, "k464": 464, "k465": 465, "k466": 466, "k467": 467, "k468": 468, "k469": 469, "k470": 470, "k471": 471, "k472": 472, "k473": 473, "k474": 474, "k475": 475, "k476": 476, "k477": 477, "k478": 478, "k479": 479, "k480": 480, "k481": 481, "k482": 482, "k483": 483, "k484": 484, "k485": 485, "k486": 486, "k487": 487, "k488": 488, "k489": 489, "k490": 490, "k491": 491, "k492": 492, "k493": 493, "k494": 494, "k495": 495, "k496": 496, "k497": 497, "k498": 498, "k499": 499 } diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index a5b5442f29..78b52a44f8 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si> -;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1525,7 +1525,7 @@ manipulating PDF documents from the command line. It supports ("glib" ,glib) ("pango" ,pango))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf) + `(("gdk-pixbuf" ,gdk-pixbuf+svg) ("python-cairocffi" ,python-cairocffi) ("python-cairosvg" ,python-cairosvg) ("python-cffi" ,python-cffi) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 639d33fb60..62207822ea 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org> +;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,7 +50,7 @@ #:use-module (gnu packages avahi) #:use-module (gnu packages boost) #:use-module (gnu packages check) - #:use-module (gnu packages dbm) + #:use-module (gnu packages databases) #:use-module (gnu packages glib) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) @@ -191,7 +192,7 @@ rates.") (define-public pulseaudio (package (name "pulseaudio") - (version "14.0") + (version "14.2") (source (origin (method url-fetch) (uri (string-append @@ -199,7 +200,7 @@ rates.") name "-" version ".tar.xz")) (sha256 (base32 - "0qf20rgg0ysrnvg3359j56ndls07qmfn5rsy9r85bc42jdfpfd58")) + "1wb6zyln49ca93rl9id8r873b2sb8l79122ck824kr0s5isgglvm")) (modules '((guix build utils))) (snippet ;; Disable console-kit support by default since it's deprecated @@ -212,14 +213,20 @@ rates.") (patches (search-patches "pulseaudio-fix-mult-test.patch" "pulseaudio-longer-test-timeout.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments - `(#:configure-flags (list "--localstatedir=/var" ;"--sysconfdir=/etc" - "--disable-oss-output" - "--enable-bluez5" - (string-append "--with-udev-rules-dir=" - (assoc-ref %outputs "out") - "/lib/udev/rules.d")) + `(#:configure-flags + (let ((out (assoc-ref %outputs "out"))) + (list "-Doss-output=disable" + "-Dbluez5=true" + "-Dlocalstatedir=/var" + (string-append "-Dudevrulesdir=" + out "/lib/udev/rules.d") + ;; Ensure the RUNPATH contains all installed library locations. + (string-append "-Dc_link_args=-Wl,-rpath=" + out "/lib/pulseaudio:" + out "/lib:" + out "/lib/pulse-" ,version "/modules"))) #:phases (modify-phases %standard-phases (add-before 'check 'pre-check (lambda _ @@ -231,7 +238,6 @@ rates.") (setenv "CK_DEFAULT_TIMEOUT" "120") #t))))) (inputs - ;; TODO: Add optional inputs (GTK+?). `(("alsa-lib" ,alsa-lib) ("bluez" ,bluez) ("sbc" ,sbc) @@ -260,9 +266,9 @@ rates.") ("perl-xml-parser" ,perl-xml-parser) ("pkg-config" ,pkg-config))) (propagated-inputs - ;; 'libpulse*.la' contain `-lgdbm' and `-lcap', so propagate them. + ;; 'libpulse*.la' contain `-ltdb' and `-lcap', so propagate them. `(("libcap" ,libcap) - ("gdbm" ,gdbm))) + ("tdb" ,tdb))) (home-page "http://www.pulseaudio.org/") (synopsis "Sound server") (description diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 14f5fdef54..03b83b188b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4017,14 +4017,14 @@ structure for Python.") (define-public python-docutils (package (name "python-docutils") - (version "0.16") + (version "0.17.1") (source (origin (method url-fetch) (uri (pypi-uri "docutils" version)) (sha256 (base32 - "1z3qliszqca9m719q3qhdkh0ghh90g500avzdgi7pl77x5h3mpn2")))) + "09gii36lp1bs26cpxqyfd20xahnpbrbjzcnba2xq08y3wk97frb8")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -4136,15 +4136,14 @@ text styles of documentation.") (define-public python-pygments (package (name "python-pygments") - (version "2.7.3") + (version "2.8.1") (source (origin (method url-fetch) (uri (pypi-uri "Pygments" version)) (sha256 (base32 - "05mps9r966r3dpqw6zrs1nlwjdf5y4960hl9m7abwb3qyfnarwyc")))) - (replacement python-pygments/fixed) + "153zyxigm879sk2n71lfv03y2pgxb7dl0dlsbwkz9aydxnkf2mi6")))) (build-system python-build-system) (arguments ;; FIXME: Tests require sphinx, which depends on this. @@ -4156,18 +4155,6 @@ text styles of documentation.") (license license:bsd-2) (properties `((python2-variant . ,(delay python2-pygments)))))) -(define python-pygments/fixed - (package - (inherit python-pygments) - (version "2.7.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Pygments" version)) - (sha256 - (base32 - "0dy35ry5qa8dpklk4fkj9kfpw2qb4mh5ha9866kw30wf96dx0jfz")))))) - ;; Pygments 2.6 and later does not support Python 2. (define-public python2-pygments (let ((base (package-with-python2 (strip-python2-variant python-pygments)))) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 73f94a3929..b181a31915 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1475,4 +1475,4 @@ move around." (package-inputs base-rust)))))) ;; TODO(staging): Bump this variable to the latest packaged rust. -(define-public rust rust-1.45) +(define-public rust rust-1.50) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 128bd95af8..f2afe763c5 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -115,7 +115,7 @@ joystick, and graphics hardware.") (define-public sdl2 (package (inherit sdl) (name "sdl2") - (version "2.0.12") + (version "2.0.14") (source (origin (method url-fetch) (uri @@ -123,7 +123,7 @@ joystick, and graphics hardware.") version ".tar.gz")) (sha256 (base32 - "0qy8wbqvfkb5ps8kxgaaf2zzpkjqbsw712hlp74znbn0jpv6i4il")))) + "1g1jahknv5r4yhh1xq5sf0md20ybdw1zh1i15lry26sq39bmn8fq")))) (arguments (substitute-keyword-arguments (package-arguments sdl) ((#:configure-flags flags) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index a7a3443707..27415c4431 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -56,14 +56,14 @@ (define-public python-sphinx (package (name "python-sphinx") - (version "3.3.1") + (version "3.5.2") (source (origin (method url-fetch) (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "0023vc2i29pjxmvdqbz1wdbi7gbj56y1br1b2z8h8wa44li5k38y")))) + "1zx5ik3rqbawyz52lidljqkdgv2418cwnl67jxf26sbb9g1gqb37")))) (build-system python-build-system) (arguments `(#:phases diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b6acebcecc..df10f3d5dc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -46,6 +46,7 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro> ;;; Copyright © 2020 Ivan Kozlov <kanichos@yandex.ru> ;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net> +;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2021 Alexey Abramov <levenson@mmer.org> ;;; Copyright © 2021 Andrew Tropin <andrew@trop.in> ;;; Copyright © 2021 David Wilson <david@daviwil.com> diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index 934a6d9e38..a14ca02e84 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>> ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ #:use-module (gnu packages bdw-gc) #:use-module (gnu packages compression) #:use-module (gnu packages gtk) + #:use-module (gnu packages image) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -40,7 +42,7 @@ (define-public w3m (package (name "w3m") - (version "0.5.3+git20200502") + (version "0.5.3+git20210102") (source (origin (method git-fetch) ;; Debian's fork of w3m is the only one that is still maintained. @@ -50,21 +52,22 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0yyfhwcwy1dvdbirj6zqwk4gl8z9npfavs0k7ipcg5fd16vnx7mi")))) + "0amq1wfjp5mhqjmvrc0yhxjlx1335p78d7ap8iykfjn5h8yhmrg5")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target ;; Use $EDITOR instead of a hard-coded value. - #:configure-flags '("--with-editor=") + #:configure-flags (list "--with-editor=" + "--with-imagelib=imlib2") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-perl (lambda _ (substitute* '("scripts/w3mmail.cgi.in" "scripts/dirlist.cgi.in") - (("@PERL@") (which "perl"))) - #t))))) + (("@PERL@") (which "perl")))))))) (inputs `(("gdk-pixbuf" ,gdk-pixbuf) + ("imlib2" ,imlib2) ("libgc" ,libgc) ("libx11" ,libx11) ("ncurses" ,ncurses) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 596d9f7f2b..3f78be7114 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro> +;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2021 Cage <cage-dev@twistfold.it> ;;; Copyright © 2021 Benoit Joly <benoit@benoitj.ca> ;;; Copyright © 2021 Alexander Krotov <krotov@iitp.ru> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d7bbd7489b..a0a512ca94 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1054,7 +1054,7 @@ data.") (define-public json-c (package (name "json-c") - (version "0.14") + (version "0.15") (source (origin (method url-fetch) (uri (string-append @@ -1062,8 +1062,7 @@ data.") version ".tar.gz")) (sha256 (base32 - "0w381krr99q5a2rypx4g437fa7gzgl82i64sgnrs6g5jr44dwxxk")) - (patches (search-patches "json-c-CVE-2020-12762.patch")))) + "1im484iz08j3gmzpw07v16brwq46pxxj65i996kkp2vivcfhmn5q")))) (build-system cmake-build-system) (home-page "https://github.com/json-c/json-c/wiki") (synopsis "JSON implementation in C") diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 8891170e10..4fc4a1d281 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2021 Michael Rohleder <mike@rohleder.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,7 +46,7 @@ (define-public wget (package (name "wget") - (version "1.20.3") + (version "1.21.1") (source (origin (method url-fetch) @@ -53,7 +54,7 @@ version ".tar.lz")) (sha256 (base32 - "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39")))) + "1bchzkacjsc5c0x01ngaana9fs5j12wfw1c8qxps1yp68x9vx6yv")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3b10573635..46cece7073 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Jean-Baptiste Note <jean-baptiste.note@m4x.org> +;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org> ;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> @@ -2473,7 +2474,7 @@ XC-APPGROUP, XTEST.") (define-public libevdev (package (name "libevdev") - (version "1.9.1") + (version "1.11.0") (source (origin (method url-fetch) @@ -2481,7 +2482,7 @@ XC-APPGROUP, XTEST.") name "-" version ".tar.xz")) (sha256 (base32 - "1jvsphdrs1i54ccjcn6ll26jy42am7h28lbsvwa6pmxgqm43qq7m")))) + "1l628xblk36vh7aqia1fw6hh62af7va0pd70h28112l5i4afmx33")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) |