[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'staging'
|
From: |
guix-commits |
|
Subject: |
02/02: Merge branch 'staging' |
|
Date: |
Wed, 4 Dec 2019 15:12:56 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 33b59c1a3edbb81735e8d4e977b107f3ba1c2f9f
Merge: 936aa05 d733a46
Author: Marius Bakke <address@hidden>
Date: Wed Dec 4 20:12:41 2019 +0100
Merge branch 'staging'
gnu/local.mk | 8 +-
gnu/packages/base.scm | 26 +-
gnu/packages/bioinformatics.scm | 3 +-
gnu/packages/calendar.scm | 4 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/check.scm | 4 +-
gnu/packages/code.scm | 32 +-
gnu/packages/compression.scm | 9 +-
gnu/packages/cran.scm | 3 +-
gnu/packages/cups.scm | 13 +-
gnu/packages/databases.scm | 57 ++-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs-xyz.scm | 3 +-
gnu/packages/finance.scm | 9 +-
gnu/packages/freedesktop.scm | 8 +-
gnu/packages/gdb.scm | 30 +-
gnu/packages/gl.scm | 13 +-
gnu/packages/gnuzilla.scm | 14 +-
gnu/packages/gstreamer.scm | 41 +-
gnu/packages/gtk.scm | 20 +-
gnu/packages/image.scm | 6 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/java.scm | 97 +++-
gnu/packages/kde-frameworks.scm | 547 +++++++++++++--------
gnu/packages/kde-plasma.scm | 16 +-
gnu/packages/kde.scm | 86 ++--
gnu/packages/kodi.scm | 3 +-
gnu/packages/libreoffice.scm | 2 +-
gnu/packages/linux.scm | 4 +-
gnu/packages/maths.scm | 33 +-
gnu/packages/maven.scm | 5 +-
gnu/packages/nss.scm | 10 +-
.../patches/gstreamer-buffer-reset-offset.patch | 59 ---
.../patches/kinit-kdeinit-extra_libs.patch | 4 +-
gnu/packages/patches/kpmcore-fix-tests.patch | 30 ++
.../patches/kpmcore-remove-broken-test.patch | 139 ++++++
.../patches/mesa-timespec-test-32bit.patch | 17 +
gnu/packages/patches/orc-typedef-enum.patch | 17 +
gnu/packages/patches/pyqt-unbundled-qt.patch | 19 +
gnu/packages/patches/qtbase-old-kernel.patch | 25 -
gnu/packages/patches/sdl2-mesa-compat.patch | 21 +
gnu/packages/pdf.scm | 4 +-
gnu/packages/pulseaudio.scm | 19 +-
gnu/packages/python-xyz.scm | 4 +-
gnu/packages/qt.scm | 179 +++----
gnu/packages/ruby.scm | 3 +-
gnu/packages/rust.scm | 33 +-
gnu/packages/sdl.scm | 1 +
gnu/packages/sphinx.scm | 4 +-
gnu/packages/tls.scm | 28 +-
gnu/packages/version-control.scm | 4 +-
gnu/packages/video.scm | 15 +-
gnu/packages/virtualization.scm | 11 +-
gnu/packages/vulkan.scm | 30 +-
gnu/packages/web.scm | 55 ++-
gnu/packages/xiph.scm | 4 +-
gnu/packages/xorg.scm | 8 +-
guix/build/ant-build-system.scm | 15 +-
guix/build/cargo-build-system.scm | 15 -
guix/build/cargo-utils.scm | 16 +-
60 files changed, 1167 insertions(+), 730 deletions(-)
diff --cc gnu/packages/education.scm
index 9139578,71c8502..c457f5a
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@@ -563,11 -562,16 +563,11 @@@ language and very flexible regarding t
version "/src/ktouch-" version ".tar.xz"))
(sha256
(base32
- "19rdk94pls75hdvx11hnfk3qpm6l28p9q45q5f04sknxagrfaznr"))))
+ "0dm6xcwai0bx2h16rny1xa9n1509mfxvy39kfxx5qih53p15jrnk"))))
- (build-system cmake-build-system)
+ (build-system qt-build-system)
(arguments
- `(#:modules ((guix build cmake-build-system)
- (guix build qt-utils)
- (guix build utils))
- #:imported-modules (,@%cmake-build-system-modules
- (guix build qt-utils))
- #:phases
- (modify-phases %standard-phases
+ `(#:phases
+ (modify-phases (@ (guix build qt-build-system) %standard-phases)
(add-after 'configure 'patch-makefiles
(lambda* (#:key inputs #:allow-other-keys)
(let ((qtdec (assoc-ref inputs "qtdeclarative")))