From 5cd1a056bc1330066afac72988cce8229c75482c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 15:14:53 +0100 Subject: [PATCH 01/85] gnu: xinput: Update to 1.6.3. * gnu/packages/xorg.scm (xinput): Update to 1.6.3. --- 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 022cb49c20..b71efedf32 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3692,7 +3692,7 @@ (define-public xineramaproto (define-public xinput (package (name "xinput") - (version "1.6.2") + (version "1.6.3") (source (origin (method url-fetch) @@ -3702,7 +3702,7 @@ (define-public xinput ".tar.bz2")) (sha256 (base32 - "1i75mviz9dyqyf7qigzmxq8vn31i86aybm662fzjz5c086dx551n")))) + "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im")))) (build-system gnu-build-system) (inputs `(("libxrender" ,libxrender) From 6d5811ef8ec2fa1a9596e8039b3a189dc182d645 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 15:15:18 +0100 Subject: [PATCH 02/85] gnu: xkeyboard-config: Update to 2.28. * gnu/packages/xorg.scm (xkeyboard-config): Update to 2.28. --- 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 b71efedf32..706faff32e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3837,7 +3837,7 @@ (define-public xkbutils (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.27") + (version "2.28") (source (origin (method url-fetch) @@ -3847,7 +3847,7 @@ (define-public xkeyboard-config ".tar.bz2")) (sha256 (base32 - "07wh443lhwv1j0q6xnxnji7f7ahh7xphxj90fv02cdd6zv4aw3b9")))) + "1kmxc8hdw4qpvdlzp4ag8ygl34lqhs6sn3pcz1sl0kn61xdv5bb9")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) From 64136870445f15242a75fca317fc8af35c4a8cee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 Jan 2020 01:06:51 +0100 Subject: [PATCH 03/85] gnu: freeglut: Update to 3.2.1. * gnu/packages/gl.scm (freeglut): Update to 3.2.1. [inputs]: Remove MESA, XORGPROTO and XINPUT. --- gnu/packages/gl.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 077b009688..ad1b845b6f 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -96,7 +96,7 @@ (define-public glu (define-public freeglut (package (name "freeglut") - (version "3.0.0") + (version "3.2.1") (source (origin (method url-fetch) (uri (string-append @@ -104,16 +104,13 @@ (define-public freeglut version "/freeglut-" version ".tar.gz")) (sha256 (base32 - "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra")))) + "0s6sk49q8ijgbsrrryb7dzqx2fa744jhx1wck5cz5jia2010w06l")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no test target - (inputs `(("mesa" ,mesa) - ("libx11" ,libx11) + (inputs `(("libx11" ,libx11) ("libxi" ,libxi) ("libxrandr" ,libxrandr) - ("libxxf86vm" ,libxxf86vm) - ("xorgproto" ,xorgproto) - ("xinput" ,xinput))) + ("libxxf86vm" ,libxxf86vm))) (propagated-inputs ;; Headers from Mesa and GLU are needed. `(("glu" ,glu) From 5f6130473788c074536cee2d29dcb052c3140182 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 Jan 2020 01:09:59 +0100 Subject: [PATCH 04/85] gnu: freeglut: Do not build static libraries. * gnu/packages/gl.scm (freeglut)[arguments]: Add #:configure-flags. --- gnu/packages/gl.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index ad1b845b6f..23904a556b 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -106,7 +106,9 @@ (define-public freeglut (base32 "0s6sk49q8ijgbsrrryb7dzqx2fa744jhx1wck5cz5jia2010w06l")))) (build-system cmake-build-system) - (arguments '(#:tests? #f)) ; no test target + (arguments + '(#:tests? #f ;no test target + #:configure-flags '("-DFREEGLUT_BUILD_STATIC_LIBS=OFF"))) (inputs `(("libx11" ,libx11) ("libxi" ,libxi) ("libxrandr" ,libxrandr) From f0bce2e08feb157b3d8b5100b1ea26bbbd6141e3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 Jan 2020 20:26:07 +0100 Subject: [PATCH 05/85] gnu: nss, nss-certs: Update to 3.49. * gnu/packages/certs.scm (nss-certs): Update to 3.49. * gnu/packages/nss.scm (nss): 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 f47260121b..1736d20c7e 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define certdata2pem (define-public nss-certs (package (name "nss-certs") - (version "3.46.1") + (version "3.49") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv")))) + "07g7pn0r29y2h5p2zibz273yhkx6k4wvy8m1308hcqzxqi6hjf37")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 2e34f8e26f..2df4af9d50 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -70,7 +70,7 @@ (define-public nspr (define-public nss (package (name "nss") - (version "3.48") + (version "3.49") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -81,7 +81,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "1b7qs1q7jqhw9dvkdznanzhc5dyq4bwx0biywszy3qx4hqm8571z")) + "07g7pn0r29y2h5p2zibz273yhkx6k4wvy8m1308hcqzxqi6hjf37")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-freebl-stubs.patch" @@ -130,7 +130,7 @@ (define-public nss ;; leading to test failures: ;; . To ;; work around that, set the time to roughly the release date. - (invoke "faketime" "2019-12-01" "./nss/tests/all.sh"))) + (invoke "faketime" "2020-01-01" "./nss/tests/all.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) From 6e332fd3706fbe81c67b50c9d6b27df18f363c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Mon, 13 Jan 2020 12:39:45 +0100 Subject: [PATCH 06/85] gnu: qtbase: Open links properly without xdg-utils in profile * gnu/packages/qt.scm (qtbase)[inputs]: Add XDG-UTILS. [arguments](patch-xdg-open): New phase. Signed-off-by: Marius Bakke --- gnu/packages/qt.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 514577678e..8dc771a5f8 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2018 John Soo ;;; Copyright © 2020 Mike Rosset +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -363,6 +364,7 @@ (define-public qtbase (build-system gnu-build-system) (propagated-inputs `(("mesa" ,mesa) + ;; Use which the package, not the function ("which" ,(@ (gnu packages base) which)))) (inputs `(("alsa-lib" ,alsa-lib) @@ -407,6 +409,7 @@ (define-public qtbase ("xcb-util-keysyms" ,xcb-util-keysyms) ("xcb-util-renderutil" ,xcb-util-renderutil) ("xcb-util-wm" ,xcb-util-wm) + ("xdg-utils" ,xdg-utils) ("zlib" ,zlib))) (native-inputs `(("bison" ,bison) @@ -428,6 +431,14 @@ (define-public qtbase "qmake/library/qmakebuiltins.cpp") (("/bin/sh") (which "sh"))) #t)) + (add-after 'configure 'patch-xdg-open + (lambda _ + (substitute* '("src/platformsupport/services/genericunix/qgenericunixservices.cpp") + (("^.*const char \\*browsers.*$" all) + (string-append "*browser = QStringLiteral(\"" + (which "xdg-open") + "\"); return true; \n" all))) + #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) From e4da86f358f0a862d1e635a294a14607f6b854f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:09:10 +0100 Subject: [PATCH 07/85] gnu: source-highlight: Update to 3.1.9. * gnu/packages/pretty-print.scm (source-highlight): Update to 3.1.9. --- gnu/packages/pretty-print.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 6f2b3f78ea..fc98478d4c 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -190,7 +190,7 @@ (define-public fmt (define-public source-highlight (package (name "source-highlight") - (version "3.1.8") + (version "3.1.9") (source (origin (method url-fetch) @@ -198,7 +198,7 @@ (define-public source-highlight version ".tar.gz")) (sha256 (base32 - "18xdalxg7yzrxc1njzgw7aryq2jdm7zq2yqz41sc7k6il5z6lcq1")))) + "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs")))) (build-system gnu-build-system) ;; The ctags that comes with emacs does not support the --excmd options, ;; so can't be used From 89a6d2d1451986365f6161f3589d3753033faa0a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Jan 2020 18:39:46 +0100 Subject: [PATCH 08/85] gnu: procps: Update to 3.3.16. * gnu/packages/linux.scm (procps): Update to 3.3.16. --- 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 5235d6cedc..7242894f46 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1224,14 +1224,14 @@ (define-public ddate (define-public procps (package (name "procps") - (version "3.3.15") + (version "3.3.16") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/procps-ng/Production/" "procps-ng-" version ".tar.xz")) (sha256 (base32 - "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h")))) + "1br0g93ysqhlv13i1k4lfbimsgxnpy5rgs4lxfc9rkzdbpbaqplj")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) From f7e3e8c82e72136720614ffda98a0249f699fad7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:35:10 +0100 Subject: [PATCH 09/85] gnu: nss, nss-certs: Update to 3.49.1. * gnu/packages/certs.scm (nss-certs): Update to 3.49.1. * gnu/packages/nss.scm (nss): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/nss.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 1736d20c7e..864fe5def1 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define certdata2pem (define-public nss-certs (package (name "nss-certs") - (version "3.49") + (version "3.49.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "07g7pn0r29y2h5p2zibz273yhkx6k4wvy8m1308hcqzxqi6hjf37")))) + "0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 2df4af9d50..294891734d 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -70,7 +70,7 @@ (define-public nspr (define-public nss (package (name "nss") - (version "3.49") + (version "3.49.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -81,7 +81,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "07g7pn0r29y2h5p2zibz273yhkx6k4wvy8m1308hcqzxqi6hjf37")) + "0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-freebl-stubs.patch" From 11fbe0c3c38ceb75afb6b263f38688f20120ae20 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:35:52 +0100 Subject: [PATCH 10/85] gnu: cups: Update to 2.3.1. * gnu/packages/cups.scm (cups-minimal): Update to 2.3.1. --- 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 0adca9addb..b71f448785 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -187,7 +187,7 @@ (define-public cups-filters (define-public cups-minimal (package (name "cups-minimal") - (version "2.3.0") + (version "2.3.1") (source (origin (method url-fetch) @@ -195,7 +195,7 @@ (define-public cups-minimal version "/cups-" version "-source.tar.gz")) (sha256 (base32 - "19d1jpdpxy0fclq37pchi7ldnw9dssxx3zskcgqai3h0rwlh5bxc")))) + "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv")))) (build-system gnu-build-system) (arguments `(#:configure-flags From dfe3b39d1eaeabbff04461025c684ebc67757177 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:36:17 +0100 Subject: [PATCH 11/85] gnu: cups-filters: Update to 1.26.2. * gnu/packages/cups.scm (cups-filters): Update to 1.26.2. --- 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 b71f448785..8fbb2ee4f6 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -58,7 +58,7 @@ (define-module (gnu packages cups) (define-public cups-filters (package (name "cups-filters") - (version "1.25.13") + (version "1.26.2") (source(origin (method url-fetch) (uri @@ -66,7 +66,7 @@ (define-public cups-filters "cups-filters-" version ".tar.xz")) (sha256 (base32 - "1z3b7p6pp6yzvzl2nip9q0gn4fr5k9qwpnnhqqkiaaf3b1nfswjj")) + "1a8x6zgw3m4717gw3842gsrgjl05q92xygy4rp5vwr1d1xjmyxp1")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output From ca69163cc5aac9ff15a358449ed229631434a4fa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:36:55 +0100 Subject: [PATCH 12/85] gnu: MariaDB: Remove workaround package. * gnu/packages/databases.scm (mariadb)[arguments]: Add substitution for the 'mysql_install_db' script. (mariadb/fixed-install-db): Remove variable. (libdbi-drivers)[native-inputs]: Change from MARIADB/FIXED-INSTALL-DB to MARIADB. --- gnu/packages/databases.scm | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ca15c77026..283c8920d9 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -879,6 +879,11 @@ (define-public mariadb (rename-file (string-append out "/bin/mysql_config") (string-append dev "/bin/mysql_config")) + + (substitute* (string-append out "/bin/mysql_install_db") + (("\\$basedir/share/mysql") + (string-append lib "/share/mysql"))) + ;; Embed an absolute reference to OpenSSL in mysql_config ;; and the pkg-config file to avoid propagation. (substitute* (list (string-append dev "/bin/mysql_config") @@ -914,33 +919,6 @@ (define-public mariadb as a drop-in replacement of MySQL.") (license license:gpl2))) -;; TODO: mysql_install_db is broken in MariaDB. This package is here as -;; a workaround for packages that need it. Merge with 'mariadb' in the next -;; rebuild cycle. -(define-public mariadb/fixed-install-db - (hidden-package - (package/inherit - mariadb - (name "mariadb-fixed") - (native-inputs '()) - (inputs - `(("mariadb" ,mariadb) - ("mariadb:lib" ,mariadb "lib"))) - (outputs '("out")) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules ((guix build utils))) - (let ((out (assoc-ref %outputs "out"))) - (copy-recursively (assoc-ref %build-inputs "mariadb") out) - (substitute* (string-append out "/bin/mysql_install_db") - (("\\$basedir/share/mysql") - (string-append (assoc-ref %build-inputs "mariadb:lib") - "/share/mysql"))) - #t))))))) - ;; Don't forget to update the other postgresql packages when upgrading this one. (define-public postgresql (package @@ -3278,7 +3256,7 @@ (define-public libdbi-drivers `(;; For tests. ("inetutils" ,inetutils) ("glibc-locales" ,glibc-locales) - ("mariadb" ,mariadb/fixed-install-db))) + ("mariadb" ,mariadb))) (inputs `(("libdbi" ,libdbi) ("mariadb:dev" ,mariadb "dev") From b0b7954271b7ca466de82d70897f96ac7e2cf8fd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:40:42 +0100 Subject: [PATCH 13/85] gnu: OpenSSL@1.0: Update to 1.0.2u. * gnu/packages/tls.scm (openssl-1.0): Update to 1.0.2u. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 10d864348c..ece880f2f2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -424,7 +424,7 @@ (define-public openssl-1.0 (package (inherit openssl) (name "openssl") - (version "1.0.2t") + (version "1.0.2u") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -436,7 +436,7 @@ (define-public openssl-1.0 "/openssl-" version ".tar.gz"))) (sha256 (base32 - "1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql")) + "05lxcs4hzyfqd5jn0d9p0fvqna62v2s4pc9qgmq0dpcknkzwdl7c")) (patches (search-patches "openssl-runpath.patch" "openssl-c-rehash-in.patch")))) (outputs '("out" From 7eb22b188bc68be7614c576e40d792ffe31a8bb1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:41:13 +0100 Subject: [PATCH 14/85] gnu: libinput: Update to 1.15.0. * gnu/packages/freedesktop.scm (libinput): Update to 1.15.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 ed221439b4..205015bae1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -180,14 +180,14 @@ (define-public xdg-utils (define-public libinput (package (name "libinput") - (version "1.14.3") + (version "1.15.0") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "1dy58j8dvr7ri34bx0lppmh5638m956azgwk501w373hi42kmsqg")))) + "1qa3b2fd4pv8ysf0mgwnyhqv9v48zgy3sy0q3a3vxcmwcvpizgxz")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false") From fe19ab3f0344b092f72df44b27c6858c344d5898 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:41:47 +0100 Subject: [PATCH 15/85] gnu: libva: Update to 2.6.1. * gnu/packages/video.scm (libva): Update to 2.6.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2b3b9d982d..a04bd3549a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -738,7 +738,7 @@ (define-public libmatroska (define-public libva (package (name "libva") - (version "2.5.0") + (version "2.6.1") (source (origin (method url-fetch) @@ -750,7 +750,7 @@ (define-public libva (string-append "https://www.freedesktop.org/software/vaapi/releases/" "libva/libva-" version "/libva-" version ".tar.bz2"))) (sha256 - (base32 "0y38mw1ggxm15zq06r4qpwhd5wx4bppw1rsxpr6sq1m5d79rra1s")))) + (base32 "19df3r02k1p4cbyvifkdjyc8q7hi23f5b3x3390z52l25mjfnmvc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From 289d66d0cf2894146095030ccfcf3dcec352669e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:42:12 +0100 Subject: [PATCH 16/85] gnu: mesa: Update to 19.3.2. * gnu/packages/gl.scm (mesa): Update to 19.3.2. --- 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 23904a556b..42bed5d623 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -229,7 +229,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "19.2.7") + (version "19.3.2") (source (origin (method url-fetch) @@ -241,7 +241,7 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "17jp8ghipgz62vqqz5llskxypkcmgf8gnlgnj0pyvnbgi6vryyg3")) + "1hg1gvcwvayksrdh9z8rfz66h3z1ffspmm2qgyy2nd8n8qrfwfjf")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) From ad7287b20ea157d5e3c474b52b051e8edad21409 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:43:13 +0100 Subject: [PATCH 17/85] gnu: libwebp: Update to 1.1.0. * gnu/packages/image.scm (libwebp): Update to 1.1.0. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a518b69b8e..6306a3d20b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1102,7 +1102,7 @@ (define-public vigra-c (define-public libwebp (package (name "libwebp") - (version "1.0.3") + (version "1.1.0") (source (origin ;; No tarballs are provided for >0.6.1. @@ -1113,7 +1113,7 @@ (define-public libwebp (file-name (git-file-name name version)) (sha256 (base32 - "1l8h9d3z3kla567ilmymrgg8vc2n763g8qss1hah8dg832hbqkxf")))) + "0r2yy9if0ndvpzadk39bigvsygyqnlv0xjb9w2aj6rs534mncazz")))) (build-system gnu-build-system) (inputs `(("freeglut" ,freeglut) From 58d1d46a5ebbc911952e00207139234050b7debd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:43:33 +0100 Subject: [PATCH 18/85] gnu: libxkbcommon: Update to 0.10.0. * gnu/packages/xdisorg.scm (libxkbcommon): Update to 0.10.0. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c1f6876c7e..459efd6626 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -302,14 +302,14 @@ (define-public xclip (define-public libxkbcommon (package (name "libxkbcommon") - (version "0.9.1") + (version "0.10.0") (source (origin (method url-fetch) (uri (string-append "https://xkbcommon.org/download/libxkbcommon-" version ".tar.xz")) (sha256 (base32 - "1q4v378sr9ad8fy9znl7k8xpf0wch655r9m6z0bcc7sw1azsminl")))) + "1wmnl0hngn6vrqrya4r8hvimlkr4jag39yjprls4gyrqvh667hsp")))) (build-system meson-build-system) (inputs `(("libx11" ,libx11) From 50adab10263c3e4b2c609a6cc5eef2fdddf57b29 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:43:53 +0100 Subject: [PATCH 19/85] gnu: libical: Update to 3.0.7. * gnu/packages/calendar.scm (libical): Update to 3.0.7. --- 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 5e7ac66260..5a88c98456 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -50,7 +50,7 @@ (define-module (gnu packages calendar) (define-public libical (package (name "libical") - (version "3.0.6") + (version "3.0.7") (source (origin (method url-fetch) (uri (string-append @@ -58,7 +58,7 @@ (define-public libical version "/libical-" version ".tar.gz")) (sha256 (base32 - "15sdmh8w4vszd7jhv9fdpd48anpkniq2k1jw7siy9v1jnz1232jw")))) + "1z33wzaazbd7drl6qbh1750whd78xl2cg0gjnxyya9m83vgndgha")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; test suite appears broken From 3c2ebce669ff3340f32683690aef94469b217aea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 10:50:20 +0100 Subject: [PATCH 20/85] gnu: dejagnu: Update to 1.6.2. * gnu/packages/dejagnu.scm (dejagnu): Update to 1.6.2. --- gnu/packages/dejagnu.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dejagnu.scm b/gnu/packages/dejagnu.scm index f2aca50f1a..0dee89dfc1 100644 --- a/gnu/packages/dejagnu.scm +++ b/gnu/packages/dejagnu.scm @@ -28,7 +28,7 @@ (define-module (gnu packages dejagnu) (define-public dejagnu (package (name "dejagnu") - (version "1.6.1") + (version "1.6.2") (source (origin (method url-fetch) @@ -36,7 +36,7 @@ (define-public dejagnu version ".tar.gz")) (sha256 (base32 - "14hnq1mh91vqprc43xdy4f15sycw6fbajrh7zi6cw2kyg6xjhnxz")))) + "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd")))) (build-system gnu-build-system) (inputs `(("expect" ,expect))) (arguments From 2daded5a9152003c3e64cb47250084c8a3192035 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 20:25:12 +0100 Subject: [PATCH 21/85] gnu: python-pygments: Update to 2.5.2. * gnu/packages/python-xyz.scm (python-pygments): Update to 2.5.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 2c308796e7..d6f2ac8179 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2616,14 +2616,14 @@ (define-public python2-docutils (define-public python-pygments (package (name "python-pygments") - (version "2.4.2") + (version "2.5.2") (source (origin (method url-fetch) (uri (pypi-uri "Pygments" version)) (sha256 (base32 - "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748")))) + "1zmhnswy0wxfn0xprs9aqsvx2c3kmzfn2wx14q8cv3vpkxdamj4q")))) (build-system python-build-system) (arguments ;; FIXME: Tests require sphinx, which depends on this. From 25b8d676c01bc9cd206a12bd2bdd767e47b4e693 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Jan 2020 21:48:25 +0100 Subject: [PATCH 22/85] gnu: ImageMagick: Update to 6.9.10-87. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-87. --- 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 e6a178713a..2b4bc5680d 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,14 +48,14 @@ (define-public imagemagick ;; 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-78") + (version "6.9.10-87") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "178sai7r0w2hwv01is25c8mxf9lc2ba0l16qm45h9vv49y5dy08q")))) + "09m0nx7y6j5cq13r583kp3lbsc357cc3q0kcvzbya54r5lx20a5p")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") From 9792adaa611e495ee1a53e5849a37fef7fa49edf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:38:40 +0100 Subject: [PATCH 23/85] gnu: gstreamer: Build with Meson. The package fails to build with GNU Make 4.3, and upstream no longer supports autotools. * gnu/packages/gstreamer.scm (gstreamer)[build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Remove #:configure-flags. Add #:phases. [native-inputs]: Add GTK-DOC. --- gnu/packages/gstreamer.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 63b4179bc6..126972fd1b 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -116,19 +116,27 @@ (define-public gstreamer (sha256 (base32 "0kp93622y29pck8asvil1fmzf55s2gx76wv475a6izc3cwj49w73")))) - (build-system gnu-build-system) + (build-system meson-build-system) (outputs '("out" "doc")) (arguments - `(#:configure-flags - (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")))) + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'move-docs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (copy-recursively (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + (delete-file-recursively (string-append out "/share/gtk-doc")) + #t)))))) (propagated-inputs `(("glib" ,glib))) ; required by gstreamer-1.0.pc. (native-inputs `(("bison" ,bison) ("flex" ,flex) ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper))) From 738923b6e3ac85c78b1e97a9a85979495ed8ba51 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:40:02 +0100 Subject: [PATCH 24/85] gnu: gst-plugins-base: Build with Meson. * gnu/packages/gstreamer.scm (gst-plugins-base)[build-system]: Change to MESON-BUILD-SYSTEM. [outputs]: Remove. [arguments]: Enable parallel tests. Disable doc generation and Mesa dependency. --- gnu/packages/gstreamer.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 126972fd1b..e78afdabb8 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -171,8 +171,7 @@ (define-public gst-plugins-base (sha256 (base32 "0sl1hxlyq46r02k7z70v09vx1gi4rcypqmzra9jid93lzvi76gmi")))) - (build-system gnu-build-system) - (outputs '("out" "doc")) + (build-system meson-build-system) (propagated-inputs `(("glib" ,glib) ;required by gstreamer-sdp-1.0.pc ("gstreamer" ,gstreamer) ;required by gstreamer-plugins-base-1.0.pc @@ -206,11 +205,10 @@ (define-public gst-plugins-base ("gobject-introspection" ,gobject-introspection) ("python-wrapper" ,python-wrapper))) (arguments - `(#:parallel-tests? #f ; 'pipelines/tcp' fails in parallel - #:configure-flags - (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) + '(#:configure-flags '("-Dgl=disabled" + ;; FIXME: Documentation fails to build without + ;; enabling GL above, which causes other problems. + "-Ddoc=false") #:phases (modify-phases %standard-phases (add-before 'configure 'patch From 321f47c25d82fa510ea4e1891f719c4255272e39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:40:42 +0100 Subject: [PATCH 25/85] gnu: gst-plugins-good: Build with Meson. * gnu/packages/gstreamer.scm (gst-plugins-good)[build-system]: Change to MESON-BUILD-SYSTEM. --- gnu/packages/gstreamer.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index e78afdabb8..310f5388bc 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -236,7 +236,7 @@ (define-public gst-plugins-good (sha256 (base32 "068k3cbv1yf3gbllfdzqsg263kzwh21y8dpwr0wvgh15vapkpfs0")))) - (build-system gnu-build-system) + (build-system meson-build-system) (inputs `(("aalib" ,aalib) ("cairo" ,cairo) From 2dc277dd997da8ada68349ea321192719edc814c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:41:41 +0100 Subject: [PATCH 26/85] gnu: gst-plugins-bad: Build with Meson. * gnu/packages/gstreamer.scm (gst-plugins-bad)[outputs]: Remove. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Enable tests, except for one. Disable documentation generation. --- gnu/packages/gstreamer.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 310f5388bc..7bbb564d16 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -297,19 +297,24 @@ (define-public gst-plugins-bad (sha256 (base32 "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi")))) - (outputs '("out" "doc")) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments - '(#:tests? #f ; XXX: 13 of 53 tests fail - #:configure-flags - (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")))) + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; FIXME: Why is this failing. + (substitute* "tests/check/meson.build" + ((".*elements/dash_mpd\\.c.*") + "")) + #t))))) (propagated-inputs `(("gst-plugins-base" ,gst-plugins-base))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) + ;; TODO: Enable documentation for 1.18. + ;;("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) ("python" ,python))) (inputs From 1bf1e32b01624fe7833d6a6d1bd6cff7e4559c72 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:43:03 +0100 Subject: [PATCH 27/85] gnu: gst-plugins-ugly: Build with Meson. * gnu/packages/gstreamer.scm (gst-plugins-ugly)[build-system]: Change to MESON-BUILD-SYSTEM. --- gnu/packages/gstreamer.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 7bbb564d16..815340a14c 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -378,7 +378,7 @@ (define-public gst-plugins-ugly (sha256 (base32 "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m")))) - (build-system gnu-build-system) + (build-system meson-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) ("liba52" ,liba52) From 4bebd7e4e606c1fc7578c948094675e6f95c2619 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:43:32 +0100 Subject: [PATCH 28/85] gnu: gst-libav: Build with Meson. * gnu/packages/gstreamer.scm (gst-libav)[build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Remove. --- gnu/packages/gstreamer.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 815340a14c..d84d2009b5 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -419,9 +419,7 @@ (define-public gst-libav ;; Drop bundled ffmpeg. (delete-file-recursively "gst-libs/ext/libav") #t)))) - (build-system gnu-build-system) - (arguments - '(#:configure-flags '("--with-system-libav"))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) From c450ee975529f25607e67cb405a2a6b515cf655e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Jan 2020 21:44:02 +0100 Subject: [PATCH 29/85] gnu: python-gst: Build with Meson. * gnu/packages/gstreamer.scm (python-gst)[build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Adjust accordingly. --- gnu/packages/gstreamer.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index d84d2009b5..6fd683c9de 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -447,15 +447,16 @@ (define-public python-gst (sha256 (base32 "1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390")))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments - `(#:modules ((guix build gnu-build-system) + `(#:modules ((guix build meson-build-system) + (guix build utils) ((guix build python-build-system) #:prefix python:)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%meson-build-system-modules (guix build python-build-system)) #:configure-flags (list (string-append - "--with-pygi-overrides-dir=" + "-Dpygi-overrides-dir=" (python:site-packages %build-inputs %outputs) "gi/overrides")))) (native-inputs `(("pkg-config" ,pkg-config) From 6839095af7f6c8a8d5ad481db22cd4ece0a1b5e3 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 21 Jan 2020 16:44:18 +0100 Subject: [PATCH 30/85] gnu: mrustc: Update to 0.8.1. * gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/rust.scm (mrustc): Update to 0.8.1. [source](patches): Remove it. [native-inputs]: Add zlib. --- gnu/local.mk | 1 - ....0-fix-variable-length-integer-receiving.patch | 15 --------------- gnu/packages/rust.scm | 9 ++++----- 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9dd67ddd5c..bbafa062ed 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1180,7 +1180,6 @@ dist_patch_DATA = \ %D%/packages/patches/mozjs38-tracelogger.patch \ %D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \ - %D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mumps-shared-libseq.patch \ diff --git a/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch b/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch deleted file mode 100644 index 9e76653a07..0000000000 --- a/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/thepowersgang/mrustc/issues/109 -From: Danny Milosavljevic -Date: Fri, 3 Jan 2019 13:00:00 +0100 - ---- mrustc/src/expand/proc_macro.cpp.orig 2019-02-01 14:16:54.208486062 +0100 -+++ mrustc/src/expand/proc_macro.cpp 2019-02-01 14:17:14.350925705 +0100 -@@ -977,7 +977,7 @@ - for(;;) - { - auto b = recv_u8(); -- v |= static_cast(b) << ofs; -+ v |= static_cast(b & 0x7F) << ofs; - if( (b & 0x80) == 0 ) - break; - ofs += 7; diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index cec565bbc8..70e8d0a814 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -91,7 +91,7 @@ (define-public mrustc (let ((rustc-version "1.19.0")) (package (name "mrustc") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -100,9 +100,7 @@ (define-public mrustc (file-name (git-file-name name version)) (sha256 (base32 - "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")) - (patches - (search-patches "mrustc-0.8.0-fix-variable-length-integer-receiving.patch")))) + "00800zckq009kf9v3hb8kp1svryvq3jpg4439ksm3wcidjvszdzc")))) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs @@ -111,7 +109,8 @@ (define-public mrustc `(("bison" ,bison) ("flex" ,flex) ;; Required for the libstd sources. - ("rustc" ,(package-source rust-1.19)))) + ("rustc" ,(package-source rust-1.19)) + ("zlib" ,zlib))) (arguments `(#:test-target "local_tests" #:make-flags (list (string-append "LLVM_CONFIG=" From b07384b5647057a67cd46109bd0272a195165855 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 21 Jan 2020 16:47:10 +0100 Subject: [PATCH 31/85] gnu: mrustc: Clean up. * gnu/packages/rust.scm (mrust)[native-inputs]: Remove zlib. [inputs]: Remove llvm. Add zlib. [arguments]<#:make-flags>: Remove LLVM_CONFIG. Add RUSTC_TARGET. [patch-date]: Modify. [unpack-target-compiler]: Modify. [configure]: Add CXX. [build-minicargo]: Modify. [install]: Install run_rustc. --- gnu/packages/rust.scm | 45 ++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 70e8d0a814..83af92493b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -104,52 +104,45 @@ (define-public mrustc (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs - `(("llvm" ,llvm-3.9.1))) + `(("zlib" ,zlib))) (native-inputs `(("bison" ,bison) ("flex" ,flex) ;; Required for the libstd sources. - ("rustc" ,(package-source rust-1.19)) - ("zlib" ,zlib))) + ("rustc" ,(package-source rust-1.19)))) (arguments `(#:test-target "local_tests" - #:make-flags (list (string-append "LLVM_CONFIG=" - (assoc-ref %build-inputs "llvm") - "/bin/llvm-config")) + #:make-flags + (list ,(string-append "RUSTC_TARGET=" + (or (%current-target-system) + (nix-system->gnu-triplet-for-rust)))) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-date (lambda _ (substitute* "Makefile" (("shell date") "shell date -d @1")) + (substitute* "run_rustc/Makefile" + (("[$]Vtime ") "$V ")) #t)) (add-after 'patch-date 'unpack-target-compiler (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "minicargo.mk" - ;; Don't try to build LLVM. - (("^[$][(]LLVM_CONFIG[)]:") "xxx:") - ;; Build for the correct target architecture. - (("^RUSTC_TARGET := x86_64-unknown-linux-gnu") - (string-append "RUSTC_TARGET := " - ,(or (%current-target-system) - (nix-system->gnu-triplet-for-rust))))) (invoke "tar" "xf" (assoc-ref inputs "rustc")) - (chdir "rustc-1.19.0-src") + (chdir ,(string-append "rustc-" rustc-version "-src")) (invoke "patch" "-p0" "../rust_src.patch") (chdir "..") #t)) (replace 'configure (lambda* (#:key inputs #:allow-other-keys) - (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) + (setenv "CC" (string-append (assoc-ref inputs "gcc") + "/bin/gcc")) + (setenv "CXX" (string-append (assoc-ref inputs "gcc") + "/bin/g++")) #t)) (add-after 'build 'build-minicargo - (lambda _ - (for-each (lambda (target) - (invoke "make" "-f" "minicargo.mk" target)) - '("output/libstd.hir" "output/libpanic_unwind.hir" - "output/libproc_macro.hir" "output/libtest.hir")) - ;; Technically the above already does it - but we want to be clear. - (invoke "make" "-C" "tools/minicargo"))) + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "-f" "minicargo.mk" "LIBS" make-flags) + (apply invoke "make" "-C" "tools/minicargo" make-flags))) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -159,7 +152,8 @@ (define-public mrustc (cargo-bin (string-append cargo-out "/bin")) (lib (string-append out "/lib")) (lib/rust (string-append lib "/mrust")) - (gcc (assoc-ref inputs "gcc"))) + (gcc (assoc-ref inputs "gcc")) + (run_rustc (string-append out "/share/mrustc/run_rustc"))) ;; These files are not reproducible. (for-each delete-file (find-files "output" "\\.txt$")) (delete-file-recursively "output/local_tests") @@ -171,6 +165,9 @@ (define-public mrustc ;; minicargo uses relative paths to resolve mrustc. (install-file "tools/bin/minicargo" tools-bin) (install-file "tools/bin/minicargo" cargo-bin) + (mkdir-p run_rustc) + (copy-file "run_rustc/Makefile" + (string-append run_rustc "/Makefile")) #t)))))) (synopsis "Compiler for the Rust progamming language") (description "Rust is a systems programming language that provides memory From 5b600fcae65df18c617adc0e5c35e98484e2b3cc Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 21 Jan 2020 20:30:06 +0100 Subject: [PATCH 32/85] gnu: mrustc: Update to 0.9. * gnu/packages/rust.scm (mrustc): update to 0.9. [arguments]<#:test-target]: Change to "test". <#:phases>[unpack-target-compiler]: Modify. [install]: Modify. (rust-1.19)[arguments]<#:phases>[build]: Modify. --- gnu/packages/rust.scm | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 83af92493b..8bed56ff72 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -91,7 +91,7 @@ (define-public mrustc (let ((rustc-version "1.19.0")) (package (name "mrustc") - (version "0.8.1") + (version "0.9") (source (origin (method git-fetch) (uri (git-reference @@ -100,7 +100,7 @@ (define-public mrustc (file-name (git-file-name name version)) (sha256 (base32 - "00800zckq009kf9v3hb8kp1svryvq3jpg4439ksm3wcidjvszdzc")))) + "194ny7vsks5ygiw7d8yxjmp1qwigd71ilchis6xjl6bb2sj97rd2")))) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs @@ -111,7 +111,7 @@ (define-public mrustc ;; Required for the libstd sources. ("rustc" ,(package-source rust-1.19)))) (arguments - `(#:test-target "local_tests" + `(#:test-target "test" #:make-flags (list ,(string-append "RUSTC_TARGET=" (or (%current-target-system) @@ -129,8 +129,13 @@ (define-public mrustc (lambda* (#:key inputs outputs #:allow-other-keys) (invoke "tar" "xf" (assoc-ref inputs "rustc")) (chdir ,(string-append "rustc-" rustc-version "-src")) - (invoke "patch" "-p0" "../rust_src.patch") + (invoke "patch" "-p0" ,(string-append "../rustc-" rustc-version + "-src.patch")) (chdir "..") + (setenv "RUSTC_VERSION" ,rustc-version) + (setenv "MRUSTC_TARGET_VER" + ,(version-major+minor rustc-version)) + (setenv "OUTDIR_SUF" "") #t)) (replace 'configure (lambda* (#:key inputs #:allow-other-keys) @@ -141,8 +146,15 @@ (define-public mrustc #t)) (add-after 'build 'build-minicargo (lambda* (#:key make-flags #:allow-other-keys) + ;; TODO: minicargo.mk: RUSTC_VERSION=$(RUSTC_VERSION) RUSTC_CHANNEL=$(RUSTC_SRC_TY) OUTDIR_SUF=$(OUTDIR_SUF) (apply invoke "make" "-f" "minicargo.mk" "LIBS" make-flags) (apply invoke "make" "-C" "tools/minicargo" make-flags))) + ;(add-after 'check 'check-locally + ; (lambda* (#:key make-flags #:allow-other-keys) + ; ;; The enum test wouldn't work otherwise. + ; ;; See . + ; (setenv "MRUSTC_TARGET_VER" ,(version-major+minor rustc-version)) + ; (apply invoke "make" "local_tests" make-flags))) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -153,11 +165,12 @@ (define-public mrustc (lib (string-append out "/lib")) (lib/rust (string-append lib "/mrust")) (gcc (assoc-ref inputs "gcc")) - (run_rustc (string-append out "/share/mrustc/run_rustc"))) + (run_rustc (string-append out + "/share/mrustc/run_rustc"))) ;; These files are not reproducible. (for-each delete-file (find-files "output" "\\.txt$")) - (delete-file-recursively "output/local_tests") - (mkdir-p lib) + ;(delete-file-recursively "output/local_tests") + (mkdir-p (dirname lib/rust)) (copy-recursively "output" lib/rust) (mkdir-p bin) (mkdir-p tools-bin) @@ -285,8 +298,12 @@ (define rust-1.19 (setenv "CFG_RELEASE_CHANNEL" "stable") (setenv "CFG_LIBDIR_RELATIVE" "lib") (setenv "CFG_VERSION" "1.19.0-stable-mrustc") + (setenv "MRUSTC_TARGET_VER" ,(version-major+minor version)) ; bad: (setenv "CFG_PREFIX" "mrustc") ; FIXME output path. (mkdir-p "output") + ;; mrustc 0.9 doesn't check the search paths for crates anymore. + (copy-recursively (string-append rustc-bootstrap "/lib/mrust") + "output") (invoke (string-append rustc-bootstrap "/tools/bin/minicargo") "src/rustc" "--vendor-dir" "src/vendor" "--output-dir" "output/rustc-build" From 0025a1d31eb1d0aedb9e13a60ba36b9a13b67461 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jan 2020 21:10:49 +0100 Subject: [PATCH 33/85] gnu: gstreamer: Disable two tests on i686. * gnu/packages/gstreamer.scm (gstreamer)[arguments]: Add phase when building for i686 systems. --- gnu/packages/gstreamer.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 6fd683c9de..ce4eb707e7 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -119,8 +119,22 @@ (define-public gstreamer (build-system meson-build-system) (outputs '("out" "doc")) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases + ;; FIXME: Since switching to the meson-build-system, two tests + ;; started failing on i686. See + ;; . + ,@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) + `((add-after 'unpack 'disable-some-tests + (lambda _ + (substitute* "tests/check/gst/gstsystemclock.c" + (("tcase_add_test \\(tc_chain, test_stress_cleanup_unschedule.*") + "") + (("tcase_add_test \\(tc_chain, test_stress_reschedule.*") + "")) + #t))) + '()) (add-after 'install 'move-docs (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) From e003b7591f6c0cff8aeaf0d2063fb8a038a068a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jan 2020 21:12:48 +0100 Subject: [PATCH 34/85] gnu: gst-plugins-bad: Disable failing test on armhf-linux. * gnu/packages/gstreamer.scm (gst-plugins-bad)[arguments]: Add phase when building for armhf-linux. --- gnu/packages/gstreamer.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index ce4eb707e7..7ff78b2a77 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -313,8 +313,19 @@ (define-public gst-plugins-bad "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi")))) (build-system meson-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases + ,@(if (string-prefix? "arm" (or (%current-target-system) + (%current-system))) + ;; Disable test that fails on ARMv7. + ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/1188 + `((add-after 'unpack 'disable-asfmux-test + (lambda _ + (substitute* "tests/check/meson.build" + (("\\[\\['elements/asfmux\\.c'\\]\\],") + "")) + #t))) + '()) (add-after 'unpack 'disable-failing-test (lambda _ ;; FIXME: Why is this failing. From b3c2ebda5bcedcfb88475e53b7f36c3a42cac8b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jan 2020 21:13:35 +0100 Subject: [PATCH 35/85] gnu: gst-plugins-good: Disable failing tests on armhf-linux. * gnu/packages/gstreamer.scm (gst-plugins-good)[arguments]: Add phase when building for armhf-linux. --- gnu/packages/gstreamer.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 7ff78b2a77..1e26a3ce3e 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -283,6 +283,22 @@ (define-public gst-plugins-good (arguments `(#:phases (modify-phases %standard-phases + ,@(if (string-prefix? "arm" (or (%current-target-system) + (%current-system))) + ;; FIXME: These tests started failing on armhf after switching to Meson. + ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/689 + `((add-after 'unpack 'disable-tests-for-armhf + (lambda _ + (substitute* "tests/check/elements/rtpbin_buffer_list.c" + (("tcase_add_test \\(tc_chain, test_bufferlist\\);") + "")) + (substitute* "tests/check/elements/rtpulpfec.c" + (("tcase_add_loop_test.*rtpulpfecdec_recovered_from_many.*") + "") + (("tcase_add.*rtpulpfecdec_recovered_using_recovered_packet.*") + "")) + #t))) + '()) (add-after 'unpack 'disable-failing-tests (lambda _ From 43190ac64c5181841d68beade4d19e792f4f38a2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 22:37:34 +0100 Subject: [PATCH 36/85] gnu: evolution-data-server: Fix build with libical 3.0.7. * gnu/packages/patches/evolution-data-server-libical-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnome.scm (evolution-data-server)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 3 +- ...evolution-data-server-libical-compat.patch | 36 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/evolution-data-server-libical-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 448e70aa38..af030781a5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -838,6 +838,7 @@ dist_patch_DATA = \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ %D%/packages/patches/evolution-data-server-locales.patch \ + %D%/packages/patches/evolution-data-server-libical-compat.patch \ %D%/packages/patches/exiv2-CVE-2017-14860.patch \ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cadd4d0655..ba5181c756 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6256,7 +6256,8 @@ (define-public evolution-data-server (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches (search-patches "evolution-data-server-locales.patch")) + (patches (search-patches "evolution-data-server-locales.patch" + "evolution-data-server-libical-compat.patch")) (sha256 (base32 "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3")))) diff --git a/gnu/packages/patches/evolution-data-server-libical-compat.patch b/gnu/packages/patches/evolution-data-server-libical-compat.patch new file mode 100644 index 0000000000..a988519ea0 --- /dev/null +++ b/gnu/packages/patches/evolution-data-server-libical-compat.patch @@ -0,0 +1,36 @@ +Prevent test failure and possible data loss due to API change in libical 3.0.7. + +https://gitlab.gnome.org/GNOME/evolution-data-server/issues/185 +https://lists.infradead.org/pipermail/libical-devel/2020-January/000907.html + +Adapted from upstream: + +https://gitlab.gnome.org/GNOME/evolution-data-server/commit/77384ab552c19bf374dbeda53dc37f98d07bd4ec + +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -108,7 +108,7 @@ + + set(gcr_minimum_version 3.4) + set(libgdata_minimum_version 0.15.1) +-set(libical_minimum_version 2.0) ++set(libical_minimum_version 3.0.7) + set(libsecret_minimum_version 0.5) + set(libxml_minimum_version 2.0.0) + set(sqlite_minimum_version 3.7.17) +diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c +index 7501f2a43dcc3af91e93e89751caf76e77c2ac23..93f4806ba2c5193f746e9fae5bf74d08ad05f8bf 100644 +--- a/src/calendar/libedata-cal/e-cal-meta-backend.c ++++ b/src/calendar/libedata-cal/e-cal-meta-backend.c +@@ -3958,9 +3958,8 @@ + gchar *base64; + + base64 = g_base64_encode ((const guchar *) content, len); +- new_attach = icalattach_new_from_data (base64, NULL, NULL); ++ new_attach = icalattach_new_from_data (base64, (GFunc) g_free, NULL); + g_free (content); +- g_free (base64); + + ecmb_remove_all_but_filename_parameter (prop); + From 80921d298ae87444ca4b401ab71ba038d5fe6d40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Jan 2020 15:47:04 +0100 Subject: [PATCH 37/85] gnu: freeglut@2: Override inherited package arguments. This is a follow-up to commit 5f6130473788c074536cee2d29dcb052c3140182. * gnu/packages/gl.scm (freeglut-2.8)[arguments]: New field. --- gnu/packages/gl.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 42bed5d623..d0718d5d45 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -146,7 +146,9 @@ (define-public freeglut-2.8 (sha256 (base32 "16lrxxxd9ps9l69y3zsw6iy0drwjsp6m26d1937xj71alqk6dr6x")))) - (build-system gnu-build-system))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))))) (define-public ftgl (package From 8377512e0c36146f55bde044e2f9b004c7482236 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 22 Jan 2020 13:29:34 +0100 Subject: [PATCH 38/85] guix: qt-build-system: Add phase `check-setup`. * guix/build/qt-build-system.scm (check-setup): New function. (%standard-phases): Add as new phase `check-setup before `check. * doc/guix.texi (Build System)[qt-build-system]: Describe the new phase. --- doc/guix.texi | 25 +++++++++++++++++++++---- guix/build/qt-build-system.scm | 14 +++++++++++++- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3141c4582f..8cc824b917 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -47,7 +47,7 @@ Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018, 2019 Marius Bakke@* -Copyright @copyright{} 2017, 2019 Hartmut Goebel@* +Copyright @copyright{} 2017, 2019, 2020 Hartmut Goebel@* Copyright @copyright{} 2017, 2019 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* @@ -6447,10 +6447,24 @@ Which Perl package is used can be specified with @code{#:perl}. This variable is exported by @code{(guix build-system qt)}. It is intended for use with applications using Qt or KDE. -This build system adds the phase @code{qt-wrap} to the ones defined by -@code{cmake-build-system}, after the @code{install} phase. +This build system adds the following two phases to the ones defined by +@code{cmake-build-system}: -This phase searches for Qt5 plugin paths, QML paths and some XDG in the inputs +@table @code +@item check-setup +The phase @code{check-setup} prepares the environment for running +the checks as commonly used by Qt test programs. +For now this only sets some environment variables: +@code{QT_QPA_PLATFORM=offscreen}, +@code{DBUS_FATAL_WARNINGS=0} and +@code{CTEST_OUTPUT_ON_FAILURE=1}. + +This phase is added before the @code{check} phase. +It's a separate phase to ease adjusting if necessary. + +@item qt-wrap +The phase @code{qt-wrap} +searches for Qt5 plugin paths, QML paths and some XDG in the inputs and output. In case some path is found, all programs in the output's @file{bin/}, @file{sbin/}, @file{libexec/} and @file{lib/libexec/} directories are wrapped in scripts defining the necessary environment variables. @@ -6460,6 +6474,9 @@ by listing their names in the @code{#:qt-wrap-excluded-outputs} parameter. This is useful when an output is known not to contain any Qt binaries, and where wrapping would gratuitously add a dependency of that output on Qt, KDE, or such. + +This phase is added after the @code{install} phase. +@end table @end defvr @defvr {Scheme Variable} r-build-system diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm index be2b808901..005157b0a4 100644 --- a/guix/build/qt-build-system.scm +++ b/guix/build/qt-build-system.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver -;;; Copyright © 2019 Hartmut Goebel +;;; Copyright © 2019, 2020 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +36,17 @@ (define-module (guix build qt-build-system) ;; ;; Code: +(define* (check-setup #:rest args) + ;; Make Qt render "offscreen". In many cases this allows to run tests + ;; without starting a X11 server. + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; Qt/KDE tests often need dbus (`dbus-launch …`) which is not fully + ;; set-up the the build container. + (setenv "DBUS_FATAL_WARNINGS" "0") + ;; Set here to ease overwriting 'check (even if set there, too) + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + #t) + (define (variables-for-wrapping base-directories) (define (collect-sub-dirs base-directories subdirectory) @@ -101,6 +112,7 @@ (define handle-output (define %standard-phases (modify-phases cmake:%standard-phases + (add-before 'check 'check-setup check-setup) (add-after 'install 'qt-wrap wrap-all-programs))) (define* (qt-build #:key inputs (phases %standard-phases) From cd165d105a35da9094b70d0e5d5320a4a6ac8c0d Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 23 Jan 2020 21:13:42 +0100 Subject: [PATCH 39/85] gnu: Cleanup KDE packages to use the update qt-build-system. * gnu/packages/kde.scm (grantleetheme): [arguments] Remove. (kdeconnect)[arguments]{check-setup}: Remove. libkdegames: Use qt-build-system. [arguments]: Remove. * gnu/packages/kde-frameworks.scm (kguiaddons, kitemmodels, kitemviews, kplotting, sonnet, kcompletion, kcrash, kdesignerplugin, kglobalaccel, kparts, ktextwidgets, khtml, kmediaplayer): Use qt-build-system. [arguments]: Remove. (kpeople): Use qt-build-system. [arguments]: Remove. (kconfigwidgets, kwidgetsaddons) Use qt-build-system. [arguments]{check-setup}: Remove. * gnu/packages/kde-plasma.scm (kdecoration) Use qt-build-system. [arguments]: Remove. (libkscreen): Use qt-build-system. [arguments]: Remove. (libksysguard): Use qt-build-system. [arguments]{check-setup}: Remove. * gnu/packages/kde-utils.scm (kronometer, rsibreak): [arguments] Remove. --- gnu/packages/kde-frameworks.scm | 158 ++++---------------------------- gnu/packages/kde-plasma.scm | 27 +----- gnu/packages/kde-utils.scm | 16 ---- gnu/packages/kde.scm | 25 +---- 4 files changed, 25 insertions(+), 201 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 9230bb71c0..aab54ec4fb 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -24,6 +24,7 @@ (define-module (gnu packages kde-frameworks) #:use-module (guix build-system cmake) + #:use-module (guix build-system qt) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -702,7 +703,7 @@ (define-public kguiaddons (sha256 (base32 "0k22kargqxf0j09wzk1x90b526npj8a0210ilk0n1k6spc8xa6mr")))) - (build-system cmake-build-system) + (build-system qt-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, ;; python-sip, clang-python, libclang. Requires python-2 in all cases for @@ -713,14 +714,6 @@ (define-public kguiaddons (inputs `(("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Utilities for graphical user interfaces") (description "The KDE GUI addons provide utilities for graphical user @@ -885,20 +878,12 @@ (define-public kitemmodels (sha256 (base32 "10bhg0db9gdg2hlc02ngg1i2q7a99862d5973hxqzf620d28p5rd")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item models extending the Qt model-view framework") (description "KItemModels provides the following models: @@ -944,21 +929,12 @@ (define-public kitemviews (sha256 (base32 "15h0w16wgj94kxz4vgjb34i3pyx5w1f2npj86j4d2sa0mxxpmqyz")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item views extending the Qt model-view framework") (description "KItemViews includes a set of views, which can be used with @@ -979,20 +955,12 @@ (define-public kplotting (sha256 (base32 "11kpq34j37c1gsvj5nxhkc31bw8gw2n7nkqsfx87jw9f4v2vhmr9")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("qtbase" ,qtbase) ("qttools" ,qttools))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ ; kplotting - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Data plotting library") (description "KPlotWidget is a QWidget-derived class that provides a virtual @@ -1104,7 +1072,7 @@ (define-public kwidgetsaddons (sha256 (base32 "1nzgv3v3kyq5jm2b9xri6qjawspr9ycxhskfvj8kkgr46dr35qyc")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools) @@ -1114,12 +1082,6 @@ (define-public kwidgetsaddons (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "DBUS_FATAL_WARNINGS" "0") - #t)) (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. @@ -1414,15 +1376,7 @@ (define-public sonnet (sha256 (base32 "0gqxmyxmwn2rs9f8x2z8pfmbx0mvkyh7nalnsmfqkph8f0fja9ig")))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) @@ -1573,7 +1527,7 @@ (define-public kcompletion (sha256 (base32 "10ggypg09acc19gkvxsigfsaq8s5vqv64ada307blpzy8j74bisb")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools))) @@ -1581,14 +1535,6 @@ (define-public kcompletion `(("kconfig" ,kconfig) ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Powerful autocompletion framework and widgets") (description "This framework helps implement autocompletion in Qt-based @@ -1653,7 +1599,7 @@ (define-public kcrash (sha256 (base32 "1xl3bzxfchfafcplil3g07gq1a3fnwx1i40bxp4jfsgb8d8slfwc")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs @@ -1661,14 +1607,6 @@ (define-public kcrash ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Graceful handling of application crashes") (description "KCrash provides support for intercepting and handling @@ -2291,7 +2229,7 @@ (define-public kconfigwidgets (sha256 (base32 "098xdfvnyz9bdkc6iyq5r2s4vkfdhbrri4015yzbs73j4f2wcxz5")))) - (build-system cmake-build-system) + (build-system qt-build-system) (propagated-inputs `(("kauth" ,kauth) ("kcodecs" ,kcodecs) @@ -2316,11 +2254,6 @@ (define-public kconfigwidgets ;; make QDirIterator follow symlinks (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) (string-append a " | QDirIterator::FollowSymlinks" b))) - #t)) - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Widgets for configuration dialogs") @@ -2439,7 +2372,7 @@ (define-public kdesignerplugin (sha256 (base32 "1w7glszd82iyw6kxzmp0568rm3qfadi7vw7gfxg4c15w5ikkvxn9")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools))) @@ -2461,14 +2394,6 @@ (define-public kdesignerplugin ("kxmlgui" ,kxmlgui) ("qtwebkit" ,qtwebkit) ("sonnet" ,sonnet))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Integrating KDE frameworks widgets with Qt Designer") (description "This framework provides plugins for Qt Designer that allow it @@ -2594,7 +2519,7 @@ (define-public kglobalaccel (sha256 (base32 "1xpfvwnrj81mk3di02n37b469gxzmnk89icmcz6wwyk54m86fw76")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) @@ -2610,14 +2535,6 @@ (define-public kglobalaccel ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras) ("xcb-util-keysyms" ,xcb-util-keysyms))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Global desktop keyboard shortcuts") (description "KGlobalAccel allows you to have global accelerators that are @@ -2947,7 +2864,7 @@ (define-public kparts (sha256 (base32 "0md0349r4mdm2r04p5s3pgm17v4w40r3kz58lzp6qfcw25b969nw")))) - (build-system cmake-build-system) + (build-system qt-build-system) (propagated-inputs `(("kio" ,kio) ("ktextwidgets" ,ktextwidgets) @@ -2972,14 +2889,6 @@ (define-public kparts ("qtbase" ,qtbase) ("solid" ,solid) ("sonnet" ,sonnet))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugin framework for user interface components") (description "This library implements the framework for KDE parts, which are @@ -2999,7 +2908,7 @@ (define-public kpeople (sha256 (base32 "1q2hh2i8hd638p907g0srdxmxm9h2ay91dmhslqzcgwnlhln4gfl")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs @@ -3012,14 +2921,7 @@ (define-public kpeople ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) (arguments - `(#:tests? #f ; FIXME: 1/3 tests fail. - #:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) + `(#:tests? #f)) ; FIXME: 1/3 tests fail. (home-page "https://community.kde.org/Frameworks") (synopsis "Provides access to all contacts and aggregates them by person") (description "KPeople offers unified access to our contacts from different @@ -3252,7 +3154,7 @@ (define-public ktextwidgets (sha256 (base32 "1qb1mad5bg19xwykzpwk2b3s505ka4jkg0fsi56ri57wq8gv4qha")))) - (build-system cmake-build-system) + (build-system qt-build-system) (propagated-inputs `(("ki18n" ,ki18n) ("sonnet" ,sonnet))) @@ -3272,14 +3174,6 @@ (define-public ktextwidgets ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase) ("qtspeech" ,qtspeech))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Text editing widgets") (description "KTextWidgets provides widgets for displaying and editing text. @@ -3747,7 +3641,7 @@ (define-public khtml name "-" version ".tar.xz")) (sha256 (base32 "15f77r6dxkkvi2vxvxlwa7qz3whmz229g79bgadiwffmzxja0ywd")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("perl" ,perl))) @@ -3775,14 +3669,6 @@ (define-public khtml ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras) ("sonnet" ,sonnet))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; Make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 HTML widget and component") (description "KHTML is a web rendering engine, based on the KParts @@ -3868,7 +3754,7 @@ (define-public kmediaplayer name "-" version ".tar.xz")) (sha256 (base32 "19v53h3lkys3ryrjacrdng9ak91g03b9s986xhnw1r84zy242kdm")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("kdoctools" ,kdoctools) @@ -3883,14 +3769,6 @@ (define-public kmediaplayer ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("qtbase" ,qtbase))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; Make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 plugin interface for media player features") (description "KMediaPlayer builds on the KParts framework to provide a diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index e4360362db..a04b2f0279 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -25,6 +25,7 @@ (define-module (gnu packages kde-plasma) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) + #:use-module (guix build-system qt) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) @@ -45,17 +46,12 @@ (define-public kdecoration (sha256 (base32 "0rljpywpaqmar13jijphkpc9k1crma476j9my0d00hfrjil5xlnn")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("ki18n" ,ki18n) ("qtbase" ,qtbase))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (home-page "https://cgit.kde.org/kdecoration.git") (synopsis "Plugin based library to create window decorations") (description "KDecoration is a library to create window decorations. @@ -137,7 +133,7 @@ (define-public libkscreen name "-" version ".tar.xz")) (sha256 (base32 "0znxfqqyyij6i4dp95gf5g4vrhg4jsshgh2k13ldy294kby2mxw0")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ;; For testing. @@ -148,16 +144,7 @@ (define-public libkscreen ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras))) (arguments - '(#:tests? #f ; FIXME: 55% tests passed, 5 tests failed out of 11 - #:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - ;; For the missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - ;; Run the tests offscreen. - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) + '(#:tests? #f)) ; FIXME: 55% tests passed, 5 tests failed out of 11 (home-page "https://community.kde.org/Solid/Projects/ScreenManagement") (synopsis "KDE's screen management software") (description "KScreen is the new screen management software for KDE Plasma @@ -199,7 +186,7 @@ (define-public libksysguard ("qtx11extras" ,qtx11extras) ("plasma" ,plasma-framework) ("zlib" ,zlib))) - (build-system cmake-build-system) + (build-system qt-build-system) (arguments `(#:configure-flags `(,(string-append "-DKDE_INSTALL_DATADIR=" @@ -212,10 +199,6 @@ (define-public libksysguard ;; KF5AuthConfig.cmake.in contains this already. (substitute* "processcore/CMakeLists.txt" (("KAUTH_HELPER_INSTALL_DIR") "KDE_INSTALL_LIBEXECDIR")))) - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen"))) (replace 'check (lambda _ ;; TODO: Fix this failing test-case diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 9005b5014a..38bdfbfaba 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -233,14 +233,6 @@ (define-public kronometer ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set ("qtbase" ,qtbase))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://kde.org/applications/utilities/org.kde.kronometer") (synopsis "Simple stopwatch application") (description "Kronometer is a stopwatch application. It features the @@ -399,14 +391,6 @@ (define-public rsibreak ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set ("qtbase" ,qtbase))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://kde.org/applications/utilities/org.kde.rsibreak") (synopsis "Assists in the Recovery and Prevention of Repetitive Strain Injury") diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index bb5c25014e..0c62fd9dba 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -89,13 +89,6 @@ (define-public grantleetheme ("kiconthemes" ,kiconthemes) ("knewstuff" ,knewstuff) ("qtbase" ,qtbase))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://cgit.kde.org/grantleetheme.git") (synopsis "Library providing Grantlee theme support") (description "This library provides Grantlee theme support.") @@ -521,13 +514,7 @@ (define-public kdeconnect (build-system qt-build-system) (arguments `(#:configure-flags '("-DBUILD_TESTING=ON") - #:tests? #f ; tests fail hard in our build environment - #:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) + #:tests? #f)) ; tests fail hard in our build environment (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("kdoctools" ,kdoctools) @@ -644,7 +631,7 @@ (define-public libkdegames "/src/libkdegames-" version ".tar.xz")) (sha256 (base32 "12dvkmjgbi8dp9y55zmx1pw3zr2i374c4vn3mfn9r31bf06dr701")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs @@ -674,14 +661,6 @@ (define-public libkdegames ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://games.kde.org/") (synopsis "Runtime library for kdegames") (description "Runtime library for kdegames") From 156221051627a5c5737ba8e211d23c2adb80d7e2 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 22:24:11 +0100 Subject: [PATCH 40/85] gnu: Add baloo-widgets. * gnu/packages/kde.scm (baloo-widgets): New variable. --- gnu/packages/kde.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 0c62fd9dba..8a612bfe5b 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -67,6 +67,39 @@ (define-module (gnu packages kde) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) +(define-public baloo-widgets + (package + (name "baloo-widgets") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/baloo-widgets-" version ".tar.xz")) + (sha256 + (base32 "0bba8dgxd7rcjji809kwnw78hl1nb5ssh2ir4k4b0wvx395jifgd")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("baloo" ,baloo) + ("kconfig" ,kconfig) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Baloo") + (synopsis "Wigets for use with Baloo") + (description "Baloo is a framework for searching and managing metadata. +This package contains GUI widgets for baloo.") + (license license:lgpl2.0+))) + (define-public grantleetheme (package (name "grantleetheme") From af204f933f11928aacb6747cf94dfe90665cf614 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 22:02:28 +0100 Subject: [PATCH 41/85] gnu: Add dolphin. * gnu/packages/kde-system.scm: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde-systemtools.scm | 88 ++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 gnu/packages/kde-systemtools.scm diff --git a/gnu/local.mk b/gnu/local.mk index 7267bb79de..209bc7abf3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -285,6 +285,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/kde-frameworks.scm \ %D%/packages/kde-multimedia.scm \ %D%/packages/kde-plasma.scm \ + %D%/packages/kde-systemtools.scm \ %D%/packages/kde-utils.scm \ %D%/packages/kerberos.scm \ %D%/packages/key-mon.scm \ diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm new file mode 100644 index 0000000000..11228630ab --- /dev/null +++ b/gnu/packages/kde-systemtools.scm @@ -0,0 +1,88 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017, 2020 Hartmut Goebel +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages kde-systemtools) + #:use-module (guix build-system qt) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages) + #:use-module (gnu packages kde) + #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages qt) + #:use-module (gnu packages ruby)) + +(define-public dolphin + (package + (name "dolphin") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/dolphin-" version ".tar.xz")) + (sha256 + (base32 "0klxyvcj1bmzpsyahj9kq3smvwzww30pjk5c90j6jpf14hizawfy")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools) + ("ruby" ,ruby) + ("ruby-test-unit" ,ruby-test-unit))) + (inputs + `(("baloo" ,baloo) + ("baloo-widgets" ,baloo-widgets) + ("kactivities" ,kactivities) + ("kbookmarks" ,kbookmarks) + ("kcmutils" ,kcmutils) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kinit" ,kinit) + ("kio" ,kio) + ("knewstuff" ,knewstuff) + ("knotifications" ,knotifications) + ("kparts" ,kparts) + ("ktextwidgets" ,ktextwidgets) + ("kwindowsystem" ,kwindowsystem) + ("oxygen-icons" ,oxygen-icons) ;; default icon set + ("phonon" ,phonon) + ("qtbase" ,qtbase) + ("solid" ,solid))) + (arguments + `(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen + (home-page "https://kde.org/applications/system/org.kde.dolphin") + (synopsis "File manager for KDE") + (description "Dolphin is a file manager for KDE focusing on usability. +The main features of Dolphin are: +@itemize +@item Navigation bar for URLs, which allows to navigate quickly + through the file hierarchy. +@item View properties are remembered for each folder. +@item Split of views is supported. +@item Network transparency. +@item Undo/redo functionality. +@item Renaming of a variable number of selected items in one step. +@end itemize") + (license ;; GPL for programs, FDL for documentation + (list license:gpl2+ license:fdl1.2+)))) From a4317df4c8a5ca9b13a9caae65836e283d276493 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 22:32:00 +0100 Subject: [PATCH 42/85] gnu: Add dolphin-plugins. * gnu/packages/kde-systemtools.scm (dolphin-plugins): New variable. --- gnu/packages/kde-systemtools.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 11228630ab..827ab2d7ca 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -86,3 +86,31 @@ (define-public dolphin @end itemize") (license ;; GPL for programs, FDL for documentation (list license:gpl2+ license:fdl1.2+)))) + +(define-public dolphin-plugins + (package + (name "dolphin-plugins") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/dolphin-plugins-" version ".tar.xz")) + (sha256 + (base32 "0m9sl5fybk60h7r91a5qfxvwzksg2kxn1bc2ygrr8klm2pv0x1l2")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("dolphin" ,dolphin) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("ktexteditor" ,ktexteditor) + ("kxmlgui" ,kxmlgui) + ("oxygen-icons" ,oxygen-icons) ;; default icon set + ("qtbase" ,qtbase))) + (home-page "http://www.kde.org/") + (synopsis "VCS-Plugins for Dolphin") + (description "This package contains plugins that offer integration in +Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.") + (license license:gpl2+))) From 05ddf22c442d10d7f53829d204b91e1eea398510 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 22:39:22 +0100 Subject: [PATCH 43/85] gnu: Add khelpcenter. * gnu/packages/kde-systemtools.scm (khelpcenter): New variable. --- gnu/packages/kde-systemtools.scm | 46 +++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 827ab2d7ca..9a7c0f08b8 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -26,7 +26,9 @@ (define-module (gnu packages kde-systemtools) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages qt) - #:use-module (gnu packages ruby)) + #:use-module (gnu packages ruby) + #:use-module (gnu packages search) + #:use-module (gnu packages xml)) (define-public dolphin (package @@ -114,3 +116,45 @@ (define-public dolphin-plugins (description "This package contains plugins that offer integration in Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.") (license license:gpl2+))) + +(define-public khelpcenter + (package + (name "khelpcenter") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/khelpcenter-" version ".tar.xz")) + (sha256 + (base32 "0ympq1qm5h14mw18wry7l02ndg1f5kddwkf5bliip6vk2vxiff50")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + `(("grantlee" ,grantlee) + ("karchive" ,karchive) + ("kbookmarks" ,kbookmarks) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kdbusaddons" ,kdbusaddons) + ("khtml" ,khtml) + ("ki18n" ,ki18n) + ("kinit" ,kinit) + ("kio" ,kio) + ("kjs" ,kjs) + ("kparts" ,kparts) + ("kservice" ,kservice) + ("kwindowsystem" ,kwindowsystem) + ("libxml2" ,libxml2) + ("oxygen-icons" ,oxygen-icons) ;; default icon set + ("qtbase" ,qtbase) + ("xapian" ,xapian))) + (arguments + `(#:tests? #f)) ;; 1/1 test fails + (home-page "https://kde.org/applications/system/org.kde.Help") + (synopsis "KDE documentation viewer") + (description "KDE documentation viewer") + (license license:gpl2+))) From c1827284e6a8e674c019bbc6e747525d44186280 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 22:52:09 +0100 Subject: [PATCH 44/85] gnu: Add konsole. * gnu/packages/kde-systemtools.scm (konsole): New variable. --- gnu/packages/kde-systemtools.scm | 55 ++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 9a7c0f08b8..ded695895c 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -158,3 +158,58 @@ (define-public khelpcenter (synopsis "KDE documentation viewer") (description "KDE documentation viewer") (license license:gpl2+))) + +(define-public konsole + (package + (name "konsole") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/konsole-" version ".tar.xz")) + (sha256 + (base32 "09bhgqjnqlpxkkgdpn35pvj747ab7waz10zalvpwdpgqkw811iic")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + `(("kbookmarks" ,kbookmarks) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kguiaddons" ,kguiaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kinit" ,kinit) + ("kio" ,kio) + ("knewstuff" ,knewstuff) + ("kglobalaccel" ,kglobalaccel) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kparts" ,kparts) + ("kpty" ,kpty) + ("kservice" ,kservice) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("oxygen-icons" ,oxygen-icons) ;; default icon set + ("qtbase" ,qtbase) + ("qtscript" ,qtscript))) + (arguments + `(#:tests? #f)) ;; TODO: 2/15 tests fail even with HOME, offscreen, SHELL, debus + (home-page "http://www.kde.org/") + (synopsis "Terminal emulator similar for KDE") + (description "Konsole is a terminal emulator, similar to xterm, built on +the KDE Platform. It can contain multiple terminal sessions inside one window +using detachable tabs. Konsole supports customizable schemes, saved sessions, +output monitoring and more. + +This package is part of the KDE base applications module.") + (license ;; GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) From 9808d6c559a9611bc0615375505828b9ee6a1c97 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 23:49:24 +0100 Subject: [PATCH 45/85] gnu: Add krfb. * gnu/packages/kde-systemtools.scm (krfb): New variable. --- gnu/packages/kde-systemtools.scm | 59 +++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index ded695895c..207e8342f5 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -23,12 +23,17 @@ (define-module (gnu packages kde-systemtools) #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages compression) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages libvnc) + #:use-module (gnu packages linux) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) #:use-module (gnu packages ruby) #:use-module (gnu packages search) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg)) (define-public dolphin (package @@ -213,3 +218,55 @@ (define-public konsole This package is part of the KDE base applications module.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + +(define-public krfb + (package + (name "krfb") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/krfb-" version ".tar.xz")) + (sha256 + (base32 "079f4jlmd69a5nppmn7khsxrnswlfbdzjni0cbixwlcij05y2267")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config) + ("kdoctools" ,kdoctools))) + (inputs + `(("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdnssd" ,kdnssd) + ("ki18n" ,ki18n) + ("knotifications" ,knotifications) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libvnc" ,libvnc) + ("libxcb" ,libxcb) + ("libxtst" ,libxtst) + ("oxygen-icons" ,oxygen-icons) ;; default icon set + ("pipewire" ,pipewire) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) + ("xcb-util-image" ,xcb-util-image) + ("zlib" ,zlib))) + (home-page "https://kde.org/applications/internet/org.kde.krfb") + (synopsis "Desktop Sharing utility") + (description "KDE Desktop Sharing is a server application that allows you +to share your current session with a user on another machine. The desktop +session can be viewed or even controlled remotely by any VNC or RFB client, +such as the KDE Remote Desktop Connection client. + +KDE Desktop Sharing can restrict access to only users who are explicitly +invited, and will ask for confirmation when a user attempts to connect. + +This package is part of the KDE networking module.") + (license ;; GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) From 7059b1a22216c1fd92608b1a6c81de836015a04a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 21 Jan 2020 00:04:58 +0100 Subject: [PATCH 46/85] gnu: Add ksystemlog. * gnu/packages/kde-systemtools.scm (ksystemlog): New variable. --- gnu/packages/kde-systemtools.scm | 40 ++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 207e8342f5..ab39d9eb68 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -270,3 +270,43 @@ (define-public krfb This package is part of the KDE networking module.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + +(define-public ksystemlog + (package + (name "ksystemlog") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/ksystemlog-" version ".tar.xz")) + (sha256 + (base32 "079r2xnj168y9kz37rhxr3rcwh6fksljsj1ihmi7f7a8wmdabz4p")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + ;; Not including Journald since this is not used in guix + `(("karchive" ,karchive) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("kitemviews" ,kitemviews) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ("oxygen-icons" ,oxygen-icons) ;; default icon set + ("qtbase" ,qtbase))) + (home-page "https://kde.org/applications/system/org.kde.ksystemlog") + (synopsis "System log viewer") + (description "This program is developed for being used by beginner users, +which don't know how to find information about their Linux system, and how the +log files are in their computer. But it is also designed for advanced users, +who want to quickly see problems occuring on their server. + +This package is part of the KDE administration module.") + (license license:gpl2+))) From 333d15790caec5c6782c3889a29b6f91d40ac42d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 28 Jan 2020 15:39:18 +0200 Subject: [PATCH 47/85] gnu: kde-systemtools.scm: Adjust module imports. * gnu/packages/kde-systemtools.scm: Remove libvnc, add vnc. --- gnu/packages/kde-systemtools.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index ab39d9eb68..682a5f583c 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -26,12 +26,12 @@ (define-module (gnu packages kde-systemtools) #:use-module (gnu packages compression) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) - #:use-module (gnu packages libvnc) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) #:use-module (gnu packages ruby) #:use-module (gnu packages search) + #:use-module (gnu packages vnc) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) From e35b50ecdd553f3fac4d16db311149dbcc3028fe Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 19:05:29 +0100 Subject: [PATCH 48/85] gnu: Add akonadi. * gnu/packages/kde-pim.scm, gnu/packages/patches/akonadi-paths.patch, gnu/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch gnu/packages/patches/akonadi-timestamps.patch: New files. * gnu/local.mk (MODULES): Add kde-pim.scm. (dist_patch): Add the patches. --- gnu/local.mk | 4 + gnu/packages/kde-pim.scm | 112 ++++++++++++++++++ ...ake-installation-properly-relocatabl.patch | 49 ++++++++ gnu/packages/patches/akonadi-paths.patch | 49 ++++++++ gnu/packages/patches/akonadi-timestamps.patch | 14 +++ 5 files changed, 228 insertions(+) create mode 100644 gnu/packages/kde-pim.scm create mode 100644 gnu/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch create mode 100644 gnu/packages/patches/akonadi-paths.patch create mode 100644 gnu/packages/patches/akonadi-timestamps.patch diff --git a/gnu/local.mk b/gnu/local.mk index 209bc7abf3..912809b74d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -284,6 +284,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/kde.scm \ %D%/packages/kde-frameworks.scm \ %D%/packages/kde-multimedia.scm \ + %D%/packages/kde-pim.scm \ %D%/packages/kde-plasma.scm \ %D%/packages/kde-systemtools.scm \ %D%/packages/kde-utils.scm \ @@ -707,6 +708,9 @@ dist_patch_DATA = \ %D%/packages/patches/aegisub-icu59-include-unistr.patch \ %D%/packages/patches/aegisub-boost68.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ + %D%/packages/patches/akonadi-paths.patch \ + %D%/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch \ + %D%/packages/patches/akonadi-timestamps.patch \ %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \ %D%/packages/patches/amule-crypto-6.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm new file mode 100644 index 0000000000..3bf3e96a02 --- /dev/null +++ b/gnu/packages/kde-pim.scm @@ -0,0 +1,112 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017, 2019, 2020 Hartmut Goebel +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages kde-pim) + #:use-module (guix build-system qt) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages) + #:use-module (gnu packages boost) + #:use-module (gnu packages databases) + #:use-module (gnu packages documentation) + #:use-module (gnu packages gnome) + #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages qt) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages xml)) + +(define-public akonadi + (package + (name "akonadi") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/akonadi-" version ".tar.xz")) + (sha256 + (base32 "0v7f1049wjnqxhwxr1443wc2cfbdqmf15xcwjz3j1m0vgdva9pyg")) + (patches (search-patches + "akonadi-paths.patch" + "akonadi-timestamps.patch" + "akonadi-Revert-Make-installation-properly-relocatabl.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools) + ("shared-mime-info" ,shared-mime-info))) + (inputs + `(("boost" ,boost) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdesignerplugin" ,kdesignerplugin) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ;; Do NOT add mysql or postgresql to the inputs. Otherwise the binaries + ;; and wrapped files will refer to them, even if the user choices none + ;; of these. Executables are searched on $PATH then. + ("qtbase" ,qtbase) + ("sqlite" ,sqlite))) + (arguments + `(#:tests? #f ;; TODO 135/167 tests fail + #:configure-flags '("-DDATABASE_BACKEND=SQLITE") ; lightweight + #:modules ((ice-9 textual-ports) + ,@%qt-build-system-modules) + #:phases + (modify-phases (@ (guix build qt-build-system) %standard-phases) + (add-before 'configure 'add-definitions + (lambda _ + (let ((out (assoc-ref %outputs "out")) + (mysql (assoc-ref %build-inputs "mysql")) + (pgsql (assoc-ref %build-inputs "postgresql"))) + (with-output-to-file "CMakeLists.txt.new" + (lambda _ + (display + (string-append + "add_compile_definitions(\n" + "NIX_OUT=\"" out "\"\n" + ;; pin binaries for mysql backend + ")\n\n")) + (display + (call-with-input-file "CMakeLists.txt" + get-string-all)))) + (rename-file "CMakeLists.txt.new" "CMakeLists.txt")) + #t))))) + (home-page "https://kontact.kde.org/components/akonadi.html") + (synopsis "Extensible cross-desktop storage service for PIM") + (description "Akonadi is an extensible cross-desktop Personal Information +Management (PIM) storage service. It provides a common framework for +applications to store and access mail, calendars, addressbooks, and other PIM +data. + +This package contains the Akonadi PIM storage server and associated +programs.") + (license license:fdl1.2+))) diff --git a/gnu/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch b/gnu/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch new file mode 100644 index 0000000000..c3964c5c05 --- /dev/null +++ b/gnu/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch @@ -0,0 +1,49 @@ +From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001 +From: gnidorah +Date: Fri, 22 Dec 2017 17:36:03 +0300 +Subject: [PATCH] Revert "Make Akonadi installation properly relocatable" + +This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a. +--- + CMakeLists.txt | 3 --- + KF5AkonadiConfig.cmake.in | 6 +++--- + 2 files changed, 3 insertions(+), 6 deletions(-) + +Index: akonadi-19.08.0/CMakeLists.txt +=================================================================== +--- akonadi-19.08.0.orig/CMakeLists.txt ++++ akonadi-19.08.0/CMakeLists.txt +@@ -306,9 +306,6 @@ configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR +- AKONADI_INCLUDE_DIR +- KF5Akonadi_DATA_DIR + ) + + install(FILES +Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in +=================================================================== +--- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in ++++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in +@@ -26,8 +26,8 @@ if(BUILD_TESTING) + find_dependency(Qt5Test "@QT_REQUIRED_VERSION@") + endif() + +-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") +-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") ++set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@") ++set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@") + + find_dependency(Boost "@Boost_MINIMUM_VERSION@") + +@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako + include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) + + # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed +-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") ++set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") + + #################################################################################### + # CMAKE_AUTOMOC diff --git a/gnu/packages/patches/akonadi-paths.patch b/gnu/packages/patches/akonadi-paths.patch new file mode 100644 index 0000000000..da250ee9e8 --- /dev/null +++ b/gnu/packages/patches/akonadi-paths.patch @@ -0,0 +1,49 @@ +This is based on the respectve patch from NixPkgs, but with the parts pinning +mysql and postgresql executables removed. The our package definition on why. + + +Index: akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/akonadicontrol/agentmanager.cpp ++++ akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp +@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, + mStorageController = new Akonadi::ProcessControl; + mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld + connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); +- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + + if (mAgentServerEnabled) { + mAgentServer = new Akonadi::ProcessControl; + connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); +- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + } + } + +Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/akonadicontrol/agentprocessinstance.cpp ++++ akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp +@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A + } else { + Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); + const QStringList arguments = QStringList() << executable << identifier(); +- const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher")); ++ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); + mController->start(agentLauncherExec, arguments); + } + return true; +Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp ++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer( + #endif + + // generate config file +- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf")); ++ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); + const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); + const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); + if (globalConfig.isEmpty()) { diff --git a/gnu/packages/patches/akonadi-timestamps.patch b/gnu/packages/patches/akonadi-timestamps.patch new file mode 100644 index 0000000000..e299a6991f --- /dev/null +++ b/gnu/packages/patches/akonadi-timestamps.patch @@ -0,0 +1,14 @@ +Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp ++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer( + bool confUpdate = false; + QFile actualFile(actualConfig); + // update conf only if either global (or local) is newer than actual +- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) || +- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { ++ if (true) { + QFile globalFile(globalConfig); + QFile localFile(localConfig); + if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) { From 7cfb118cbe77cc9d351b9ad42d0cde93ba29be31 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 19:49:11 +0100 Subject: [PATCH 49/85] gnu: Add kmime. * gnu/packages/kde-pim.scm (kmime): New variable. --- gnu/packages/kde-pim.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 3bf3e96a02..393ffaba7e 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -110,3 +110,37 @@ (define-public akonadi This package contains the Akonadi PIM storage server and associated programs.") (license license:fdl1.2+))) + +(define-public kmime + (package + (name "kmime") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kmime-" version ".tar.xz")) + (sha256 + (base32 "1pc00pwwrngsyr7ppvqwfgvcgy2wiqdbqxhv9xidn4dw9way2ng6")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcodecs" ,kcodecs) + ("ki18n" ,ki18n) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-test-case + (lambda _ + ;; This is curious: autotests/CMakeLists.txt sets LC_TIME=C, but + ;; the Qt locale returns different. See kmime commit 3a9651d26a. + (substitute* "autotests/dateformattertest.cpp" + (("(Today|Yesterday) 12:34:56" line day) + (string-append day " 12:34 PM"))) + #t))))) + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") + (synopsis "Library for handling MIME data") + (description "A library for MIME handling.") + (license license:lgpl2.0+))) From 962b288ad5c117dfd924b38f808b50a6faf59dbf Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 19:55:57 +0100 Subject: [PATCH 50/85] gnu: Add kmbox. * gnu/packages/kde-pim.scm (kmbox): New variable. --- gnu/packages/kde-pim.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 393ffaba7e..be05abe386 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -111,6 +111,29 @@ (define-public akonadi programs.") (license license:fdl1.2+))) +(define-public kmbox + (package + (name "kmbox") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kmbox-" version ".tar.xz")) + (sha256 + (base32 "13b5v1nx46k5ais3cms7yxrfi8p6xbljpkpg3f7v1asb6kshv7g2")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcodecs" ,kcodecs) + ("kmime" ,kmime) + ("qtbase" ,qtbase))) + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") + (synopsis "Library for handling mbox mailboxes") + (description "A library for accessing mail storages in MBox format.") + (license license:lgpl2.0+ ))) + (define-public kmime (package (name "kmime") From 68b1d81d53ba0992b65b9d084e9314038734ad88 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 20:06:46 +0100 Subject: [PATCH 51/85] gnu: Add kcalutils. * gnu/packages/kde-pim.scm (kcalutils): New variable. --- gnu/packages/kde-pim.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index be05abe386..0bbbf83988 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -111,6 +111,45 @@ (define-public akonadi programs.") (license license:fdl1.2+))) +(define-public kcalutils + (package + (name "kcalutils") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kcalutils-" version ".tar.xz")) + (sha256 + (base32 "1nlkik4qiciyh1slgpis3n5h9pks2ygdba9yq4s16nnmip4l45w2")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("libxml2" ,libxml2))) ;; xmllint required for tests + (inputs + `(("grantlee" ,grantlee) + ("kcalendarcore" ,kcalendarcore) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kpimtextedit" ,kpimtextedit) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests + ("qtbase" ,qtbase))) + (arguments + `(#:tests? #f)) ;; TODO: seem to pull in some wrong theme + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") + (synopsis "Library with utility functions for the handling of calendar +data") + (description "This library provides a utility and user interface +functions for accessing calendar data using the kcalcore API.") + (license license:lgpl2.0+))) + (define-public kmbox (package (name "kmbox") From 8c71fd436347f5363e43387c4e3dc44f3c578d6e Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 20:09:50 +0100 Subject: [PATCH 52/85] gnu: Add kpimtextedit. * gnu/packages/kde-pim.scm (kpimtextedit): New variable. --- gnu/packages/kde-pim.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 0bbbf83988..e5744076c9 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -206,3 +206,43 @@ (define-public kmime (synopsis "Library for handling MIME data") (description "A library for MIME handling.") (license license:lgpl2.0+))) + +(define-public kpimtextedit + (package + (name "kpimtextedit") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kpimtextedit-" version ".tar.xz")) + (sha256 + (base32 "1as48j5qfpj9pqjck1615nlpk4a850m7xxcyl41gx8biww027zvm")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("grantlee" ,grantlee) + ("kcodecs" ,kcodecs) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kdesignerplugin" ,kdesignerplugin) + ("kemoticons" ,kemoticons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("ksyntaxhighlighting" ,ksyntaxhighlighting) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase) + ("qtspeech", qtspeech) + ("sonnet" ,sonnet))) + (arguments + `(#:tests? #f)) ;; TODO - test suite hangs + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") + (synopsis "Library providing a textedit with PIM-specific features") + (description "A library for PIM-specific text editing utilities.") + (license ;; GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) From 0a0df84f0b2d29b79e84e5f508a801c7b011cef6 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 20:24:07 +0100 Subject: [PATCH 53/85] gnu: Add kidentitymanagement. * gnu/packages/kde-pim.scm (kidentitymanagement): New variable. --- gnu/packages/kde-pim.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index e5744076c9..b0bd75685e 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -150,6 +150,45 @@ (define-public kcalutils functions for accessing calendar data using the kcalcore API.") (license license:lgpl2.0+))) +(define-public kidentitymanagement + (package + (name "kidentitymanagement") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kidentitymanagement-" version ".tar.xz")) + (sha256 + (base32 "0dqz49sp5hq44590rrxav8688aqlzsww4q4n55ksfy13nk9i5mbf")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kemoticons" ,kemoticons) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("kpimtextedit" ,kpimtextedit) + ("ktextwidgets" ,ktextwidgets) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp/dummy-home") ;; FIXME: what is this? + #t))))) + (home-page "https://kontact.kde.org/") + (synopsis "Library for shared identities between mail applications") + (description "Library for shared identities between mail applications.") + (license ;; GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + (define-public kmbox (package (name "kmbox") From 037994df433ab82c705d214cf917589414df353e Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 22:52:57 +0100 Subject: [PATCH 54/85] gnu: Add kimap. * gnu/packages/kde-pim.scm (kimap): New variable. --- gnu/packages/kde-pim.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index b0bd75685e..0eb1c10747 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -24,6 +24,7 @@ (define-module (gnu packages kde-pim) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages boost) + #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages gnome) @@ -189,6 +190,37 @@ (define-public kidentitymanagement (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) +(define-public kimap + (package + (name "kimap") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kimap-" version ".tar.xz")) + (sha256 + (base32 "0l8hb2z82jzbwr12lw5fismwk1a3ca4dk966p1fxg4bibck8vjj6")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("cyrus-sasl" ,cyrus-sasl) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("kmime" ,kmime) + ("qtbase" ,qtbase))) + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") + (synopsis "Library for handling IMAP") + (description "This library provides a job-based API for interacting with +an IMAP4rev1 server. It manages connections, encryption and parameter quoting +and encoding, but otherwise provides quite a low-level interface to the +protocol. This library does not implement an IMAP client; it merely makes it +easier to do so.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kmbox (package (name "kmbox") From 6e03dbea47bc2cad44d69bbcfdd3964a864ad61e Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 22:53:44 +0100 Subject: [PATCH 55/85] gnu: Add kldap. * gnu/packages/kde-pim.scm (kldap): New variable. --- gnu/packages/kde-pim.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 0eb1c10747..0d42cf7e63 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -29,6 +29,7 @@ (define-module (gnu packages kde-pim) #:use-module (gnu packages documentation) #:use-module (gnu packages gnome) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages openldap) #:use-module (gnu packages qt) #:use-module (gnu packages sqlite) #:use-module (gnu packages xml)) @@ -221,6 +222,34 @@ (define-public kimap (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) +(define-public kldap + (package + (name "kldap") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kldap-" version ".tar.xz")) + (sha256 + (base32 "1blbnj8av6h168g14gyphyd9sz87af773b1qglmbkv5pzbzaanxn")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + `(("ki18n" ,ki18n) + ("kio" ,kio) + ("kwidgetsaddons" ,kwidgetsaddons) + ("qtbase" ,qtbase))) + (propagated-inputs + `(("cyrus-sasl" ,cyrus-sasl) + ("openldap" ,openldap))) + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") + (synopsis "Library for accessing LDAP") + (description "This library provides an API for LDAP.") + (license license:lgpl2.0+))) + (define-public kmbox (package (name "kmbox") From ff6adc0aaa472ab720c69ffec66296619df96c50 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 21:15:40 +0100 Subject: [PATCH 56/85] gnu: Add ktnef. * gnu/packages/kde-pim.scm (ktnef): New variable. --- gnu/packages/kde-pim.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 0d42cf7e63..f02d461209 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -346,3 +346,31 @@ (define-public kpimtextedit (description "A library for PIM-specific text editing utilities.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + +(define-public ktnef + (package + (name "ktnef") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/ktnef-" version ".tar.xz")) + (sha256 + (base32 "0kgfhh46130hg1xq8km5gjzxa3b620j1zdrg54qivxa782smgbl6")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcalendarcore" ,kcalendarcore) + ("kcalutils" ,kcalutils) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kcontacts" ,kcontacts) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("qtbase" ,qtbase))) + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/ktnef/html/") + (synopsis "Viewer for mail attachments using TNEF format") + (description "Viewer for mail attachments using TNEF format") + (license license:lgpl2.0+))) From 2a876c1c1dddec967b9be36b0abc14a9b5b53398 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 21:15:40 +0100 Subject: [PATCH 57/85] gnu: Add kalarmcal. * gnu/packages/kde-pim.scm (kalarmcal): New variable. --- gnu/packages/kde-pim.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index f02d461209..139ad107ad 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -113,6 +113,46 @@ (define-public akonadi programs.") (license license:fdl1.2+))) +(define-public kalarmcal + (package + (name "kalarmcal") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kalarmcal-" version ".tar.xz")) + (sha256 + (base32 "0w9qsx2gqwny2v4fsj4awn814s9b7yrxvqrawlick3r2kp4x1sgn")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("akonadi", akonadi) + ("boost" ,boost) + ("kcalendarcore" ,kcalendarcore) + ("kcalutils" ,kcalutils) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kdbusaddons" ,kdbusaddons) + ("kholidays" ,kholidays) + ("ki18n" ,ki18n) + ("kidentitymanagement" ,kidentitymanagement) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kpimtextedit" ,kpimtextedit) + ("ktextwidgets" ,ktextwidgets) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase))) + (arguments + `(#:tests? #f)) ;; TODO: TZ setup + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") + (synopsis "Library for handling kalarm calendar data") + (description "This library provides an API for KAlarm alarms.") + (license license:lgpl2.0+))) + (define-public kcalutils (package (name "kcalutils") From 8d41c6a3b58eac788aae8dcb8f256b6c423deef3 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 23:00:25 +0100 Subject: [PATCH 58/85] gnu: Add akonadi-mime. * gnu/packages/kde-pim.scm (akonadi-mime): New variable. --- gnu/packages/kde-pim.scm | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 139ad107ad..76e49da124 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -113,6 +113,59 @@ (define-public akonadi programs.") (license license:fdl1.2+))) +(define-public akonadi-mime + (package + (name "akonadi-mime") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/akonadi-mime-" version ".tar.xz")) + (sha256 + (base32 "03q3dnhzcgmgcqvijnwi4ikg0m1zad2l679bqnp051v27fvs4yg7")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("libxslt" ,libxslt) ;; xslt for generating interface descriptions + ("shared-mime-info" ,shared-mime-info))) + (inputs + `(("akonadi" ,akonadi) + ("boost", boost) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kdbusaddons" ,kdbusaddons) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmime" ,kmime) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase))) + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/akonadi/html/") + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'copy-desktop-file-early + (lambda _ + (let ((plugins-dir "/tmp/.local/share/akonadi/plugins/serializer")) + (mkdir-p plugins-dir) + (copy-file "serializers/akonadi_serializer_mail.desktop" + (string-append plugins-dir "/akonadi_serializer_mail.desktop"))) + #t)) + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" "/tmp") + #t))))) + (synopsis "Akonadi MIME handling library") + (description "Akonadi Mime is a library that effectively bridges the +type-agnostic API of the Akonadi client libraries and the domain-specific +KMime library. It provides jobs, models and other helpers to make working +with emails through Akonadi easier.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kalarmcal (package (name "kalarmcal") From d03ad6cf778e83e6b4bb633805fc384786900a21 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 23:16:13 +0100 Subject: [PATCH 59/85] gnu: Add akonadi-notes. * gnu/packages/kde-pim.scm (akonadi-notes): New variable. --- gnu/packages/kde-pim.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 76e49da124..9d6a13edcd 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -166,6 +166,35 @@ (define-public akonadi-mime (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) +(define-public akonadi-notes + (package + (name "akonadi-notes") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/akonadi-notes-" version ".tar.xz")) + (sha256 + (base32 "0r8vh11bfjzhspb5kp2d0kcgwqd2m5qpxpamiajzjq910f51sw3w")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("akonadi" ,akonadi) + ("kcodecs" ,kcodecs) + ("ki18n" ,ki18n) + ("kmime" ,kmime) + ("qtbase" ,qtbase))) + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/akonadi/html/") + (synopsis "Akonadi notes access library") + (description "Akonadi Notes is a library that effectively bridges the +type-agnostic API of the Akonadi client libraries and the domain-specific +KMime library. It provides a helper class for note attachments and for +wrapping notes into KMime::Message objects.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kalarmcal (package (name "kalarmcal") From a24fcdbdf4ea2005138ab9de655f3882845c968c Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 23:24:12 +0100 Subject: [PATCH 60/85] gnu: Add akonadi-search. * gnu/packages/kde-pim.scm (akonadi-search): New variable. --- gnu/packages/kde-pim.scm | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 9d6a13edcd..c6a3695daa 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -31,6 +31,7 @@ (define-module (gnu packages kde-pim) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages openldap) #:use-module (gnu packages qt) + #:use-module (gnu packages search) #:use-module (gnu packages sqlite) #:use-module (gnu packages xml)) @@ -195,6 +196,46 @@ (define-public akonadi-notes (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) +(define-public akonadi-search + (package + (name "akonadi-search") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/akonadi-search-" version ".tar.xz")) + (sha256 + (base32 "16qzs2cs4nxwrpwcdgwry95qn6wmg8s1p4w3qajx1ahkgwmsh11s")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-mime" ,akonadi-mime) + ("boost" ,boost) + ("kcalendarcore" ,kcalendarcore) + ("kcmutils" ,kcmutils) + ("kcontacts" ,kcontacts) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmime" ,kmime) + ("krunner" ,krunner) + ("kwindowsystem" ,kwindowsystem) + ("qtbase" ,qtbase) + ("xapian" ,xapian))) + (arguments + `(#:tests? #f)) ;; TODO: needs dbus + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/akonadi/html/") + (synopsis "Akonadi search library") + (description "Xapian-based indexing and query infrastructure for +Akonadi.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kalarmcal (package (name "kalarmcal") From ad80c7ef158648ebbde10d1ddaff96ac94d4d7c9 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 23:29:43 +0100 Subject: [PATCH 61/85] gnu: Add akonadi-contacts. * gnu/packages/kde-pim.scm (akonadi-contacts): New variable. --- gnu/packages/kde-pim.scm | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index c6a3695daa..ce89dba1b6 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -114,6 +114,57 @@ (define-public akonadi programs.") (license license:fdl1.2+))) +(define-public akonadi-contacts + (package + (name "akonadi-contacts") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/akonadi-contacts-" version ".tar.xz")) + (sha256 + (base32 "1pw1s8c6dlcb103cw46p1ikvas3y8cwiwnfdny2jd3hr3rig4px9")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("akonadi" ,akonadi) + ("boost" ,boost) + ("kauth" ,kauth) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kcoreaddons" ,kcoreaddons) + ("kdbusaddons" ,kdbusaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kjobwidgets" ,kjobwidgets) + ("kmime" ,kmime) + ("kservice" ,kservice) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ("prison" ,prison) + ("kio" ,kio) + ("qtbase" ,qtbase) + ("solid" ,solid) + ("sonnet" ,sonnet))) + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/akonadi/html/") + (synopsis "Akonadi contacts access library") + (description "Akonadi Contacts is a library that effectively bridges the +type-agnostic API of the Akonadi client libraries and the domain-specific +KContacts library. It provides jobs, models and other helpers to make working +with contacts and addressbooks through Akonadi easier. + +The library provides a complex dialog for editing contacts and several models +to list and filter contacts.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public akonadi-mime (package (name "akonadi-mime") From 29157edcd669e6cb500deee9e41a655a0da17618 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 15 Dec 2019 00:10:44 +0100 Subject: [PATCH 62/85] gnu: Add ksmtp. * gnu/packages/kde-pim.scm (ksmtp): New variable. --- gnu/packages/kde-pim.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index ce89dba1b6..2ced957708 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -561,6 +561,46 @@ (define-public kpimtextedit (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) +(define-public ksmtp + (package + (name "ksmtp") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/ksmtp-" version ".tar.xz")) + (sha256 + (base32 "1pd8mma3xbq83jkn76gqinn6xh9imaji0jrg3qzysf5rvjl8kcqn")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("cyrus-sasl" ,cyrus-sasl) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("qtbase" ,qtbase))) + (arguments + `(#:tests? #f ;; TODO: does not find sasl mechs + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing + (lambda _ + (substitute* "src/CMakeLists.txt" + (("^(install\\(.* )\\$\\{KF5_INSTALL_TARGETS_DEFAULT_ARGS\\}\\)" + _ prefix) + (string-append prefix "${KDE_INSTALL_TARGETS_DEFAULT_ARGS})"))) + #t))))) + (home-page "https://cgit.kde.org/ksmtp.git") + (synopsis "Library for sending email through an SMTP server") + (description "This library provides an API for handling SMTP +services. SMTP (Simple Mail Transfer Protocol) is the most prevalent Internet +standard protocols for e-mail transmission.") + (license license:lgpl2.0+))) + (define-public ktnef (package (name "ktnef") From 789cf5c397edc24b6a1468615852708abe5bd117 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 23:38:25 +0100 Subject: [PATCH 63/85] gnu: Add kontactinterface. * gnu/packages/kde-pim.scm (kontactinterface): New variable. --- gnu/packages/kde-pim.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 2ced957708..3d11ec7870 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -521,6 +521,33 @@ (define-public kmime (description "A library for MIME handling.") (license license:lgpl2.0+))) +(define-public kontactinterface + (package + (name "kontactinterface") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kontactinterface-" version ".tar.xz")) + (sha256 + (base32 "1p0iw9i8cxh3jn7094wvxhlpc2sw52q8csfdgch1lf3dwhkpp0k7")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kparts" ,kparts) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase))) + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") + (synopsis "Kontact interface library") + (description "Kontact Interface library.") + (license license:lgpl2.0+))) + (define-public kpimtextedit (package (name "kpimtextedit") From 0fcbdde77b91a60c92ddb6e3282cb4b5e83f57ea Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 15 Dec 2019 00:22:09 +0100 Subject: [PATCH 64/85] gnu: Add libkgapi. * gnu/packages/kde-pim.scm (libkgapi): New variable. --- gnu/packages/kde-pim.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 3d11ec7870..f9f4dc620b 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -655,3 +655,39 @@ (define-public ktnef (synopsis "Viewer for mail attachments using TNEF format") (description "Viewer for mail attachments using TNEF format") (license license:lgpl2.0+))) + +(define-public libkgapi + (package + (name "libkgapi") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/libkgapi-" version ".tar.xz")) + (sha256 + (base32 "0z76b745n4hhjndrhv1w5acibia8x1frh78jx7bvxa72d8wphn08")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("cyrus-sasl" ,cyrus-sasl) + ("ki18n" ,ki18n) + ("kcontacts" ,kcontacts) + ("kcalendarcore" ,kcalendarcore) + ("kio" ,kio) + ("kwallet" ,kwallet) + ("kwindowsystem" ,kwindowsystem) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine))) + (arguments + `(#:tests? #f)) ;; TODO 6/48 tests fail + (home-page "https://cgit.kde.org/libkgapi.git") + (synopsis "Library for accessing various Google services via their public +API") + (description "@code{LibKGAPI} is a C++ library that implements APIs for +various Google services.") + (license license:lgpl2.0+))) From 5a75e4448aa0b66ef0146ada4621304b3d43c231 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 23:31:39 +0100 Subject: [PATCH 65/85] gnu: Add kmailtransport. * gnu/packages/kde-pim.scm (kmailtransport): New variable. --- gnu/packages/kde-pim.scm | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index f9f4dc620b..10019103a4 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -464,6 +464,48 @@ (define-public kldap (description "This library provides an API for LDAP.") (license license:lgpl2.0+))) +(define-public kmailtransport + (package + (name "kmailtransport") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kmailtransport-" version ".tar.xz")) + (sha256 + (base32 "04jdnqxbp4382vjxh06rrvsigbrygqfkw0fvbbjnjymp585mgkr4")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-mime" ,akonadi-mime) + ("boost" ,boost) + ("cyrus-sasl" ,cyrus-sasl) + ("kcalendarcore" ,kcalendarcore) + ("kcmutils" ,kcmutils) + ("kcontacts" ,kcontacts) + ("kdbusaddons" ,kdbusaddons) + ("kconfigwidgets" ,kconfigwidgets) + ("ki18n" ,ki18n) + ("kitemmodels", kitemmodels) + ("kio" ,kio) + ("kmime" ,kmime) + ("ksmtp" ,ksmtp) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("libkgapi" ,libkgapi) + ("qtbase" ,qtbase))) + (arguments + `(#:tests? #f)) ;; TODO - 3/3 tests fail, require drkonqi + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") + (synopsis "Mail transport service library") + (description " This library provides an API and support code for managing +mail transport.") + (license license:lgpl2.0+))) + (define-public kmbox (package (name "kmbox") From 37ac66221ccc2ba0f37dac871b160315a1d78e79 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Dec 2019 23:35:26 +0100 Subject: [PATCH 66/85] gnu: Add akonadi-calendar. * gnu/packages/kde-pim.scm (akonadi-calendar): New variable. --- gnu/packages/kde-pim.scm | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 10019103a4..a2db3a24ad 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -114,6 +114,50 @@ (define-public akonadi programs.") (license license:fdl1.2+))) +(define-public akonadi-calendar + (package + (name "akonadi-calendar") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/akonadi-calendar-" version ".tar.xz")) + (sha256 + (base32 "1550h08i8rjnbd9yrnhd9v3v68ingrag2bdxrbid62qvam0n5ihy")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("boost" ,boost) + ("kcalendarcore" ,kcalendarcore) + ("kcalutils" ,kcalutils) + ("kcodecs" ,kcodecs) + ("kcontacts" ,kcontacts) + ("kdbusaddons" ,kdbusaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmailtransport" ,kmailtransport) + ("kmime" ,kmime) + ("kpimtextedit" ,kpimtextedit) + ("ksmtp" ,ksmtp) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("qtbase" ,qtbase))) + (arguments + `(#:tests? #f)) ;; TODO: 1/1 test fails + (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/akonadi/html/") + (synopsis "Library providing calendar helpers for Akonadi items") + (description "This library manages calendar specific actions for +collection and item views.") + (license license:lgpl2.0+))) + (define-public akonadi-contacts (package (name "akonadi-contacts") From 25b620d96770d6f8ebb6710e625796789790d072 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 9 Dec 2019 17:44:04 +0100 Subject: [PATCH 67/85] gnu: Add libkleo. * gnu/packages/kde-pim.scm (libkleo): New variable. --- gnu/packages/kde-pim.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index a2db3a24ad..27c3ea40e2 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -28,6 +28,7 @@ (define-module (gnu packages kde-pim) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages openldap) #:use-module (gnu packages qt) @@ -777,3 +778,41 @@ (define-public libkgapi (description "@code{LibKGAPI} is a C++ library that implements APIs for various Google services.") (license license:lgpl2.0+))) + +(define-public libkleo + (package + (name "libkleo") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/libkleo-" version ".tar.xz")) + (sha256 + (base32 "0vjp07j102mi20c4q2fdvkjc0skb9q7msxp64n76wy3cciv346jz")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools) + ("qttools" ,qttools))) + (inputs + `(("boost" ,boost) + ("gpgme" ,gpgme) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("ki18n" ,ki18n) + ("kitemmodels" ,kitemmodels) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kpimtextedit" ,kpimtextedit) + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase))) + (home-page "https://cgit.kde.org/libkleo.git/") + (synopsis "KDE PIM cryptographic library") + (description "@code{libkleo} is a library for Kleopatra and other parts of +KDE using certificate-based crypto.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) From ba4f9352c175092e5145e22cf9d4c9882170d293 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 18 Jan 2020 21:09:03 +0100 Subject: [PATCH 68/85] gnu: Add kleopatra. * gnu/packages/kde-utils.scm (kleopatra): New variable. --- gnu/packages/kde-pim.scm | 57 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 27c3ea40e2..4bb4c85b55 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -27,6 +27,7 @@ (define-module (gnu packages kde-pim) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) + #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages kde-frameworks) @@ -509,6 +510,62 @@ (define-public kldap (description "This library provides an API for LDAP.") (license license:lgpl2.0+))) +(define-public kleopatra + (package + (name "kleopatra") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kleopatra-" version ".tar.xz")) + (sha256 + (base32 "1bqwxdl91s2nai871vvhkmcc3simbnvr2i5m6dnl327bplzqgfa4")))) + (build-system qt-build-system) + (native-inputs + `(("dbus" ,dbus) + ("extra-cmake-modules" ,extra-cmake-modules) + ("gnupg" ,gnupg) ;; TODO: Remove after gpgme uses fixed path + ("kdoctools" ,kdoctools))) + (inputs + `(("boost" ,boost) + ("gpgme" ,gpgme) + ("kcmutils" ,kcmutils) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kitemmodels" ,kitemmodels) + ("kmime" ,kmime) + ("knotifications" ,knotifications) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libassuan" ,libassuan) + ("libkleo" ,libkleo) + ("oxygen-icons" ,oxygen-icons) ;; default icon set + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "dbus-launch" "ctest" ".") + #t))))) + (home-page "https://kde.org/applications/utilities/org.kde.kleopatra") + (synopsis "Certificate Manager and Unified Crypto GUI") + (description "Kleopatra is a certificate manager and a universal crypto +GUI. It supports managing X.509 and OpenPGP certificates in the GpgSM keybox +and retrieving certificates from LDAP servers.") + (license ;; GPL for programs, FDL for documentation + (list license:gpl2+ license:fdl1.2+)))) + (define-public kmailtransport (package (name "kmailtransport") From 48d5d0ef1c05e3655909b907c2ac166114bbe19a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 3 Dec 2019 23:42:10 +0100 Subject: [PATCH 69/85] gnu: Add kgpg. * gnu/packages/kde-utils.scm (kgpg): New variable. --- gnu/packages/kde-pim.scm | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 4bb4c85b55..d2b6beb55a 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -412,6 +412,54 @@ (define-public kcalutils functions for accessing calendar data using the kcalcore API.") (license license:lgpl2.0+))) +(define-public kgpg + (package + (name "kgpg") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kgpg-" version ".tar.xz")) + (sha256 + (base32 "1dis7zv51a4lhx5l3wlwnhym8f79h8sibhhk97fkn8d7szdrmfw5")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("gnupg" ,gnupg) ;; TODO: Remove after gpgme uses fixed path + ("kdoctools" ,kdoctools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("boost" ,boost) + ("gpgme" ,gpgme) + ("karchive" ,karchive) + ("kcodecs" ,kcodecs) + ("kcontacts" ,kcontacts) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kjobwidgets" ,kjobwidgets) + ("knotifications" ,knotifications) + ("kservice" ,kservice) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("oxygen-icons" ,oxygen-icons) ;; default icon set + ("qtbase" ,qtbase))) + (home-page "https://kde.org/applications/utilities/org.kde.kgpg") + (synopsis "Graphical front end for GNU Privacy Guard") + (description "Kgpg manages cryptographic keys for the GNU Privacy Guard, +and can encrypt, decrypt, sign, and verify files. It features a simple editor +for applying cryptography to short pieces of text, and can also quickly apply +cryptography to the contents of the clipboard.") + (license license:gpl2+))) + (define-public kidentitymanagement (package (name "kidentitymanagement") From 4357222be3b0849ba3aa1709106642ccf588eb83 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 18 Jan 2020 18:59:33 +0100 Subject: [PATCH 70/85] gnu: Add libkdepim. * gnu/packages/kde-pim.scm (libkdepim): New variable. --- gnu/packages/kde-pim.scm | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index d2b6beb55a..a3b5896e20 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -848,6 +848,54 @@ (define-public ktnef (description "Viewer for mail attachments using TNEF format") (license license:lgpl2.0+))) +(define-public libkdepim + (package + (name "libkdepim") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/libkdepim-" version ".tar.xz")) + (sha256 + (base32 "0ndh97w1bfii4snx9yc0qazqk5jhx22s810kj656967xd1w4bj9n")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-search" ,akonadi-search) + ("boost" ,boost) + ("kcmutils" ,kcmutils) + ("kcodecs" ,kcodecs) + ("kcalendarcore" ,kcalendarcore) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kcoreaddons" ,kcoreaddons) + ("kdbusaddons" ,kdbusaddons) + ("kdesignerplugin" ,kdesignerplugin) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kjobwidgets" ,kjobwidgets) + ("kldap" ,kldap) + ("kmime" ,kmime) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("qtbase" ,qtbase))) + (home-page "https://cgit.kde.org/libkdepim.git") + (synopsis "Libraries for common kdepim apps") + (description "Libraries for common kdepim apps.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public libkgapi (package (name "libkgapi") From 63d589626bfad14c44dfbec539793b486ae5b66a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 18 Jan 2020 19:13:02 +0100 Subject: [PATCH 71/85] gnu: Add kmailimporter. * gnu/packages/kde-pim.scm (kmailimporter): New variable. --- gnu/packages/kde-pim.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index a3b5896e20..fc74a90b57 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -614,6 +614,44 @@ (define-public kleopatra (license ;; GPL for programs, FDL for documentation (list license:gpl2+ license:fdl1.2+)))) +(define-public kmailimporter + (package + (name "kmailimporter") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/mailimporter-" version ".tar.xz")) + (sha256 + (base32 "0vmrgjz47f96crrbv0bhaz0abh2am4whhb294rfz02mvjghbzpzv")))) + (properties `((upstream-name . "mailimporter"))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-mime" ,akonadi-mime) + ("boost" ,boost) + ("karchive" ,karchive) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kdbusaddons" ,kdbusaddons) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmime" ,kmime) + ("kxmlgui" ,kxmlgui) + ("libkdepim" ,libkdepim) + ("qtbase" ,qtbase))) + (home-page "https://cgit.kde.org/mailimporter.git") + (synopsis "KDE mail importer library") + (description "KDE mail importer library.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kmailtransport (package (name "kmailtransport") From a8546f4682bad158886cee3e90c166c71b1acd22 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 19 Jan 2020 22:19:15 +0100 Subject: [PATCH 72/85] gnu: Add kpimcommon. * gnu/packages/kde-pim.scm (kpimcommon): New variable. --- gnu/packages/kde-pim.scm | 62 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index fc74a90b57..1352b317f2 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -778,6 +778,68 @@ (define-public kontactinterface (description "Kontact Interface library.") (license license:lgpl2.0+))) +(define-public kpimcommon + (package + (name "kpimcommon") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/pimcommon-" version ".tar.xz")) + (sha256 + (base32 "1jl40ymq46yjn9va78hklgg91ikrfahf3w4jl5ziiqbivcl7r9kn")))) + (properties `((upstream-name . "pimcommon"))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("karchive" ,karchive) + ("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("boost" ,boost) + ("grantlee" ,grantlee) + ;; TODO: ("kaccounts" ,kaccounts) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kcoreaddons" ,kcoreaddons) + ("kdbusaddons" ,kdbusaddons) + ("kdesignerplugin" ,kdesignerplugin) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kimap" ,kimap) + ("kio" ,kio) + ("kirigami" ,kirigami) ;; run-time dependency + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kjobwidgets" ,kjobwidgets) + ("kmime" ,kmime) + ("knewstuff" ,knewstuff) + ("kpimtextedit" ,kpimtextedit) + ("kservice" ,kservice) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libkdepim" ,libkdepim) + ("libxslt" ,libxslt) + ("purpose" ,purpose) + ("qtbase" ,qtbase) + ("qtwebengine" ,qtwebengine))) + (arguments + `(#:tests? #f)) ;; TODO tests hang + (home-page "https://cgit.kde.org/pimcommon.git") + (synopsis "Common library for KDE PIM") + (description "Common library for KDE PIM.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kpimtextedit (package (name "kpimtextedit") From 2dd5b1e8b3ba5df830d6406b278e95319e104423 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 18 Jan 2020 21:14:12 +0100 Subject: [PATCH 73/85] gnu: Add kdepim-apps-libs. * gnu/packages/kde-pim.scm (kdepim-apps-libs): New variable. --- gnu/packages/kde-pim.scm | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 1352b317f2..9d48475a17 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -30,6 +30,7 @@ (define-module (gnu packages kde-pim) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) + #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages openldap) #:use-module (gnu packages qt) @@ -412,6 +413,51 @@ (define-public kcalutils functions for accessing calendar data using the kcalcore API.") (license license:lgpl2.0+))) +(define-public kdepim-apps-libs + (package + (name "kdepim-apps-libs") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kdepim-apps-libs-" version ".tar.xz")) + (sha256 + (base32 "10xbzvp9cm5fpy4nxp38qm4vf0bycpq94bm4z2j4lw7ll1aq8irw")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("boost" ,boost) + ("gpgme" ,gpgme) + ("grantlee" ,grantlee) + ("grantleetheme" ,grantleetheme) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kcoreaddons" ,kcoreaddons) + ("kdbusaddons" ,kdbusaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kimap" ,kimap) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmime" ,kmime) + ("kpimcommon" ,kpimcommon) + ("kservice" ,kservice) + ("kwidgetsaddons" ,kwidgetsaddons) + ("libkleo" ,libkleo) + ("prison" ,prison) + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase))) + (home-page "https://cgit.kde.org/kdepim-apps-libs.git") + (synopsis "KDE PIM mail related libraries and data files") + (description "KDE PIM mail related libraries and data files.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kgpg (package (name "kgpg") From 565df8a2678336ca527642fb575fde9046862093 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 8 Dec 2019 21:35:48 +0100 Subject: [PATCH 74/85] gnu: Add qoauth. * gnu/packages/web.scm (qoauth): New variable. --- gnu/packages/web.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a0f46e3ee6..6f45072772 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -106,6 +106,7 @@ (define-module (gnu packages web) #:use-module (gnu packages jemalloc) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages kde) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages libunistring) @@ -829,6 +830,50 @@ (define-public qjson ;; Only version 2.1 of the license (license license:lgpl2.1))) +(define-public qoauth + (package + (name "qoauth") + (version "2.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ayoy/qoauth.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1b2jdqs526ac635yb2whm049spcsk7almnnr6r5b4yqhq922anw3")))) + (build-system gnu-build-system) + (inputs + `(("qca" ,qca) + ("qtbase" ,qtbase))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-code + (lambda _ + (make-file-writable "src/qoauth.pc") + (substitute* "src/src.pro" + (("/lib64") "/lib")) + #t)) + (delete 'configure) ; no configure script + (delete 'check) ; no test target + (add-before 'build 'qmake + (lambda _ + (let ((qca (assoc-ref %build-inputs "qca"))) + (invoke + "qmake" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "QMAKE_INCDIR+=" qca "/include/Qca-qt5/QtCrypto") + (string-append "LIBS+=-L" qca "/lib") + (string-append "LIBS+=-lqca-qt5")))))))) + (home-page "https://github.com/ayoy/qoauth") + (synopsis "Qt-based C++ library for OAuth authorization scheme") + (description "QOAuth is an attempt to support interaction with +OAuth-powered network services in a Qt way, i.e. simply, clearly and +efficiently. It gives the application developer no more than 4 methods.") + (license license:lgpl2.1+))) + (define-public krona-tools (package (name "krona-tools") From 533c95bc17cd253455be077a54b1435d0c60950c Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 8 Dec 2019 20:06:14 +0100 Subject: [PATCH 75/85] gnu: Add choqok. * gnu/packages/kde-internet.scm: New file. * gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch: New file. * gnu/lokal.mk: Add them. --- gnu/local.mk | 2 + gnu/packages/kde-internet.scm | 94 +++++++++++++++++++ .../choqok-Fix-building-under-Qt-5.13.patch | 89 ++++++++++++++++++ 3 files changed, 185 insertions(+) create mode 100644 gnu/packages/kde-internet.scm create mode 100644 gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch diff --git a/gnu/local.mk b/gnu/local.mk index 912809b74d..da3291fdc6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -283,6 +283,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/kawa.scm \ %D%/packages/kde.scm \ %D%/packages/kde-frameworks.scm \ + %D%/packages/kde-internet.scm \ %D%/packages/kde-multimedia.scm \ %D%/packages/kde-pim.scm \ %D%/packages/kde-plasma.scm \ @@ -771,6 +772,7 @@ dist_patch_DATA = \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ %D%/packages/patches/ceph-volume-respect-PATH.patch \ %D%/packages/patches/chmlib-inttypes.patch \ + %D%/packages/patches/choqok-Fix-building-under-Qt-5.13.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ %D%/packages/patches/clamav-system-tomsfastmath.patch \ %D%/packages/patches/clang-3.5-libc-search-path.patch \ diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm new file mode 100644 index 0000000000..4b382df2e7 --- /dev/null +++ b/gnu/packages/kde-internet.scm @@ -0,0 +1,94 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017, 2019, 2020 Hartmut Goebel +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages kde-internet) + #:use-module (guix build-system qt) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages) + #:use-module (gnu packages kde) + #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-pim) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages qt) + #:use-module (gnu packages web)) + +(define-public choqok + (package + (name "choqok") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/choqok/" + (version-major+minor version) + "/src/choqok-" version ".tar.xz")) + (sha256 + (base32 "03ri4y1wzyqlixnhczsls5gmy7jzzm67bb5gz8bav51ngc32fxca")) + (patches (search-patches "choqok-Fix-building-under-Qt-5.13.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools) + ("pkg-config" ,pkg-config))) + (inputs + `(("attica" ,attica) + ("kcmutils" ,kcmutils) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kdewebkit" ,kdewebkit) + ("kemoticons" ,kemoticons) + ("kglobalaccel" ,kglobalaccel) + ("kguiaddons" ,kguiaddons) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kparts" ,kparts) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kxmlgui" ,kxmlgui) + ;; TODO: telepathy + ("oxygen-icons" ,oxygen-icons) ; default icon set + ("qca" ,qca) + ("qoauth" ,qoauth) + ("qtbase" ,qtbase) + ("qtwebkit" ,qtwebkit) + ("sonnet" ,sonnet))) + (home-page "https://kde.org/applications/internet/org.kde.choqok") + (synopsis "Micro-Blogging Client") + (description "Choqok is a fast, efficient and simple to use micro-blogging +client for KDE. It currently supports the twitter.com and identi.ca +microblogging services. + +Other notable features include: +@itemize +@item Support for user + friends time-lines. +@item Support for @Reply time-lines. +@item Support for sending and receiving direct messages. +@item Twitpic.com integration. +@item The ability to use multiple accounts simultaneously. +@item Support for search APIs for all services. +@item KWallet integration. +@item Support for automatic shortening urls with more than 30 characters. +@item Support for configuring status lists appearance. +@end itemize") + (license license:gpl3+))) diff --git a/gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch b/gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch new file mode 100644 index 0000000000..4250106a19 --- /dev/null +++ b/gnu/packages/patches/choqok-Fix-building-under-Qt-5.13.patch @@ -0,0 +1,89 @@ +Add QMap include to fix building under Qt 5.13 + +This combines several patches which all add the same missing include: +- e13ab06f65a4e8b6259bccda1401abb9c1c9fdca +- 546ede9ef712bb1b156a55ce30df81c3203dde61 +- 08fb06b63a78888e6703de6ac1a4fd6a0e2791eb +- bef6784596bf0b41287ebad81f138e1c8c2a6be2 + +Include is no longer added transitively. +--- + +--- a/plugins/betternotify/notify.h ++++ b/plugins/betternotify/notify.h +@@ -23,6 +23,7 @@ + #ifndef NOTIFY_H + #define NOTIFY_H + ++#include + #include + #include + #include +--- a/plugins/untiny/untiny.h ++++ b/plugins/untiny/untiny.h +@@ -27,6 +27,7 @@ + + #include "plugin.h" + ++#include + #include + #include + #include +--- a/plugins/uploaders/flickr/flickr.h ++++ b/plugins/uploaders/flickr/flickr.h +@@ -26,6 +26,8 @@ + + #include "uploader.h" + ++#include ++ + /** + @author Andrey Esin \ + */ +diff --git a/plugins/uploaders/imageshack/imageshack.h b/plugins/uploaders/imageshack/imageshack.h +index d9ddc88..63d0e3f 100644 +--- a/plugins/uploaders/imageshack/imageshack.h ++++ b/plugins/uploaders/imageshack/imageshack.h +@@ -26,6 +26,8 @@ + + #include "uploader.h" + ++#include ++ + /** + @author Mehrdad Momeny \ + */ +--- a/plugins/uploaders/mobypicture/mobypicture.h ++++ b/plugins/uploaders/mobypicture/mobypicture.h +@@ -26,6 +26,8 @@ + + #include "uploader.h" + ++#include ++ + class KJob; + + class Mobypicture : public Choqok::Uploader +--- a/plugins/uploaders/posterous/posterous.h ++++ b/plugins/uploaders/posterous/posterous.h +@@ -26,6 +26,8 @@ + + #include "uploader.h" + ++#include ++ + class KJob; + + class Posterous : public Choqok::Uploader +--- a/plugins/uploaders/twitgoo/twitgoo.h ++++ b/plugins/uploaders/twitgoo/twitgoo.h +@@ -26,6 +26,8 @@ + + #include "uploader.h" + ++#include ++ + class KJob; + + class Twitgoo : public Choqok::Uploader +-- From e21713270cf79f6e0867c21b3f2e6fba34f8dc6f Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 8 Dec 2019 22:53:19 +0100 Subject: [PATCH 76/85] gnu: Add kget. * gnu/packages/kde-internet.scm (kget): New variable. --- gnu/packages/kde-internet.scm | 63 +++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 4b382df2e7..5f21b99685 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -23,6 +23,8 @@ (define-module (gnu packages kde-internet) #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages boost) + #:use-module (gnu packages gnupg) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-pim) @@ -92,3 +94,64 @@ (define-public choqok @item Support for configuring status lists appearance. @end itemize") (license license:gpl3+))) + +(define-public kget + (package + (name "kget") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kget-" version ".tar.xz")) + (sha256 + (base32 "004qqq93iqidh2m9q2p2cwlbc2kfrz0g8a2mgd712c9p66l7s42s")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("gmp" ,gmp) + ("gpgme" ,gpgme) + ("kcmutils" ,kcmutils) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdelibs4support" ,kdelibs4support) ;; KLocale + ("kdoctools" ,kdoctools) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("kitemviews" ,kitemviews) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kparts" ,kparts) + ("kservice" ,kservice) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libgcrypt" ,libgcrypt) + ("libktorrent" ,libktorrent) + ;; TODO: libmms + ;; TODO: LibKWorkspace - plasma-workspace? + ("oxygen-icons" ,oxygen-icons) ; default icon set + ("qca" ,qca) + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase) + )) + (home-page "http://www.kde.org/") + (synopsis "Versatile and user-friendly download manager") + (description "KGet is an advanced download manager with support for +Metalink and Bittorrent. Downloads are added to the list, where they can be +paused, queued, or scheduled for later. KGet supports download via FTP anf +HTTP(S) as well as pausing downloads. + +This package is part of the KDE networking module.") + (license ;; GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) From 579aa350eddcf6e645b2455d845e7caad6163ca9 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 8 Dec 2019 23:09:54 +0100 Subject: [PATCH 77/85] gnu: Add konversation. * gnu/packages/kde-internet.scm (konversation): New variable. * gnu/packages/patches/konversation-Fix-build-with-Qt-5.11.patch: New file. * gnu/lokal.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde-internet.scm | 72 +++++++++++++++++++ .../konversation-Fix-build-with-Qt-5.11.patch | 24 +++++++ 3 files changed, 97 insertions(+) create mode 100644 gnu/packages/patches/konversation-Fix-build-with-Qt-5.11.patch diff --git a/gnu/local.mk b/gnu/local.mk index da3291fdc6..98b7395598 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1071,6 +1071,7 @@ 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/konversation-Fix-build-with-Qt-5.11.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-internet.scm b/gnu/packages/kde-internet.scm index 5f21b99685..54ca9250ae 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -155,3 +155,75 @@ (define-public kget This package is part of the KDE networking module.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + +(define-public konversation + (package + (name "konversation") + (version "1.7.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/konversation/" version + "/src/konversation-" version ".tar.xz")) + (sha256 + (base32 "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0")) + (patches (search-patches "konversation-Fix-build-with-Qt-5.11.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + `(("karchive" ,karchive) + ("kbookmarks" ,kbookmarks) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kemoticons" ,kemoticons) + ("kglobalaccel" ,kglobalaccel) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidletime" ,kidletime) + ("kio" ,kio) + ("kitemviews" ,kitemviews) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kparts" ,kparts) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("oxygen-icons" ,oxygen-icons) ; default icon set + ("phonon" ,phonon) + ("qtbase" ,qtbase) + ("qca" ,qca) + ("solid" ,solid) + ("sonnet" ,sonnet))) + (home-page "https://kde.org/applications/internet/org.kde.konversations") + (synopsis "Graphical Internet Relay Chat (IRC) client for KDE") + (description "Konversation is a graphical Internet Relay Chat client (IRC) +with KDE support. + +Features are: +@itemize +@item Standard IRC features +@item SSL server support +@item Bookmarking support +@item Easy to use graphical user interface +@item Multiple servers and channels in one single window +@item DCC file transfer with resume support +@item Multiple identities for different servers +@item Text decorations and colors +@item Pattern-based message highlighting and OnScreen Display notifications +@item Automatic UTF-8 detection +@item Per channel encoding support +@item Theme support for nick icons +@item Highly configurable +@item Multi-language scripting support (with DCOP) +@item Customizable command aliases +@item NickServ-aware log-on (for registered nicknames) +@item Smart logging +@item Traditional or enhanced-shell-style nick completion +@end itemize") + (license ;; GPL for programs, FDL for documentation + (list license:gpl2+ license:fdl1.2+)))) diff --git a/gnu/packages/patches/konversation-Fix-build-with-Qt-5.11.patch b/gnu/packages/patches/konversation-Fix-build-with-Qt-5.11.patch new file mode 100644 index 0000000000..d9d29bbd1a --- /dev/null +++ b/gnu/packages/patches/konversation-Fix-build-with-Qt-5.11.patch @@ -0,0 +1,24 @@ +From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame +Date: Sun, 21 Jul 2019 09:14:32 +0200 +Subject: Fix build with Qt 5.13 + +--- + src/irc/outputfilter.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp +index f9e6253..45d11fb 100644 +--- a/src/irc/outputfilter.cpp ++++ b/src/irc/outputfilter.cpp +@@ -32,6 +32,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +cgit v1.1 + From cbcf4cb4825f8c28f6da5e1e2bf5ab6c5a792381 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 23 Dec 2019 19:54:22 +0100 Subject: [PATCH 78/85] gnu: Add kopete. Not all optional packages are enabled yet. * gnu/packages/kde-internet.scm (kopete): New variable. --- gnu/packages/kde-internet.scm | 92 ++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 54ca9250ae..d675fca6c3 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -24,13 +24,25 @@ (define-module (gnu packages kde-internet) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages boost) + #:use-module (gnu packages compression) + #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) + #:use-module (gnu packages image) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-pim) + #:use-module (gnu packages libidn) + #:use-module (gnu packages linux) + #:use-module (gnu packages messaging) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) - #:use-module (gnu packages web)) + #:use-module (gnu packages serialization) + #:use-module (gnu packages telephony) + #:use-module (gnu packages tls) + #:use-module (gnu packages video) + #:use-module (gnu packages web) + #:use-module (gnu packages xiph) + #:use-module (gnu packages xml)) (define-public choqok (package @@ -227,3 +239,81 @@ (define-public konversation @end itemize") (license ;; GPL for programs, FDL for documentation (list license:gpl2+ license:fdl1.2+)))) + +(define-public kopete + (package + (name "kopete") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kopete-" version ".tar.xz")) + (sha256 + (base32 "088jya4v04l7r38pph1hxkr6ln4023s3ji3y8ipzdkalcx8hgr6l")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools) + ("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("boost" ,boost) + ("expat" ,expat) + ("glib" ,glib) + ("gpgme" ,gpgme) + ("jsoncpp" ,jsoncpp) + ("kcmutils" ,kcmutils) + ("kconfig" ,kconfig) + ("kcontacts" ,kcontacts) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdelibs4support" ,kdelibs4support) + ("kdnssd" ,kdnssd) + ("kemoticons" ,kemoticons) + ("khtml" ,khtml) + ("ki18n" ,ki18n) + ("kidentitymanagement" ,kidentitymanagement) + ("kjs" ,kjs) + ;; TODO? kleopatra (additionally to libkleo) + ("knotifyconfig" ,knotifyconfig) + ("kparts" ,kparts) + ("kpimtextedit" ,kpimtextedit) + ("ktexteditor" ,ktexteditor) + ("kwallet" ,kwallet) + ;; TODO: Libgadu + ("libidn" ,libidn) + ("libkleo" ,libkleo) + ;; TODO: LibMeanwhile + ("libotr" ,libotr) + ("libsrtp" ,libsrtp) + ("libxml2" ,libxml2) + ("libxstl" ,libxslt) + ;; TODO: Mediastreamer + ("openssl", openssl) + ("ortp" ,ortp) + ("phonon" ,phonon) + ("qca" ,qca) + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase) + ("speex" ,speex) + ("v4l-utils" ,v4l-utils) + ;; TODO: Xmms + ("zlib" ,zlib))) + ;; TODO: enable video support + (home-page "https://kde.org/applications/internet/org.kde.kopete") + (synopsis "Instant messaging and chat application") + (description "Kopete is an instant messenger supporting Jabber/XMPP ,AIM, +ICQ, Gadu-Gadu, Novell GroupWise Messenger, and more. It is designed to be a +flexible and extensible multi-protocol system suitable for personal and +enterprise use. + +The goal of Kopete is to provide users with a single easy-to-use way to access +all of their instant messaging systems. The interface puts people first, and +is integrated with the system address book to let you access your contacts +from other KDE applications. + +This package is part of the KDE networking module.") + (license ;; GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) From ff9b47101311226b71a0239f8e99af4ed5697f11 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 9 Dec 2019 09:25:35 +0100 Subject: [PATCH 79/85] gnu: Add krdc. VNC support is yet missing since I did not find the required VNC packages. * gnu/packages/kde-internet.scm (krdc): New variable. --- gnu/packages/kde-internet.scm | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index d675fca6c3..c1c4567aec 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -36,7 +36,9 @@ (define-module (gnu packages kde-internet) #:use-module (gnu packages messaging) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) + #:use-module (gnu packages rdesktop) #:use-module (gnu packages serialization) + #:use-module (gnu packages ssh) #:use-module (gnu packages telephony) #:use-module (gnu packages tls) #:use-module (gnu packages video) @@ -317,3 +319,48 @@ (define-public kopete This package is part of the KDE networking module.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + +(define-public krdc + (package + (name "krdc") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/krdc-" version ".tar.xz")) + (sha256 + (base32 "1p6g994whzjz9aarzrblh70xzs3jvygd1898qxgfymndlfxaxjyl")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + `(("kbookmarks" ,kbookmarks) + ("freerdp" ,freerdp) + ("kcmutils" ,kcmutils) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kdnssd" ,kdnssd) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("knotifyconfig" ,knotifyconfig) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libssh2" ,libssh) + ;; TODO: libvnc{server,client} - is not tigervnc-{server,client} + ("oxygen-icons" ,oxygen-icons) ; default icon set + ("qtbase" ,qtbase))) + (home-page "https://kde.org/applications/internet/org.kde.krdc") + (synopsis "Remote desktop client") + (description "KRDC is a client application that allows you to view or even +control the desktop session on another machine that is running a compatible +server. VNC and RDP are supported. + +This package is part of the KDE networking module.") + (license ;; GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) From 724bd81d54917878a777e4e6343390bae30b636d Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 9 Dec 2019 09:53:12 +0100 Subject: [PATCH 80/85] gnu: Add libktorrent. * gnu/packages/kde-internet.scm (libktorrent): New variable. --- gnu/packages/kde-internet.scm | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index c1c4567aec..9bc91e005a 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -34,6 +34,7 @@ (define-module (gnu packages kde-internet) #:use-module (gnu packages libidn) #:use-module (gnu packages linux) #:use-module (gnu packages messaging) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) #:use-module (gnu packages rdesktop) @@ -364,3 +365,39 @@ (define-public krdc This package is part of the KDE networking module.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + +(define-public libktorrent + (package + (name "libktorrent") + (version "2.1.1") + (source + (origin + (method url-fetch) + ;; TODO: Base on version of ktorrent + (uri (string-append "mirror://kde//stable/ktorrent/5.1.2" + "/libktorrent-" version ".tar.xz")) + (sha256 + (base32 "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("boost" ,boost) + ("gmp" ,gmp) + ("karchive" ,karchive) + ("kcrash" ,kcrash) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("libgcrypt" ,libgcrypt) + ("qca" ,qca) + ("qtbase" ,qtbase) + ("solid" ,solid))) + (home-page "https://cgit.kde.org/libktorrent.git") + (synopsis "BitTorrent protocol library for C++ / Qt 5 / KDE Frameworks") + (description "The KTorrent library supports connectivity to HTTP and UDP +trackers, mainline DHT and the new generation Micro Transport +Protocol (uTP). In addition, it provides many powerful BitTorrent network +features including but not limited to torrent downloading and seeding, torrent +creation and downloaded data verification, magnet links, advanced peer +management, IP blocking lists.") + (license license:gpl2+))) From 3588ac9c100bb117634db682f470c2b6faac0b2f Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 9 Dec 2019 10:47:25 +0100 Subject: [PATCH 81/85] gnu: Add ktorrent. * gnu/packages/kde-internet.scm (ktorrent): New variable. --- gnu/packages/kde-internet.scm | 58 +++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 9bc91e005a..16eecef258 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -34,6 +34,7 @@ (define-module (gnu packages kde-internet) #:use-module (gnu packages libidn) #:use-module (gnu packages linux) #:use-module (gnu packages messaging) + #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) @@ -366,6 +367,63 @@ (define-public krdc (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) +(define-public ktorrent + (package + (name "ktorrent") + (version "5.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/ktorrent/" version + "/ktorrent-" version ".tar.xz")) + (sha256 + (base32 "0kwd0npxfg4mdh7f3xadd2zjlqalpb1jxk61505qpcgcssijf534")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + `(("boost" ,boost) + ("gmp" ,gmp) + ("karchive" ,karchive) + ("kcmutils" ,kcmutils) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdewebkit" ,kdewebkit) + ("kdnssd" ,kdnssd) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kio" ,kio) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kparts" ,kparts) + ("kplotting" ,kplotting) + ("kross", kross) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libgcrypt" ,libgcrypt) + ("libktorrent" ,libktorrent) + ;; TODO: LibKWorkspace -> plasma-workspace? + ("oxygen-icons" ,oxygen-icons) ; default icon set + ("phonon" ,phonon) + ("qtbase" ,qtbase) + ("qtscript" ,qtscript) + ("qtwebkit" ,qtwebkit) + ("solid" ,solid) + ("syndication" ,syndication) + ("taglib" ,taglib))) + (home-page "https://kde.org/applications/internet/org.kde.ktorrent") + (synopsis "BitTorrent client") + (description "KTorrent is a BitTorrent application by KDE which allows you +to download files using the BitTorrent protocol. It enables you to run +multiple torrents at the same time and comes with extended features to make it +a full-featured client for BitTorrent.") + (license license:gpl2+))) + (define-public libktorrent (package (name "libktorrent") From da0ef4dd9f18f88150f36a45e92a4726ec1da94b Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 18 Jan 2020 23:02:34 +0100 Subject: [PATCH 82/85] gnu: libktorrent: Base source-code URL on version of ktorrent. * gnu/packages/kde-internet.scm (libktorrent)[source]: Base path in URL on version of ktorrent. --- gnu/packages/kde-internet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 16eecef258..5a5b750aa4 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -431,8 +431,8 @@ (define-public libktorrent (source (origin (method url-fetch) - ;; TODO: Base on version of ktorrent - (uri (string-append "mirror://kde//stable/ktorrent/5.1.2" + (uri (string-append "mirror://kde//stable/ktorrent/" + (package-version ktorrent) "/libktorrent-" version ".tar.xz")) (sha256 (base32 "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w")))) From cf256651acc487c064cc6cf577a3c355756f5872 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 9 Dec 2019 11:31:00 +0100 Subject: [PATCH 83/85] gnu: Add libgravatar. * gnu/packages/kde-internet.scm (libgravatar): New variable. --- gnu/packages/kde-internet.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 5a5b750aa4..4b0504ca5c 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -424,6 +424,38 @@ (define-public ktorrent a full-featured client for BitTorrent.") (license license:gpl2+))) +(define-public libgravatar + (package + (name "libgravatar") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/libgravatar-" version ".tar.xz")) + (sha256 + (base32 "1yzq9d0hzqh1hdfpnh7fp44fyjk169gvm4pqgwg24ra00z8j2d3z")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kconfig" ,kconfig) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("kpimcommon" ,kpimcommon) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("qtbase" ,qtbase))) + (arguments + `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?) + (home-page "https://cgit.kde.org/libgravatar.git") + (synopsis "Online avatar lookup library") + (description "This library allows to retrieve avatar images based on a +hash from a person's email address, as well as local caching to avoid +unnecessary network operations.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public libktorrent (package (name "libktorrent") From 146d0483b0af1faa0ff73b9384c086901fd6cc28 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Feb 2020 14:40:52 +0100 Subject: [PATCH 84/85] gnu: Qt: Update to 5.12.7 [fixes CVE-2020-0569, CVE-2020-0570]. * 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, qtwebengine): Update to 5.12.7. --- gnu/packages/qt.scm | 127 ++++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 80570c00dd..466c6ba358 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -340,7 +340,7 @@ (define-public qt-4 (define-public qtbase (package (name "qtbase") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -349,7 +349,7 @@ (define-public qtbase version ".tar.xz")) (sha256 (base32 - "09wz7zs1x5mpgs2y4xnl2zv3naqls4sz6v2arwl1fz2dsx4jddba")) + "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch")) (modules '((guix build utils))) @@ -606,7 +606,7 @@ (define-deprecated qt qtbase) (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -615,7 +615,7 @@ (define-public qtsvg version ".tar.xz")) (sha256 (base32 - "13zg5095ffm88dsrybyi075i9zw3yrkibqzvj57an9sq89n3w926")))) + "1f3vqv3s83gjillhgi0wghyf3825fgy1ffhvkxhdk673shb0kxjb")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -681,7 +681,7 @@ (define-public qtsvg (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -690,7 +690,7 @@ (define-public qtimageformats version ".tar.xz")) (sha256 (base32 - "0n3qc5rx7kzb4csmcxaxdm2bqpciz2j2pz2zdfrlpi1ml4liq39k")) + "02zpcbx71dz6xvga07dnzqwdfz9pjmy673n706fj8pxq9zi9xlcv")) (modules '((guix build utils))) (snippet '(begin @@ -712,7 +712,7 @@ (define-public qtimageformats (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -721,7 +721,7 @@ (define-public qtx11extras version ".tar.xz")) (sha256 (base32 - "0sqx785kb4kfxfl3cmg848dlxlxmfdg8jnfh3rrk8q0iazsr2faz")))) + "15hb90n47khsp3qnzyjd3mh8gi9qvy07dqdr4qspiww43r5mz293")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -736,7 +736,7 @@ (define-public qtx11extras (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -745,7 +745,7 @@ (define-public qtxmlpatterns version ".tar.xz")) (sha256 (base32 - "1l44476ibb8rv4rf80vbjdc3712lmrl1xcxswa513ip66k47p5vn")))) + "0ys1kf0zdn8gak1ik9p7i7bdyfz2frvklcyz013s9wm1550h20lh")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f) ; TODO: Enable the tests @@ -767,7 +767,7 @@ (define-public qtxmlpatterns (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -776,7 +776,7 @@ (define-public qtdeclarative version ".tar.xz")) (sha256 (base32 - "1lw6nr26cjdrshin3gq5xwqb0bvslg0ml99cw8rx9wb2anpd3c9l")))) + "1gg9xbv8ah4p55ws97brwn0csl0k3j1x6zdknrrsnh7j6nh0bp2w")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -799,7 +799,7 @@ (define-public qtdeclarative (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -808,7 +808,7 @@ (define-public qtconnectivity version ".tar.xz")) (sha256 (base32 - "1ni2x848dxf0c7ilk461vz0z46qis8zv6jxbpyhpbhzdg9rcdw8h")))) + "06h71pd5w5prh722mcbgmx7l71xvh5xpjrlbg17yblx0n6wlhwb4")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -823,7 +823,7 @@ (define-public qtconnectivity (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -832,7 +832,7 @@ (define-public qtwebsockets version ".tar.xz")) (sha256 (base32 - "07nnzqhsnb4q8pbka9dk5nxmqinbg9yicag7f4rlq2p6ffmgn2zh")))) + "05rv52pp5zg4g14zh7c6jc77l426056b8xyr40ps6cpmb0jkrlbg")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -850,7 +850,7 @@ (define-public qtwebsockets (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -859,7 +859,7 @@ (define-public qtsensors version ".tar.xz")) (sha256 (base32 - "1x8f55qyix5bsd0hl9rzi56ndyv4h16z2qh8is9nv13jpk0a9nsr")))) + "0h77h34rn6cgy5qiqq163pj3bhbka1ydkfgjcx01ns1g9sgym6ib")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -883,7 +883,7 @@ (define-public qtsensors (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -892,7 +892,7 @@ (define-public qtmultimedia version ".tar.xz")) (sha256 (base32 - "0w4mcxmj41b9phwirppn9ws1vxy3sww7prvhhmh0jsnaca4hwn4z")) + "07fvnjywn3hkrxfbxasmy83jr6jq9lf1grasfwij54hz6y0smg98")) (modules '((guix build utils))) (snippet '(begin @@ -934,7 +934,7 @@ (define-public qtmultimedia (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -943,7 +943,7 @@ (define-public qtwayland version ".tar.xz")) (sha256 (base32 - "1i2i4d6qa512njm6gvd1ygcyb5p4d6axciqg9ys380yw9nl6m77s")) + "1ib61zh6jrab3yz592p47ldfgphi4i184kqf14vhwn31akibh6pw")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -986,7 +986,7 @@ (define-public qtwayland (define-public qtserialport (package (inherit qtsvg) (name "qtserialport") - (version "5.12.5") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -995,7 +995,7 @@ (define-public qtserialport version ".tar.xz")) (sha256 (base32 - "0qmq3yppc54vf7xrwyrwk91h6x04w0hf4bnw5b3y5kwyllhh7vzq")))) + "07vjv3p7n7n5v15wdpi8x5sbnvyjqdh85qfzf9mz8l6ppqp2hk12")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase) @@ -1020,7 +1020,7 @@ (define-public qtserialport (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1029,7 +1029,7 @@ (define-public qtserialbus version ".tar.xz")) (sha256 (base32 - "1ppmrwshj42lpx21m2gxblrlbigjf10fwg3fk5x5130ih89446q7")))) + "1bkyk1v7bcq657n88a6675lj55vl9y8v46h4kf27v58yjzgiw842")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -1041,7 +1041,7 @@ (define-public qtserialbus (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1050,7 +1050,7 @@ (define-public qtwebchannel version ".tar.xz")) (sha256 (base32 - "1my8vcsidx9r5wpd1iax8skhp5ac3234g9r7ax04k9z17mqd2i97")))) + "0xff3fbbpcl0kkq0rg9npj127ycirygicbkxlf0v593sjpjp5bmh")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1065,7 +1065,7 @@ (define-public qtwebchannel (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1074,7 +1074,7 @@ (define-public qtwebglplugin version ".tar.xz")) (sha256 (base32 - "1pahdyhinhq1xhsc7lsfprjjpz6fn9vgwqcyi72hc3wzyr98in11")))) + "0fswnmhb8fm7wqgzv8cjy1j2sgb5mhx80jl411laawn7bf2ysjg0")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1100,7 +1100,7 @@ (define-public qtwebglplugin (define-public qtwebview (package (inherit qtsvg) (name "qtwebview") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1109,7 +1109,7 @@ (define-public qtwebview version ".tar.xz")) (sha256 (base32 - "0ykjwz3cwv718gvgvnlhq7wia8gllnj3cdzw3amj0rh63hy65h22")))) + "1rvvkg6dl34hklllnlzlcffik746f15lzxdnwggc97dmx8n2vy6k")))) (native-inputs `(("perl" ,perl))) (inputs @@ -1123,7 +1123,7 @@ (define-public qtwebview (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1132,7 +1132,7 @@ (define-public qtlocation version ".tar.xz")) (sha256 (base32 - "0y12vs6jwiwljdn57jqs1dwi6wfw1l5l95dvj9g93h739p533qks")))) + "07vq4aycayq2bg8yi4awidb25xyvws2ajbnrmad3rnpg1fw0bsfi")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1153,7 +1153,7 @@ (define-public qtlocation (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1162,7 +1162,7 @@ (define-public qttools version ".tar.xz")) (sha256 (base32 - "0xy7sf8w2lln1l59lhrf0kb687avwirrh63izp7509jwi33r2jg9")))) + "0j1rl368sjknsmwp2f7bwqcb0sx13l3l4dxbm70873si9l8rf2l6")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1181,7 +1181,7 @@ (define-public qttools (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1190,7 +1190,7 @@ (define-public qtscript version ".tar.xz")) (sha256 (base32 - "0z3p4bb2ddylb7y2xvagjbn7fc5d0ic08cmrrb67h8wf6fnq5051")) + "06a02230mj4bd8qvjaf2q97grzbj1c1rq36x7236fnhjsikbq7fa")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1205,7 +1205,7 @@ (define-public qtscript (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1214,7 +1214,7 @@ (define-public qtquickcontrols version ".tar.xz")) (sha256 (base32 - "169cvwiav5d538cw81rbdimb1pis0z6fkaxlwhd4z4pzhyhrd3f4")))) + "1rar337vv0dx52r2gxwiwy1axn0fpy79rka09xizjlxsdg3vnf0h")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1229,7 +1229,7 @@ (define-public qtquickcontrols (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1238,7 +1238,7 @@ (define-public qtquickcontrols2 version ".tar.xz")) (sha256 (base32 - "0w5910wblzc7q2llyb7fyfcbmy1fl369c6w5d6r5sh26z490gasw")))) + "0dx2jag6l5a80220fvmf49z1psliqf1ijqx6jsvvzv81mpjjd59s")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1254,7 +1254,7 @@ (define-public qtquickcontrols2 (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1263,7 +1263,7 @@ (define-public qtgraphicaleffects version ".tar.xz")) (sha256 (base32 - "1vvpq34433j94n9yyhh4if4yv51i8xiffpvyn3xgffx14iv35l6y")))) + "1knapc14a80cn2f5bbfj7lhq9flr3v0gwjg9ka7xl8y642235w02")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1281,7 +1281,7 @@ (define-public qtgraphicaleffects (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1290,7 +1290,7 @@ (define-public qtgamepad version ".tar.xz")) (sha256 (base32 - "1cxkqnhx0baxh3csjl7ar151v0zizf86f4338rr38liwb7rwbsz1")))) + "150y7bc755l9y8w7nkg3gfw5n6rlj9hhq0ibc9g1xgllpr18qqq7")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1311,7 +1311,7 @@ (define-public qtgamepad (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1320,7 +1320,7 @@ (define-public qtscxml version ".tar.xz")) (sha256 (base32 - "12y6ga7j6xby9rz1c9h17r9ih4i16i1ylr6b4vmrn7svidy87msk")) + "1dpvjkvwc3fj86vay8q8vzym73cix7ri2ianx87ck0gqjny51adg")) (modules '((guix build utils))) (snippet '(begin @@ -1342,7 +1342,7 @@ (define-public qtscxml (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1351,7 +1351,7 @@ (define-public qtpurchasing version ".tar.xz")) (sha256 (base32 - "1kbhmzrw612yb4brxi3fwslil31j31vm0zqpb52vcma7vbivg80z")))) + "0xjsn7p629ni68vk4xlw2cvcs53ipcqv1pa4hck0nabddcgcnzkg")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1362,7 +1362,7 @@ (define-public qtpurchasing (define-public qtcanvas3d (package (inherit qtsvg) (name "qtcanvas3d") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1371,7 +1371,7 @@ (define-public qtcanvas3d version ".tar.xz")) (sha256 (base32 - "024xglrb321rp3wb3fhprw7pl6zvmpgfkpwgabbyx8p58k4yccrd")) + "0l0c1p6jwz5rygyxslfw7jw3wbd23w5n9zg04aqlh5g15qx52fmn")) (modules '((guix build utils))) (snippet '(begin @@ -1401,7 +1401,7 @@ (define-public qtcanvas3d (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1410,7 +1410,7 @@ (define-public qtcharts version ".tar.xz")) (sha256 (base32 - "0gdark4z2g8j0kzjg1aqq91ap04h6hzjl163g8xlwxwdn5dxpnql")))) + "0pyg2lpxmhf4amj57zihp5ry0y9m39xq5hbcx4hqj78bdm96ah23")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1428,7 +1428,7 @@ (define-public qtcharts (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1437,7 +1437,7 @@ (define-public qtdatavis3d version ".tar.xz")) (sha256 (base32 - "1zm4xfi2ijqr3n3g0lfs3yzil6w7c54r8vsj1d541lz7wnm92ka1")))) + "09wbv4g29sq5z2fphk2910albr3iv3l14nch3ml77w6drw9mgzq7")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1455,7 +1455,7 @@ (define-public qtdatavis3d (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1464,7 +1464,7 @@ (define-public qtnetworkauth version ".tar.xz")) (sha256 (base32 - "1gba6rdhcvljc4dnzhnkxrdlaxm3y095ljqg1sz3p1k0m632s4pa")))) + "0sspni7zllhspk70yjj2d0li9r4rs3iflnksj8mvjx2yl9qpryyb")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1484,7 +1484,7 @@ (define-public qtnetworkauth (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1493,7 +1493,7 @@ (define-public qtremoteobjects version ".tar.xz")) (sha256 (base32 - "16fna70pljn45yj6hv3g4qvb1imcnfj43jchvydspdhg08ykbda9")))) + "03qjj7l63wn1zqkmlja9yrnc38rf6b3apnmsn0kw0h61x72awskd")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1517,7 +1517,7 @@ (define-public qtremoteobjects (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") - (version "5.12.6") + (version "5.12.7") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1526,7 +1526,7 @@ (define-public qtspeech version ".tar.xz")) (sha256 (base32 - "12l7rycjfa6d9gnnjd6i097pf1qqzjnz9c1jgxhpldvkf0n7pbi7")))) + "0q30m9l28zsdzdmny7wjskd2fjfrgh1l595wir6bhwhil95g3i0c")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) @@ -1560,7 +1560,8 @@ (define-public qtwebengine "/submodules/" name "-everywhere-src-" version ".tar.xz")) (sha256 - (base32 "08c60nh95m98mcqk444axs76xi6m9x0wvdxrzk9c2cxwqdbz59fa")) + (base32 + "1yj6pcj945fpbc7nihav0plxpx8ikylmxjy7wqdv5znslgf59dw3")) (modules '((ice-9 ftw) (ice-9 match) (srfi srfi-1) From 20fe3cd761c286a27236d8fced4152a0ccdc547d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Feb 2020 15:19:59 +0100 Subject: [PATCH 85/85] gnu: libical: Add upstream patch to preserve API compatibility. * gnu/packages/calendar.scm (libical)[source](patches): New field. --- gnu/packages/calendar.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 5a88c98456..060e4d18ad 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 Troy Sankey ;;; Copyright © 2016 Stefan Reichoer ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Marius Bakke