From 17c26b7ec52b21f19234eaf160036ad400071eb0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Aug 2019 13:57:44 +0300 Subject: build/cargo-build-system: Move generate-all-checksums to cargo-utils. * guix/build/cargo-build-system.scm (generate-all-checksums): Move procedure ... * guix/build/cargo-utils.scm: ... to here. --- guix/build/cargo-build-system.scm | 15 --------------- guix/build/cargo-utils.scm | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 7d363a18a5..8aa9390457 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -40,21 +40,6 @@ ;; ;; Code: -;; TODO: Move this to (guix build cargo-utils). Will cause a full rebuild -;; of all rust compilers. - -(define (generate-all-checksums dir-name) - (for-each - (lambda (filename) - (let* ((dir (dirname filename)) - (checksum-file (string-append dir "/.cargo-checksum.json"))) - (when (file-exists? checksum-file) (delete-file checksum-file)) - (display (string-append - "patch-cargo-checksums: generate-checksums for " - dir "\n")) - (generate-checksums dir))) - (find-files dir-name "Cargo.toml$"))) - (define (manifest-targets) "Extract all targets from the Cargo.toml manifest" (let* ((port (open-input-pipe "cargo read-manifest")) diff --git a/guix/build/cargo-utils.scm b/guix/build/cargo-utils.scm index 79e5440378..5ac429a62a 100644 --- a/guix/build/cargo-utils.scm +++ b/guix/build/cargo-utils.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Ivan Petkov +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +23,8 @@ #:use-module (guix build utils) #:use-module (ice-9 popen) #:use-module (ice-9 rdelim) - #:export (generate-checksums)) + #:export (generate-checksums + generate-all-checksums)) ;; Commentary: ;; @@ -66,3 +68,15 @@ the same directory." (display "},\"package\":" port) (write (file-sha256 "/dev/null") port) (display "}" port))))) + +(define (generate-all-checksums dir-name) + (for-each + (lambda (filename) + (let* ((dir (dirname filename)) + (checksum-file (string-append dir "/.cargo-checksum.json"))) + (when (file-exists? checksum-file) (delete-file checksum-file)) + (display (string-append + "patch-cargo-checksums: generate-checksums for " + dir "\n")) + (generate-checksums dir))) + (find-files dir-name "Cargo.toml$"))) -- cgit v1.2.3 From e80a447976ce7784db1cb2dc9e99a42b58ea1b6c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Aug 2019 14:00:46 +0300 Subject: gnu: gnuzilla: Use 'generate-all-checksums'. * gnu/packages/gnuzilla.scm (icecat)[arguments]: During custom 'patch-cargo-checksums phase, replace call to 'generate-checksums' with call to 'generate-all-checksums'. --- gnu/packages/gnuzilla.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ff382b2388..eec66b15c9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 ng0 @@ -743,7 +743,7 @@ from forcing GEXP-PROMISE." ;; "--with-system-png" ) - #:imported-modules ,%cargo-utils-modules ;for `generate-checksums' + #:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums' #:modules ((ice-9 ftw) (ice-9 rdelim) @@ -843,15 +843,7 @@ from forcing GEXP-PROMISE." (substitute* '("Cargo.lock" "servo/Cargo.lock") (("(\"checksum .* = )\".*\"" all name) (string-append name "\"" null-hash "\""))) - (for-each - (lambda (filename) - (delete-file filename) - (let ((dir (dirname filename))) - (display (string-append - "patch-cargo-checksums: generate-checksums for " - dir "\n")) - (generate-checksums dir))) - (find-files "third_party/rust" ".cargo-checksum.json"))) + (generate-all-checksums "third_party/rust")) #t)) (add-before 'configure 'augment-CPLUS_INCLUDE_PATH (lambda* (#:key build inputs #:allow-other-keys) -- cgit v1.2.3 From e07b04882a621f0e78ec9cc81071722529530290 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Aug 2019 14:04:31 +0300 Subject: gnu: rust: Use 'generate-all-checksums'. * gnu/packages/rust.scm (rust@1.19)[arguments]: During custom 'patch-cargo-checksums phase, replace call to 'generate-checksums' with call to 'generate-all-checksums'. (rust@1.32)[arguments]: Same. --- gnu/packages/rust.scm | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b4c50437f7..584c48a699 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Nikolai Merinov -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2019 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2019 Ivan Petkov @@ -196,7 +196,7 @@ safety and thread safety guarantees.") (properties '((timeout . 72000) ;20 hours (max-silent-time . 18000))) ;5 hours (for armel) (arguments - `(#:imported-modules ,%cargo-utils-modules ;for `generate-checksums' + `(#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums' #:modules ((guix build utils) (ice-9 match) (guix build gnu-build-system)) #:phases (modify-phases %standard-phases @@ -273,16 +273,7 @@ test = { path = \"../libtest\" } (substitute* "src/Cargo.lock" (("(\"checksum .* = )\".*\"" all name) (string-append name "\"" ,%cargo-reference-hash "\""))) - (for-each - (lambda (filename) - (use-modules (guix build cargo-utils)) - (delete-file filename) - (let* ((dir (dirname filename))) - (display (string-append - "patch-cargo-checksums: generate-checksums for " - dir "\n")) - (generate-checksums dir))) - (find-files "src/vendor" ".cargo-checksum.json")) + (generate-all-checksums "src/vendor") #t)) ;; This phase is overridden by newer versions. (replace 'configure @@ -978,16 +969,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (substitute* "Cargo.lock" (("(\"checksum .* = )\".*\"" all name) (string-append name "\"" ,%cargo-reference-hash "\""))) - (for-each - (lambda (filename) - (use-modules (guix build cargo-utils)) - (delete-file filename) - (let* ((dir (dirname filename))) - (display (string-append - "patch-cargo-checksums: generate-checksums for " - dir "\n")) - (generate-checksums dir))) - (find-files "vendor" ".cargo-checksum.json")) + (generate-all-checksums "vendor") #t)) (add-after 'enable-codegen-tests 'override-jemalloc (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From 4585859f33983e793f33b76e29f0d375220ee270 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 14 Aug 2019 12:09:03 +0300 Subject: gnu: rust: Fix building. This is a follow-up to e07b04882a621f0e78ec9cc81071722529530290. * gnu/packages/rust.scm (rust@1.19, rust@1.32)[arguments]: When using functions from (guix build cargo-utils), make sure to include said module in that build phase. --- gnu/packages/rust.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 584c48a699..7f0e5e5cb6 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -270,6 +270,7 @@ test = { path = \"../libtest\" } #t)) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda* _ + (use-modules (guix build cargo-utils)) (substitute* "src/Cargo.lock" (("(\"checksum .* = )\".*\"" all name) (string-append name "\"" ,%cargo-reference-hash "\""))) @@ -966,6 +967,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; root of the rust tarball (replace 'patch-cargo-checksums (lambda* _ + (use-modules (guix build cargo-utils)) (substitute* "Cargo.lock" (("(\"checksum .* = )\".*\"" all name) (string-append name "\"" ,%cargo-reference-hash "\""))) -- cgit v1.2.3 From 7fe021b48499a93e5b471bcd6573439242af3e0b Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 15 Aug 2019 15:35:48 +0200 Subject: gnu: vulkan-headers: Update to 1.1.119. * gnu/packages/vulkan.scm (vulkan-headers): Update to 1.1.119. [arguments]: Remove unnecessary phases. * gnu/packages/vulkan.scm (vulkan-loader): Update hash. * gnu/packages/vulkan.scm (vulkan-tools): Update hash. --- gnu/packages/vulkan.scm | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 0b3d476fa2..f9cb9954b8 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -159,7 +159,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.114") + (version "1.1.119") (source (origin (method git-fetch) @@ -169,7 +169,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka")))) + "158df0a8kfh5gyixv7kb5n1yp1qx891g0c1fcj22bb82kp1pz3f3")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. @@ -193,7 +193,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "1rkm6dzdzxva62shscipz3kpp66x4kgmwvp1ski2fvf4jzzcbv7h")))) + "0asqyhj2cff1551rbx7lcl0rkyxn16bf6ja9ra8dc6gp8bj04d2g")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". @@ -203,28 +203,6 @@ interpretation of the specifications for these languages.") (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)) - ;; Make sure that the files needed for Mesa's Vulkan overlay are availabe. - (add-after 'unpack 'copy-headers1 - (lambda* (#:key outputs #:allow-other-keys) - (install-file "tests/layers/vk_layer_data.h" - (string-append (assoc-ref %outputs "out") - "/include/vulkan")) - (install-file "tests/layers/vk_layer_extension_utils.h" - (string-append (assoc-ref %outputs "out") - "/include/vulkan")) - (install-file "loader/vk_loader_platform.h" - (string-append (assoc-ref %outputs "out") - "/include/vulkan")) - #t)) - (add-after 'build 'copy-headers2 - (lambda* (#:key outputs #:allow-other-keys) - (install-file "vk_layer_dispatch_table.h" - (string-append (assoc-ref %outputs "out") - "/include/vulkan")) - (install-file "vk_dispatch_table_helper.h" - (string-append (assoc-ref %outputs "out") - "/include/vulkan")) #t))) #:configure-flags (list "-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest' submodule. @@ -266,7 +244,7 @@ and the ICD.") (file-name (git-file-name name version)) (sha256 (base32 - "1lz06mpni8ghf1xcxi4g6ck306lfaqwfi6f1w64kp9hczmvapfhf")))) + "0q1nlcw28yf88dbbhncmsc9b0sz3jz0cjap94qn63m18nrphfzsg")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) -- cgit v1.2.3 From 47406a929058d11330a6833adafe5513cdd25b5c Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 15 Aug 2019 15:36:12 +0200 Subject: gnu: mesa: Remove unnecessary inputs. * gnu/packages/gl.scm (mesa)[native-inputs]: Remove unnecessary inputs. --- gnu/packages/gl.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index a2658a6789..8a3a1f1bd8 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -272,9 +272,7 @@ also known as DXTn or DXTC) for Mesa.") ("gettext" ,gettext-minimal) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `(("glslang" ,glslang) - ("vulkan-headers" ,vulkan-headers) - ("vulkan-loader" ,vulkan-loader))) + `(("glslang" ,glslang))) (_ `())) ("pkg-config" ,pkg-config) -- cgit v1.2.3 From 23cbc6b61ef6611a915adb400e04fc6d961ae609 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 15 Aug 2019 16:21:23 +0200 Subject: gnu: libinput: Update to 1.14.0. * gnu/packages/freedesktop.scm (libinput): Update to 1.14.0. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9cfdbca3fb..a0cf2c8cbf 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -152,14 +152,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.13.4") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk")))) + "0rzw2kx06ywc19lwf147f474xav7w83h28k0afy822wjz0j5rf3w")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) -- cgit v1.2.3 From 3e93b2bdeb449063f9c00aaeba23ec7c4499b138 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 11:35:39 +0300 Subject: gnu: qt: Update to 5.12.4. * gnu/packages/qt.scm (qt, qtbase, qtsvg, qtimageformats, qtx11extras, qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors, qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel, qtwebglplugin, qtwebview, qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech): Update to 5.12.4. (qt, qtbase)[source]: Remove xkbcommon from list of directories to remove. (qtbase)[source]: Remove upstreamed patch. (python-sip): Update to 4.19.18. [source]: Update to new source uri. (python-pyqt): Update to 5.12.3. [source]: Update to new source uri. * gnu/packages/patches/qtbase-old-kernel.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/qtbase-old-kernel.patch | 25 ----- gnu/packages/qt.scm | 155 +++++++++++++-------------- 3 files changed, 76 insertions(+), 105 deletions(-) delete mode 100644 gnu/packages/patches/qtbase-old-kernel.patch diff --git a/gnu/local.mk b/gnu/local.mk index e4730aafcd..abb4c7a84f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1252,7 +1252,6 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-CVE-2018-16872.patch \ %D%/packages/patches/qemu-CVE-2019-6778.patch \ %D%/packages/patches/qt4-ldflags.patch \ - %D%/packages/patches/qtbase-old-kernel.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ diff --git a/gnu/packages/patches/qtbase-old-kernel.patch b/gnu/packages/patches/qtbase-old-kernel.patch deleted file mode 100644 index aa26fb6c4f..0000000000 --- a/gnu/packages/patches/qtbase-old-kernel.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://672856.bugs.gentoo.org/attachment.cgi?id=557978 -https://bugs.gentoo.org/672856 - -The patch fixes building qtbase with linux kernels < 4.11. -See bug #34431. - -diff -Naurp a/src/corelib/global/minimum-linux_p.h b/src/corelib/global/minimum-linux_p.h ---- a/src/corelib/global/minimum-linux_p.h 2018-11-25 15:51:11.000000000 +0300 -+++ b/src/corelib/global/minimum-linux_p.h 2018-12-17 13:25:38.176823753 +0300 -@@ -75,14 +75,9 @@ QT_BEGIN_NAMESPACE - * - accept4 2.6.28 - * - renameat2 3.16 QT_CONFIG(renameat2) - * - getrandom 3.17 QT_CONFIG(getentropy) -- * - statx 4.11 QT_CONFIG(statx) - */ - --#if QT_CONFIG(statx) --# define MINLINUX_MAJOR 4 --# define MINLINUX_MINOR 11 --# define MINLINUX_PATCH 0 --#elif QT_CONFIG(getentropy) -+#if QT_CONFIG(getentropy) - # define MINLINUX_MAJOR 3 - # define MINLINUX_MINOR 17 - # define MINLINUX_PATCH 0 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index daef46faf6..f3e4fa58b1 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -123,7 +123,7 @@ system, and the core design of Django is reused in Grantlee.") (define-public qt (package (name "qt") - (version "5.11.3") + (version "5.12.4") (outputs '("out" "examples")) (source (origin (method url-fetch) @@ -136,7 +136,7 @@ system, and the core design of Django is reused in Grantlee.") version ".tar.xz")) (sha256 (base32 - "0kgzy32s1fr22fxxfhcyncfryb3qxrznlr737r4y5khk4xj1g545")) + "1q95sjyldm2p5xvqn0f52fin0q5axy982nqd3289jxcqwh75xnl5")) (modules '((guix build utils))) (snippet '(begin @@ -154,7 +154,7 @@ system, and the core design of Django is reused in Grantlee.") (delete-file-recursively (string-append "qtbase/src/3rdparty/" dir))) (list "double-conversion" "freetype" "harfbuzz-ng" "libpng" "libjpeg" "pcre2" "sqlite" "xcb" - "xkbcommon" "zlib")) + "zlib")) (for-each (lambda (dir) (delete-file-recursively dir)) @@ -513,7 +513,7 @@ system, and the core design of Django is reused in Grantlee.") (define-public qtbase (package (name "qtbase") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -522,10 +522,9 @@ system, and the core design of Django is reused in Grantlee.") version ".tar.xz")) (sha256 (base32 - "071yc9iz14qs4s8yvrwllyfdzp5yjxsdpvbjxdrf0g5q69vqigy6")) + "158i0apc3i8bbgrk9j1k34y2b03v0kwwv8m7aaaxpxsglppwgyr0")) ;; Use TZDIR to avoid depending on package "tzdata". - (patches (search-patches "qtbase-use-TZDIR.patch" - "qtbase-old-kernel.patch")) + (patches (search-patches "qtbase-use-TZDIR.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 @@ -534,7 +533,7 @@ system, and the core design of Django is reused in Grantlee.") (for-each delete-file-recursively (list "double-conversion" "freetype" "harfbuzz-ng" "libpng" "libjpeg" "pcre2" "sqlite" "xcb" - "xkbcommon" "zlib")) + "zlib")) #t))))) (build-system gnu-build-system) (propagated-inputs @@ -753,7 +752,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -762,7 +761,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32 - "14a4rprbj9f9rhixbk7143xdz34d7d39xh9v2sc1w43q9sf2rsi1")))) + "010drs2dv573fgbswnj83yrdxnj3lbcha4y4xgjm1ikkb98i420i")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -828,7 +827,7 @@ HostData=lib/qt5 (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -837,7 +836,7 @@ HostData=lib/qt5 version ".tar.xz")) (sha256 (base32 - "0zq8igsjyyhxsjr43vpaasrqjw3x0g6rwqf8kaz7y9vs7ny63ch4")) + "1cvv62r28ld5f0ipvahxv81bj8ik2m819x20pln1f3d9xv1jbvid")) (modules '((guix build utils))) (snippet '(begin @@ -859,7 +858,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -868,7 +867,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) version ".tar.xz")) (sha256 (base32 - "11fd2mc20qmnyv1vqhaqad2q6m0i4lmkr432rmqvpkgphpkfp7pr")))) + "07mfkfgj02z7fb1swx5nmih3i979kpriwr8jprywl0aamyg01k29")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -883,7 +882,7 @@ from within Qt 5."))) (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -892,7 +891,7 @@ from within Qt 5."))) version ".tar.xz")) (sha256 (base32 - "1vhfvgi39miqsx3iq7c9sii2sykq0yfng69b70i0smr20zihpl4b")))) + "0rjniwgid8ypzfx33di5bprn8r3sk4zcqxa3xp5nb3wlpccigshb")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -912,7 +911,7 @@ xmlpatternsvalidator."))) (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -921,7 +920,7 @@ xmlpatternsvalidator."))) version ".tar.xz")) (sha256 (base32 - "1rhsf9bma2zwwpixk2fsg31x7c1pmsk144npypgc9w86swhkc9lf")))) + "19yd38q8r30jjw12wjrf6i8ygi9lk4fg7zil3gc6g787fgnhahb1")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -944,7 +943,7 @@ with JavaScript and C++."))) (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -953,7 +952,7 @@ with JavaScript and C++."))) version ".tar.xz")) (sha256 (base32 - "0amks3qad31i7cha85kvcaxvlmmgkc3gm4jdkw2p02ixxfygr30l")))) + "1vvkn6k4qiyyrd3m3c7fj6qiq0fw32wvd7sn1zl15blz5cj0b7bl")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -968,7 +967,7 @@ with Bluetooth and NFC."))) (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -977,7 +976,7 @@ with Bluetooth and NFC."))) version ".tar.xz")) (sha256 (base32 - "1ffmapfy68xwwbxbg19ng6b5h8v42cf78s21j7rgq49gm70r0402")))) + "1giaxcvwv0mvxb2iapvdfiz128j0hjw3pi9vzi8irll6yjifswdl")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -995,7 +994,7 @@ consume data received from the server, or both."))) (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1004,7 +1003,7 @@ consume data received from the server, or both."))) version ".tar.xz")) (sha256 (base32 - "0n88c8xi9pbyh7q1pcqv4yjv6nx62abflj8qgfr4qzb0sp8m6mx7")))) + "1af0mv22yqdi93c2r36ajiax1yv89nk8qdj1xgb0h04nlmz3r1wm")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -1028,7 +1027,7 @@ recognition API for devices."))) (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1037,7 +1036,7 @@ recognition API for devices."))) version ".tar.xz")) (sha256 (base32 - "0h9wx86zj20n4xc3qnml0i360x2dc1yd2z2af1flj8fwyzppi03j")) + "0ga26g832i8srpm99bzmxynlgf70zzp5p8vi1fqq096adymmj1vw")) (modules '((guix build utils))) (snippet '(begin @@ -1079,7 +1078,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1088,7 +1087,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) version ".tar.xz")) (sha256 (base32 - "1chz4wchgkzd45h143i5hkqg0whcgdbj37gkg7j4kj31whllzjb2")) + "1dz6fj768yn75mn35av0k8925bx15g0qazar9h9qfxljqdcykb9g")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -1131,7 +1130,7 @@ compositor libraries."))) (define-public qtserialport (package (inherit qtsvg) (name "qtserialport") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1140,7 +1139,7 @@ compositor libraries."))) version ".tar.xz")) (sha256 (base32 - "1nkbfsxzgicwns3k11hhzjxy2hgrigj8xcw2by0jc1j71mnmxi4n")))) + "0fddn217q0cpk6p0c0z4ir4lrvqpbfkmfaw40gqxsbpvm7w7sj5z")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase) @@ -1165,7 +1164,7 @@ interacting with serial ports from within Qt."))) (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1174,7 +1173,7 @@ interacting with serial ports from within Qt."))) version ".tar.xz")) (sha256 (base32 - "0vf12jk1ma0v0dlpliw1x9i04iaik1kjkiaby7gaxm2abprxwr2n")))) + "1z0iccn2lk80qjkvlhv33plgld9q6xnz9s2h0xkkxq9yyh2nkmb9")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -1186,7 +1185,7 @@ and others."))) (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1195,7 +1194,7 @@ and others."))) version ".tar.xz")) (sha256 (base32 - "1wrdawlqvcw84h8q52mvbjhp1vkd6fhz6c8ijlg9rw0s3fj4y99w")))) + "1dzx7f9aa7zq46d7xhhchp233m4qv7zxdf56w5mshqcyd4dilmxb")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1210,7 +1209,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1219,7 +1218,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) version ".tar.xz")) (sha256 (base32 - "0wqz8lycmi7pffzy0pz5960w109lbk4mkbw0l1lh64avl6clq7b9")))) + "0rijdn20bqkx9f73y8pvam1878anaynf6nv0asxjk031jfca0vvm")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1245,7 +1244,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (define-public qtwebview (package (inherit qtsvg) (name "qtwebview") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1254,7 +1253,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) version ".tar.xz")) (sha256 (base32 - "1njmn1n03dp4md8cz58cq2z6bsxd8nwlw0238zmavh7px3jzc9kh")))) + "0pasmcr6xdlbgi4gdkkm4w5ba00r71vyibsw7hyx1nadfxmlq90z")))) (native-inputs `(("perl" ,perl))) (inputs @@ -1268,7 +1267,7 @@ native APIs where it makes sense."))) (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1277,7 +1276,7 @@ native APIs where it makes sense."))) version ".tar.xz")) (sha256 (base32 - "1sq0f41jwmsimv9a1wl2nk5nifjppm5j92rr4n4s7qwnnjjrir2q")))) + "185k53qsaqcv280602p92vaddsfxf4frqk4gp4zsvzkrfsyl0yqj")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1298,7 +1297,7 @@ positioning and geolocation plugins."))) (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1307,7 +1306,7 @@ positioning and geolocation plugins."))) version ".tar.xz")) (sha256 (base32 - "13lzdxxi02yhvx4mflhisl6aqv2fiss5m804cqccd1wvp8dyh1f2")))) + "1dkfpmhpymaagvlybqq7s7bix0gqzsa5zbpfp56wvh59c0w3a3iv")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1326,7 +1325,7 @@ that helps in Qt development."))) (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1335,7 +1334,7 @@ that helps in Qt development."))) version ".tar.xz")) (sha256 (base32 - "027cvggbcvwyz76cn1bl1zvqg0nq7iica1b7yx7xyy0hb36g715v")) + "0sibbhq88jni850jw7anwnvmykzm1w5qbjkblbradirqfvkkznvs")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1350,7 +1349,7 @@ ECMAScript and Qt."))) (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1359,7 +1358,7 @@ ECMAScript and Qt."))) version ".tar.xz")) (sha256 (base32 - "0dvmy31qbl76yy0j5y8m7mvnmqyg2c01fmlkn0snvc5h5ah5skjf")))) + "0n4qvafpc828cyc7w931drhxrawgxijzbmr6mh5ppiipad8c5m1j")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1374,7 +1373,7 @@ can be used to build complete interfaces in Qt Quick."))) (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1383,7 +1382,7 @@ can be used to build complete interfaces in Qt Quick."))) version ".tar.xz")) (sha256 (base32 - "11nhpb0xckv5jjkqj5szr94c2rvyjwr89ch58hh64nsqaav30mpl")))) + "0c8343k1w6v4k96agp3x0xy3fh49ylbp6h5wwxxpv35w73npwi4s")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1399,7 +1398,7 @@ not available."))) (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1408,7 +1407,7 @@ not available."))) version ".tar.xz")) (sha256 (base32 - "1qjpdzkamf27cg5n1wsf0zk939lcgppgydfjzap9s4fxzj1nkn0l")))) + "0wyzkd5zx9qd3mwynkmxiin0fixaczb76lajhhcl2957iwb8phqb")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1454,7 +1453,7 @@ backend for QtQuick scene graph.") (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1463,7 +1462,7 @@ backend for QtQuick scene graph.") version ".tar.xz")) (sha256 (base32 - "1k222cx18zq48sfna91hmy427qzk2n2xz3dlyz59iyz72k6915g9")))) + "0iacdqa22dgvnp143klpzg5hxffy6fzqi5jn3r6liwhqzc86zpi5")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1484,7 +1483,7 @@ and mobile applications targeting TV-like form factors."))) (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1493,7 +1492,7 @@ and mobile applications targeting TV-like form factors."))) version ".tar.xz")) (sha256 (base32 - "1mv8mz36v34dckrzy5r41mq3sqznbalrhndk3avz2154xmkjf5qk")) + "1y6l18df3qj03lr58clsmgn2n38nrf0gr2g5bwkm3081c8mbfvv9")) (modules '((guix build utils))) (snippet '(begin @@ -1515,7 +1514,7 @@ also contains functionality to support data models and executable content."))) (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1524,7 +1523,7 @@ also contains functionality to support data models and executable content."))) version ".tar.xz")) (sha256 (base32 - "1fd0gxdj5mrh81iwimq1243i3n47sqv9ik8nslahfh0q3dsx7k8n")))) + "0whn45q8dgm7bz5lqxzjfg56xhz2bi3axl50h5nqs3ix0h8s213q")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1535,7 +1534,7 @@ purchasing goods and services."))) (define-public qtcanvas3d (package (inherit qtsvg) (name "qtcanvas3d") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1544,7 +1543,7 @@ purchasing goods and services."))) version ".tar.xz")) (sha256 (base32 - "0f110z7cmkzns9k00aa5zhzq2fpybfxkd7gdlwzcbhc8hn20986m")) + "0sbqrpx36x9filb693blwidgdqcxr88h8w5pky97l1rdajmfiq6p")) (modules '((guix build utils))) (snippet '(begin @@ -1574,7 +1573,7 @@ drawing calls from Qt Quick JavaScript."))) (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1583,7 +1582,7 @@ drawing calls from Qt Quick JavaScript."))) version ".tar.xz")) (sha256 (base32 - "1p4m1nkbbxlkwmbmasx5r83skzssmlcgfzyvj30x2dyrqkmz7627")))) + "17lwcsbx2n8a19q54za1pipispj68r77vn6d55s88xy31nl6izq6")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1601,7 +1600,7 @@ selecting one of the charts themes.") (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1610,7 +1609,7 @@ selecting one of the charts themes.") version ".tar.xz")) (sha256 (base32 - "1kqwr3avcvcyy4i28vjgxk1bsjj9011zr668hsk1zrjxnnwjwdl3")))) + "0nmids4gf6f03byyaav4mq6qhby6bfjzmr4axsm051hc8gmhw5hw")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1628,7 +1627,7 @@ customized by using themes or by adding custom items and labels to them.") (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1637,7 +1636,7 @@ customized by using themes or by adding custom items and labels to them.") version ".tar.xz")) (sha256 (base32 - "0dd35698wzg89975vi2ijl2lym495fjizsl03mjixsjnvb1x0q50")))) + "0mdz3pp3vzkz65i0cb62gnh7crng4k1a347yp5yjnnj0p13fn0g5")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1657,7 +1656,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1666,7 +1665,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) version ".tar.xz")) (sha256 (base32 - "1d3jzsxfyjhgb6wj9iv1388bv7j6pi08346nmkm1c1a4iykhc0zp")))) + "04zl2z1vffw7l831ginnv2dks1rn1glw4wc7c3q0pydz59w0rpal")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1690,7 +1689,7 @@ processes or computers."))) (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") - (version "5.11.3") + (version "5.12.4") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1699,7 +1698,7 @@ processes or computers."))) version ".tar.xz")) (sha256 (base32 - "158p7zqd0vg55gf88jzc3d4f7649ihh80k0m1q46m2yp6fpdjbxr")))) + "1v4h9g4s3xjy2hnf4shk40bnjqnv0jix34glc68kqrpmnc7ndy9g")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1722,16 +1721,15 @@ message."))) (define-public python-sip (package (name "python-sip") - (version "4.19.13") + (version "4.19.18") (source (origin (method url-fetch) - (uri - (string-append "mirror://sourceforge/pyqt/sip/" - "sip-" version "/sip-" version ".tar.gz")) + (uri (string-append "https://www.riverbankcomputing.com/static/" + "Downloads/sip/" version "/sip-" version ".tar.gz")) (sha256 (base32 - "0pniq03jk1n5bs90yjihw3s3rsmjd8m89y9zbnymzgwrcl2sflz3")))) + "07kyd56xgbb40ljb022rq82shgxprlbl0z27mpf1b6zd00w8dgf0")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-wrapper))) @@ -1784,17 +1782,16 @@ module provides support functions to the automatically generated code.") (define-public python-pyqt (package (name "python-pyqt") - (version "5.11.3") + (version "5.12.3") (source (origin (method url-fetch) - (uri - (string-append "mirror://sourceforge/pyqt/PyQt5/" - "PyQt-" version "/PyQt5_gpl-" - version ".tar.gz")) + (uri (string-append "https://www.riverbankcomputing.com/static/" + "Downloads/PyQt5/" version "/PyQt5_gpl-" + version ".tar.gz")) (sha256 (base32 - "0wqh4srqkcc03rvkwrcshaa028psrq58xkys6npnyhqxc0apvdf9")) + "041155bdzp57jy747p5d59740c55yy3241cy1x2lgcdsvqvzmc0d")) (patches (search-patches "pyqt-configure.patch" "pyqt-public-sip.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 65ff644e16d90cd8b355b6a03de1c91c6859704b Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 29 Aug 2019 15:39:05 +0200 Subject: gnu: libvdpau: Update to 1.3. * gnu/packages/video.scm (libvdpau): Update to 1.3. [source]: Switch to git-fetch. [build-system]: Switch to meson-build-system. --- gnu/packages/video.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1ebeb41aff..d6227973d8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2335,17 +2335,18 @@ and JACK.") (define-public libvdpau (package (name "libvdpau") - (version "1.2") + (version "1.3") (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.freedesktop.org/vdpau/libvdpau" - "/uploads/14b620084c027d546fa0b3f083b800c6/" - "libvdpau-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/vdpau/libvdpau.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "01ps6g6p6q7j2mjm9vn44pmzq3g75mm7mdgmnhb1qkjjdwc9njba")))) - (build-system gnu-build-system) + "1fb1nh5apr9kzx9bm2lysjwpyva1s60b2l2p230nqgvb11q25hd2")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 5ceb1a3da6e144d51e976df57c74c98a57d12a3a Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 29 Aug 2019 15:40:43 +0200 Subject: gnu: wayland-protocols: Update to 1.18. * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.18. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a0cf2c8cbf..ed3b2db0ee 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -582,7 +582,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.17") + (version "1.18") (source (origin (method url-fetch) (uri (string-append @@ -590,7 +590,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "wayland-protocols-" version ".tar.xz")) (sha256 (base32 - "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz")))) + "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx")))) (build-system gnu-build-system) (inputs `(("wayland" ,wayland))) -- cgit v1.2.3 From d111ae4f57ffe24686c4cfe79cf36fb768571b6e Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 29 Aug 2019 15:43:02 +0200 Subject: gnu: mesa: Update to 19.1.5. * gnu/packages/gl.scm (mesa): Update to 19.1.5. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 8a3a1f1bd8..2fa210fb37 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -224,7 +224,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.1.4") + (version "19.1.5") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1yvb7ja09i36zjifpyrf8jmbm9z0wqs2w3x8dlmxkkzdv6knilm6")) + "1d3frncljickn5yi2ch1w2phwxhxpi6diyac3cbin9f76m7f2m3v")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) -- cgit v1.2.3 From e01d384efcdaf564bbb221e43b81e087c8e2af06 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 11 Sep 2019 12:06:32 +0200 Subject: gnu: vulkan-headers: Update to 1.1.121. * gnu/packages/vulkan.scm (vulkan-headers): Update to 1.1.121. * gnu/packages/vulkan.scm (vulkan-loader): Update hash. * gnu/packages/vulkan.scm (vulkan-tools): Update hash. --- gnu/packages/vulkan.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index f9cb9954b8..d642100440 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -159,7 +159,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.119") + (version "1.1.121") (source (origin (method git-fetch) @@ -169,7 +169,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "158df0a8kfh5gyixv7kb5n1yp1qx891g0c1fcj22bb82kp1pz3f3")))) + "0hbgbdxj7lrm37phb0pkq5zgss3h21znj3mivnyva5f60i2wgr73")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. @@ -193,7 +193,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "0asqyhj2cff1551rbx7lcl0rkyxn16bf6ja9ra8dc6gp8bj04d2g")))) + "1gbrppfxrncvva30fikgzm7f15xs527sb4lf1sswdyxj3h5cw741")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". @@ -244,7 +244,7 @@ and the ICD.") (file-name (git-file-name name version)) (sha256 (base32 - "0q1nlcw28yf88dbbhncmsc9b0sz3jz0cjap94qn63m18nrphfzsg")))) + "1jndlz3n35zlz44p1b4cgl2alvsmgrqnkxdn5mpahg0zb8dgwmm8")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) -- cgit v1.2.3 From ad57da29ecef51179eab9b5d9a4b1a995711b1c5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 18:50:21 +0200 Subject: gnu: libwebp: Remove obsolete phase. * gnu/packages/image.scm (libwebp)[arguments]: Remove <#:phases>. --- gnu/packages/image.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0026e99f59..51b76162ef 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1131,11 +1131,7 @@ language bindings to VIGRA.") (arguments '(#:configure-flags '("--enable-libwebpmux" "--enable-libwebpdemux" - "--enable-libwebpdecoder") - #:phases (modify-phases %standard-phases - (add-after 'unpack 'bootstrap - (lambda _ - (invoke "autoreconf" "-vif")))))) + "--enable-libwebpdecoder"))) (home-page "https://developers.google.com/speed/webp/") (synopsis "Lossless and lossy image compression") (description -- cgit v1.2.3 From a5cd5c91bfffebcb3000c3fe295357f1097ba4ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:29:17 +0200 Subject: gnu: tzdata: Update to 2019c. * gnu/packages/base.scm (tzdata): Update to 2019c. (tzdata-for-tests): Stay on 2019b. --- gnu/packages/base.scm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 4e80a2fadb..1d1e126b6a 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1191,7 +1191,7 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2019b") + (version "2019c") (source (origin (method url-fetch) (uri (string-append @@ -1199,7 +1199,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85")))) + "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -1249,7 +1249,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf")))))) + "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn")))))) (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) @@ -1267,7 +1267,25 @@ and daylight-saving rules.") (define-public tzdata-for-tests (hidden-package (package - (inherit tzdata)))) + (inherit tzdata) + (version "2019b") + (source (origin + (method url-fetch) + (uri (string-append + "https://data.iana.org/time-zones/releases/tzdata" + version ".tar.gz")) + (sha256 + (base32 + "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85")))) + (inputs + `(("tzcode" ,(origin + (method url-fetch) + (uri (string-append + "https://data.iana.org/time-zones/releases/tzcode" + version ".tar.gz")) + (sha256 + (base32 + "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf"))))))))) (define-public libiconv (package -- cgit v1.2.3 From c021c4323c4c00dc1ef9c74cb598140ed73c2003 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:29:58 +0200 Subject: gnu: libfaketime: Update to 0.9.8. * gnu/packages/check.scm (libfaketime): Update to 0.9.8. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index dab0bd39c3..18af697693 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2195,7 +2195,7 @@ portable to just about any platform.") (define-public libfaketime (package (name "libfaketime") - (version "0.9.7") + (version "0.9.8") (home-page "https://github.com/wolfcw/libfaketime") (source (origin (method git-fetch) @@ -2204,7 +2204,7 @@ portable to just about any platform.") (commit (string-append "v" version)))) (sha256 (base32 - "1cin1pqwpsswcv7amiwijirvcg3x1zf2l00s1x84nxc5602fzr5c")) + "1mfdl82ppgbdvy1ny8mb7xii7p0g7awvn4bn36jb8v4r545slmjc")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From a40416f2bfc07d2287a9a4a30055066149482b67 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:30:43 +0200 Subject: gnu: imagemagick: Update to 6.9.10-68. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-68. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 807fd43b9b..74fbf9158a 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-58") + (version "6.9.10-68") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "1hrd408lqgwg70aaif8g60lipwsplsg61722kpmx7a08pygs46hf")))) + "1jxjxhnvznpbdigry2cgxx94cx6k6y3rs40a464n5yln29s1qlz1")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") -- cgit v1.2.3 From c29bdd54a71fff38c3ed784a29693c10c97e34e7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:31:49 +0200 Subject: gnu: nspr: Update to 4.22. * gnu/packages/nss.scm (nspr): Update to 4.22. --- gnu/packages/nss.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index b6df366a77..8629b3e173 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -34,7 +34,7 @@ (define-public nspr (package (name "nspr") - (version "4.21") + (version "4.22") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "0nkbgk0x31nfm4xl8la0a3vrnpa8gzkh7g4k65p7n880n73k5shm")))) + "0c6ljv3bdqhc169srbpjy0cs52xk715p04zy08rcjvl54k6bdr69")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From d45c75fc5772e6b5232473e2bf5c3e15aa457e76 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:32:18 +0200 Subject: gnu: nss, nss-certs: Update to 3.46.1. * gnu/packages/nss.scm (nss): Update to 3.46.1. * gnu/packages/certs.scm (nss-certs): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/nss.scm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 7e0071ecf9..f47260121b 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.45") + (version "3.46.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "12sfq9xvpwpc22qnjsg1if1lmchiy33byrh92wn91phz7li0abqi")))) + "0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 8629b3e173..65f95aaa8a 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -70,7 +70,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.45") + (version "3.46.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -81,7 +81,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "12sfq9xvpwpc22qnjsg1if1lmchiy33byrh92wn91phz7li0abqi")) + "0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-freebl-stubs.patch" @@ -130,7 +130,7 @@ in the Mozilla clients.") ;; leading to test failures: ;; . To ;; work around that, set the time to roughly the release date. - (invoke "faketime" "2019-05-01" "./nss/tests/all.sh"))) + (invoke "faketime" "2019-10-01" "./nss/tests/all.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 72fbea3fef404cde578bee9bca04da839c6a18d6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:33:01 +0200 Subject: gnu: bluez: Update to 5.51. * gnu/packages/linux.scm (bluez): Update to 5.51. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e4abeadaa0..1d293c8239 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3737,7 +3737,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.50") + (version "5.51") (source (origin (method url-fetch) (uri (string-append @@ -3745,7 +3745,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z")))) + "1fpbsl9kkfq6mn6n0dg4h0il4c7fzhwhn79gh907k5b2kwszpvgb")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 9205f45107d17146b90b189c9541c3b2d7dac721 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:33:54 +0200 Subject: gnu: lz4: Update to 1.9.2. * gnu/packages/compression.scm (lz4): Update to 1.9.2. [native-inputs]: Add PYTHON. --- gnu/packages/compression.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index c4298c1e95..fc17fd3919 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -735,7 +735,7 @@ decompression of some loosely related file formats used by Microsoft.") (define-public lz4 (package (name "lz4") - (version "1.9.1") + (version "1.9.2") (source (origin (method git-fetch) @@ -743,10 +743,13 @@ decompression of some loosely related file formats used by Microsoft.") (commit (string-append "v" version)))) (sha256 (base32 - "1l1caxrik1hqs40vj3bpv1pikw6b74cfazv5c0v6g48zpcbmshl0")) + "0lpaypmk70ag2ks3kf2dl4ac3ba40n5kc1ainkp9wfjawz76mh61")) (file-name (git-file-name name version)))) (build-system gnu-build-system) - (native-inputs `(("valgrind" ,valgrind))) ;for tests + (native-inputs + `(;; For tests. + ("python" ,python) + ("valgrind" ,valgrind))) (arguments `(#:test-target "test" #:make-flags (list "CC=gcc" -- cgit v1.2.3 From 3572b3904feb4162855fba9f974cc58a236038ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:34:31 +0200 Subject: gnu: libogg: Update to 1.3.4. * gnu/packages/xiph.scm (libogg): Update to 1.3.4. --- gnu/packages/xiph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index bac6ac0d4d..e40e8e427c 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -58,14 +58,14 @@ (define libogg (package (name "libogg") - (version "1.3.3") + (version "1.3.4") (source (origin (method url-fetch) (uri (string-append "https://downloads.xiph.org/releases/ogg/libogg-" version ".tar.xz")) (sha256 (base32 - "022wjlzn8fx7mfby4pcgyjwx8zir7jr7cizichh3jgaki8bwcgsg")))) + "1zlk33vxvxr0l9lhkbhkdwvylw96d2n0fnd3d8dl031hph9bqqy1")))) (build-system gnu-build-system) (synopsis "Library for manipulating the ogg multimedia format") (description -- cgit v1.2.3 From 080edbe949c67f88e4ca002fc919f4ead8d814ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:36:00 +0200 Subject: gnu: gdk-pixbuf: Update to 2.40.0. * gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.40.0. [arguments]: Remove obsolete phase. --- gnu/packages/gtk.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 34f9ca3844..3f6043fcac 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -460,7 +460,7 @@ highlighting and other features typical of a source code editor.") (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.38.1") + (version "2.40.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -468,7 +468,7 @@ highlighting and other features typical of a source code editor.") name "-" version ".tar.xz")) (sha256 (base32 - "0fmbjgjcyym3qg46f64qgl7icdm4ii77flyc1mhk244rp8vgi7zi")))) + "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dinstalled_tests=false") @@ -494,16 +494,7 @@ highlighting and other features typical of a source code editor.") '((replace 'check (lambda _ (invoke "meson" "test" "--timeout-multiplier" "5")))) - '()) - (add-before 'configure 'aid-install-script - (lambda* (#:key outputs #:allow-other-keys) - ;; "build-aux/post-install.sh" invokes `gdk-pixbuf-query-loaders` - ;; for updating loader.cache, but it's not on PATH. Make it use - ;; the one we're installing. XXX: Won't work when cross-compiling. - (substitute* "build-aux/post-install.sh" - (("gdk-pixbuf-query-loaders" match) - (string-append (assoc-ref outputs "out") "/bin/" match))) - #t))))) + '())))) (propagated-inputs `(;; Required by gdk-pixbuf-2.0.pc ("glib" ,glib) -- cgit v1.2.3 From 605b7f42cf4d452a68fbf3c65035db5238d624c0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:36:29 +0200 Subject: gnu: gtk+: Update to 3.24.12. * gnu/packages/gtk.scm (gtk+): Update to 3.24.12. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3f6043fcac..dd6b3e5a36 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -721,7 +721,7 @@ application suites.") (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.24.10") + (version "3.24.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -729,7 +729,7 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "00qvq1r96ikdalv7xzgng1kad9i0rcahqk01gwhxl3xrw83z3a1m")) + "10xyyhlfb0yk4hglngxh2zsv9xrxkqv343df8h01dvagc6jyp10k")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) -- cgit v1.2.3 From 18b804c40f1c58536c59d2e813897eb38bc6e690 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:36:59 +0200 Subject: gnu: libinput: Update to 1.14.1. * gnu/packages/freedesktop.scm (libinput): Update to 1.14.1. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 457d650869..ab3d028214 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -152,14 +152,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "0rzw2kx06ywc19lwf147f474xav7w83h28k0afy822wjz0j5rf3w")))) + "0w7fas37mp2k06f12i3lnj717lw73asziknj6z51kh1m50ja6cz3")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false") -- cgit v1.2.3 From cb15ad775d5bf1b21ed16e115b06dbab44236e49 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:37:30 +0200 Subject: gnu: libgit2: Update to 0.28.3. * gnu/packages/version-control.scm (libgit2): Update to 0.28.3. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 573fa6f8cc..bcc3377a44 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -524,7 +524,7 @@ everything from small to very large projects with speed and efficiency.") (define-public libgit2 (package (name "libgit2") - (version "0.28.2") + (version "0.28.3") (source (origin (method git-fetch) (uri (git-reference @@ -533,7 +533,7 @@ everything from small to very large projects with speed and efficiency.") (file-name (git-file-name name version)) (sha256 (base32 - "0cm8fvs05rj0baigs2133q5a0sm3pa234y8h6hmwhl2bz9xq3k4b")) + "07068flm9xi25wmcs65nyfg6a7ikgfv96i2nhgyj5gzs9gljqiz2")) (patches (search-patches "libgit2-avoid-python.patch" "libgit2-mtime-0.patch")) -- cgit v1.2.3 From 969aea1f0322210c7982e434ca6eb5ed69eb1502 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:38:26 +0200 Subject: gnu: libical: Update to 3.0.6. * gnu/packages/calendar.scm (libical): Update to 3.0.6. --- gnu/packages/calendar.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 326805f70d..6c60008ec7 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -50,7 +50,7 @@ (define-public libical (package (name "libical") - (version "3.0.5") + (version "3.0.6") (source (origin (method url-fetch) (uri (string-append @@ -58,7 +58,7 @@ version "/libical-" version ".tar.gz")) (sha256 (base32 - "1rkq9qkvbv76n6k6kc8pxhwj9vhyigkb6flfcn1rk6wwqk451mbs")))) + "15sdmh8w4vszd7jhv9fdpd48anpkniq2k1jw7siy9v1jnz1232jw")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; test suite appears broken -- cgit v1.2.3 From a4384dc970df534a2d1e96570e1e98abd8c85cd7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 21:01:43 +0200 Subject: gnu: OpenBLAS: Incorporate grafted changes. * gnu/packages/maths.scm (openblas)[replacement]: Remove. [arguments]: Add NUM_THREADS in #:make-flags. (openblas/fixed-num-threads): Remove variable. --- gnu/packages/maths.scm | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fe9d59b69a..2664315674 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3106,10 +3106,6 @@ parts of it.") (define-public openblas (package - ;; TODO: Incorporate 'openblas/fixed-num-threads' changes on the next - ;; rebuild cycle. - (replacement openblas/fixed-num-threads) - (name "openblas") (version "0.3.6") (source @@ -3137,6 +3133,13 @@ parts of it.") (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "SHELL=bash" "MAKE_NB_JOBS=0" ;use jobserver for submakes + + ;; This is the maximum number of threads OpenBLAS will ever use (that + ;; is, if $OPENBLAS_NUM_THREADS is greater than that, then NUM_THREADS + ;; is used.) If we don't set it, the makefile sets it to the number + ;; of cores of the build machine, which is obviously wrong. + "NUM_THREADS=128" + ;; Build the library for all supported CPUs. This allows ;; switching CPU targets at runtime with the environment variable ;; OPENBLAS_CORETYPE=, where "type" is a supported CPU type. @@ -3191,24 +3194,6 @@ parts of it.") (synopsis "Optimized BLAS library based on GotoBLAS (ILP64 version)") (license license:bsd-3))) -(define openblas/fixed-num-threads - ;; TODO: Move that to 'openblas' proper on the next rebuild cycle. - (package - (inherit openblas) - (version (match (string-split (package-version openblas) #\.) - ((numbers ... (= string-length len)) - (string-join (append numbers - (list (make-string len #\a))) - ".")))) - (arguments - (substitute-keyword-arguments (package-arguments openblas) - ((#:make-flags flags ''()) - ;; This is the maximum number of threads OpenBLAS will ever use (that - ;; is, if $OPENBLAS_NUM_THREADS is greater than that, then NUM_THREADS - ;; is used.) If we don't set it, the makefile sets it to the number - ;; of cores of the build machine, which is obviously wrong. - `(cons "NUM_THREADS=128" ,flags)))))) - (define* (make-blis implementation #:optional substitutable?) "Return a BLIS package with the given IMPLEMENTATION (see config/ in the source tree for a list of implementations.) -- cgit v1.2.3 From 2ea095300a2e25a02b964711fa8a4b3a07f09843 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 21:03:16 +0200 Subject: gnu: OpenBLAS: Update to 0.3.7. * gnu/packages/maths.scm (openblas): Update to 0.3.7. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2664315674..c8df21fcde 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3107,7 +3107,7 @@ parts of it.") (define-public openblas (package (name "openblas") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) @@ -3116,7 +3116,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1r2g9zzwq5dm8vjd19pxwggfvfzy56cvkmpmp5d014qr3svgmsap")))) + "0jbdjsi0qsxahdcm42agnn1y7xpmg0hrhwjsxg0zbhs9wwy3p568")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 1ea8b3b1a08488759c71381970ca677761a1e870 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 8 Oct 2019 12:41:44 -0700 Subject: gnu: electron-cash: Update to 4.0.10. * gnu/packages/finance (electron-cash): Update to 4.0.10. [inputs]: Add python-dateutil and python-dnspython. --- gnu/packages/finance.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 960e3adeb3..1230e5c270 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -76,6 +76,7 @@ #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) #:use-module (gnu packages version-control) @@ -413,7 +414,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (package (inherit electrum) (name "electron-cash") - (version "4.0.7") + (version "4.0.10") (source (origin (method url-fetch) @@ -424,13 +425,17 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") ".tar.gz")) (sha256 (base32 - "0xswmr68cm1c77lzisi3z812jzqczm9dfrshfhdq42zz5kaz4gnn")) + "1rcywlma6hk52ymisx536jvkdwa73rhn1jxhsbs4wbvajl90w9s8")) (modules '((guix build utils))) (snippet '(begin ;; Delete the bundled dependencies. (delete-file-recursively "packages") #t)))) + (inputs + `(,@(package-inputs electrum) + ("python-dateutil", python-dateutil) + ("python-dnspython", python-dnspython))) (home-page "https://electroncash.org/") (synopsis "Bitcoin Cash wallet") (description -- cgit v1.2.3 From 1c10ba3a249f797493cc67da48cbb58398425920 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 9 Oct 2019 12:54:39 +0200 Subject: gnu: python-packaging: Update to 19.2. * gnu/packages/python-xyz.scm (python-packaging): Update to 19.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b0f5ec7588..1ae83dfa87 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12919,14 +12919,14 @@ several utilities, as well as an API for building localization tools.") (define-public python-packaging (package (name "python-packaging") - (version "19.0") + (version "19.2") (source (origin (method url-fetch) (uri (pypi-uri "packaging" version)) (sha256 (base32 - "1brjhygq9dz6x1kdljivkjfldi3qf5rbkqgck1bpgv9qpv8ab60c")))) + "0izwlz9h0bw171a1chr311g2y7n657zjaf4mq4rgm8pp9lbj9f98")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From f855616fff96679ac0412cefa89cdf34084b97ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 9 Oct 2019 12:55:06 +0200 Subject: gnu: qpdf: Update to 9.0.1. * gnu/packages/pdf.scm (qpdf): Update to 9.0.1. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 003b5a9548..b13caf37fe 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -668,14 +668,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (define-public qpdf (package (name "qpdf") - (version "8.4.1") + (version "9.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "1fsfy38dnm9cy1j40jw5x8vn84l6f2kgb68rdjl0wxignfw05z87")) + "0lhgb82s2402ad2yiswkj227vjlw9zypphdfdivfkbril7dg6495")) (modules '((guix build utils))) (snippet ;; Replace shebang with the bi-lingual shell/Perl trick to remove -- cgit v1.2.3 From 1e429a82636409f762e20d29e07ce50708832add Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 9 Oct 2019 12:55:26 +0200 Subject: gnu: cups-filters: Update to 1.25.7. * gnu/packages/cups.scm (cups-filters): Update to 1.25.7. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 152258a522..229e0bb425 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -58,7 +58,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.25.1") + (version "1.25.7") (source(origin (method url-fetch) (uri @@ -66,7 +66,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "0nlq44jnjcnrbdv0dv5myg5kaycmk6a4klynpvj65xvn3l9cq28s")) + "015lb60744win3hw84s1m1gyyb6n3vj4rw12yvm1fai8gf2zi4k9")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output -- cgit v1.2.3 From 5ba3ea4211931e635209ee1a61b4811071d3773d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 9 Oct 2019 12:55:52 +0200 Subject: gnu: CUPS: Update to 2.3.0. * gnu/packages/cups.scm (cups-minimal): Update to 2.3.0. [arguments]: Adjust for renamed test file. [license]: Change to ASL2.0. --- gnu/packages/cups.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 229e0bb425..4c35c64c6c 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -187,7 +187,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") (define-public cups-minimal (package (name "cups-minimal") - (version "2.2.11") + (version "2.3.0") (source (origin (method url-fetch) @@ -195,7 +195,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") version "/cups-" version "-source.tar.gz")) (sha256 (base32 - "0v5p10lyv8wv48s8ghkhjmdrxg6iwj8hn36v1ilkz46n7y0i107m")))) + "19d1jpdpxy0fclq37pchi7ldnw9dssxx3zskcgqai3h0rwlh5bxc")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -225,7 +225,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") #t))) (add-before 'build 'patch-tests (lambda _ - (substitute* "test/ippserver.c" + (substitute* "tools/ippeveprinter.c" (("# else /\\* HAVE_AVAHI \\*/") "#elif defined(HAVE_AVAHI)")) #t))))) @@ -245,7 +245,8 @@ networked printers, and printers can be shared from one computer to another. Internally, CUPS uses PostScript Printer Description (@dfn{PPD}) files to describe printer capabilities and features, and a wide variety of generic and device-specific programs to convert and print many types of files.") - (license license:gpl2))) + ;; CUPS is Apache 2.0 with exceptions, see the NOTICE file. + (license license:asl2.0))) (define-public cups (package (inherit cups-minimal) -- cgit v1.2.3 From 4442d4dc409a9361d22760f184b294ef0421c8da Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 9 Oct 2019 12:56:49 +0200 Subject: gnu: pulseaudio: Update to 13.0. * gnu/packages/pulseaudio.scm (pulseaudio): Update to 13.0. [arguments]: Remove obsolete phase. --- gnu/packages/pulseaudio.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index ff4049d707..9777da540e 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -130,7 +130,7 @@ rates.") (define-public pulseaudio (package (name "pulseaudio") - (version "12.2") + (version "13.0") (source (origin (method url-fetch) (uri (string-append @@ -138,7 +138,7 @@ rates.") name "-" version ".tar.xz")) (sha256 (base32 - "0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0")) + "0mw0ybrqj7hvf8lqs5gjzip464hfnixw453lr0mqzlng3b5266wn")) (modules '((guix build utils))) (snippet ;; Disable console-kit support by default since it's deprecated @@ -160,11 +160,6 @@ rates.") (assoc-ref %outputs "out") "/lib/udev/rules.d")) #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-alsa-include - (lambda _ - (substitute* '("configure" "src/modules/alsa/alsa-ucm.h") - (("use-case\\.h") "alsa/use-case.h")) - #t)) (add-before 'check 'pre-check (lambda _ ;; 'tests/lock-autospawn-test.c' wants to create a file -- cgit v1.2.3 From 45b01f2e05ce05ef796c186260e86c9042731cc0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 9 Oct 2019 12:57:19 +0200 Subject: gnu: orc: Update to 0.4.30. * gnu/packages/gstreamer.scm (orc): Update to 0.4.30. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Adjust phase order to cope with the new out-of-source build. [native-inputs]: Add GTK-DOC. --- gnu/packages/gstreamer.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 1ec161a599..065f92deb6 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -29,6 +29,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages audio) @@ -68,19 +69,19 @@ (define-public orc (package (name "orc") - (version "0.4.29") + (version "0.4.30") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/data/src/" "orc/orc-" version ".tar.xz")) (sha256 (base32 - "1cisbbn69p9c8vikn0nin14q0zscby5m8cyvzxyw2pjb2kwh32ag")))) - (build-system gnu-build-system) + "0wj93im7i8a6546q2r8sp39yjfbxflkc0ygb0b8iqsd58qhvjhds")))) + (build-system meson-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'disable-faulty-test + (add-after 'unpack 'disable-faulty-test (lambda _ ;; XXX Disable the 'test-limits' and 'exec_opcodes_sys' ;; tests, which fail on some machines. See: @@ -90,6 +91,8 @@ (("if \\(error\\) return 1;") "if (error) return 77;")) #t))))) + (native-inputs + `(("gtk-doc" ,gtk-doc))) (home-page "https://gstreamer.freedesktop.org/modules/orc.html") (synopsis "Oil runtime compiler") (description -- cgit v1.2.3 From d1b8ef998d4b1d7dc6e80bef9cbf65636d8e67a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 9 Oct 2019 12:58:51 +0200 Subject: gnu: gstreamer: Update to 1.16.1. * gnu/packages/patches/gstreamer-buffer-reset-offset.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gstreamer.scm (gstreamer): Update to 1.16.1. [source](patches): Remove. (gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, python-gst): Update to 1.16.1. --- gnu/local.mk | 1 - gnu/packages/gstreamer.scm | 29 +++++------ .../patches/gstreamer-buffer-reset-offset.patch | 59 ---------------------- 3 files changed, 14 insertions(+), 75 deletions(-) delete mode 100644 gnu/packages/patches/gstreamer-buffer-reset-offset.patch diff --git a/gnu/local.mk b/gnu/local.mk index eb37450324..6bea463262 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -936,7 +936,6 @@ dist_patch_DATA = \ %D%/packages/patches/guile-relocatable.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ - %D%/packages/patches/gstreamer-buffer-reset-offset.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk2-theme-paths.patch \ diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 065f92deb6..0d951009da 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -106,17 +106,16 @@ arrays of data.") (define-public gstreamer (package (name "gstreamer") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-" version ".tar.xz")) - (patches (search-patches "gstreamer-buffer-reset-offset.patch")) (sha256 (base32 - "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf")))) + "0z9pyhf6zm1r0spw6zym80bvbyx6h8xg9h6535csbnn48ws1q882")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -155,7 +154,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) @@ -163,7 +162,7 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0")))) + "0aybbwnzm15074smdk2bamj3ssck3hjvmilvgh49f19xjf4w8g2w")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs @@ -214,7 +213,7 @@ for the GStreamer multimedia library.") (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) @@ -223,7 +222,7 @@ for the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5")))) + "07wgz9anf4ram2snp8n1wv6l0q3pd00iaw8bvw3wgklg05lvxflz")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -277,14 +276,14 @@ developers consider to have good quality code and correct functionality.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2")))) + "1dddqacxgp77f3nl153x5a6139wdphc9phds2fpqb2cv6faiqj2n")))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments @@ -357,7 +356,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) @@ -365,7 +364,7 @@ par compared to the rest.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3")))) + "07cajqjs8pqchpf2sm87hljx4ibwvkiavqxmacxsr5airar17yab")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -392,7 +391,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") (define-public gst-libav (package (name "gst-libav") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) (uri (string-append @@ -400,7 +399,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") name "-" version ".tar.xz")) (sha256 (base32 - "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z")) + "1i31ra0l77cfahb6k5xpx45zwvpskzm848aijsbbx9x4x65799g8")) (modules '((guix build utils))) (snippet '(begin @@ -428,7 +427,7 @@ compression formats through the use of the libav library.") (define-public python-gst (package (name "python-gst") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) (uri (string-append @@ -436,7 +435,7 @@ compression formats through the use of the libav library.") "gst-python-" version ".tar.xz")) (sha256 (base32 - "0f1d9rvy2qxlymmfzyknnfr5rz1vx69jv17gp7wnamc5s6p7mp2m")))) + "12bl6kc0ny2vyf6klas2bwqcv0pi55q9ns5zw261px16a6awhsdl")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) diff --git a/gnu/packages/patches/gstreamer-buffer-reset-offset.patch b/gnu/packages/patches/gstreamer-buffer-reset-offset.patch deleted file mode 100644 index 024892a60f..0000000000 --- a/gnu/packages/patches/gstreamer-buffer-reset-offset.patch +++ /dev/null @@ -1,59 +0,0 @@ -Fix a buffer offset problem in GStreamer 1.16. Initially reported by Mark H. -Weaver in . - -See also . - -From 1734c9fc1a4f99b165383ae1eb02f04e0844a00c Mon Sep 17 00:00:00 2001 -From: Nicolas Dufresne -Date: Sat, 29 Jun 2019 09:22:05 -0400 -Subject: [PATCH] bufferpool: Fix the buffer size reset code - -The offset in gst_buffer_resize() is additive. So to move back the -offset to zero, we need to pass the opposite of the current offset. This -was raised through the related unit test failingon 32bit as on 64bit -the alignment padding was enough to hide the issue. The test was -modified to also fail on 64bit. This patch will remove spurious -assertions like: - - assertion 'bufmax >= bufoffs + offset + size' failed - -Fixes #316 ---- - gst/gstbufferpool.c | 7 +++++-- - tests/check/gst/gstbufferpool.c | 2 +- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/gst/gstbufferpool.c b/gst/gstbufferpool.c -index e5c7a5872..619860e63 100644 ---- a/gst/gstbufferpool.c -+++ b/gst/gstbufferpool.c -@@ -1222,8 +1222,11 @@ default_reset_buffer (GstBufferPool * pool, GstBuffer * buffer) - GST_BUFFER_OFFSET_END (buffer) = GST_BUFFER_OFFSET_NONE; - - /* if the memory is intact reset the size to the full size */ -- if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_TAG_MEMORY)) -- gst_buffer_resize (buffer, 0, pool->priv->size); -+ if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_TAG_MEMORY)) { -+ gsize offset; -+ gst_buffer_get_sizes (buffer, &offset, NULL); -+ gst_buffer_resize (buffer, -offset, pool->priv->size); -+ } - - /* remove all metadata without the POOLED flag */ - gst_buffer_foreach_meta (buffer, remove_meta_unpooled, pool); -diff --git a/tests/check/gst/gstbufferpool.c b/tests/check/gst/gstbufferpool.c -index f0c3c8d8e..dd9b2dc03 100644 ---- a/tests/check/gst/gstbufferpool.c -+++ b/tests/check/gst/gstbufferpool.c -@@ -190,7 +190,7 @@ GST_START_TEST (test_buffer_modify_discard) - gst_buffer_pool_acquire_buffer (pool, &buf, NULL); - buffer_track_destroy (buf, &dcount); - /* do resize, as we didn't modify the memory, pool should reuse this buffer */ -- gst_buffer_resize (buf, 5, 2); -+ gst_buffer_resize (buf, 8, 2); - gst_buffer_unref (buf); - - /* buffer should've gone back into pool */ --- -2.22.0 - -- cgit v1.2.3 From 52b61e999101724c7e2d341586e9a6150614f208 Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Tue, 1 Oct 2019 14:25:32 +0200 Subject: gnu: gtk+: Add libxrandr input. This fixes multi-monitor issues in XFCE and other Gtk+ apps. * gnu/packages/gtk.scm (gtk+)[inputs]: Add libxrandr. Signed-off-by: Marius Bakke --- gnu/packages/gtk.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index dd6b3e5a36..d1e81a8efc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -743,6 +743,7 @@ application suites.") ("libxinerama" ,libxinerama) ("libxkbcommon" ,libxkbcommon) ("libxdamage" ,libxdamage) + ("libxrandr" ,libxrandr) ("mesa" ,mesa) ("pango" ,pango) ("wayland" ,wayland) -- cgit v1.2.3 From 2b8491fbbe818944baf454faf1326034022ac320 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Aug 2019 22:52:06 +0200 Subject: gnu: mariadb: Split into out, lib and dev. * gnu/packages/databases.scm (mariadb): Split into out, lib and dev. (perl-dbd-mysql, python-mysqlclient): Adjust dependencies. * gnu/packages/bioinformatics.scm (kentutils): Adjust dependencies. * gnu/packages/cran.scm (r-rmysql): Adjust dependencies. * gnu/packages/emacs-xyz.scm (emacs-emacsql): Adjust dependencies. * gnu/packages/kodi.scm (kodi): Adjust dependencies. * gnu/packages/qt.scm (qt, qtbase): Adjust dependencies. * gnu/packages/ruby.scm (ruby-mysql2): Adjust dependencies. --- gnu/packages/bioinformatics.scm | 3 ++- gnu/packages/cran.scm | 3 ++- gnu/packages/databases.scm | 57 +++++++++++++++++++++++++++++------------ gnu/packages/emacs-xyz.scm | 3 ++- gnu/packages/kodi.scm | 3 ++- gnu/packages/qt.scm | 6 +++-- gnu/packages/ruby.scm | 3 ++- 7 files changed, 55 insertions(+), 23 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a573ef682f..a8662dc238 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11272,7 +11272,8 @@ models. TADbit is complemented by TADkit for visualizing 3D models.") ("tcsh" ,tcsh) ("perl" ,perl) ("libpng" ,libpng) - ("mariadb" ,mariadb) + ("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("openssl" ,openssl))) (home-page "http://genome.cse.ucsc.edu/index.html") (synopsis "Assorted bioinformatics utilities") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8754f83f72..88453c3faf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2689,7 +2689,8 @@ dimensioned arrays.") (properties `((upstream-name . "RMySQL"))) (build-system r-build-system) (inputs - `(("mariadb" ,mariadb) + `(("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("zlib" ,zlib))) (propagated-inputs `(("r-dbi" ,r-dbi))) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index bb7adf25a6..ca2ca9bda0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -647,9 +647,11 @@ Language.") (find-files "pcre") (find-files "zlib"))) #t)))) (build-system cmake-build-system) + (outputs '("out" "lib" "dev")) (arguments `(#:configure-flags - '("-DBUILD_CONFIG=mysql_release" + (list + "-DBUILD_CONFIG=mysql_release" ;; Linking with libarchive fails, like this: ;; ld: /gnu/store/...-libarchive-3.2.2/lib/libarchive.a(archive_entry.o): @@ -673,15 +675,26 @@ Language.") "-DDEFAULT_COLLATION=utf8_general_ci" "-DMYSQL_DATADIR=/var/lib/mysql" "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" - "-DINSTALL_INFODIR=share/mysql/docs" - "-DINSTALL_MANDIR=share/man" + (string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "lib")) + (string-append "-DCMAKE_INSTALL_RPATH=" (assoc-ref %outputs "lib") + "/lib") + (string-append "-DINSTALL_INFODIR=" (assoc-ref %outputs "out") + "/share/mysql/docs") + (string-append "-DINSTALL_MANDIR=" (assoc-ref %outputs "out") + "/share/man") + (string-append "-DINSTALL_SCRIPTDIR=" (assoc-ref %outputs "out") "/bin") + (string-append "-DINSTALL_BINDIR=" (assoc-ref %outputs "out") "/bin") + "-DCMAKE_INSTALL_LIBDIR=lib" "-DINSTALL_PLUGINDIR=lib/mysql/plugin" - "-DINSTALL_SCRIPTDIR=bin" - "-DINSTALL_INCLUDEDIR=include/mysql" - "-DINSTALL_DOCREADMEDIR=share/mysql/docs" - "-DINSTALL_SUPPORTFILESDIR=share/mysql/support-files" + (string-append "-DINSTALL_INCLUDEDIR=" (assoc-ref %outputs "dev") + "/include/mysql") + (string-append "-DINSTALL_DOCREADMEDIR=" (assoc-ref %outputs "out") + "/share/mysql/docs") + (string-append "-DINSTALL_DOCDIR=" (assoc-ref %outputs "out") + "/share/mysql/docs") + (string-append "-DINSTALL_SUPPORTFILESDIR=" (assoc-ref %outputs "out") + "/share/mysql/support-files") "-DINSTALL_MYSQLSHAREDIR=share/mysql" - "-DINSTALL_DOCDIR=share/mysql/docs" "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases @@ -764,19 +777,29 @@ Language.") 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (test (assoc-ref outputs "test"))) + (dev (assoc-ref outputs "dev")) + (lib (assoc-ref outputs "lib"))) (substitute* (string-append out "/bin/mysql_install_db") (("basedir=\"\"") (string-append "basedir=\"" out "\""))) ;; Remove unneeded files for testing. - (with-directory-excursion out + (with-directory-excursion lib (for-each delete-file-recursively - '("data" "mysql-test" "sql-bench" - "share/man/man1/mysql-test-run.pl.1")) - ;; Delete huge and unnecessary executables. - (for-each delete-file (find-files "bin" "(test|embedded)")) + '("data" "mysql-test" "sql-bench")) ;; And static libraries. (for-each delete-file (find-files "lib" "\\.a$"))) + (with-directory-excursion out + (delete-file "share/man/man1/mysql-test-run.pl.1") + ;; Delete huge and unnecessary executables. + (for-each delete-file (find-files "bin" "(test|embedded)"))) + (mkdir-p (string-append dev "/share")) + (mkdir-p (string-append dev "/bin")) + (rename-file (string-append lib "/bin/mysqld") + (string-append out "/bin/mysqld")) + (rename-file (string-append lib "/share/pkgconfig") + (string-append dev "/share/pkgconfig")) + (rename-file (string-append out "/bin/mysql_config") + (string-append dev "/bin/mysql_config")) #t)))))) (native-inputs `(("bison" ,bison) @@ -1544,7 +1567,8 @@ columns, primary keys, unique constraints and relationships.") #:tests? #f)) (propagated-inputs `(("perl-dbi" ,perl-dbi) - ("mysql" ,mariadb))) + ("mysql" ,mariadb "lib") + ("mysql-dev" ,mariadb "dev"))) (home-page "https://metacpan.org/release/DBD-mysql") (synopsis "DBI MySQL interface") (description "This package provides a MySQL driver for the Perl5 @@ -2662,7 +2686,8 @@ database).") ("mock" ,python-mock) ("py.test" ,python-pytest))) (inputs - `(("mysql" ,mariadb) + `(("mysql" ,mariadb "lib") + ("mysql-dev" ,mariadb "dev") ("libz" ,zlib) ("openssl" ,openssl))) (home-page "https://github.com/PyMySQL/mysqlclient-python") diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1b8ae47fc2..0dfff8146b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11325,7 +11325,8 @@ object has been freed.") #t))))) (inputs `(("emacs-minimal" ,emacs-minimal) - ("mariadb" ,mariadb) + ("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("postgresql" ,postgresql))) (propagated-inputs `(("emacs-finalize" ,emacs-finalize) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index a9b5b85a47..fbb153b1f2 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -436,7 +436,8 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") ("libxrender" ,libxrender) ("libxslt" ,libxslt) ("lzo" ,lzo) - ("mariadb" ,mariadb) + ("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("openssl" ,openssl) ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b688b405f1..e8eb1ad376 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -224,7 +224,8 @@ system, and the core design of Django is reused in Grantlee.") ("libxslt" ,libxslt) ("libxtst" ,libxtst) ("mtdev" ,mtdev) - ("mariadb" ,mariadb) + ("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("nss" ,nss) ("openssl" ,openssl) ("postgresql" ,postgresql) @@ -579,7 +580,8 @@ system, and the core design of Django is reused in Grantlee.") ("libxslt" ,libxslt) ("libxtst" ,libxtst) ("mtdev" ,mtdev) - ("mariadb" ,mariadb) + ("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("nss" ,nss) ("openssl" ,openssl) ("pcre2" ,pcre2) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7d736c7c27..21fbd2ecd4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2645,7 +2645,8 @@ specs for Ruby implementations in ruby/spec.") (invoke "rspec")) #t))))) (inputs - `(("mariadb" ,mariadb) + `(("mariadb" ,mariadb "lib") + ("mariadb-dev" ,mariadb "dev") ("zlib" ,zlib))) (native-inputs `(("ruby-rspec" ,ruby-rspec) -- cgit v1.2.3 From 4a38ec9e98e2ca6dc1f01824b9097e0e668b48ab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 12 Oct 2019 20:53:14 +0200 Subject: gnu: Remove GDB@8.2. * gnu/packages/gdb.scm (gdb-8.2): Rename to ... (gdb-8.3): ... this. Update to 8.3.1. (gdb): Refer to GDB-8.3. --- gnu/packages/gdb.scm | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 48d1c0da6b..66bdb81a74 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -34,17 +34,17 @@ #:use-module (guix download) #:use-module (guix build-system gnu)) -(define-public gdb-8.2 +(define-public gdb-8.3 (package (name "gdb") - (version "8.2.1") + (version "8.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) (sha256 (base32 - "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha")))) + "1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; FIXME "make check" fails on single-processor systems. @@ -106,19 +106,7 @@ the program is running to try to fix bugs. It can be used to debug programs written in C, C++, Ada, Objective-C, Pascal and more.") (license gpl3+))) -(define-public gdb-8.3 - (package - (inherit gdb-8.2) - (version "8.3.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gdb/gdb-" - version ".tar.xz")) - (sha256 - (base32 - "1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y")))))) - (define-public gdb ;; This is the fixed version that packages depend on. Update it rarely ;; enough to avoid massive rebuilds. - gdb-8.2) + gdb-8.3) -- cgit v1.2.3 From 178611c8334e5448591350f475d348b33bf66f65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 12 Oct 2019 20:54:27 +0200 Subject: gnu: mesa: Update to 19.2.1. * gnu/packages/gl.scm (mesa): Update to 19.2.1. [native-inputs]: Replace PYTHON with PYTHON-WRAPPER. --- gnu/packages/gl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 794bf5993d..81f808017d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -229,7 +229,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.1.5") + (version "19.2.1") (source (origin (method url-fetch) @@ -241,7 +241,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1d3frncljickn5yi2ch1w2phwxhxpi6diyac3cbin9f76m7f2m3v")) + "1s81kwcjkkahnf5y5mshmd3q9j057hhsai7awpq6yb6im2hkriac")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) @@ -281,7 +281,7 @@ also known as DXTn or DXTC) for Mesa.") (_ `())) ("pkg-config" ,pkg-config) - ("python" ,python) + ("python" ,python-wrapper) ("python-mako" ,python-mako) ("which" ,(@ (gnu packages base) which)))) (arguments -- cgit v1.2.3 From e3fa098177d83d3d4622a3fa1dc5ef9dbe2de484 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 12 Oct 2019 20:54:53 +0200 Subject: gnu: libXfont: Update to 2.0.4. * gnu/packages/xorg.scm (libxfont2): Update to 2.0.4. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3bc83a6175..18ebab654d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4899,14 +4899,14 @@ new API's in libXft, or the legacy API's in libX11.") (define-public libxfont2 (package (inherit libxfont) - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libXfont2-" version ".tar.bz2")) (sha256 (base32 - "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf")))))) + "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd")))))) (define-public libxi (package -- cgit v1.2.3 From c4220afb941cfa2d03d90198c38c1fd27ccc8721 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 12 Oct 2019 20:55:20 +0200 Subject: gnu: libXvMC: Update to 1.0.12. * gnu/packages/xorg.scm (libxvmc): Update to 1.0.12. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 18ebab654d..aad2ba848b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4967,7 +4967,7 @@ new API's in libXft, or the legacy API's in libX11.") (define-public libxvmc (package (name "libxvmc") - (version "1.0.11") + (version "1.0.12") (source (origin (method url-fetch) @@ -4977,7 +4977,7 @@ new API's in libXft, or the legacy API's in libX11.") ".tar.bz2")) (sha256 (base32 - "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja")))) + "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb")))) (build-system gnu-build-system) (propagated-inputs `(("libxv" ,libxv))) -- cgit v1.2.3 From d87f6816a43fadbc7eed61d3b30931ac4a98dfe4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 12 Oct 2019 21:07:36 +0200 Subject: gnu: python-sphinx: Update to 2.2.0. * gnu/packages/sphinx.scm (python-sphinx): Update to 2.2.0. --- gnu/packages/sphinx.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index da7492c42e..64c1fc3318 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -45,14 +45,14 @@ (define-public python-sphinx (package (name "python-sphinx") - (version "2.1.2") + (version "2.2.0") (source (origin (method url-fetch) (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "09y4mjmbxz94pmfr2lzf1hkx2xk0khcpb8xsqfmir4l7dds9x9zr")))) + "0ig8s94xg0p6h9y5s3ns9x8i10b24ihzvs65b5jwrhrgih7nnn0d")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8df9249d8e12423160d4308664b937e118231ae7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 13 Oct 2019 17:03:44 +0300 Subject: gnu: qt: Update to 5.12.5. * gnu/packages/qt.scm (qt, qtbase, qtsvg, qtimageformats, qtx11extras, qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors, qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel, qtwebglplugin, qtwebview, qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech): Update to 5.12.5. --- gnu/packages/qt.scm | 128 ++++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e8eb1ad376..a8b2bb40be 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -129,7 +129,7 @@ system, and the core design of Django is reused in Grantlee.") (define-public qt (package (name "qt") - (version "5.12.4") + (version "5.12.5") (outputs '("out" "examples")) (source (origin (method url-fetch) @@ -142,7 +142,7 @@ system, and the core design of Django is reused in Grantlee.") version ".tar.xz")) (sha256 (base32 - "1q95sjyldm2p5xvqn0f52fin0q5axy982nqd3289jxcqwh75xnl5")) + "160jr7w39lpd7cwnlbgf5yj8halan7zpnxj2hbwwlrvpvchrwad2")) (modules '((guix build utils))) (snippet '(begin @@ -525,7 +525,7 @@ system, and the core design of Django is reused in Grantlee.") (define-public qtbase (package (name "qtbase") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -534,7 +534,7 @@ system, and the core design of Django is reused in Grantlee.") version ".tar.xz")) (sha256 (base32 - "158i0apc3i8bbgrk9j1k34y2b03v0kwwv8m7aaaxpxsglppwgyr0")) + "09fnwjyxl4fsvlajkdvizw9spfkxq5mvaqld7mckxnm9ppxvz2pw")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch")) (modules '((guix build utils))) @@ -765,7 +765,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -774,7 +774,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32 - "010drs2dv573fgbswnj83yrdxnj3lbcha4y4xgjm1ikkb98i420i")))) + "0h4qcy5l3gzcgqp53nqqa1wlbxqklly402q9m5z1srwzfk7r39vm")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -840,7 +840,7 @@ HostData=lib/qt5 (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -849,7 +849,7 @@ HostData=lib/qt5 version ".tar.xz")) (sha256 (base32 - "1cvv62r28ld5f0ipvahxv81bj8ik2m819x20pln1f3d9xv1jbvid")) + "02hzkrlqk3waiqgbjx7npyb7y85p2ri6p076ppkbjbsl6143j6cz")) (modules '((guix build utils))) (snippet '(begin @@ -871,7 +871,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -880,7 +880,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) version ".tar.xz")) (sha256 (base32 - "07mfkfgj02z7fb1swx5nmih3i979kpriwr8jprywl0aamyg01k29")))) + "0s1a0sbnf7d415mkdrihjdybi0vsq5ccwjm6qrw0h14bwkrmlhl9")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -895,7 +895,7 @@ from within Qt 5."))) (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -904,7 +904,7 @@ from within Qt 5."))) version ".tar.xz")) (sha256 (base32 - "0rjniwgid8ypzfx33di5bprn8r3sk4zcqxa3xp5nb3wlpccigshb")))) + "1gdsm12bfg0xg4g09ar26l8zqqqgbk22z522y7q8wyc7gw8dj1dr")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -924,7 +924,7 @@ xmlpatternsvalidator."))) (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -933,7 +933,7 @@ xmlpatternsvalidator."))) version ".tar.xz")) (sha256 (base32 - "19yd38q8r30jjw12wjrf6i8ygi9lk4fg7zil3gc6g787fgnhahb1")))) + "144i5crdp9szj0906vs01bhgwvcx29a1pvrf6mp9w9819cyk5i92")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -956,7 +956,7 @@ with JavaScript and C++."))) (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -965,7 +965,7 @@ with JavaScript and C++."))) version ".tar.xz")) (sha256 (base32 - "1vvkn6k4qiyyrd3m3c7fj6qiq0fw32wvd7sn1zl15blz5cj0b7bl")))) + "12z8ing2bpkk53hgqn0y15j12npqv4sfkpgc2x6prx49srr2rxmx")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -980,7 +980,7 @@ with Bluetooth and NFC."))) (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -989,7 +989,7 @@ with Bluetooth and NFC."))) version ".tar.xz")) (sha256 (base32 - "1giaxcvwv0mvxb2iapvdfiz128j0hjw3pi9vzi8irll6yjifswdl")))) + "0qij55bifdg0ip9kc5ka6f6cl39nnn2bmplrhada23lwqjbycn2x")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1007,7 +1007,7 @@ consume data received from the server, or both."))) (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1016,7 +1016,7 @@ consume data received from the server, or both."))) version ".tar.xz")) (sha256 (base32 - "1af0mv22yqdi93c2r36ajiax1yv89nk8qdj1xgb0h04nlmz3r1wm")))) + "118bra2ik3d2ji7cpy14plz25pl2ch15dpklr0zv4ns7dxq6ma73")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -1040,7 +1040,7 @@ recognition API for devices."))) (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1049,7 +1049,7 @@ recognition API for devices."))) version ".tar.xz")) (sha256 (base32 - "0ga26g832i8srpm99bzmxynlgf70zzp5p8vi1fqq096adymmj1vw")) + "1727wf76nlc6snc9800rky6zz45i240gr8b025j4vwayvkys986m")) (modules '((guix build utils))) (snippet '(begin @@ -1091,7 +1091,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1100,7 +1100,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) version ".tar.xz")) (sha256 (base32 - "1dz6fj768yn75mn35av0k8925bx15g0qazar9h9qfxljqdcykb9g")) + "0iiqdwn54y8lsmq3y0w681q6wl0l18g06px1za9iyia9f4k33z99")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -1143,7 +1143,7 @@ compositor libraries."))) (define-public qtserialport (package (inherit qtsvg) (name "qtserialport") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1152,7 +1152,7 @@ compositor libraries."))) version ".tar.xz")) (sha256 (base32 - "0fddn217q0cpk6p0c0z4ir4lrvqpbfkmfaw40gqxsbpvm7w7sj5z")))) + "0qmq3yppc54vf7xrwyrwk91h6x04w0hf4bnw5b3y5kwyllhh7vzq")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase) @@ -1177,7 +1177,7 @@ interacting with serial ports from within Qt."))) (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1186,7 +1186,7 @@ interacting with serial ports from within Qt."))) version ".tar.xz")) (sha256 (base32 - "1z0iccn2lk80qjkvlhv33plgld9q6xnz9s2h0xkkxq9yyh2nkmb9")))) + "08icq26m8a0pnapwds0mv7haybizchkmqxg0g8r6xi83lxhswx44")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -1198,7 +1198,7 @@ and others."))) (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1207,7 +1207,7 @@ and others."))) version ".tar.xz")) (sha256 (base32 - "1dzx7f9aa7zq46d7xhhchp233m4qv7zxdf56w5mshqcyd4dilmxb")))) + "1s65nfs4y031vldf7dk7rdjsfi8a0z04w787rwz0bvi20z11l7cz")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1222,7 +1222,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1231,7 +1231,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) version ".tar.xz")) (sha256 (base32 - "0rijdn20bqkx9f73y8pvam1878anaynf6nv0asxjk031jfca0vvm")))) + "1xy45djrc4lcnvd5vq3ds2scpzkpcxhsnvmsmgbnvwmnwnrb5hxa")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1257,7 +1257,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (define-public qtwebview (package (inherit qtsvg) (name "qtwebview") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1266,7 +1266,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) version ".tar.xz")) (sha256 (base32 - "0pasmcr6xdlbgi4gdkkm4w5ba00r71vyibsw7hyx1nadfxmlq90z")))) + "09ig6dyvzxl499vplmpdd6shvs2mfvbgqx48cgs3hs6d6p1xim56")))) (native-inputs `(("perl" ,perl))) (inputs @@ -1280,7 +1280,7 @@ native APIs where it makes sense."))) (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1289,7 +1289,7 @@ native APIs where it makes sense."))) version ".tar.xz")) (sha256 (base32 - "185k53qsaqcv280602p92vaddsfxf4frqk4gp4zsvzkrfsyl0yqj")))) + "08h10khklf811bqn143pbkcipfn6nwysxs1mw5bcmi5banbvbj0j")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1310,7 +1310,7 @@ positioning and geolocation plugins."))) (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1319,7 +1319,7 @@ positioning and geolocation plugins."))) version ".tar.xz")) (sha256 (base32 - "1dkfpmhpymaagvlybqq7s7bix0gqzsa5zbpfp56wvh59c0w3a3iv")))) + "09a0siyiny5wgsnyqxi5y7s1n2dc975wn831sryl71a9gc29bq18")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1338,7 +1338,7 @@ that helps in Qt development."))) (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1347,7 +1347,7 @@ that helps in Qt development."))) version ".tar.xz")) (sha256 (base32 - "0sibbhq88jni850jw7anwnvmykzm1w5qbjkblbradirqfvkkznvs")) + "1x0x9zr31ic5yki45r48bkmb9w9pvqawppklnws07117x15770q0")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1362,7 +1362,7 @@ ECMAScript and Qt."))) (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1371,7 +1371,7 @@ ECMAScript and Qt."))) version ".tar.xz")) (sha256 (base32 - "0n4qvafpc828cyc7w931drhxrawgxijzbmr6mh5ppiipad8c5m1j")))) + "0n953lnz6gsa8dpa7c93i4qv50jzdyahgs28qxvabnn3vbxsxpj6")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1386,7 +1386,7 @@ can be used to build complete interfaces in Qt Quick."))) (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1395,7 +1395,7 @@ can be used to build complete interfaces in Qt Quick."))) version ".tar.xz")) (sha256 (base32 - "0c8343k1w6v4k96agp3x0xy3fh49ylbp6h5wwxxpv35w73npwi4s")))) + "13ybd87shs09lpr1rji5k0wik1rmwa8lh78vab5vcva8jb2bsi6p")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1411,7 +1411,7 @@ not available."))) (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1420,7 +1420,7 @@ not available."))) version ".tar.xz")) (sha256 (base32 - "0wyzkd5zx9qd3mwynkmxiin0fixaczb76lajhhcl2957iwb8phqb")))) + "1ba6qr4h16zap9f36dw5qip97s4bv83prncqka043l70w2kxpgdx")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1466,7 +1466,7 @@ backend for QtQuick scene graph.") (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1475,7 +1475,7 @@ backend for QtQuick scene graph.") version ".tar.xz")) (sha256 (base32 - "0iacdqa22dgvnp143klpzg5hxffy6fzqi5jn3r6liwhqzc86zpi5")))) + "0czdmmbjc6zpj213pwwgjh0h2awzmrgkqy5gl5a5vk7p8wfz126y")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1496,7 +1496,7 @@ and mobile applications targeting TV-like form factors."))) (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1505,7 +1505,7 @@ and mobile applications targeting TV-like form factors."))) version ".tar.xz")) (sha256 (base32 - "1y6l18df3qj03lr58clsmgn2n38nrf0gr2g5bwkm3081c8mbfvv9")) + "034n97nyz9ymjcxzqchvwr1bllzwav9hjpjkqggygcnd010wf7kg")) (modules '((guix build utils))) (snippet '(begin @@ -1527,7 +1527,7 @@ also contains functionality to support data models and executable content."))) (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1536,7 +1536,7 @@ also contains functionality to support data models and executable content."))) version ".tar.xz")) (sha256 (base32 - "0whn45q8dgm7bz5lqxzjfg56xhz2bi3axl50h5nqs3ix0h8s213q")))) + "0nv1psq1vsrpvk8y3lqgxl0g1w7ll6nrxhgw9zxg71ykhm4vrkkv")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1547,7 +1547,7 @@ purchasing goods and services."))) (define-public qtcanvas3d (package (inherit qtsvg) (name "qtcanvas3d") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1556,7 +1556,7 @@ purchasing goods and services."))) version ".tar.xz")) (sha256 (base32 - "0sbqrpx36x9filb693blwidgdqcxr88h8w5pky97l1rdajmfiq6p")) + "036q2r1disvb8aaiix7p0yn4wwqfq22qnsfkmqvgnnncwdnf0lqm")) (modules '((guix build utils))) (snippet '(begin @@ -1586,7 +1586,7 @@ drawing calls from Qt Quick JavaScript."))) (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1595,7 +1595,7 @@ drawing calls from Qt Quick JavaScript."))) version ".tar.xz")) (sha256 (base32 - "17lwcsbx2n8a19q54za1pipispj68r77vn6d55s88xy31nl6izq6")))) + "02361bf59bsnhk0kz767vbg4rbx8qn5z92avcfhh00ds2slk0z2c")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1613,7 +1613,7 @@ selecting one of the charts themes.") (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1622,7 +1622,7 @@ selecting one of the charts themes.") version ".tar.xz")) (sha256 (base32 - "0nmids4gf6f03byyaav4mq6qhby6bfjzmr4axsm051hc8gmhw5hw")))) + "1ws46ijmxmrgg6rmg9mb5sfa2zx4rpjw1f7vqqcgpirhafznbq8x")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1640,7 +1640,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.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1649,7 +1649,7 @@ customized by using themes or by adding custom items and labels to them.") version ".tar.xz")) (sha256 (base32 - "0mdz3pp3vzkz65i0cb62gnh7crng4k1a347yp5yjnnj0p13fn0g5")))) + "1wd967sqw0rf8j6wg4qm45rsrzfbg0kcf9j0rrq0qm9h5md4fcq9")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1669,7 +1669,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1678,7 +1678,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) version ".tar.xz")) (sha256 (base32 - "04zl2z1vffw7l831ginnv2dks1rn1glw4wc7c3q0pydz59w0rpal")))) + "1kgarxc63jx12ifgjj8cw2033nm1p0lkxq6762zyy7yxjfpk3wdc")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1702,7 +1702,7 @@ processes or computers."))) (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") - (version "5.12.4") + (version "5.12.5") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1711,7 +1711,7 @@ processes or computers."))) version ".tar.xz")) (sha256 (base32 - "1v4h9g4s3xjy2hnf4shk40bnjqnv0jix34glc68kqrpmnc7ndy9g")))) + "0nzj6vs56qplym1rr1jbybbpr5jwqhbjqk9igpcj06kd4gbhqk7r")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests -- cgit v1.2.3 From d967fbc13aaf47c8d7edc4102e45f2eaf8902ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 6 Mar 2019 08:05:06 +0100 Subject: gnu: ant-build-system: Don't override symlinks. When repacking jar-files, don't work on symlinks: Otherwise, they would be overridden with the repacked jar-file. * guix/build/ant-build-system.scm (regular-jar-file-predicate): New procedure. (generate-jar-indices, strip-jar-timestamps): Use it. --- guix/build/ant-build-system.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index 49549c1b4b..fae1b47ec5 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2018 Ricardo Wurmus +;;; Copyright © 2019 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -171,6 +172,12 @@ to the default GNU unpack strategy." #:allow-other-keys) (apply invoke `("ant" ,build-target ,@make-flags))) +(define (regular-jar-file-predicate file stat) + "Predicate returning true if FILE is ending on '.jar' +and STAT indicates it is a regular file." + (and ((file-name-predicate "\\.jar$") file stat) + (eq? 'regular (stat:type stat)))) + (define* (generate-jar-indices #:key outputs #:allow-other-keys) "Generate file \"META-INF/INDEX.LIST\". This file does not use word wraps and is preferred over \"META-INF/MANIFEST.MF\", which does use word wraps, @@ -181,7 +188,10 @@ dependencies of this jar file." (invoke "jar" "-i" jar)) (for-each (match-lambda ((output . directory) - (for-each generate-index (find-files directory "\\.jar$")))) + (for-each generate-index + (find-files + directory + regular-jar-file-predicate)))) outputs) #t) @@ -222,7 +232,8 @@ repack them. This is necessary to ensure that archives are reproducible." (for-each (match-lambda ((output . directory) - (for-each repack-archive (find-files directory "\\.jar$")))) + (for-each repack-archive + (find-files directory regular-jar-file-predicate)))) outputs) #t) -- cgit v1.2.3 From 44bac44ca13d0b79a32bfd8f96601fff78bd4cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 4 Mar 2019 19:10:35 +0100 Subject: gnu: java-javaee-servletapi: Don't use unstable tarball. * gnu/packages/java.scm (java-javaee-servletapi)[source]: Use git-fetch. --- gnu/packages/java.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d9ea5526b8..9c1cec2aa4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018, 2019 Gábor Boskovits ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2019 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -2940,14 +2941,15 @@ API and version 2.1 of the Java ServerPages API.") (package (name "java-javaee-servletapi") (version "3.1.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/javaee/servlet-spec/" - "archive/" version ".zip")) - (file-name (string-append name "-" version ".zip")) - (sha256 - (base32 - "0m6p13vgfb1ihich1jp5j6fqlhkjsrkn32c86bsbkryp38ipwg8w")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/javaee/servlet-spec.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0s03lj8w5an70lkqbjycgfrfk0kc07vbfav91jzk87gh3awf9ksl")))) (build-system ant-build-system) (arguments `(#:jar-name "javax-servletapi.jar" -- cgit v1.2.3 From 8ea8d607f978bbbf5d3062a52797f106a2beb041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 4 Mar 2019 18:42:22 +0100 Subject: gnu: java-javaee-servletapi: Add properties-files to jar. * gnu/packages/java.scm (jav-javaee-servletapi)[arguments]: Add phase 'copy-resources' to copy properties-files. --- gnu/packages/java.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9c1cec2aa4..ace50f3a47 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2955,7 +2955,25 @@ API and version 2.1 of the Java ServerPages API.") `(#:jar-name "javax-servletapi.jar" ;; no tests #:tests? #f - #:source-dir "src/main/java")) + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes/javax/servlet/http") + (let ((from-prefix "src/main/java/javax/servlet/") + (to-prefix "build/classes/javax/servlet/")) + (for-each (lambda (f) + (copy-file (string-append from-prefix f) + (string-append to-prefix f))) + (list "LocalStrings_ja.properties" + "LocalStrings.properties" + "LocalStrings_fr.properties" + "http/LocalStrings_es.properties" + "http/LocalStrings_ja.properties" + "http/LocalStrings.properties" + "http/LocalStrings_fr.properties"))) + #t))))) (native-inputs `(("unzip" ,unzip))) (home-page "https://javaee.github.io/servlet-spec/") -- cgit v1.2.3 From 53ba191b3b94c7961d703b58b9aaa2ebb6fe0429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 4 Mar 2019 20:53:43 +0100 Subject: gnu: Remove dependencies on java-tomcat, use servlet API instead. These packages are using java-tomcat as a dependency where they actually only need a servlet API. * gnu/packages/maven.scm (maven-wagon-tck-http)[inputs]: Remove java-tomcat, add java-javaee-servletapi. (maven-wagon-http)[native-inputs]: Same here. * gnu/packages/web.scm (java-eclipse-jetty-util)[inputs]: Same here. (java-eclipse-jetty-http-test-classes)[inputs]: Same here. (java-eclipse-jetty-security)[inputs]: Same here. (java-eclipse-jetty-servlet)[inputs]: Same here. (java-eclipse-jetty-webapp-9.2)[inputs]: Same here. --- gnu/packages/maven.scm | 5 +++-- gnu/packages/web.scm | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index d383f16255..592cc74f2d 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2019 Tobias Geerinckx-Rite +;;; Copyright © 2019 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -523,7 +524,7 @@ gets and puts artifacts using the file system."))) (inputs `(("java-plexus-util" ,java-plexus-utils) ("maven-wagon-provider-api" ,maven-wagon-provider-api) - ("java-tomcat" ,java-tomcat) + ("java-javaee-servletapi" ,java-javaee-servletapi) ("java-slf4j-api" ,java-slf4j-api) ("java-commons-codec" ,java-commons-codec) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) @@ -663,7 +664,7 @@ wagon providers supporting HTTP."))) ("java-jdom2" ,java-jdom2) ("java-asm" ,java-asm) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-tomcat" ,java-tomcat) + ("java-javaee-servletapi" ,java-javaee-servletapi) ("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2) ("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2) ("java-eclipse-jetty-http-9.2" ,java-eclipse-jetty-http-9.2) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6e89c3a406..a1c5593ee8 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5869,7 +5869,7 @@ Web Server.") #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat))) + ("servlet" ,java-javaee-servletapi))) (native-inputs `(("junit" ,java-junit) ("hamcrest" ,java-hamcrest-all) @@ -6057,7 +6057,7 @@ or embedded instantiation. This package provides the JMX management."))) #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("java-javaee-servletapi" ,java-javaee-servletapi) ("http" ,java-eclipse-jetty-http) ("io" ,java-eclipse-jetty-io) ("util" ,java-eclipse-jetty-util))))) @@ -6152,7 +6152,7 @@ artifact."))) #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("servlet" ,java-javaee-servletapi) ("http" ,java-eclipse-jetty-http) ("server" ,java-eclipse-jetty-server) ("util" ,java-eclipse-jetty-util))) @@ -6195,7 +6195,7 @@ infrastructure"))) #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("java-javaee-servletapi" ,java-javaee-servletapi) ("http" ,java-eclipse-jetty-http) ("http-test" ,java-eclipse-jetty-http-test-classes) ("io" ,java-eclipse-jetty-io) @@ -6330,7 +6330,7 @@ container."))) ("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2) ("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2) ("java-eclipse-jetty-xml-9.2" ,java-eclipse-jetty-xml-9.2) - ("java-tomcat" ,java-tomcat) + ("java-javaee-servletapi" ,java-javaee-servletapi) ,@(package-inputs java-eclipse-jetty-util-9.2))) (native-inputs `(("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2) -- cgit v1.2.3 From b503ae3dbadbfcf30344ea6f9fc676bbf2dcaeb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Thu, 9 Aug 2018 19:45:27 +0200 Subject: gnu: java-commons-daemon: Update to 1.1.0. * gnu/packages/java (java-commons-daemon): Update to 1.1.0. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ace50f3a47..718430dbb7 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6352,14 +6352,14 @@ This is a part of the Apache Commons Project.") (define-public java-commons-daemon (package (name "java-commons-daemon") - (version "1.0.15") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/daemon/source/" "commons-daemon-" version "-src.tar.gz")) (sha256 (base32 - "0ci46kq8jpz084ccwq0mmkahcgsmh20ziclp2jf5i0djqv95gvhi")))) + "141gkhfzv5v3pdhic6y4ardq2dhsa3v36j8wmmhy6f8mac48fp7n")))) (build-system ant-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From bc3497a573567c1936af26e10e634acf49808f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 15 Apr 2019 07:35:51 +0200 Subject: gnu: Add java-ecj in version 4.6.3. * gnu/packages/java.scm (java-ecj): New variable. --- gnu/packages/java.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 718430dbb7..15e814441f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2467,6 +2467,45 @@ Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n" (native-inputs `(("unzip" ,unzip))))) +(define-public java-ecj + (package (inherit java-ecj-3) + (version "4.6.3") + (source + (origin + (method url-fetch) + (uri (string-append + "http://archive.eclipse.org/eclipse/downloads/drops4/R-" + version + "-201703010400/ecjsrc-" + version + ".jar")) + (sha256 + (base32 + "11cfgsdgznja1pvlxkjbqykxd7pcd5655vkm7s44xmahmap15gpl")))) + (arguments + `(#:tests? #f ; none included + #:build-target "build" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build.xml + (lambda _ + (substitute* "src/build.xml" + (("^.*MANIFEST.*$") + "")) + #t)) + (add-after 'unpack 'fix-prop + (lambda _ + (substitute* "src/build.xml" + (("^.*properties.*$") + " + ")) + #t)) + (add-before 'build 'chdir + (lambda _ + (chdir "src") + #t)) + (replace 'install (install-jars "."))))))) + (define-public java-cisd-base (let ((revision 38938) (base-version "14.12.0")) -- cgit v1.2.3 From 39775121c4ebfbbb00f6a9a209f0acf795e6604c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Thu, 7 Mar 2019 00:58:05 +0100 Subject: gnu: java-tomcat: Build the full Tomcat package. Currently java-tomcat uses the "package" build-target. In that way, it is built like a library, with only the jar files. This commit will change the build-target to "deploy" in order to build the full tomcat package. * gnu/packages/web.scm (java-tomcat)[source]: Remove bat-files in snippet. [inputs]: Remove java-eclipse-jdt-core, add java-commons-daemon, java-ecj. [native-inputs]: Remove. [arguments]: Use "deploy" build-target, add phases 'modify-deploy, 'symlink-commons-daemon, 'symlink-java-ecj, change 'install phase. --- gnu/packages/web.scm | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a1c5593ee8..726e56338d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5718,14 +5718,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (snippet '(begin (for-each delete-file (find-files "." "\\.jar$")) + (for-each delete-file (find-files "." "\\.bat$")) #t)))) (build-system ant-build-system) (inputs - `(("java-eclipse-jdt-core" ,java-eclipse-jdt-core))) - (native-inputs - `(("java-junit" ,java-junit))) + `(("java-commons-daemon" ,java-commons-daemon) + ("java-ecj" ,java-ecj))) (arguments - `(#:build-target "package" + `(#:build-target "deploy" #:tests? #f; requires downloading some files. #:phases (modify-phases %standard-phases @@ -5748,6 +5748,34 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (("")) #t)) + (add-after 'unpack 'modify-deploy + (lambda _ + ;; The Tomcat build downloads and copies these files to the + ;; bin and lib directory. + ;; We instead symlink to the input (see below). + (substitute* "build.xml" + (("") + "")) + #t)) + (add-after 'install 'symlink-commons-daemon + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((commons-daemon (assoc-ref inputs "java-commons-daemon")) + (files (find-files commons-daemon "commons-daemon-.*\\.jar")) + (daemon-jar (car files)) + (out-bin (string-append (assoc-ref outputs "out") "/bin")) + (target (string-append out-bin "/commons-daemon.jar"))) + (symlink daemon-jar target) + #t))) + (add-after 'install 'symlink-java-ecj + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((java-ecj (assoc-ref inputs "java-ecj")) + (files (find-files java-ecj "ecj.*\\.jar")) + (java-ecj-jar (car files)) + (out-lib (string-append (assoc-ref outputs "out") "/lib")) + (target (string-append out-lib "/java-ecj.jar"))) + (symlink java-ecj-jar target) + #t))) (add-after 'unpack 'generate-properties (lambda _ ;; This could have been passed to make-flags, but getcwd returns @@ -5758,7 +5786,10 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (string-append "base.path=" (getcwd) "/downloads\n")))) #t)) (replace 'install - (install-jars "output/build/lib"))))) + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "output/build" out)) + #t))))) (home-page "https://tomcat.apache.org") (synopsis "Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket") -- cgit v1.2.3 From d99e7ee0f2bbe4abe08552afaa9821036da2a760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 1 May 2019 20:02:06 +0200 Subject: gnu: java-tomcat: Update to 8.5.46. * gnu/packages/web.scm (java-tomcat): Update to 8.5.46. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 726e56338d..fbf72b078a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5705,14 +5705,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (define-public java-tomcat (package (name "java-tomcat") - (version "8.5.38") + (version "8.5.46") (source (origin (method url-fetch) (uri (string-append "mirror://apache/tomcat/tomcat-8/v" version "/src/apache-tomcat-" version "-src.tar.gz")) (sha256 (base32 - "13pbsyk39g1qph82nngp54mqycmg60rxlxwy4yszsssahrqnggb2")) + "0fb49gsqa3r6jrwc54yynvsakq9qbzr2pbxr7a29c2zvja2v65iq")) (modules '((guix build utils))) ;; Delete bundled jars. (snippet -- cgit v1.2.3 From 8fc24f300b56bcebb7a1257f99767d5e964c52a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 13 Oct 2019 23:00:15 +0200 Subject: gnu: OpenSSL@1.0: Incorporate grafted changes. * gnu/packages/tls.scm (openssl-1.0): Update to 1.0.2t. [replacement]: Remove. [arguments]: Add #:parallel-build?. (openssl-1.0.2t): Remove variable. --- gnu/packages/tls.scm | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 2def6ee703..3aa3efbfb8 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -391,8 +391,7 @@ required structures.") (package (inherit openssl) (name "openssl") - (version "1.0.2s") - (replacement openssl-1.0.2t) + (version "1.0.2t") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -404,7 +403,7 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa")) + "1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql")) (patches (search-patches "openssl-runpath.patch" "openssl-c-rehash-in.patch")))) (outputs '("out" @@ -412,6 +411,8 @@ required structures.") "static")) ;6MiB of .a files (arguments (substitute-keyword-arguments (package-arguments openssl) + ;; Parallel build is not supported in 1.0.x. + ((#:parallel-build? _ #f) #f) ((#:phases phases) `(modify-phases ,phases (add-before 'patch-source-shebangs 'patch-tests @@ -474,27 +475,6 @@ required structures.") ,version "/misc")) #t))))))))) -(define openssl-1.0.2t - (package - (inherit openssl) - (version "1.0.2t") - (source (origin - (inherit (package-source openssl-1.0)) - (uri (list (string-append "https://www.openssl.org/source/openssl-" - version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/" - "openssl-" version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/old/" - (string-trim-right version char-set:letter) - "/openssl-" version ".tar.gz"))) - (sha256 - (base32 - "1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql")))) - (arguments - (substitute-keyword-arguments (package-arguments openssl-1.0) - ;; Parallel build is not supported in 1.0.x. - ((#:parallel-build? _ #f) #f))))) - (define-public libressl (package (name "libressl") -- cgit v1.2.3 From 52efb4adefe767c1ccdd5a643d960dce6756f83e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 13 Oct 2019 22:44:40 +0200 Subject: gnu: cups-filters: Update to 1.25.11. * gnu/packages/cups.scm (cups-filters): Update to 1.25.11. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 4c35c64c6c..72a75829fb 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -58,7 +58,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.25.7") + (version "1.25.11") (source(origin (method url-fetch) (uri @@ -66,7 +66,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "015lb60744win3hw84s1m1gyyb6n3vj4rw12yvm1fai8gf2zi4k9")) + "0ni8krr4rf5833livn9401cd41gspjvxj0iiqnc1rfg3x90i0fxh")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output -- cgit v1.2.3 From 531b63eba77e40ac65ed89bdba48f6174adf12d0 Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Tue, 1 Oct 2019 11:31:42 +0200 Subject: gnu: pulseaudio: Add optional X11 inputs. * gnu/packages/pulseaudio.scm (pulseaudio)[inputs]: Add libxcb, libice, libsm, and libxtst. Signed-off-by: Marius Bakke --- gnu/packages/pulseaudio.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 9777da540e..671dcd1563 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -50,7 +50,8 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-web) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages xiph)) + #:use-module (gnu packages xiph) + #:use-module (gnu packages xorg)) (define-public libsndfile (package @@ -182,6 +183,13 @@ rates.") ("libltdl" ,libltdl) ("fftwf" ,fftwf) ("avahi" ,avahi) + + ;; For the optional X11 modules. + ("libice" ,libice) + ("libsm" ,libsm) + ("libxcb" ,libxcb) + ("libxtst" ,libxtst) + ("eudev" ,eudev))) ;for the detection of hardware audio devices (native-inputs `(("check" ,check) -- cgit v1.2.3 From 2737c7fe8a24f18a7f1495781dbe34c4b8af5bed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 14 Oct 2019 18:16:21 +0200 Subject: gnu: mesa: Fix test failure on 32-bit systems. * gnu/packages/patches/mesa-timespec-test-32bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gl.scm (mesa)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/gl.scm | 3 ++- gnu/packages/patches/mesa-timespec-test-32bit.patch | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mesa-timespec-test-32bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index addeb82491..b403386d68 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1110,6 +1110,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ + %D%/packages/patches/mesa-timespec-test-32bit.patch \ %D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 81f808017d..63e12efe06 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -243,7 +243,8 @@ also known as DXTn or DXTC) for Mesa.") (base32 "1s81kwcjkkahnf5y5mshmd3q9j057hhsai7awpq6yb6im2hkriac")) (patches - (search-patches "mesa-skip-disk-cache-test.patch")))) + (search-patches "mesa-skip-disk-cache-test.patch" + "mesa-timespec-test-32bit.patch")))) (build-system meson-build-system) (propagated-inputs `(;; The following are in the Requires.private field of gl.pc. diff --git a/gnu/packages/patches/mesa-timespec-test-32bit.patch b/gnu/packages/patches/mesa-timespec-test-32bit.patch new file mode 100644 index 0000000000..3e4890f3a4 --- /dev/null +++ b/gnu/packages/patches/mesa-timespec-test-32bit.patch @@ -0,0 +1,17 @@ +Fix a test failure on 32-bit systems. + +Taken from upstream: +https://gitlab.freedesktop.org/mesa/mesa/commit/dd1dba80b9ee74ec8b90761285a8262e374bf8ef + +diff --git a/src/util/tests/timespec/timespec_test.cpp b/src/util/tests/timespec/timespec_test.cpp +--- a/src/util/tests/timespec/timespec_test.cpp ++++ b/src/util/tests/timespec/timespec_test.cpp +@@ -206,7 +206,7 @@ TEST(timespec_test, timespec_from_nsec) + + timespec_from_nsec(&a, UINT64_MAX); + EXPECT_EQ(a.tv_nsec, UINT64_MAX % NSEC_PER_SEC); +- EXPECT_EQ(a.tv_sec, UINT64_MAX / NSEC_PER_SEC); ++ EXPECT_EQ(a.tv_sec, (time_t)(UINT64_MAX / NSEC_PER_SEC)); + } + + TEST(timespec_test, timespec_from_usec) -- cgit v1.2.3 From c43626131222b7b62d8cb6f5fe90c072d440df26 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 15 Oct 2019 18:09:14 +0200 Subject: gnu: sdl2: Fix build on 32-bit architectures. * gnu/packages/patches/sdl2-mesa-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/sdl.scm (sdl2)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/patches/sdl2-mesa-compat.patch | 21 +++++++++++++++++++++ gnu/packages/sdl.scm | 1 + 3 files changed, 23 insertions(+) create mode 100644 gnu/packages/patches/sdl2-mesa-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index b403386d68..e7af37eb9c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1314,6 +1314,7 @@ dist_patch_DATA = \ %D%/packages/patches/scotch-build-parallelism.patch \ %D%/packages/patches/scotch-integer-declarations.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ + %D%/packages/patches/sdl2-mesa-compat.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ diff --git a/gnu/packages/patches/sdl2-mesa-compat.patch b/gnu/packages/patches/sdl2-mesa-compat.patch new file mode 100644 index 0000000000..8182e582e7 --- /dev/null +++ b/gnu/packages/patches/sdl2-mesa-compat.patch @@ -0,0 +1,21 @@ +Do not include GLES header when OpenGL headers are already included. + +Taken from upstream: +https://hg.libsdl.org/SDL/rev/369b01006eb2 + +diff -r 4cbaffd0083b -r 369b01006eb2 src/video/SDL_video.c +--- a/src/video/SDL_video.c Fri Oct 11 06:18:24 2019 +0200 ++++ b/src/video/SDL_video.c Sat Oct 12 18:47:56 2019 +0200 +@@ -37,9 +37,9 @@ + #include "SDL_opengl.h" + #endif /* SDL_VIDEO_OPENGL */ + +-#if SDL_VIDEO_OPENGL_ES ++#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL + #include "SDL_opengles.h" +-#endif /* SDL_VIDEO_OPENGL_ES */ ++#endif /* SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL */ + + /* GL and GLES2 headers conflict on Linux 32 bits */ + #if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL + diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 6093405c43..235353f617 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -114,6 +114,7 @@ joystick, and graphics hardware.") (uri (string-append "https://libsdl.org/release/SDL2-" version ".tar.gz")) + (patches (search-patches "sdl2-mesa-compat.patch")) (sha256 (base32 "0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl")))) -- cgit v1.2.3 From a1d1703a1dc6bfcd10f48fe707ee7ac65300a37d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 15 Oct 2019 18:18:38 +0200 Subject: gnu: orc: Fix broken header file. * gnu/packages/patches/orc-typedef-enum.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gstreamer.scm (orc)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/gstreamer.scm | 1 + gnu/packages/patches/orc-typedef-enum.patch | 17 +++++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 gnu/packages/patches/orc-typedef-enum.patch diff --git a/gnu/local.mk b/gnu/local.mk index e7af37eb9c..287ba10f7b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1181,6 +1181,7 @@ dist_patch_DATA = \ %D%/packages/patches/openssl-c-rehash-in.patch \ %D%/packages/patches/openssl-CVE-2019-1559.patch \ %D%/packages/patches/open-zwave-hidapi.patch \ + %D%/packages/patches/orc-typedef-enum.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \ %D%/packages/patches/ots-no-include-missing-file.patch \ diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 0d951009da..51b9d8f11c 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -74,6 +74,7 @@ (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/data/src/" "orc/orc-" version ".tar.xz")) + (patches (search-patches "orc-typedef-enum.patch")) (sha256 (base32 "0wj93im7i8a6546q2r8sp39yjfbxflkc0ygb0b8iqsd58qhvjhds")))) diff --git a/gnu/packages/patches/orc-typedef-enum.patch b/gnu/packages/patches/orc-typedef-enum.patch new file mode 100644 index 0000000000..207bf32ba9 --- /dev/null +++ b/gnu/packages/patches/orc-typedef-enum.patch @@ -0,0 +1,17 @@ +Orc 0.4.30 has a bug that causes duplicate symbols due to a missing typedef. + +Taken from upstream: +https://gitlab.freedesktop.org/gstreamer/orc/merge_requests/32 + +diff --git a/orc/orctarget.h b/orc/orctarget.h +--- a/orc/orctarget.h ++++ b/orc/orctarget.h +@@ -19,7 +19,7 @@ enum { + ORC_TARGET_FAST_DENORMAL = (1<<31) + }; + +-enum { ++typedef enum { + ORC_TARGET_POWERPC_64BIT = (1<<0), + ORC_TARGET_POWERPC_LE = (1<<1), + ORC_TARGET_POWERPC_ALTIVEC = (1<<2), -- cgit v1.2.3 From a5ef1bcd24a53c13d868db786a645b6e0f10aea9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Oct 2019 11:53:03 +0200 Subject: gnu: looking-glass-client: Adjust for Mesa 19.2. * gnu/packages/virtualization.scm (looking-glass-client)[arguments]: Add phase 'add-missing-include'. --- gnu/packages/virtualization.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index a3504882a2..93e1cb5ec5 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -848,13 +848,20 @@ Machine Protocol.") (lambda* (#:key outputs #:allow-other-keys) (chdir "client") #t)) + (add-after 'chdir-to-client 'add-missing-include + (lambda _ + ;; Mimic upstream commit b9797529893, required since the + ;; update to Mesa 19.2. + (substitute* "renderers/egl/shader.h" + (("#include ") + "#include \n#include ")) + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (install-file "looking-glass-client" (string-append (assoc-ref outputs "out") "/bin")) - #t)) - ))) + #t))))) (home-page "https://looking-glass.hostfission.com") (synopsis "KVM Frame Relay (KVMFR) implementation") (description "Looking Glass allows the use of a KVM (Kernel-based Virtual -- cgit v1.2.3 From 47dda6e01e51478567e013e3814aaf48143abbc3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Oct 2019 12:12:21 +0200 Subject: gnu: rust: Use GDB 8.2 for tests. * gnu/packages/gdb.scm (gdb-8.2): New public variable. * gnu/packages/rust.scm (rust-1.27)[native-inputs]: Use GDB-8.2 instead of GDB. --- gnu/packages/gdb.scm | 12 ++++++++++++ gnu/packages/rust.scm | 3 +++ 2 files changed, 15 insertions(+) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 66bdb81a74..81e2892ad2 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -106,6 +106,18 @@ the program is running to try to fix bugs. It can be used to debug programs written in C, C++, Ada, Objective-C, Pascal and more.") (license gpl3+))) +(define-public gdb-8.2 + (package/inherit + gdb-8.3 + (version "8.2.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gdb/gdb-" + version ".tar.xz")) + (sha256 + (base32 + "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha")))))) + (define-public gdb ;; This is the fixed version that packages depend on. Update it rarely ;; enough to avoid massive rebuilds. diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 241826ef82..d04cb0ab9d 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -779,6 +779,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" "rust-bootstrap-stage0-test.patch" "rust-1.25-accept-more-detailed-gdb-lines.patch" "rust-reproducible-builds.patch"))))) + (native-inputs + (alist-replace "gdb" (list gdb-8.2) + (package-native-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) -- cgit v1.2.3 From 133be097a8064219927b1698160ecbed34db12ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Oct 2019 18:28:32 +0200 Subject: gnu: rust@1.27: Add comment about GDB requirement. This is a follow-up to commit 47dda6e01e51478567e013e3814aaf48143abbc3. * gnu/packages/rust.scm (rust-1.27)[native-inputs]: Add comment. --- gnu/packages/rust.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d04cb0ab9d..cec565bbc8 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -780,6 +780,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" "rust-1.25-accept-more-detailed-gdb-lines.patch" "rust-reproducible-builds.patch"))))) (native-inputs + ;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically. + ;; See . (alist-replace "gdb" (list gdb-8.2) (package-native-inputs base-rust))) (arguments -- cgit v1.2.3 From 07abc851ce8a580253061e065b31a4037d2f965d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Oct 2019 18:53:13 +0200 Subject: gnu: kwindowsystem: Fix test failure with Qt 5.12. * gnu/packages/patches/kwindowsystem-qt-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/kde-frameworks.scm (kwindowsystem)[source](patches): New field. [inputs]: Add XCB-UTIL-WM. --- gnu/local.mk | 1 + gnu/packages/kde-frameworks.scm | 4 +- gnu/packages/patches/kwindowsystem-qt-compat.patch | 97 ++++++++++++++++++++++ 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/kwindowsystem-qt-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index f3712d8920..78456aae66 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1015,6 +1015,7 @@ dist_patch_DATA = \ %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \ %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ %D%/packages/patches/kodi-skip-test-449.patch \ + %D%/packages/patches/kwindowsystem-qt-compat.patch \ %D%/packages/patches/laby-make-install.patch \ %D%/packages/patches/lcalc-default-parameters-1.patch \ %D%/packages/patches/lcalc-default-parameters-2.patch \ diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ec735d8903..c1279fffd4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1081,6 +1081,7 @@ configuration pages, message boxes, and password requests.") "mirror://kde/stable/frameworks/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "kwindowsystem-qt-compat.patch")) (sha256 (base32 "10zdxm08d758zbwlrbsn0ghxjpf39ids2s5pnca072gbrbrxv656")))) @@ -1096,7 +1097,8 @@ configuration pages, message boxes, and password requests.") `(("libxrender" ,libxrender) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras) - ("xcb-utils-keysyms" ,xcb-util-keysyms))) + ("xcb-utils-keysyms" ,xcb-util-keysyms) + ("xcb-util-wm" ,xcb-util-wm))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/kwindowsystem-qt-compat.patch b/gnu/packages/patches/kwindowsystem-qt-compat.patch new file mode 100644 index 0000000000..ef31636917 --- /dev/null +++ b/gnu/packages/patches/kwindowsystem-qt-compat.patch @@ -0,0 +1,97 @@ +Fix test failure with Qt 5.12. + +Taken from upstream: +https://cgit.kde.org/kwindowsystem.git/commit/?id=14998613603c7d8f91b011a2c9c20396067add0e + +diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt +index f8e67f0..c1121a7 100644 +--- a/autotests/CMakeLists.txt ++++ b/autotests/CMakeLists.txt +@@ -12,12 +12,12 @@ add_subdirectory(helper) + + if (NOT APPLE) + find_package(X11) +- find_package(XCB COMPONENTS XCB KEYSYMS) ++ find_package(XCB COMPONENTS XCB ICCCM KEYSYMS) + endif() + + macro(KWINDOWSYSTEM_UNIT_TESTS) + foreach(_testname ${ARGN}) +- set(libs KF5::WindowSystem Qt5::Test Qt5::Widgets Qt5::X11Extras XCB::KEYSYMS) ++ set(libs KF5::WindowSystem Qt5::Test Qt5::Widgets Qt5::X11Extras XCB::ICCCM XCB::KEYSYMS) + if(X11_FOUND) + list(APPEND libs ${XCB_XCB_LIBRARY}) + endif() +diff --git a/autotests/kwindowinfox11test.cpp b/autotests/kwindowinfox11test.cpp +index 634c650..f483c46 100644 +--- a/autotests/kwindowinfox11test.cpp ++++ b/autotests/kwindowinfox11test.cpp +@@ -25,8 +25,11 @@ + #include + #include + #include ++#include + #include + ++#include ++ + #include + + Q_DECLARE_METATYPE(WId) +@@ -598,19 +601,23 @@ void KWindowInfoX11Test::testWindowRole() + + void KWindowInfoX11Test::testClientMachine() + { ++ const QByteArray oldHostName = QSysInfo::machineHostName().toLocal8Bit(); ++ + KWindowInfo info(window->winId(), NET::Properties(), NET::WM2ClientMachine); +- QVERIFY(info.clientMachine().isNull()); ++ QCOMPARE(info.clientMachine(), oldHostName); + + // client machine needs to be set through xcb ++ const QByteArray newHostName = oldHostName + "2"; + xcb_change_property(QX11Info::connection(), XCB_PROP_MODE_REPLACE, window->winId(), +- XCB_ATOM_WM_CLIENT_MACHINE, XCB_ATOM_STRING, 8, 9, "localhost"); ++ XCB_ATOM_WM_CLIENT_MACHINE, XCB_ATOM_STRING, 8, newHostName.count(), ++ newHostName.data()); + xcb_flush(QX11Info::connection()); + + // it's just a property change so we can easily refresh + QX11Info::getTimestamp(); + + KWindowInfo info2(window->winId(), NET::Properties(), NET::WM2ClientMachine); +- QCOMPARE(info2.clientMachine(), QByteArrayLiteral("localhost")); ++ QCOMPARE(info2.clientMachine(), newHostName); + } + + void KWindowInfoX11Test::testName() +@@ -680,11 +687,25 @@ void KWindowInfoX11Test::testTransientFor() + + void KWindowInfoX11Test::testGroupLeader() + { +- KWindowInfo info(window->winId(), NET::Properties(), NET::WM2GroupLeader); +- QCOMPARE(info.groupLeader(), WId(0)); ++ // WM_CLIENT_LEADER is set by default ++ KWindowInfo info1(window->winId(), NET::Properties(), NET::WM2GroupLeader); ++ QVERIFY(info1.groupLeader() != XCB_WINDOW_NONE); ++ ++ xcb_connection_t *connection = QX11Info::connection(); ++ xcb_window_t rootWindow = QX11Info::appRootWindow(); ++ ++ xcb_window_t leader = xcb_generate_id(connection); ++ xcb_create_window(connection, XCB_COPY_FROM_PARENT, leader, rootWindow, 0, 0, 1, 1, ++ 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, 0, nullptr); ++ ++ xcb_icccm_wm_hints_t hints = {}; ++ hints.flags = XCB_ICCCM_WM_HINT_WINDOW_GROUP; ++ hints.window_group = leader; ++ xcb_icccm_set_wm_hints(connection, leader, &hints); ++ xcb_icccm_set_wm_hints(connection, window->winId(), &hints); + +- // TODO: here we should try to set a group leader and re-read it +- // this needs setting and parsing the WMHints ++ KWindowInfo info2(window->winId(), NET::Properties(), NET::WM2GroupLeader); ++ QCOMPARE(info2.groupLeader(), leader); + } + + void KWindowInfoX11Test::testExtendedStrut() -- cgit v1.2.3 From e8062974d5cc598134da4d57ff45970ac431611b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Oct 2019 16:34:15 +0200 Subject: gnu: python-pyqt: Fix runtime error. * gnu/packages/patches/pyqt-unbundled-qt.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/qt.scm (python-pyqt)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/patches/pyqt-unbundled-qt.patch | 19 +++++++++++++++++++ gnu/packages/qt.scm | 1 + 3 files changed, 21 insertions(+) create mode 100644 gnu/packages/patches/pyqt-unbundled-qt.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1fc916f6b3..7f690598c0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1253,6 +1253,7 @@ dist_patch_DATA = \ %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ %D%/packages/patches/pyqt-configure.patch \ %D%/packages/patches/pyqt-public-sip.patch \ + %D%/packages/patches/pyqt-unbundled-qt.patch \ %D%/packages/patches/python-2-deterministic-build-info.patch \ %D%/packages/patches/python-2.7-adjust-tests.patch \ %D%/packages/patches/python-2.7-search-paths.patch \ diff --git a/gnu/packages/patches/pyqt-unbundled-qt.patch b/gnu/packages/patches/pyqt-unbundled-qt.patch new file mode 100644 index 0000000000..5c91ed031c --- /dev/null +++ b/gnu/packages/patches/pyqt-unbundled-qt.patch @@ -0,0 +1,19 @@ +Remove test for bundled Qt which breaks dependent applications. This has +been fixed in 5.13. + +Taken from Arch Linux: +https://git.archlinux.org/svntogit/packages.git/tree/trunk/python2-pyqt5-crash-fix.patch?h=packages/pyqt5&id=3e56e11d1fd7b1eac8242ce64c58db2bd9acba20 + +diff -ur PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in +--- PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in 2019-06-25 14:41:02.000000000 +0200 ++++ PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in 2019-07-01 17:06:34.882644535 +0200 +@@ -151,8 +151,4 @@ + // initialised first (at least for Windows) and this is the only way to + // guarantee things are done in the right order. + PyQtSlotProxy::mutex = new QMutex(QMutex::Recursive); +- +- // Load the embedded qt.conf file if there is a bundled copy of Qt. +- if (!qpycore_qt_conf()) +- Py_FatalError("PyQt5.QtCore: Unable to embed qt.conf"); + } + diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a8b2bb40be..8928c1ddd4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1806,6 +1806,7 @@ module provides support functions to the automatically generated code.") (base32 "041155bdzp57jy747p5d59740c55yy3241cy1x2lgcdsvqvzmc0d")) (patches (search-patches "pyqt-configure.patch" + "pyqt-unbundled-qt.patch" "pyqt-public-sip.patch")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From ea57bb893eeb7008064d2f511dede616d4bdcbd1 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 5 Nov 2019 21:44:49 +0100 Subject: gnu: grantlee: Fix build for Qt 5.12. Build using gnu++11 standard. * gnu/packages/qt.scm(grantlee)[argument]: New element. --- gnu/packages/qt.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8928c1ddd4..0ef879678f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -100,7 +100,8 @@ ("qtscript" ,qtscript))) (build-system cmake-build-system) (arguments - `(#:phases + `(#:configure-flags '("-DCMAKE_CXX_STANDARD=11") + #:phases (modify-phases %standard-phases (add-after 'unpack 'delete-broken-tests (lambda _ -- cgit v1.2.3 From 8bfd7c8beb75ed3838efdf5973b9db5fb3ced68c Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 8 Nov 2019 11:14:52 +0100 Subject: gnu: qtwebkit: Use sqlite-with-column-metadata. This needs to be the same variant as for qtbase, otherwise applications might fail if libQt5WebKit is loaded prior to libQt5Sql. * gnu/packages/qt.scm(wtwebkit)[inputs]: Replace sqlite by sqlite-with-column-metadata. --- gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 0ef879678f..222a0cc867 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2182,7 +2182,7 @@ different kinds of sliders, and much more.") ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libwebp" ,libwebp) - ("sqlite" ,sqlite) + ("sqlite" ,sqlite-with-column-metadata) ("fontconfig" ,fontconfig) ("libxrender" ,libxrender) ("qtbase" ,qtbase) -- cgit v1.2.3 From 4f8071f2a6dfeabe12952fcbd0ae4a11cf56568e Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 19 Oct 2019 10:28:34 +0200 Subject: gnu: phonon: Update to 4.11.1. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index c1279fffd4..a084d7a260 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -139,7 +139,7 @@ common build settings used in software produced by the KDE community.") (define-public phonon (package (name "phonon") - (version "4.10.1") + (version "4.11.1") (source (origin (method url-fetch) (uri (string-append @@ -148,7 +148,7 @@ common build settings used in software produced by the KDE community.") name "-" version ".tar.xz")) (sha256 (base32 - "1dwdw0hm6685psrp7v9frhkhqvsxrbdnm3gw794j5z7g3brqvag5")))) + "0bfy8iqmjhlg3ma3iqd3kxjc2zkzpjgashbpf5x17y0dc2i1whxl")))) (build-system cmake-build-system) (native-inputs ;; TODO: Think about adding pulseaudio. Is it required for sound? -- cgit v1.2.3 From a1cbeb7b104a68ad769a9a57333b3475427f730f Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 19 Oct 2019 10:28:53 +0200 Subject: gnu: phonon-backend-gstreamer: Update to 4.10.0. * gnu/packages/kde-frameworks.scm(phonon-backend-gstreamer): Update to 4.10.0; [inputs]: Add qttools. --- gnu/packages/kde-frameworks.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index a084d7a260..613a1a9734 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -180,7 +180,7 @@ common build settings used in software produced by the KDE community.") (define-public phonon-backend-gstreamer (package (name "phonon-backend-gstreamer") - (version "4.9.0") + (version "4.10.0") (source (origin (method url-fetch) (uri (string-append @@ -189,7 +189,7 @@ common build settings used in software produced by the KDE community.") name "-" version ".tar.xz")) (sha256 (base32 - "1wc5p1rqglf0n1avp55s50k7fjdzdrhg0gind15k8796w7nfbhyf")))) + "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -198,6 +198,7 @@ common build settings used in software produced by the KDE community.") `(("qtbase" ,qtbase) ("phonon" ,phonon) ("qtbase" ,qtbase) + ("qttools" ,qttools) ("qtx11extras" ,qtx11extras) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) -- cgit v1.2.3 From 1dd1076c5e80141ab65dddce053e93fc5af18c84 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 19 Oct 2019 10:31:00 +0200 Subject: gnu: kde-frameworks: Update to 5.63.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit KHolidays is part of frameworks since version 5.43 already. * gnu/packages/kde.scm(kholidays): Move to … * gnu/packages/kde-frameworks.scm(kholidays) … here, update to 5.63.0 and [source]: Update path. (attica, baloo, bluez-qt, breeze- icons, extra-cmake-modules, kactivities, kactivities-stats, kapidox, karchive, kauth, kbookmarks, kcmutils, kcodecs, kcompletion, kconfig, kcoreaddons, kcrash, kdbusaddons, kde-frameworkintegration, kdeclarative, kded, kdelibs4support, kdesu, kdnssd, kdoctools, kemoticons, kglobalaccel, kguiaddons, khtml, ki18n, kidletime, kimageformats, kinit, kirigami, kitemmodels, kitemviews, kjobwidgets, kjs, kjsembed, kmediaplayer, knewstuff, knotifications, knotifyconfig, kpackage, kparts, kpeople, kpty, kross, krunner, kservice, ksyntaxhighlighting, ktexteditor, kunitconversion, kwallet, kwidgetsaddons, kxmlrpcclient, modemmanager-qt, networkmanager-qt, oxygen-icons, plasma-framework, prison, qqc2-desktop-style, solid, sonnet, threadweaver): Update to 5.63.0. (kconfigwidgets): Update to 5.63.0; [inputs]: Add qttools. (kdesignerplugin): Update to 5.63.0; [source]: Update path. (kdewebkit): Update to 5.63.0; [source]: Update path.; [inputs]: Add qttools. (kfilemetadata): Update to 5.63.0; [inputs]: Add kcoreaddons; [arguments]<#pahses>: Add a test-case to the blacklist (kiconthemes): Update to 5.63.0; [inputs]: Add qttools. (kio): Update to 5.63.0; [inputs]: Add qttools. (kplotting): Update to 5.63.0; [inputs]: Add qttools. (ktextwidgets): Update to 5.63.0; [inputs]: Add qttools. (kwayland): Update to 5.63.0; [inputs]: Add wayland-protocols. (kwindowsystem): Update to 5.63.0, update blacklist or tests, explicitly set XDG_RUNTIME_DIR; [inputs]: Add xcb-util-wm. (kxmlgui): Update to 5.63.0; [inputs]: Add qttools. * gnu/packages/patches/kinit-kdeinit-extra_libs.patch: Adjust. * gnu/packages/patches/kwindowsystem-qt-compat.patch: Remove obsolete patch. --- gnu/packages/kde-frameworks.scm | 370 ++++++++++++--------- gnu/packages/kde.scm | 35 -- .../patches/kinit-kdeinit-extra_libs.patch | 4 +- gnu/packages/patches/kwindowsystem-qt-compat.patch | 97 ------ 4 files changed, 209 insertions(+), 297 deletions(-) delete mode 100644 gnu/packages/patches/kwindowsystem-qt-compat.patch diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 613a1a9734..85c3736669 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -78,7 +78,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -87,7 +87,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1x868hs9jiqzkqx7gld4mdm5dzfxc5kann22y15a4f7g5a957534")))) + "14h7519bfkwzh58lxgxrj5jlfhfnrakhjcm6lmhafnkg5h56m4kr")))) (build-system cmake-build-system) (native-inputs `(("qtbase" ,qtbase))) ; For tests (needs qmake) @@ -254,7 +254,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") (define-public attica (package (name "attica") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -263,7 +263,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0bsn9mi3nj23k2r3mfgjm9i1mp8qnwf08xn9x757wk3xas0cx98v")))) + "0dvsjwl2c3liiicv2m8p1m7hlc3fcapsj5pfirmdm1l38wcayr60")))) (build-system cmake-build-system) (arguments `(#:phases @@ -294,7 +294,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (define-public bluez-qt (package (name "bluez-qt") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -303,7 +303,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") name "-" version ".tar.xz")) (sha256 (base32 - "1ixad1ya3c339c675w8nwmbga8ydq16db9fk2az3gjm68z3dch8a")))) + "179am9czhb9mcirmja5bxjmqil3qg81v56n8rmkkp5q50qpln4dh")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -327,7 +327,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -336,7 +336,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") name "-" version ".tar.xz")) (sha256 (base32 - "03mb7x8mc2h6cjb4mrifrbkbpj3lv9c0mg4m619rqiydg0p1yf49")))) + "17kil9dlh8w5r29arrjbv47b7jxz45kqzpg06zw3vz70bdgbb995")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -356,7 +356,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") (define-public kapidox (package (name "kapidox") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -365,7 +365,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0x41adp3rnvr6njc57ffdyh6d5i5aw13xcjdr4p6kacw9pk63ajf")))) + "0cwprhpz731bqqhr6vra6lc76k5i4pm3m9j0q21km9wm2djfmk19")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; has no test target @@ -398,7 +398,7 @@ documentation.") (define-public karchive (package (name "karchive") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -407,7 +407,7 @@ documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "1llznxc5wjjnmbjx8iwi3a93gc2z0z344viknsgls1fwdjjfyxc4")))) + "0ypykybxl9dz57rgsfihx4rfhzhphidypb2f5nwrw1f6vlqkawzs")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -432,7 +432,7 @@ GZip format, via a subclass of QIODevice.") (define-public kcodecs (package (name "kcodecs") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -441,7 +441,7 @@ GZip format, via a subclass of QIODevice.") name "-" version ".tar.xz")) (sha256 (base32 - "0491j6l28jwfpgaqs2816qpyggnra2df33iw3fgvb0wd4r4gvmjb")))) + "0w5q37lqdzyl84723kg9sh9xxn2g2wv0xfxpy3218hmc9364s89h")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -468,7 +468,7 @@ Internet).") (define-public kconfig (package (name "kconfig") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -477,7 +477,7 @@ Internet).") name "-" version ".tar.xz")) (sha256 (base32 - "06gscipc3914gwiswhp1xx4sy74bpy645ykq2i6r1sb6sm16hmja")))) + "1ya0fvrrfiw4a5wkydcjpnkkyq3ampxy5h210dm04qim6a9x8rb1")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -533,7 +533,7 @@ propagate their changes to their respective configuration files.") (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -542,7 +542,7 @@ propagate their changes to their respective configuration files.") name "-" version ".tar.xz")) (sha256 (base32 - "1j7bc5fhak8db3vdfslbjdffbdclakhfwsni2a855d08yfrl1n1w")))) + "1w658wfksxglr0fjpa2p8gmjbvpd2knzhk3byk2s9dwil7i7cvjd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -590,7 +590,7 @@ many more.") (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -599,7 +599,7 @@ many more.") name "-" version ".tar.xz")) (sha256 (base32 - "1sj3cycgci3ih65bkh7bsvbzyp7r654ppcryj4azpcsxqhy5gc7l")) + "11zwr89v0k4m1235rzr39z4cbfdwn5zg34abs62nfnr8vmba62qv")) (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (build-system cmake-build-system) (native-inputs @@ -635,7 +635,7 @@ as well as an API to create KDED modules.") (define-public kdnssd (package (name "kdnssd") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -644,7 +644,7 @@ as well as an API to create KDED modules.") name "-" version ".tar.xz")) (sha256 (base32 - "0lljj7mxmqm60kfzr37zb7z58mfyfh7zgykf7a5is1k0lxpgk6zc")))) + "1bn9c6ii1n6ns478i3lp7yzga7dbcqvdb43rfzmz7gndnmh853gm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -663,7 +663,7 @@ infrastructure.") (define-public kguiaddons (package (name "kguiaddons") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -672,7 +672,7 @@ infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "190jwhvq2fi8g03saszlaslzxmcbqrbwli9f9vm6h5j9nnc0z6h3")))) + "0k22kargqxf0j09wzk1x90b526npj8a0210ilk0n1k6spc8xa6mr")))) (build-system cmake-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, @@ -698,10 +698,45 @@ infrastructure.") interfaces in the areas of colors, fonts, text, images, keyboard input.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kholidays + (package + (name "kholidays") + (version "5.63.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1035kh0na4hwp4pnsi8p1nd7r114d4bgdnjr0g2hwmy868vx0a67")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + ;; blacklist a failing test function TODO: make it pass + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (display "[testDefaultRegions]\n*\n"))) + #t))))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative))) + (home-page "https://cgit.kde.org/kholidays.git") + (synopsis "Library for regional holiday information") + (description "This library provides a C++ API that determines holiday and +other special events for a geographical region.") + (license license:lgpl2.0+))) + (define-public ki18n (package (name "ki18n") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -710,7 +745,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") name "-" version ".tar.xz")) (sha256 (base32 - "0kvwjzqibby9fawyfb8bd81abjhsjlyi8xy9mcapnih5x2gx3z92")))) + "1fdp0bdvqbqzbxynbg3bcdridr8j3qnm9spyrrdg5q95sz99a4s9")))) (build-system cmake-build-system) (propagated-inputs `(("gettext" ,gettext-minimal) @@ -744,7 +779,7 @@ translation scripting.") (define-public kidletime (package (name "kidletime") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -753,7 +788,7 @@ translation scripting.") name "-" version ".tar.xz")) (sha256 (base32 - "1kq6zh6cjhzffjhxnc7l1pw6g38swxyspp8xl8c860zdhc9xfd1g")))) + "0zd51lsz23rqwk4lnzs5653sanprgr80p33yk8gmgsihgyfbjv0r")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -775,7 +810,7 @@ or user activity.") ;; plasma-framework which is tier 3. (package (name "kirigami") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -784,7 +819,7 @@ or user activity.") "kirigami2-" version ".tar.xz")) (sha256 (base32 - "11djxli5cq7pn19lmjz2y7z39mhlr98jskasfzyax546j47v973k")))) + "1v76d1xgmi9kkxiwq4y6rzaxs1hwwm95pw490m09rgqhli7180yv")))) (properties `((upstream-name . "kirigami2"))) (build-system cmake-build-system) (native-inputs @@ -811,7 +846,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (define-public kitemmodels (package (name "kitemmodels") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -820,7 +855,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") name "-" version ".tar.xz")) (sha256 (base32 - "13609avkqrfi79zyr737662nr8bwcfdya9dxc6gzyqx5i0l2nbw6")))) + "10bhg0db9gdg2hlc02ngg1i2q7a99862d5973hxqzf620d28p5rd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -870,7 +905,7 @@ model to observers (define-public kitemviews (package (name "kitemviews") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -879,7 +914,7 @@ model to observers name "-" version ".tar.xz")) (sha256 (base32 - "1mgh7z5xcbhc7a2qq8mqfp7j4amk93hypkpy2zc3rdhc60ps94ad")))) + "15h0w16wgj94kxz4vgjb34i3pyx5w1f2npj86j4d2sa0mxxpmqyz")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -905,7 +940,7 @@ to flat and hierarchical lists.") (define-public kplotting (package (name "kplotting") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -914,12 +949,13 @@ to flat and hierarchical lists.") name "-" version ".tar.xz")) (sha256 (base32 - "0nn2v1yvvpzpi1y1pm47zvmwsa942c7d9n8iqymqihnp0fqjr8y7")))) + "11kpq34j37c1gsvj5nxhkc31bw8gw2n7nkqsfx87jw9f4v2vhmr9")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase) + ("qttools" ,qttools))) (arguments `(#:phases (modify-phases %standard-phases @@ -940,7 +976,7 @@ pixel units.") (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -949,7 +985,7 @@ pixel units.") "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "00w5nmz9l70znv8q7q1zw3f7gngwfgf41iwbs53zqcv1z7wmrz6m")))) + "08y0m4wcq1sbxvlga3w72waj5xckh5jra5x7rvnp87dl38qxhacs")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -989,7 +1025,7 @@ integration with a custom editor as well as a ready-to-use (define-public kwayland (package (name "kwayland") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -998,14 +1034,15 @@ integration with a custom editor as well as a ready-to-use name "-" version ".tar.xz")) (sha256 (base32 - "0m9q13qzgvp03jrsyc59l6pp7jf0dvhx768p21drs46qxw6wla7l")))) + "03z8hiw0mrhl3f0y7ypc46ic0w5vlp56prbqbk448jin5hakkkdg")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) (inputs `(("qtbase" ,qtbase) - ("wayland" ,wayland))) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) (arguments `(#:tests? #f ; FIXME tests require weston to run ; weston requires wayland flags in mesa @@ -1028,7 +1065,7 @@ represented by a QPoint or a QSize.") (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1037,7 +1074,7 @@ represented by a QPoint or a QSize.") name "-" version ".tar.xz")) (sha256 (base32 - "0kpbvvmjrhxxjqc0cb63zlq06a3xspq43xv3wdingcn28zypynzc")))) + "1nzgv3v3kyq5jm2b9xri6qjawspr9ycxhskfvj8kkgr46dr35qyc")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1075,17 +1112,16 @@ configuration pages, message boxes, and password requests.") (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches (search-patches "kwindowsystem-qt-compat.patch")) (sha256 (base32 - "10zdxm08d758zbwlrbsn0ghxjpf39ids2s5pnca072gbrbrxv656")))) + "0nbkb8pkrbbp1s892ndzhakzri3qxpw48kibgb0rqz6i0azfxrz8")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1108,12 +1144,13 @@ configuration pages, message boxes, and password requests.") ;; Blacklist a failing test-functions. FIXME: Make it pass. (with-output-to-file "autotests/BLACKLIST" (lambda _ - (display "[testState]\n*\n") - (display "[testSupported]\n*\n"))) + (display "[testGroupLeader]\n*\n") + (display "[testClientMachine]\n*\n"))) ;; requires network #t)) (replace 'check (lambda _ ;; The test suite requires a running window anager + (setenv "XDG_RUNTIME_DIR" "/tmp") (system "Xvfb :1 -ac -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") (sleep 5) ;; Give Xvfb a few moments to get on it's feet @@ -1138,7 +1175,7 @@ lower level classes for interaction with the X Windowing System.") (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1147,7 +1184,7 @@ lower level classes for interaction with the X Windowing System.") name "-" version ".tar.xz")) (sha256 (base32 - "10pkgm4dzsrfnjsf78pssd1wp0y27d1y834chd267hx9vgrv8axm")))) + "0yv5q71cyyy04051ny5lr7n35pw391gxr6l324n6c0z7kgc560ad")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1176,7 +1213,7 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1185,7 +1222,7 @@ messages.") name "-" version ".tar.xz")) (sha256 (base32 - "0j8l4k13vsqh0a8mw8dw5bc78xvxhz2rh7bb870as04i32bvw772")))) + "0ydfz6ikya1h8gg9c716y8lmy45iqnx0gaghkm0vz3c3ckx99l9g")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1215,7 +1252,7 @@ which are used in DBus communication.") (define-public oxygen-icons (package (name "oxygen-icons") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1224,7 +1261,7 @@ which are used in DBus communication.") name "5" "-" version ".tar.xz")) (sha256 (base32 - "0fvm9bq1573xkha4a577s1iik8nwzks8xhrli5mm6rbh53s12wp4")))) + "0rh9bysiisnpz3c92hyba98f58dlmwf9zhbbb4vmab0qvm5d3q9g")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1240,7 +1277,7 @@ which are used in DBus communication.") (define-public prison (package (name "prison") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) @@ -1248,7 +1285,7 @@ which are used in DBus communication.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1xadc2fq6csml78czg5p572cwvmqmn334a5dxjnd7k1pdx50gi07")))) + (base32 "0spkm5j2qmwl374xrbm054rjv4rcqwsz0wl5v2nyrfq2ma4bzzw5")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1265,7 +1302,7 @@ provides uniform access to generation of barcodes with data.") (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1274,7 +1311,7 @@ provides uniform access to generation of barcodes with data.") name "-" version ".tar.xz")) (sha256 (base32 - "0aj37ldc3ywqap3sz73j54kbzycn529imr15jgl252k04rqpjya5")))) + "1sz2735fn5665pyb5v70y2fmw2mkziq83di4h06pwday9vf2r6l5")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1299,7 +1336,7 @@ feel.") (define-public solid (package (name "solid") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1308,7 +1345,7 @@ feel.") name "-" version ".tar.xz")) (sha256 (base32 - "18dw55g41q34m2qzvybvpsas1dnyryqxnlf2md0xc4r36ib9p2pn")))) + "0i124kyhd1hfnajp0hnqma35ycr3bh60z39gc6byhxb75p59swnl")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1338,7 +1375,7 @@ system.") (define-public sonnet (package (name "sonnet") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1347,7 +1384,7 @@ system.") name "-" version ".tar.xz")) (sha256 (base32 - "13bb1s2f4kfaikcga297j2fqlyr4qxdcq4v1b3zs1gas4z1wpcg6")))) + "0gqxmyxmwn2rs9f8x2z8pfmbx0mvkyh7nalnsmfqkph8f0fja9ig")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1375,7 +1412,7 @@ ASpell and HUNSPELL.") (define-public threadweaver (package (name "threadweaver") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1384,7 +1421,7 @@ ASpell and HUNSPELL.") name "-" version ".tar.xz")) (sha256 (base32 - "0r0ml5pz7h0vmydcg4gqqkl21lp6c5gqdwyfsnyad02dcjkh4hql")))) + "0z2906nmamvcg85jip98wq834rjs3nc1qlv3q182gw1cnh4nbdag")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1405,7 +1442,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (define-public kactivities (package (name "kactivities") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1414,7 +1451,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." name "-" version ".tar.xz")) (sha256 (base32 - "0dp9vx2nl9fnawzcz04fqa731s3bk2izxrqbvn71aqyrs7fymabg")))) + "03h5r7z2a449hfvaj3zk1n7dhpj49liy5q60fb4nxz4yjkgca27s")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1450,7 +1487,7 @@ with other frameworks.") (define-public kauth (package (name "kauth") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1459,7 +1496,7 @@ with other frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "1w6bp2kbp1sn4cl76fgl2pqrg660ix99qq4h65g090kc934np3zc")))) + "08gkgmxaxqpavsqdmcgs4i8j63pg5qld7agd58irpw29pgq1fj9c")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -1497,7 +1534,7 @@ utilities.") (define-public kcompletion (package (name "kcompletion") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1506,7 +1543,7 @@ utilities.") name "-" version ".tar.xz")) (sha256 (base32 - "08ym79fqk7vshsf3jk37d6jvg7ys63kwflcn5dff5ci18jan2ir2")))) + "10ggypg09acc19gkvxsigfsaq8s5vqv64ada307blpzy8j74bisb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1533,7 +1570,7 @@ integrated it into your application's other widgets.") (define-public kcrash (package (name "kcrash") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1542,7 +1579,7 @@ integrated it into your application's other widgets.") name "-" version ".tar.xz")) (sha256 (base32 - "08a8c5mbj6ll0d1ivhcjx5ga1jfbnwxsk618wcfpwwi6mkxrc3f9")))) + "1xl3bzxfchfafcplil3g07gq1a3fnwx1i40bxp4jfsgb8d8slfwc")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1568,7 +1605,7 @@ application crashes.") (define-public kdoctools (package (name "kdoctools") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1577,7 +1614,7 @@ application crashes.") name "-" version ".tar.xz")) (sha256 (base32 - "0dlal0vkxf5yh1hbfhrcrxqqi1w43q7bvv8ws8pb18jjgimzr46l")))) + "1zna9szii2r9agwfqbglk904zzpr3fyrz6x5v2rxrm3c9m110sm4")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1625,7 +1662,7 @@ from DocBook files.") (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1634,7 +1671,7 @@ from DocBook files.") name "-" version ".tar.xz")) (sha256 (base32 - "0fqj266f9f66rfjzg0rl35fac5rn5n3npyfb4gsla3mdc8fjz9mi")))) + "11wvddb7nqdyi5rin3xa0p32lmvc62yw47hwcdzc01lkfbxdn050")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1646,6 +1683,7 @@ from DocBook files.") ;; -> EOPNOTSUPP (Operation not supported) (with-output-to-file "autotests/BLACKLIST" (lambda _ + (display "[testMimetype]\n*\n") (display "[test]\n*\n"))) #t))))) (native-inputs @@ -1656,6 +1694,7 @@ from DocBook files.") `(("attr" ,attr) ;; TODO: EPub http://sourceforge.net/projects/ebook-tools ("karchive" ,karchive) + ("kcoreaddons" ,kcoreaddons) ("ki18n" ,ki18n) ("qtmultimedia" ,qtmultimedia) ("qtbase" ,qtbase) @@ -1677,7 +1716,7 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1686,7 +1725,7 @@ by applications to write metadata.") name "-" version ".tar.xz")) (sha256 (base32 - "0hhxv8m5993vlpi5yf7w3fadzckficn16flshdkby7bwq8agrbz1")))) + "15y339by7jvsbmfqb33s3ain7sfhx3789xy2xjpkh5f2f9v29r2b")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1731,7 +1770,7 @@ formats.") (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1740,7 +1779,7 @@ formats.") name "-" version ".tar.xz")) (sha256 (base32 - "1pbx974jpn8n2080gblmbh8q0yb5wxb9xblpm100rbhpg20sc2by")))) + "0pg055ampm69yr1vn03s1ys3p18raj8f5pcg0hg9hb4sjkyrr3pn")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1759,7 +1798,7 @@ asynchronous jobs.") (define-public knotifications (package (name "knotifications") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1768,7 +1807,7 @@ asynchronous jobs.") name "-" version ".tar.xz")) (sha256 (base32 - "1dbrk9r3w8pmg15bhrb8qdk4fiqvc9qggb67zvk1n7ddlfkyarz6")))) + "1rknfn50kq6ng7gclgg0n4qyhv2grc7xcf3gcax3bbyy46gajsl8")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1805,7 +1844,7 @@ covers feedback and persistent events.") (define-public kpackage (package (name "kpackage") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1814,7 +1853,7 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32 - "175b0lj4qybddjpc25b1p60lr8f9220i9ymk3wk3y3vf4893v833")) + "1h57kicsjkisysd2mmd5q9q5m421xqcv3p8vkjlqxkph5sa7y2q5")) ;; Default to: external paths/symlinks can be followed by a ;; package (patches (search-patches "kpackage-allow-external-paths.patch")))) @@ -1866,7 +1905,7 @@ were traditional plugins.") (define-public kpty (package (name "kpty") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1875,7 +1914,7 @@ were traditional plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "0r5080xl7x13qmjnjssb0d1pk626anaa4xahb7fi869fndr4xhzn")))) + "10v61016kd1q41n4dwac1nsiixji64i5y501nx0hphpjkjbaklkr")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1903,7 +1942,7 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1912,7 +1951,7 @@ and communicating with them using a pty.") name "-" version ".tar.xz")) (sha256 (base32 - "1v5cfxk5v76w1f1qvrpilrs111wvp8bn2p3bswhqp4lg0qxync0q")))) + "0yzq2jxja9wnhz91cyli2mnw32xynnzbf1lr0hk6vi8a1w2mkrzz")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1946,7 +1985,7 @@ gallons).") (define-public baloo (package (name "baloo") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -1955,7 +1994,7 @@ gallons).") name "-" version ".tar.xz")) (sha256 (base32 - "068ms071639pskhjz37cszylvfzzqhp7x1rmwdfn5nlvzrv6lrxh")))) + "1qhqv19glg98146cyc7ykq02b5b9m936xcml1w1p8fx32cp2zbch")))) (build-system cmake-build-system) (propagated-inputs `(("kcoreaddons" ,kcoreaddons) @@ -2011,7 +2050,7 @@ maintaining an index of the contents of your files.") (define-public kactivities-stats (package (name "kactivities-stats") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2020,7 +2059,7 @@ maintaining an index of the contents of your files.") name "-" version ".tar.xz")) (sha256 (base32 - "12n178244ysfak0x9qm9a2k814qi56w8xpkg03na7hlsz2l4y9v6")))) + "187fyl92pnkn317pi1pkmf7bv5z6aqdhqa6b8531xgl06gyigy45")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2041,7 +2080,7 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2050,7 +2089,7 @@ by which applications, and what documents have been linked to which activity.") name "-" version ".tar.xz")) (sha256 (base32 - "0vsn98znzdbiy8clbl9p3kiag3zvxgc9701gwg2ig8mpv3ci9lkg")))) + "011r2ms57ycz5kma0q35cji4isj0lskrxrambk11jibs1xjdis2v")))) (build-system cmake-build-system) (propagated-inputs `(("kwidgetsaddons" ,kwidgetsaddons))) @@ -2084,7 +2123,7 @@ using the XBEL format.") (define-public kcmutils (package (name "kcmutils") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2093,7 +2132,7 @@ using the XBEL format.") name "-" version ".tar.xz")) (sha256 (base32 - "1f49864xpxrbj77n7l474wkn3rw4zy8vkl3psdya7ccdk7ac2s0k")))) + "1q12n9sfgrm2f8bspsl5i9gbv4jwl25w5id9m9rnnr87hck35g68")))) (build-system cmake-build-system) (propagated-inputs `(("kconfigwidgets" ,kconfigwidgets) @@ -2137,7 +2176,7 @@ KCModules can be created with the KConfigWidgets framework.") (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2146,7 +2185,7 @@ KCModules can be created with the KConfigWidgets framework.") name "-" version ".tar.xz")) (sha256 (base32 - "0npfp6z5lc2h8y6slmz3sbymyyv9k2w73rpsjzl5zswqhzlvrb5k")))) + "098xdfvnyz9bdkc6iyq5r2s4vkfdhbrri4015yzbs73j4f2wcxz5")))) (build-system cmake-build-system) (propagated-inputs `(("kauth" ,kauth) @@ -2160,7 +2199,9 @@ KCModules can be created with the KConfigWidgets framework.") `(("kcoreaddons" ,kcoreaddons) ("kguiaddons" ,kguiaddons) ("ki18n" ,ki18n) - ("qtbase" ,qtbase))) + ;; todo: PythonModuleGeneration + ("qtbase" ,qtbase) + ("qttools" ,qttools))) (arguments `(#:phases (modify-phases %standard-phases @@ -2187,7 +2228,7 @@ their settings.") (define-public kdeclarative (package (name "kdeclarative") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2196,7 +2237,7 @@ their settings.") name "-" version ".tar.xz")) (sha256 (base32 - "043jl7rn9yawh04fwgaxb8iwksn3z8qb4yfc4s6v1znwcs7ajlda")))) + "027wnrmr79fxkf4jpdpfhp7smdai2wn9y71l1h4kgqgwfq8anwy8")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -2250,7 +2291,7 @@ that offer bindings to some of the Frameworks.") (define-public kded (package (name "kded") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2259,7 +2300,7 @@ that offer bindings to some of the Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "0kn9kzzji257mppd12jzwiibha8127ajxvng2ls765lylv9nad7q")))) + "0kjr6ff1g6xyas5si9b7zilcqcx4mgfkzfpq2c59fz1wd8q8fl05")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2283,16 +2324,16 @@ started on demand.") (define-public kdesignerplugin (package (name "kdesignerplugin") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" + (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 (base32 - "114035wil0p5z6h0li8wjzivsdxhqbih54kn4nvhn43b71xnzs3y")))) + "1w7glszd82iyw6kxzmp0568rm3qfadi7vw7gfxg4c15w5ikkvxn9")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2334,7 +2375,7 @@ ini-style description files.") (define-public kdesu (package (name "kdesu") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2343,7 +2384,7 @@ ini-style description files.") name "-" version ".tar.xz")) (sha256 (base32 - "1x2gjnmgpcaxvfav2pm92zfgxbn60awpvmn9ycs68rq47p6h9x0f")))) + "038m0sdpnsy50m3g78sfg7wk26933rh3578qsnapw2cyimx8ypxx")))) (build-system cmake-build-system) (propagated-inputs `(("kpty" ,kpty))) @@ -2365,16 +2406,16 @@ with su and ssh respectively.") (define-public kdewebkit (package (name "kdewebkit") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" + (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 (base32 - "1mnbdsiih94hlwwff9fs9gnzl3y7ayf1pskmz1rajgjmqd6rm7mm")))) + "1s3bmn1ck7xvc7a6gv7ywv9161hdahiiw20aq88s4qkm2s5wyy6v")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2387,6 +2428,7 @@ with su and ssh respectively.") ("kservice" ,kservice) ("kwallet" ,kwallet) ("qtbase" ,qtbase) + ("qttools" ,qttools) ("qtwebkit" ,qtwebkit))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Integration for QtWebKit") @@ -2397,7 +2439,7 @@ engine WebKit via QtWebKit.") (define-public kemoticons (package (name "kemoticons") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2406,7 +2448,7 @@ engine WebKit via QtWebKit.") name "-" version ".tar.xz")) (sha256 (base32 - "03vx22f9mjd10qm61f6ihr283w2sarrhg0rssxp7g7wahvshcvmh")))) + "0li1lz5kqlczvgq6b2x3nkr0hl96a337ab83fq9wxp5sx440d6sd")))) (build-system cmake-build-system) (propagated-inputs `(("kservice" ,kservice))) @@ -2437,7 +2479,7 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2446,7 +2488,7 @@ emoticons coming from different providers.") name "-" version ".tar.xz")) (sha256 (base32 - "1c6dxp6jvbw8l74n1mv0v62yr34b9447szhvd61y4sxmmfjimhz4")))) + "1xpfvwnrj81mk3di02n37b469gxzmnk89icmcz6wwyk54m86fw76")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2481,7 +2523,7 @@ window does not need focus for them to be activated.") (define-public kiconthemes (package (name "kiconthemes") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2490,7 +2532,7 @@ window does not need focus for them to be activated.") name "-" version ".tar.xz")) (sha256 (base32 - "1rgbfklb7xxg7z2zyrsmaxf883ixgfbkqilps3npwk3xac2f66rw")))) + "18p4np4chykpy2ck8c76999nh8gdj75hjfakg1pakdqhlash9q6w")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2506,7 +2548,8 @@ window does not need focus for them to be activated.") ("kitemviews" ,kitemviews) ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg) + ("qttools" ,qttools))) (arguments `(#:phases (modify-phases %standard-phases @@ -2528,7 +2571,7 @@ in applications using the KDE Frameworks.") (define-public kinit (package (name "kinit") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2537,7 +2580,7 @@ in applications using the KDE Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "11xwiny5sfqbdls249vnq6ssp5pzw1w9wg4ql9nkwwygl4ml8b9y")) + "06p0i9674nzam0f4ac2jrl9pgkycz0lc0kdn24ds2rlh85cqvjwx")) ;; Use the store paths for other packages and dynamically loaded ;; libs (patches (search-patches "kinit-kdeinit-extra_libs.patch" @@ -2597,7 +2640,7 @@ consumption.") (define-public kio (package (name "kio") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2606,7 +2649,7 @@ consumption.") name "-" version ".tar.xz")) (sha256 (base32 - "1k3cn7hvp5z9nirss29v164hahrlvlqivxlk64c8w9ynjx699ira")) + "048gq6j8di6nzsacpr8j40kw6y5607zgwqr21ahcnnb0gd2sly4l")) (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs @@ -2643,6 +2686,7 @@ consumption.") ("libxslt" ,libxslt) ("qtbase" ,qtbase) ("qtscript" ,qtscript) + ("qttools" ,qttools) ("qtx11extras" ,qtx11extras) ("sonnet" ,sonnet))) (arguments @@ -2690,7 +2734,7 @@ KIO enabled infrastructure.") (define-public knewstuff (package (name "knewstuff") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2699,7 +2743,7 @@ KIO enabled infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "0a2d9wrhjsjl0klsrn501sp9681v7qmq6hmalw061arjv165dzw2")))) + "0pkm7qapkd9xypmhsjfwlgq0l4nfgya5b23lv3zkci8lrbssaqsv")))) (build-system cmake-build-system) (propagated-inputs `(("attica" ,attica) @@ -2746,7 +2790,7 @@ specification.") (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2755,7 +2799,7 @@ specification.") name "-" version ".tar.xz")) (sha256 (base32 - "01hxj6s2sq5k5j6j1y4c5gxyl1886j7ghh0hdc95b7n4gdjwwbci")))) + "1d90gsnxy3kqd6f1bkhflrdwwx3w65sw4c7nfpkdxxhlqhzc9zr4")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2788,7 +2832,7 @@ notifications which can be embedded in your application.") (define-public kparts (package (name "kparts") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2797,7 +2841,7 @@ notifications which can be embedded in your application.") name "-" version ".tar.xz")) (sha256 (base32 - "0gqkgnvkdai8hbg1n32jq4a3yzlkarmw8a7hxlfr0ykgysanjh65")))) + "0md0349r4mdm2r04p5s3pgm17v4w40r3kz58lzp6qfcw25b969nw")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio) @@ -2840,7 +2884,7 @@ widgets with a user-interface defined in terms of actions.") (define-public kpeople (package (name "kpeople") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2849,7 +2893,7 @@ widgets with a user-interface defined in terms of actions.") name "-" version ".tar.xz")) (sha256 (base32 - "0vbgi4l14g4f0klbxqbkjcag6yi0ghhpxn5nik5sssmcx8qyk885")))) + "1q2hh2i8hd638p907g0srdxmxm9h2ay91dmhslqzcgwnlhln4gfl")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2883,7 +2927,7 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2892,7 +2936,7 @@ to easily extend the contacts collection.") name "-" version ".tar.xz")) (sha256 (base32 - "0yw2jh9dailhcwkkjl2qggg5k90bwbfsn88a3hzwyj2ng2haypis")))) + "0gjqwzsg865gha8k7hda28hsrbfzhw9jz610lkqff5713lqbcn5a")))) (build-system cmake-build-system) (propagated-inputs `(("plasma-framework" ,plasma-framework))) @@ -2953,7 +2997,7 @@ typed.") (define-public kservice (package (name "kservice") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -2962,7 +3006,7 @@ typed.") name "-" version ".tar.xz")) (sha256 (base32 - "0k8xksmw2ai7m0js7l98rv5v6ykifmnqiyy2yc1xhgn40lf1r89j")))) + "1rdapw9wirfq6pyaza0k7sg6q21rv3cfyalpzrwfrk5gkgpqxzwk")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3012,7 +3056,7 @@ types or handled by application specific code.") (define-public ktexteditor (package (name "ktexteditor") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -3021,7 +3065,7 @@ types or handled by application specific code.") "ktexteditor-" version ".tar.xz")) (sha256 (base32 - "0b5zqhm5aw7jj7dj600xa674ik11gwyzamhyz5962xhvsg5pyjwx")))) + "0vfl6rr3624n8v29z07z5c0nh5af5kfg28cnp5ksfvfnssxfzfqa")))) (build-system cmake-build-system) (propagated-inputs `(("kparts" ,kparts))) @@ -3093,7 +3137,7 @@ library.") (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -3102,7 +3146,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "1ymqmb5z4flzrns3wdjagxbzbpighbincwbhy29a0mqg4zcm82xk")))) + "1qb1mad5bg19xwykzpwk2b3s505ka4jkg0fsi56ri57wq8gv4qha")))) (build-system cmake-build-system) (propagated-inputs `(("ki18n" ,ki18n) @@ -3121,7 +3165,8 @@ library.") ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase) - ("qtspeech" ,qtspeech))) + ("qtspeech" ,qtspeech) + ("qttools" ,qttools))) (arguments `(#:phases (modify-phases %standard-phases @@ -3140,7 +3185,7 @@ It supports rich text as well as plain text.") (define-public kwallet (package (name "kwallet") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -3149,7 +3194,7 @@ It supports rich text as well as plain text.") name "-" version ".tar.xz")) (sha256 (base32 - "1dp072h5r6yd81i69759pj8klfsikrg25za44sry2kh6fxvwmngm")))) + "1dp3mrgl0h6wqp4wcqpvnvkacwkrrn5lrv6bdl008kx1y594s28g")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -3182,7 +3227,7 @@ the passwords on KDE work spaces.") (define-public kxmlgui (package (name "kxmlgui") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -3191,7 +3236,7 @@ the passwords on KDE work spaces.") name "-" version ".tar.xz")) (sha256 (base32 - "0ph67zarf1sccvp7882brrihv4dsmxq0nggan0rnk54qg0zdhgcn")))) + "0x0mfapgl8w4xal8lamh3v27a9kdb7qyaxdn48gja4x85pkvi87i")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3211,6 +3256,7 @@ the passwords on KDE work spaces.") ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase) + ("qttools" ,qttools) ("sonnet" ,sonnet))) (arguments `(#:tests? #f ; FIXME: 1/5 tests fail. @@ -3234,7 +3280,7 @@ descriptions for integrating actions from plugins.") (define-public kxmlrpcclient (package (name "kxmlrpcclient") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -3243,7 +3289,7 @@ descriptions for integrating actions from plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "1573wnv2fbjjzgx3f1qm7y8wlj22bz45mny0rxci90i76nnh4538")))) + "0k82cyxjipqpky7gs0zb5s1bc6jf22d5vwpwyiqjy32da63mc89c")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio))) @@ -3277,7 +3323,7 @@ setUrl, setUserAgent and call.") (define-public plasma-framework (package (name "plasma-framework") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -3286,7 +3332,7 @@ setUrl, setUserAgent and call.") name "-" version ".tar.xz")) (sha256 (base32 - "1pvxxw52s03i11p5byd2sh8sbvlk6h8q6briq9d4qvjy6c0pmbq4")))) + "0p0ziqw70lklx59d0nij3p9yi1vdacdfyrrp7zf74iwxd7598hci")))) (build-system cmake-build-system) (propagated-inputs `(("kpackage" ,kpackage) @@ -3374,7 +3420,7 @@ script engines.") (define-public kde-frameworkintegration (package (name "kde-frameworkintegration") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) (uri (string-append @@ -3383,7 +3429,7 @@ script engines.") "frameworkintegration-" version ".tar.xz")) (sha256 (base32 - "0pfpk268x06pjwciv4jr5v259kjck0sf4xzsgn29ifkmsk74wwmi")))) + "0n8n6lnzswi2q848qy2b4rcvkd0y1dywlk6hdmcnn8dfbxy6b050")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3431,7 +3477,7 @@ workspace.") (define-public kdelibs4support (package (name "kdelibs4support") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) @@ -3440,7 +3486,7 @@ workspace.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "1l1gjv06yp9jdiapiypwscbb6y0rfgrnw9rdsl7kkxh9ps8b8j39")))) + (base32 "17mywcmgp1yzdipwwaypbkxiyybk1w0sps50jv1bl0f23ya19mlc")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -3547,7 +3593,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (define-public khtml (package (name "khtml") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) @@ -3556,7 +3602,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0wh9z5xm0gaf1c2s7cq7763jfyv83d58x80nwsvb0ayd6y8id1bq")))) + (base32 "15f77r6dxkkvi2vxvxlwa7qz3whmz229g79bgadiwffmzxja0ywd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3606,7 +3652,7 @@ technology and using KJS for JavaScript support.") (define-public kjs (package (name "kjs") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) @@ -3615,7 +3661,7 @@ technology and using KJS for JavaScript support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0c1wyxsgn70jvw7zcjjpw12w9sg9xxvyslgnqlnnyh8sx7rrp70c")))) + (base32 "16zsan9c8kba5m70h34y544id7gig2bcbcs4s90s27pckijkkarp")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3639,7 +3685,7 @@ support.") (define-public kjsembed (package (name "kjsembed") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) @@ -3648,7 +3694,7 @@ support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0dh9012y9bqj48jp50lrsmd28bbvf4jd93l34vfzmza252yvyw3l")))) + (base32 "00sr6lv1nai2y6aawvqwnx4pbx8pw9b1jrpa0klc014gc42l6i7b")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3668,7 +3714,7 @@ QObjects, so you can script your applications.") (define-public kmediaplayer (package (name "kmediaplayer") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) @@ -3677,7 +3723,7 @@ QObjects, so you can script your applications.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0gpfrhgk2l63lyz0bz93cg7mc5g7mjvrkfvpyndmi1v7vhndp5zq")))) + (base32 "19v53h3lkys3ryrjacrdng9ak91g03b9s986xhnw1r84zy242kdm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3714,7 +3760,7 @@ KParts instead.") (define-public kross (package (name "kross") - (version "5.55.0") + (version "5.63.0") (source (origin (method url-fetch) @@ -3723,7 +3769,7 @@ KParts instead.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0p3q36gka6m62nryc3l11d30mlhiqjpghvfcyq6wikiqlv2kqvjs")))) + (base32 "0paipgkxbm6vwgqj38rlr37vgmf1rx0cl2mka8zdbndl76ng5hgc")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 2d72c39436..6a474b293b 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -407,41 +407,6 @@ illustrators, matte and texture artists, and the VFX industry. Notable features include brush stabilizers, brush engines and wrap-around mode.") (license license:gpl2+))) -(define-public kholidays - (package - (name "kholidays") - (version "17.12.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/applications/" version "/src/" - name "-" version ".tar.xz")) - (sha256 - (base32 "0595d7wbnz8kyq1bnivdrp20lwdp8ykvdll1fmb0fgm4q24z0cl8")))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; blacklist a failing test function TODO: make it pass - (with-output-to-file "autotests/BLACKLIST" - (lambda _ - (display "[testDefaultRegions]\n*\n"))) - #t))))) - (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("qttools" ,qttools))) - (inputs - `(("qtbase" ,qtbase) - ("qtdeclarative" ,qtdeclarative))) - (home-page "https://cgit.kde.org/kholidays.git") - (synopsis "Library for regional holiday information") - (description "This library provides a C++ API that determines holiday and -other special events for a geographical region.") - (license license:lgpl2.0+))) - (define-public libkomparediff2 (package (name "libkomparediff2") diff --git a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch index 8dcd4d3e95..c3c4ce1161 100644 --- a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch +++ b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch @@ -8,15 +8,13 @@ pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch =================================================================== --- kinit-5.32.0/src/kdeinit/kinit-5.32.0/src/kdeinit/.orig +++ kinit-5.32.0/src/kdeinit/kinit.cpp -@@ -96,11 +96,9 @@ +@@ -96,9 +96,9 @@ "libKF5Parts.5.dylib", "libKF5Plasma.5.dylib" #else - "libKF5KIOCore.so.5", - "libKF5Parts.so.5", --//#ifdef __KDE_HAVE_GCC_VISIBILITY // Removed for KF5, we'll see. - "libKF5Plasma.so.5" --//#endif + "GUIX_PKGS_KF5_KIO/lib/libKF5KIOCore.so.5", + "GUIX_PKGS_KF5_PARTS/lib/libKF5Parts.so.5", + "GUIX_PKGS_KF5_PLASMA/lib/libKF5Plasma.so.5" diff --git a/gnu/packages/patches/kwindowsystem-qt-compat.patch b/gnu/packages/patches/kwindowsystem-qt-compat.patch deleted file mode 100644 index ef31636917..0000000000 --- a/gnu/packages/patches/kwindowsystem-qt-compat.patch +++ /dev/null @@ -1,97 +0,0 @@ -Fix test failure with Qt 5.12. - -Taken from upstream: -https://cgit.kde.org/kwindowsystem.git/commit/?id=14998613603c7d8f91b011a2c9c20396067add0e - -diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt -index f8e67f0..c1121a7 100644 ---- a/autotests/CMakeLists.txt -+++ b/autotests/CMakeLists.txt -@@ -12,12 +12,12 @@ add_subdirectory(helper) - - if (NOT APPLE) - find_package(X11) -- find_package(XCB COMPONENTS XCB KEYSYMS) -+ find_package(XCB COMPONENTS XCB ICCCM KEYSYMS) - endif() - - macro(KWINDOWSYSTEM_UNIT_TESTS) - foreach(_testname ${ARGN}) -- set(libs KF5::WindowSystem Qt5::Test Qt5::Widgets Qt5::X11Extras XCB::KEYSYMS) -+ set(libs KF5::WindowSystem Qt5::Test Qt5::Widgets Qt5::X11Extras XCB::ICCCM XCB::KEYSYMS) - if(X11_FOUND) - list(APPEND libs ${XCB_XCB_LIBRARY}) - endif() -diff --git a/autotests/kwindowinfox11test.cpp b/autotests/kwindowinfox11test.cpp -index 634c650..f483c46 100644 ---- a/autotests/kwindowinfox11test.cpp -+++ b/autotests/kwindowinfox11test.cpp -@@ -25,8 +25,11 @@ - #include - #include - #include -+#include - #include - -+#include -+ - #include - - Q_DECLARE_METATYPE(WId) -@@ -598,19 +601,23 @@ void KWindowInfoX11Test::testWindowRole() - - void KWindowInfoX11Test::testClientMachine() - { -+ const QByteArray oldHostName = QSysInfo::machineHostName().toLocal8Bit(); -+ - KWindowInfo info(window->winId(), NET::Properties(), NET::WM2ClientMachine); -- QVERIFY(info.clientMachine().isNull()); -+ QCOMPARE(info.clientMachine(), oldHostName); - - // client machine needs to be set through xcb -+ const QByteArray newHostName = oldHostName + "2"; - xcb_change_property(QX11Info::connection(), XCB_PROP_MODE_REPLACE, window->winId(), -- XCB_ATOM_WM_CLIENT_MACHINE, XCB_ATOM_STRING, 8, 9, "localhost"); -+ XCB_ATOM_WM_CLIENT_MACHINE, XCB_ATOM_STRING, 8, newHostName.count(), -+ newHostName.data()); - xcb_flush(QX11Info::connection()); - - // it's just a property change so we can easily refresh - QX11Info::getTimestamp(); - - KWindowInfo info2(window->winId(), NET::Properties(), NET::WM2ClientMachine); -- QCOMPARE(info2.clientMachine(), QByteArrayLiteral("localhost")); -+ QCOMPARE(info2.clientMachine(), newHostName); - } - - void KWindowInfoX11Test::testName() -@@ -680,11 +687,25 @@ void KWindowInfoX11Test::testTransientFor() - - void KWindowInfoX11Test::testGroupLeader() - { -- KWindowInfo info(window->winId(), NET::Properties(), NET::WM2GroupLeader); -- QCOMPARE(info.groupLeader(), WId(0)); -+ // WM_CLIENT_LEADER is set by default -+ KWindowInfo info1(window->winId(), NET::Properties(), NET::WM2GroupLeader); -+ QVERIFY(info1.groupLeader() != XCB_WINDOW_NONE); -+ -+ xcb_connection_t *connection = QX11Info::connection(); -+ xcb_window_t rootWindow = QX11Info::appRootWindow(); -+ -+ xcb_window_t leader = xcb_generate_id(connection); -+ xcb_create_window(connection, XCB_COPY_FROM_PARENT, leader, rootWindow, 0, 0, 1, 1, -+ 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, 0, nullptr); -+ -+ xcb_icccm_wm_hints_t hints = {}; -+ hints.flags = XCB_ICCCM_WM_HINT_WINDOW_GROUP; -+ hints.window_group = leader; -+ xcb_icccm_set_wm_hints(connection, leader, &hints); -+ xcb_icccm_set_wm_hints(connection, window->winId(), &hints); - -- // TODO: here we should try to set a group leader and re-read it -- // this needs setting and parsing the WMHints -+ KWindowInfo info2(window->winId(), NET::Properties(), NET::WM2GroupLeader); -+ QCOMPARE(info2.groupLeader(), leader); - } - - void KWindowInfoX11Test::testExtendedStrut() -- cgit v1.2.3 From 862862e592e4e63f28854ab2550ab1dd754c88a0 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 23 Oct 2019 17:43:58 +0200 Subject: gnu: Add kcalendarcore. This is now a part of KDE Frameworks. * gnu/packages/kde-frameworks.scm(kcalendarcore): New variable. --- gnu/packages/kde-frameworks.scm | 62 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 85c3736669..96bd36a88a 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages calendar) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages disk) @@ -429,6 +430,67 @@ GZip format, via a subclass of QIODevice.") (license (list license:lgpl2.1 license:lgpl2.1+ license:lgpl3+ license:bsd-2)))) +(define-public kcalendarcore + (package + (name "kcalendarcore") + (version "5.63.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1cqqwpd6faz7sd6jrda564xxvwr231b175h2w3ilxx6hvz9yrps3")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("perl" ,perl) + ("tzdata" ,tzdata-for-tests))) + (inputs + `(("libical" ,libical) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'disable-failing-libical3-tests + (lambda _ + ;; testicaltimezones fails with some time-zone issue + (substitute* "autotests/CMakeLists.txt" + (("macro_unit_tests\\(testicaltimezones\\)" line) + (string-append "## " line)) + (("target_link_libraries\\(testicaltimezones " line) + (string-append "## " line))) + (for-each + delete-file + (list + ;; test cases are generated for each .ics file. These fail: + "autotests/data/Compat-libical3/AppleICal_1.5.ics" + "autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics" + "autotests/data/Compat-libical3/KOrganizer_3.1a.ics" + "autotests/data/Compat-libical3/MSExchange.ics" + "autotests/data/Compat-libical3/Mozilla_1.0.ics")) + #t)) + (add-before 'check 'set-timezone + (lambda* (#:key inputs #:allow-other-keys) + (setenv "TZ" "Europe/Prague") + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Library for interfacing with calendars") + (description "This library provides access to and handling of calendar +data. It supports the standard formats iCalendar and vCalendar and the group +scheduling standard iTIP. + +A calendar contains information like incidences (events, to-dos, journals), +alarms, time zones, and other useful information. This API provides access to +that calendar information via well known calendar formats iCalendar (or iCal) +and the older vCalendar.") + (license (list license:lgpl3+ license:bsd-2)))) + (define-public kcodecs (package (name "kcodecs") -- cgit v1.2.3 From ebd00f39fc108ecf06253e2331aca5ee2f7f8e42 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 24 Oct 2019 10:51:58 +0200 Subject: gnu: Add kcontacts. This is now a part in KDE Frameworks. * gnu/packages/kde-frameworks.scm(kcontacts): New variable. --- gnu/packages/kde-frameworks.scm | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 96bd36a88a..67cb5e4132 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1629,6 +1629,50 @@ applications. It provides a set of completion-ready widgets, or can be integrated it into your application's other widgets.") (license license:lgpl2.1+))) +(define-public kcontacts + (package + (name "kcontacts") + (version "5.63.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0xs5c5l4vck5i6879jax1nf93if02f9hyfkn60l36cxbphnbpw0h")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("xorg-server" ,xorg-server))) ; for the tests + (inputs + `(("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + ;; Xvfb doesn't have proper glx support and needs a pixeldepth + ;; of 24 bit to avoid "libGL error: failed to load driver: swrast" + ;; "Could not initialize GLX" + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (setenv "DISPLAY" ":1") + #t))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "API for contacts/address book data following the vCard standard") + (description "This library provides a vCard data model, vCard +input/output, contact group management, locale-aware address formatting, and +localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. +") + (license license:lgpl2.1+))) + (define-public kcrash (package (name "kcrash") -- cgit v1.2.3 From 12c65542339a3b2c943228b557339a51863a9a20 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 2 Nov 2019 09:15:51 +0100 Subject: gnu: Add syndication. * gnu/packages/kde-frameworks.scm (syndication): New variable. --- gnu/packages/kde-frameworks.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 67cb5e4132..d4f2ccc903 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2082,6 +2082,33 @@ mega, giga) as well as converting between different unit systems (e.g. liters, gallons).") (license license:lgpl2.1+))) +(define-public syndication + (package + (name "syndication") + (version "5.63.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1d0k6x11giylfkr183sm307n4v6rjpwkqp7y9wfhimjrcprwf2g6")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcodecs" ,kcodecs) + ("qtbase" ,qtbase))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "RSS/Atom parser library") + (description "@code{syndication} supports RSS (0.9/1.0, 0.91..2.0) and +Atom (0.3 and 1.0) feeds. The library offers a unified, format-agnostic view +on the parsed feed, so that the using application does not need to distinguish +between feed formats.") + (license license:lgpl2.1+))) + ;; Tier 3 ;; -- cgit v1.2.3 From eddad10997b3e6d0e406218eed5067a0dcb2c4cc Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 19 Oct 2019 10:36:54 +0200 Subject: gnu: kde plasma: Update to 5.17.0. * gnu/packages/kde-plasma.scm (kdecoration, kscreenlocker, libkscreen, libksysguard): Update to 5.17.0 --- gnu/packages/kde-plasma.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index c1731d459a..2802a5a461 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -37,14 +37,14 @@ (define-public kdecoration (package (name "kdecoration") - (version "5.15.1") + (version "5.17.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kdecoration-" version ".tar.xz")) (sha256 (base32 - "03lxnjbhlnyiw2znflp0f2w77a5pzv5yvsbngvwgp89ig9mansi1")))) + "0rljpywpaqmar13jijphkpc9k1crma476j9my0d00hfrjil5xlnn")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -66,14 +66,14 @@ manager which re-parents a Client window to a window decoration frame.") (define-public kscreenlocker (package (name "kscreenlocker") - (version "5.15.1") + (version "5.17.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kscreenlocker-" version ".tar.xz")) (sha256 (base32 - "1jp2z1wjsd99is31igkfnscs55h755cmp86ppkj596fcxv1krymq")))) + "1jzkq5m0hvcpsl7clai33ndiil8gls7ndir3mfcc5l8gv7df2ir0")))) (build-system cmake-build-system) (arguments `(#:phases @@ -129,14 +129,14 @@ manager which re-parents a Client window to a window decoration frame.") (define-public libkscreen (package (name "libkscreen") - (version "5.15.1") + (version "5.17.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1zpzqafrb576al10f5873nl1z135gscjza6gd3ickfzlvd9qmr18")))) + (base32 "0znxfqqyyij6i4dp95gf5g4vrhg4jsshgh2k13ldy294kby2mxw0")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -168,7 +168,7 @@ basic needs and easy to configure for those who want special setups.") (define-public libksysguard (package (name "libksysguard") - (version "5.15.1") + (version "5.17.0") (source (origin (method url-fetch) @@ -176,7 +176,7 @@ basic needs and easy to configure for those who want special setups.") "/libksysguard-" version ".tar.xz")) (sha256 (base32 - "0ml106yq4q9qagkrcaafgcky18wk76px5a1r6j36wfjqdd6wpzvs")))) + "1b79qxg6j9lqgyq8i677f00f7cbplqak1r9riyc9wj5s2r60ydw7")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 869184af51e880fcefe534abe9029d929d1412e3 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 19 Oct 2019 10:39:06 +0200 Subject: gnu: libkomparediff2: Update to 19.08.2. * gnu/packages/kde.scm (libkomparediff2): Update to 19.08.2. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 6a474b293b..fb3c0c52d8 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -410,14 +410,14 @@ features include brush stabilizers, brush engines and wrap-around mode.") (define-public libkomparediff2 (package (name "libkomparediff2") - (version "19.04.1") + (version "19.08.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/applications/" version "/src/libkomparediff2-" version ".tar.xz")) (sha256 - (base32 "1cyi7a5ss7jv87llk0k8c9g3h1qsp6j6nmdzh3xxcswr4p5skc9a")))) + (base32 "1mvihd0xpkl8kryf5dvsfgpbgs9af8c9bzq8mmr74gfsvfb8ywy5")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 6da878572843d4e4443bca72a8333575516120cc Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 19 Oct 2019 10:39:39 +0200 Subject: gnu: kqtquickcharts: Update to 19.08.2. * gnu/packages/kde.scm (kqtquickcharts): Update to 19.08.2. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index fb3c0c52d8..0d99616957 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -571,7 +571,7 @@ communicate with each other. Here's a few things KDE Connect can do: (define-public kqtquickcharts (package (name "kqtquickcharts") - (version "19.08.1") + (version "19.08.2") (source (origin (method url-fetch) @@ -579,7 +579,7 @@ communicate with each other. Here's a few things KDE Connect can do: version "/src/kqtquickcharts-" version ".tar.xz")) (sha256 (base32 - "1j3rivvh4sa94lsd0hi4xfvcikl05zrqd7634wxyaxs718ais6dg")))) + "1yy9fyd8y4g25ljdsbil19qdf4j3mzmzl489sx7rqpm3lfdzjh9k")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From 6d8bffd15509dcf640358611ef7f1a381c31b320 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 19 Oct 2019 10:38:30 +0200 Subject: gnu: krita: Update to 4.2.7.1. * gnu/packages/kde.scm (krita): Update to 4.2.7.1; [source]: Update path. --- gnu/packages/kde.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 0d99616957..accf19667d 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -320,16 +320,15 @@ plugins, as well as code to create plugins, or complete applications.") (define-public krita (package (name "krita") - (version "4.2.5") + (version "4.2.7.1") (source (origin (method url-fetch) (uri (string-append - "mirror://kde/stable/krita/" - (version-prefix version 3) + "mirror://kde/stable/krita/" version "/krita-" version ".tar.gz")) (sha256 (base32 - "1f14r2mrqasl6nr3sss0xy2h8xlxd5wdcjcd64m9nz2gwlm39r7w")))) + "0gcwq1w09gmx53i2fir73l222p41299wagvhbvsxwrz0v3crzliy")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 77f144d87ee165490ded1d22082b2b46e77c9c00 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 19 Oct 2019 10:31:57 +0200 Subject: gnu: ktouch: Update to 19.08.2. * gnu/packages/education.scm (ktouch): Update to 19.08.2. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 66e7e22f26..00d3d11813 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -554,7 +554,7 @@ language and very flexible regarding to new or unknown keyboard layouts.") (define-public ktouch (package (name "ktouch") - (version "19.08.1") + (version "19.08.2") (source (origin (method url-fetch) @@ -562,7 +562,7 @@ language and very flexible regarding to new or unknown keyboard layouts.") version "/src/ktouch-" version ".tar.xz")) (sha256 (base32 - "19rdk94pls75hdvx11hnfk3qpm6l28p9q45q5f04sknxagrfaznr")))) + "0dm6xcwai0bx2h16rny1xa9n1509mfxvy39kfxx5qih53p15jrnk")))) (build-system cmake-build-system) (arguments `(#:modules ((guix build cmake-build-system) -- cgit v1.2.3 From 15cd7067537b9fdae21e7ca7b9e25da4a6476c14 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 19 Oct 2019 10:29:10 +0200 Subject: gnu: Move kpmcore to kde.scm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit kpmcore is not a framework part. * gnu/packages/kde-frameworks.scm(kpmcore): Move from here … * gnu/packages/kde.scm(kpmcore): … to here. --- gnu/packages/kde-frameworks.scm | 33 --------------------------------- gnu/packages/kde.scm | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index d4f2ccc903..96aba546aa 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -41,7 +41,6 @@ #:use-module (gnu packages calendar) #:use-module (gnu packages compression) #:use-module (gnu packages databases) - #:use-module (gnu packages disk) #:use-module (gnu packages docbook) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) @@ -214,38 +213,6 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") ;; license: source files mention "either version 2.1 or 3" (license (list license:lgpl2.1 license:lgpl3)))) -(define-public kpmcore - (package - (name "kpmcore") - (version "3.3.0") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/kpmcore" - "/" version "/src/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq")))) - (build-system cmake-build-system) - (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("pkg-config" ,pkg-config))) - (inputs - `(("kconfigwidgets" ,kconfigwidgets) - ("kiconthemes" ,kiconthemes) - ("kio" ,kio) - ("ki18n" ,ki18n) - ("kservice" ,kservice) - ("libatasmart" ,libatasmart) - ("parted" ,parted) - ("qtbase" ,qtbase) - ("util-linux" ,util-linux))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Library for managing partitions") - (description "Library for managing partitions.") - (license license:gpl3+))) - ;; Tier 1 ;; diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index accf19667d..e81224e8c0 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1,10 +1,12 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2019 Efraim Flashner +;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Mark Meyer ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2018, 2019 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +44,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-plasma) + #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages maths) #:use-module (gnu packages pdf) @@ -464,6 +467,38 @@ including SSL/TLS, X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart cards.") (license license:lgpl2.1))) +(define-public kpmcore + (package + (name "kpmcore") + (version "3.3.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/kpmcore" + "/" version "/src/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("kconfigwidgets" ,kconfigwidgets) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("ki18n" ,ki18n) + ("kservice" ,kservice) + ("libatasmart" ,libatasmart) + ("parted" ,parted) + ("qtbase" ,qtbase) + ("util-linux" ,util-linux))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Library for managing partitions") + (description "Library for managing partitions.") + (license license:gpl3+))) + (define-public snorenotify (package (name "snorenotify") -- cgit v1.2.3 From 38988dbecf9e1ee83258c5625bb8fdacff82ed3d Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 10 Nov 2019 21:44:54 +0100 Subject: gnu: kpmcore: Update to 4.0.1. * gnu/packages/kde.scm(kpmcore): Update to 4.0.1. [origin]: Add upstream patches for making tests pass. [inputs]: Add qttools. Remove kiconthemes, kservice, libatasmart, parted. [arguments]: New element. * gnu/packages/patches/kpmcore-fix-tests.patch, gnu/packages/patches/kpmcore-remove-broken-test.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. add patches --- gnu/local.mk | 2 + gnu/packages/kde.scm | 12 +- gnu/packages/patches/kpmcore-fix-tests.patch | 30 +++++ .../patches/kpmcore-remove-broken-test.patch | 139 +++++++++++++++++++++ 4 files changed, 177 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/kpmcore-fix-tests.patch create mode 100644 gnu/packages/patches/kpmcore-remove-broken-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5dab77f899..90bf272d07 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1014,6 +1014,8 @@ dist_patch_DATA = \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ %D%/packages/patches/kpackage-allow-external-paths.patch \ + %D%/packages/patches/kpmcore-fix-tests.patch \ + %D%/packages/patches/kpmcore-remove-broken-test.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \ %D%/packages/patches/kobodeluxe-const-charp-conversion.patch \ diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index e81224e8c0..9755f66aca 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -30,6 +30,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages apr) #:use-module (gnu packages boost) @@ -470,7 +471,7 @@ cards.") (define-public kpmcore (package (name "kpmcore") - (version "3.3.0") + (version "4.0.1") (source (origin (method url-fetch) (uri (string-append @@ -479,20 +480,19 @@ cards.") name "-" version ".tar.xz")) (sha256 (base32 - "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq")))) + "1sslkwcj2cyrn7bpjdjdwikp1q8wrsxpsg2sxxd8hsairgy7ygh3")) + (patches (search-patches "kpmcore-fix-tests.patch" + "kpmcore-remove-broken-test.patch")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) (inputs `(("kconfigwidgets" ,kconfigwidgets) - ("kiconthemes" ,kiconthemes) ("kio" ,kio) ("ki18n" ,ki18n) - ("kservice" ,kservice) - ("libatasmart" ,libatasmart) - ("parted" ,parted) ("qtbase" ,qtbase) + ("qca" ,qca) ("util-linux" ,util-linux))) (home-page "https://community.kde.org/Frameworks") (synopsis "Library for managing partitions") diff --git a/gnu/packages/patches/kpmcore-fix-tests.patch b/gnu/packages/patches/kpmcore-fix-tests.patch new file mode 100644 index 0000000000..12043abe72 --- /dev/null +++ b/gnu/packages/patches/kpmcore-fix-tests.patch @@ -0,0 +1,30 @@ +Git commit c02d59aa6d314678cef9683f96b28e2a1abd82b7 by Andrius Štikonas, on behalf of Hartmut Goebel. +Committed on 07/11/2019 at 22:16. +Pushed by stikonas into branch '4.0'. + +Fix test for kpmcore: stop helper only if formerly started. + +See https://bugs.kde.org/413851 and https://phabricator.kde.org/D25161 + +diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp +--- a/src/util/externalcommand.cpp ++++ b/src/util/externalcommand.cpp +@@ -433,14 +433,17 @@ + + void ExternalCommand::stopHelper() + { ++ if (!helperStarted) ++ return; + auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"), + QStringLiteral("/Helper"), QDBusConnection::systemBus()); + QByteArray request; + const quint64 nonce = interface->getNonce(); + request.setNum(nonce); + QByteArray hash = QCryptographicHash::hash(request, QCryptographicHash::Sha512); + interface->exit(privateKey->signMessage(hash, QCA::EMSA3_Raw), nonce); + ++ helperStarted = false; + delete privateKey; + delete init; + } + diff --git a/gnu/packages/patches/kpmcore-remove-broken-test.patch b/gnu/packages/patches/kpmcore-remove-broken-test.patch new file mode 100644 index 0000000000..d02cca7883 --- /dev/null +++ b/gnu/packages/patches/kpmcore-remove-broken-test.patch @@ -0,0 +1,139 @@ +From c9a08a593bac8b8610a647db118fea6f2958156d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= +Date: Thu, 7 Nov 2019 22:12:00 +0000 +Subject: [PATCH] Remove broken smart unit test. + +BUG: 413853 +--- + test/CMakeLists.txt | 9 ---- + test/testsmart.cpp | 102 -------------------------------------------- + 2 files changed, 111 deletions(-) + delete mode 100644 test/testsmart.cpp + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 67f63a2..6a300d3 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -53,12 +53,3 @@ find_package (Threads) + # Execute external commands as root + kpm_test(testexternalcommand testexternalcommand.cpp) + add_test(NAME testexternalcommand COMMAND testexternalcommand ${BACKEND}) +- +-# Including SMART files reference +-set(SMARTPARSER ${CMAKE_SOURCE_DIR}/src/core/smartdiskinformation.cpp +- ${CMAKE_SOURCE_DIR}/src/core/smartattributeparseddata.cpp +- ${CMAKE_SOURCE_DIR}/src/core/smartparser.cpp) +- +-# Test SMART support +-kpm_test(testsmart testsmart.cpp ${SMARTPARSER}) +-add_test(NAME testsmart COMMAND testsmart ${BACKEND}) +diff --git a/test/testsmart.cpp b/test/testsmart.cpp +deleted file mode 100644 +index 2236af7..0000000 +--- a/test/testsmart.cpp ++++ /dev/null +@@ -1,102 +0,0 @@ +-#include "helpers.h" +- +-#include "util/externalcommand.h" +-#include "backend/corebackend.h" +-#include "backend/corebackendmanager.h" +-#include "core/smartstatus.h" +-#include "core/smartparser.h" +- +-#include +-#include +- +-static QString getDefaultDevicePath(); +-static bool testSmartStatus(); +-static bool testSmartParser(); +- +-int main(int argc, char **argv) +-{ +- QCoreApplication app(argc, argv); +- +- KPMCoreInitializer i; +- +- if (argc == 2) +- i = KPMCoreInitializer(argv[1]); +- +- if (!i.isValid()) +- return 1; +- +- CoreBackend *backend = CoreBackendManager::self()->backend(); +- +- if (!backend) +- { +- qWarning() << "Couldn't get backend."; +- return 1; +- } +- +- if (!testSmartStatus() || !testSmartParser()) +- return 1; +- +- return app.exec(); +-} +- +-static QString getDefaultDevicePath() +-{ +- // Getting default home partition using 'df -P /home | awk 'END{print $1}'' command +- ExternalCommand command(QStringLiteral("df"), { QStringLiteral("-P"), QStringLiteral("/home"), QStringLiteral("|"), +- QStringLiteral("awk"), QStringLiteral("\'END{print $1}\'") }); +- +- if (command.run() && command.exitCode() == 0) { +- QString output = command.output(); +- return output; +- } +- +- return QString(); +-} +- +-static bool testSmartStatus() +-{ +- QString devicePath = getDefaultDevicePath(); +- +- SmartStatus smart(devicePath); +- +- if (smart.devicePath() != devicePath) +- return false; +- +- if (!smart.status()) +- return false; +- +- if (smart.modelName() == QString()) +- return false; +- +- if (smart.firmware() == QString()) +- return false; +- +- if (smart.serial() == QString()) +- return false; +- +- if (smart.selfTestStatus() != SmartStatus::SelfTestStatus::Success) +- return false; +- +- if (!smart.isValid()) +- return false; +- +- return true; +-} +- +-static bool testSmartParser() +-{ +- QString devicePath = getDefaultDevicePath(); +- +- SmartParser parser(devicePath); +- +- if (!parser.init()) +- return false; +- +- if (parser.devicePath() != devicePath) +- return false; +- +- if (!parser.diskInformation()) +- return false; +- +- return true; +-} +-- +2.17.1 -- cgit v1.2.3 From 5efd0b2d888641ea5d16dd053c65bab0fce9b062 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Nov 2019 11:11:07 +0200 Subject: gnu: Remove reference to removed patch. This is a follow-up to 1dd1076c5e80141ab65dddce053e93fc5af18c84 * gnu/local.mk (dist_patch_DATA): Remove entry for kwindowsystem-qt-compat.patch. --- gnu/local.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/local.mk b/gnu/local.mk index 90bf272d07..0208513168 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1025,7 +1025,6 @@ dist_patch_DATA = \ %D%/packages/patches/kodi-increase-test-timeout.patch \ %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ %D%/packages/patches/kodi-skip-test-449.patch \ - %D%/packages/patches/kwindowsystem-qt-compat.patch \ %D%/packages/patches/laby-make-install.patch \ %D%/packages/patches/lcalc-default-parameters-1.patch \ %D%/packages/patches/lcalc-default-parameters-2.patch \ -- cgit v1.2.3 From 2c9d34166983565120f831284df57a07e2edd2f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 30 Oct 2019 23:39:46 +0100 Subject: gnu: libreoffice: Use the "dev" output of MariaDB. This is a fixup for the merge (32d6818569) of e0efda9561 (gnu: libreoffice: Update to 6.2.8.2.) and 2b8491fbbe (gnu: mariadb: Split into out, lib and dev.) * gnu/packages/libreoffice.scm (libreoffice)[inputs]: Change MARIADB to MARIADB:DEV. --- gnu/packages/libreoffice.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index ddf1c9aab3..6d83d633f9 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1005,7 +1005,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ("libxt" ,libxt) ("libzmf" ,libzmf) ("lpsolve" ,lpsolve) - ("mariadb" ,mariadb) + ("mariadb" ,mariadb "dev") ("mdds" ,mdds) ("mythes" ,mythes) ("neon" ,neon) -- cgit v1.2.3 From 9c8814909a8bb5f57044eecbf4a6843e66beca07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 17 Nov 2019 01:13:07 +0200 Subject: gnu: kpmcore: Fix dependencies. * gnu/packages/kde.scm(kpmcore)[inputs]: Add kauth, kcoreaddons, kwidgetsaddons. Remove kconfigwidgets, kio. --- gnu/packages/kde.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 79eb20cb59..dcce02e467 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -489,9 +489,10 @@ cards.") `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) (inputs - `(("kconfigwidgets" ,kconfigwidgets) - ("kio" ,kio) + `(("kauth" ,kauth) + ("kcoreaddons" ,kcoreaddons) ("ki18n" ,ki18n) + ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase) ("qca" ,qca) ("util-linux" ,util-linux))) -- cgit v1.2.3 From 62b8ae1a910d4b89287ead11bd2c18325e660bdf Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 6 Nov 2019 22:45:23 +0100 Subject: gnu: astyle: Create symlinks for .so files, too. The Makefile only creates files with a versioned extension (.so.3.1.0), which are not picked up be cmake's `find_libarary()`. (Instead cmake picks up the static .a library.) Symlinks for .so.3 are required to avoid phase `verify-runpath` fails. * gnu/packages/code.scm(astyle)[argumements]: New element. {install-libs}: Add creating symlinks. --- gnu/packages/code.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 20726cfebc..7656ee8739 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014 Mark H Weaver +;;; Copyright © 2019 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -597,6 +598,9 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features: #:make-flags (list (string-append "prefix=" %output) "INSTALL=install" "all") + #:modules ((guix build gnu-build-system) ;; FIXME use %default-modules + (guix build utils) + (ice-9 regex)) #:phases (modify-phases %standard-phases (replace 'configure @@ -606,12 +610,22 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features: ;; Libraries are not installed by default (let* ((output (assoc-ref outputs "out")) (libdir (string-append output "/lib"))) - (begin - (mkdir-p libdir) - (for-each (lambda (l) - (copy-file - l (string-append libdir "/" (basename l)))) - (find-files "bin" "lib*")))) + (define (make-so-link sofile strip-pattern) + (symlink + (basename sofile) + (regexp-substitute #f + (string-match strip-pattern sofile) + 'pre))) + (mkdir-p libdir) + (for-each (lambda (l) + (copy-file + l (string-append libdir "/" (basename l)))) + (find-files "bin" "lib*")) + (for-each + (lambda (sofile) + (make-so-link sofile "(\\.[0-9]){3}$") ;; link .so + (make-so-link sofile "(\\.[0-9]){2}$")) ;; link .so.3 + (find-files libdir "lib.*\\.so\\..*"))) #t))))) (home-page "http://astyle.sourceforge.net/") (synopsis "Source code indenter, formatter, and beautifier") -- cgit v1.2.3 From 0c6ab52243353e3417e5a9733bb089e4771cc86e Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 6 Nov 2019 22:50:31 +0100 Subject: gnu: astyle: Install header file, too. * gnu/packages/code.scm(astyle)[arguments]{install-libs}: Also install header file. --- gnu/packages/code.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 7656ee8739..021181bd8f 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -607,8 +607,9 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features: (lambda _ (chdir "build/gcc") #t)) (add-after 'install 'install-libs (lambda* (#:key outputs #:allow-other-keys) - ;; Libraries are not installed by default + ;; Libraries and includes are not installed by default (let* ((output (assoc-ref outputs "out")) + (incdir (string-append output "/include")) (libdir (string-append output "/lib"))) (define (make-so-link sofile strip-pattern) (symlink @@ -616,6 +617,9 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features: (regexp-substitute #f (string-match strip-pattern sofile) 'pre))) + (mkdir-p incdir) + (copy-file "../../src/astyle.h" + (string-append incdir "/astyle.h")) (mkdir-p libdir) (for-each (lambda (l) (copy-file -- cgit v1.2.3 From a59e2dd8cd16655e379abb567baf978c94f3d48e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 19:09:58 +0100 Subject: gnu: qtbase: Use absolute references in .prl files. This fixes . * gnu/packages/qt.scm (qtbase)[arguments]: Add phase 'patch-prl-files'. --- gnu/packages/qt.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 5f4f29a948..2cc44ab831 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -509,6 +509,16 @@ developers using C++ or QML, a CSS & JavaScript like language.") (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata) (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)) #t))) + (add-after 'patch-mkspecs 'patch-prl-files + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Insert absolute references to the qtbase libraries because + ;; QT_INSTALL_LIBS does not always resolve correctly, depending + ;; on context. See + (substitute* (find-files (string-append out "/lib") "\\.prl$") + (("\\$\\$\\[QT_INSTALL_LIBS\\]") + (string-append out "/lib"))) + #t))) (add-after 'unpack 'patch-paths ;; Use the absolute paths for dynamically loaded libs, otherwise ;; the lib will be searched in LD_LIBRARY_PATH which typically is -- cgit v1.2.3 From f0de36cba7f9f8a6de3a579034e10516195b97e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 Nov 2019 17:13:10 +0100 Subject: gnu: qtbase: Restore compatibility with old kernels. * gnu/packages/qt.scm (qtbase)[arguments]: Add 'no-feature-renameat2' to the configure flags. --- gnu/packages/qt.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2cc44ab831..b8c0b3f6d2 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -451,6 +451,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") ;; kernels that the glibc supports, including the RHEL6 ;; (2.6.32) and RHEL7 (3.10) kernels. "-no-feature-getentropy" ; requires Linux 3.17 + "-no-feature-renameat2" ; requires Linux 3.16 ;; Do not build examples; if desired, these could go ;; into a separate output, but for the time being, we -- cgit v1.2.3 From 6d460e80d1b06fc094374e7ba5c2503f2a897f11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 19:30:56 +0100 Subject: gnu: Qt: Update to 5.12.6 LTS. * gnu/packages/qt.scm (qtbase, qtsvg, qtimageformats, qtx11extras, qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors, qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel, qtwebglplugin, qtwebview, qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech): Update to 5.12.6. --- gnu/packages/qt.scm | 120 ++++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b8c0b3f6d2..631e060a1e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -325,7 +325,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtbase (package (name "qtbase") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -334,7 +334,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32 - "09fnwjyxl4fsvlajkdvizw9spfkxq5mvaqld7mckxnm9ppxvz2pw")) + "09wz7zs1x5mpgs2y4xnl2zv3naqls4sz6v2arwl1fz2dsx4jddba")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch")) (modules '((guix build utils))) @@ -581,7 +581,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -590,7 +590,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32 - "0h4qcy5l3gzcgqp53nqqa1wlbxqklly402q9m5z1srwzfk7r39vm")))) + "13zg5095ffm88dsrybyi075i9zw3yrkibqzvj57an9sq89n3w926")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -656,7 +656,7 @@ HostData=lib/qt5 (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -665,7 +665,7 @@ HostData=lib/qt5 version ".tar.xz")) (sha256 (base32 - "02hzkrlqk3waiqgbjx7npyb7y85p2ri6p076ppkbjbsl6143j6cz")) + "0n3qc5rx7kzb4csmcxaxdm2bqpciz2j2pz2zdfrlpi1ml4liq39k")) (modules '((guix build utils))) (snippet '(begin @@ -687,7 +687,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -696,7 +696,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) version ".tar.xz")) (sha256 (base32 - "0s1a0sbnf7d415mkdrihjdybi0vsq5ccwjm6qrw0h14bwkrmlhl9")))) + "0sqx785kb4kfxfl3cmg848dlxlxmfdg8jnfh3rrk8q0iazsr2faz")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -711,7 +711,7 @@ from within Qt 5."))) (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -720,7 +720,7 @@ from within Qt 5."))) version ".tar.xz")) (sha256 (base32 - "1gdsm12bfg0xg4g09ar26l8zqqqgbk22z522y7q8wyc7gw8dj1dr")))) + "1l44476ibb8rv4rf80vbjdc3712lmrl1xcxswa513ip66k47p5vn")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -740,7 +740,7 @@ xmlpatternsvalidator."))) (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -749,7 +749,7 @@ xmlpatternsvalidator."))) version ".tar.xz")) (sha256 (base32 - "144i5crdp9szj0906vs01bhgwvcx29a1pvrf6mp9w9819cyk5i92")))) + "1lw6nr26cjdrshin3gq5xwqb0bvslg0ml99cw8rx9wb2anpd3c9l")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -772,7 +772,7 @@ with JavaScript and C++."))) (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -781,7 +781,7 @@ with JavaScript and C++."))) version ".tar.xz")) (sha256 (base32 - "12z8ing2bpkk53hgqn0y15j12npqv4sfkpgc2x6prx49srr2rxmx")))) + "1ni2x848dxf0c7ilk461vz0z46qis8zv6jxbpyhpbhzdg9rcdw8h")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -796,7 +796,7 @@ with Bluetooth and NFC."))) (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -805,7 +805,7 @@ with Bluetooth and NFC."))) version ".tar.xz")) (sha256 (base32 - "0qij55bifdg0ip9kc5ka6f6cl39nnn2bmplrhada23lwqjbycn2x")))) + "07nnzqhsnb4q8pbka9dk5nxmqinbg9yicag7f4rlq2p6ffmgn2zh")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -823,7 +823,7 @@ consume data received from the server, or both."))) (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -832,7 +832,7 @@ consume data received from the server, or both."))) version ".tar.xz")) (sha256 (base32 - "118bra2ik3d2ji7cpy14plz25pl2ch15dpklr0zv4ns7dxq6ma73")))) + "1x8f55qyix5bsd0hl9rzi56ndyv4h16z2qh8is9nv13jpk0a9nsr")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -856,7 +856,7 @@ recognition API for devices."))) (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -865,7 +865,7 @@ recognition API for devices."))) version ".tar.xz")) (sha256 (base32 - "1727wf76nlc6snc9800rky6zz45i240gr8b025j4vwayvkys986m")) + "0w4mcxmj41b9phwirppn9ws1vxy3sww7prvhhmh0jsnaca4hwn4z")) (modules '((guix build utils))) (snippet '(begin @@ -907,7 +907,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -916,7 +916,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) version ".tar.xz")) (sha256 (base32 - "0iiqdwn54y8lsmq3y0w681q6wl0l18g06px1za9iyia9f4k33z99")) + "1i2i4d6qa512njm6gvd1ygcyb5p4d6axciqg9ys380yw9nl6m77s")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -993,7 +993,7 @@ interacting with serial ports from within Qt."))) (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1002,7 +1002,7 @@ interacting with serial ports from within Qt."))) version ".tar.xz")) (sha256 (base32 - "08icq26m8a0pnapwds0mv7haybizchkmqxg0g8r6xi83lxhswx44")))) + "1ppmrwshj42lpx21m2gxblrlbigjf10fwg3fk5x5130ih89446q7")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -1014,7 +1014,7 @@ and others."))) (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1023,7 +1023,7 @@ and others."))) version ".tar.xz")) (sha256 (base32 - "1s65nfs4y031vldf7dk7rdjsfi8a0z04w787rwz0bvi20z11l7cz")))) + "1my8vcsidx9r5wpd1iax8skhp5ac3234g9r7ax04k9z17mqd2i97")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1038,7 +1038,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1047,7 +1047,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) version ".tar.xz")) (sha256 (base32 - "1xy45djrc4lcnvd5vq3ds2scpzkpcxhsnvmsmgbnvwmnwnrb5hxa")))) + "1pahdyhinhq1xhsc7lsfprjjpz6fn9vgwqcyi72hc3wzyr98in11")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1073,7 +1073,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (define-public qtwebview (package (inherit qtsvg) (name "qtwebview") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1082,7 +1082,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) version ".tar.xz")) (sha256 (base32 - "09ig6dyvzxl499vplmpdd6shvs2mfvbgqx48cgs3hs6d6p1xim56")))) + "0ykjwz3cwv718gvgvnlhq7wia8gllnj3cdzw3amj0rh63hy65h22")))) (native-inputs `(("perl" ,perl))) (inputs @@ -1096,7 +1096,7 @@ native APIs where it makes sense."))) (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1105,7 +1105,7 @@ native APIs where it makes sense."))) version ".tar.xz")) (sha256 (base32 - "08h10khklf811bqn143pbkcipfn6nwysxs1mw5bcmi5banbvbj0j")))) + "0y12vs6jwiwljdn57jqs1dwi6wfw1l5l95dvj9g93h739p533qks")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1126,7 +1126,7 @@ positioning and geolocation plugins."))) (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1135,7 +1135,7 @@ positioning and geolocation plugins."))) version ".tar.xz")) (sha256 (base32 - "09a0siyiny5wgsnyqxi5y7s1n2dc975wn831sryl71a9gc29bq18")))) + "0xy7sf8w2lln1l59lhrf0kb687avwirrh63izp7509jwi33r2jg9")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1154,7 +1154,7 @@ that helps in Qt development."))) (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1163,7 +1163,7 @@ that helps in Qt development."))) version ".tar.xz")) (sha256 (base32 - "1x0x9zr31ic5yki45r48bkmb9w9pvqawppklnws07117x15770q0")) + "0z3p4bb2ddylb7y2xvagjbn7fc5d0ic08cmrrb67h8wf6fnq5051")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1178,7 +1178,7 @@ ECMAScript and Qt."))) (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1187,7 +1187,7 @@ ECMAScript and Qt."))) version ".tar.xz")) (sha256 (base32 - "0n953lnz6gsa8dpa7c93i4qv50jzdyahgs28qxvabnn3vbxsxpj6")))) + "169cvwiav5d538cw81rbdimb1pis0z6fkaxlwhd4z4pzhyhrd3f4")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1202,7 +1202,7 @@ can be used to build complete interfaces in Qt Quick."))) (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1211,7 +1211,7 @@ can be used to build complete interfaces in Qt Quick."))) version ".tar.xz")) (sha256 (base32 - "13ybd87shs09lpr1rji5k0wik1rmwa8lh78vab5vcva8jb2bsi6p")))) + "0w5910wblzc7q2llyb7fyfcbmy1fl369c6w5d6r5sh26z490gasw")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1227,7 +1227,7 @@ not available."))) (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1236,7 +1236,7 @@ not available."))) version ".tar.xz")) (sha256 (base32 - "1ba6qr4h16zap9f36dw5qip97s4bv83prncqka043l70w2kxpgdx")))) + "1vvpq34433j94n9yyhh4if4yv51i8xiffpvyn3xgffx14iv35l6y")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1254,7 +1254,7 @@ coloring, and many more."))) (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1263,7 +1263,7 @@ coloring, and many more."))) version ".tar.xz")) (sha256 (base32 - "0czdmmbjc6zpj213pwwgjh0h2awzmrgkqy5gl5a5vk7p8wfz126y")))) + "1cxkqnhx0baxh3csjl7ar151v0zizf86f4338rr38liwb7rwbsz1")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1284,7 +1284,7 @@ and mobile applications targeting TV-like form factors."))) (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1293,7 +1293,7 @@ and mobile applications targeting TV-like form factors."))) version ".tar.xz")) (sha256 (base32 - "034n97nyz9ymjcxzqchvwr1bllzwav9hjpjkqggygcnd010wf7kg")) + "12y6ga7j6xby9rz1c9h17r9ih4i16i1ylr6b4vmrn7svidy87msk")) (modules '((guix build utils))) (snippet '(begin @@ -1315,7 +1315,7 @@ also contains functionality to support data models and executable content."))) (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1324,7 +1324,7 @@ also contains functionality to support data models and executable content."))) version ".tar.xz")) (sha256 (base32 - "0nv1psq1vsrpvk8y3lqgxl0g1w7ll6nrxhgw9zxg71ykhm4vrkkv")))) + "1kbhmzrw612yb4brxi3fwslil31j31vm0zqpb52vcma7vbivg80z")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1335,7 +1335,7 @@ purchasing goods and services."))) (define-public qtcanvas3d (package (inherit qtsvg) (name "qtcanvas3d") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1344,7 +1344,7 @@ purchasing goods and services."))) version ".tar.xz")) (sha256 (base32 - "036q2r1disvb8aaiix7p0yn4wwqfq22qnsfkmqvgnnncwdnf0lqm")) + "024xglrb321rp3wb3fhprw7pl6zvmpgfkpwgabbyx8p58k4yccrd")) (modules '((guix build utils))) (snippet '(begin @@ -1374,7 +1374,7 @@ drawing calls from Qt Quick JavaScript."))) (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1383,7 +1383,7 @@ drawing calls from Qt Quick JavaScript."))) version ".tar.xz")) (sha256 (base32 - "02361bf59bsnhk0kz767vbg4rbx8qn5z92avcfhh00ds2slk0z2c")))) + "0gdark4z2g8j0kzjg1aqq91ap04h6hzjl163g8xlwxwdn5dxpnql")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1401,7 +1401,7 @@ selecting one of the charts themes.") (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1410,7 +1410,7 @@ selecting one of the charts themes.") version ".tar.xz")) (sha256 (base32 - "1ws46ijmxmrgg6rmg9mb5sfa2zx4rpjw1f7vqqcgpirhafznbq8x")))) + "1zm4xfi2ijqr3n3g0lfs3yzil6w7c54r8vsj1d541lz7wnm92ka1")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1428,7 +1428,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.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1437,7 +1437,7 @@ customized by using themes or by adding custom items and labels to them.") version ".tar.xz")) (sha256 (base32 - "1wd967sqw0rf8j6wg4qm45rsrzfbg0kcf9j0rrq0qm9h5md4fcq9")))) + "1gba6rdhcvljc4dnzhnkxrdlaxm3y095ljqg1sz3p1k0m632s4pa")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1457,7 +1457,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1466,7 +1466,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) version ".tar.xz")) (sha256 (base32 - "1kgarxc63jx12ifgjj8cw2033nm1p0lkxq6762zyy7yxjfpk3wdc")))) + "16fna70pljn45yj6hv3g4qvb1imcnfj43jchvydspdhg08ykbda9")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1490,7 +1490,7 @@ processes or computers."))) (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") - (version "5.12.5") + (version "5.12.6") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1499,7 +1499,7 @@ processes or computers."))) version ".tar.xz")) (sha256 (base32 - "0nzj6vs56qplym1rr1jbybbpr5jwqhbjqk9igpcj06kd4gbhqk7r")))) + "12l7rycjfa6d9gnnjd6i097pf1qqzjnz9c1jgxhpldvkf0n7pbi7")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests -- cgit v1.2.3 From cff1e095048a238d0b1265c98543d2727d2f6193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Thu, 28 Nov 2019 16:27:39 +0100 Subject: gnu: java: Remove precompiled classes. * gnu/packages/java.scm (jamvm-1-bootstrap, jamvm): Remove prebuilt classes.zip. Signed-off-by: Ricardo Wurmus --- gnu/packages/java.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 955625b0c5..cc63ccf19a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -193,7 +193,12 @@ language.") (patches (search-patches "jamvm-arm.patch")) (sha256 (base32 - "06lhi03l3b0h48pc7x58bk9my2nrcf1flpmglvys3wyad6yraf36")))) + "06lhi03l3b0h48pc7x58bk9my2nrcf1flpmglvys3wyad6yraf36")) + (snippet + '(begin + ;; Remove precompiled software. + (delete-file "lib/classes.zip") + #t)))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -206,6 +211,7 @@ language.") `(("classpath" ,classpath-bootstrap) ("jikes" ,jikes) ("libffi" ,libffi) + ("zip" ,zip) ("zlib" ,zlib))) ;; When built with a recent GCC and glibc the configure step of icedtea-6 ;; fails with an invalid instruction error. @@ -660,7 +666,12 @@ machine."))) version ".tar.gz")) (sha256 (base32 - "1nl0zxz8y5x8gwsrm7n32bry4dx8x70p8z3s9jbdvs8avyb8whkn")))) + "1nl0zxz8y5x8gwsrm7n32bry4dx8x70p8z3s9jbdvs8avyb8whkn")) + (snippet + '(begin + ;; Remove precompiled software. + (delete-file "src/classlib/gnuclasspath/lib/classes.zip") + #t)))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -669,6 +680,7 @@ machine."))) (inputs `(("classpath" ,classpath-devel) ("ecj-javac-wrapper" ,ecj-javac-wrapper) + ("zip" ,zip) ("zlib" ,zlib))))) (define ecj-javac-wrapper-final -- cgit v1.2.3 From d733a469d74f74734825f1ce777956fb4cac5534 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 26 Nov 2019 19:33:15 +0100 Subject: gnu: Remove dependency on Python 2 for some Qt packages. * gnu/packages/qt.scm (qtbase, qtmultimedia) [native-inputs]: Replace python-2 by python. (qtdeclarative)[native-inputs]: Replace python-2 by python, add python-wrapper. --- gnu/packages/qt.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 86685a325b..c0d652a407 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -401,7 +401,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") ("gperf" ,gperf) ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-2) + ("python" ,python) ("vulkan-headers" ,vulkan-headers) ("ruby" ,ruby))) (arguments @@ -756,7 +756,8 @@ xmlpatternsvalidator."))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-2) + ("python" ,python) + ("python-wrapper" ,python-wrapper) ("qtsvg" ,qtsvg) ("qtxmlpatterns" ,qtxmlpatterns))) (inputs @@ -889,7 +890,7 @@ recognition API for devices."))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-2) + ("python" ,python) ("qtdeclarative" ,qtdeclarative))) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3