* bug#26352: [PATCH 0/3] Update KDE Frameworks to 5.32
@ 2017-04-03 18:54 Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2 Hartmut Goebel
2017-04-03 19:12 ` bug#26352: [PATCH 4/4] gnu: kde-frameworks: No longer setenv CTEST_OUTPUT_ON_FAILURE Hartmut Goebel
0 siblings, 2 replies; 11+ messages in thread
From: Hartmut Goebel @ 2017-04-03 18:54 UTC (permalink / raw)
To: 26352
This updates to the current version.
Hartmut Goebel (3):
gnu: Update networkmanager to version 1.6.2.
gnu: Update phonon to 4.9.1
gnu: Update kde-frameworks to 5.32.0
gnu/local.mk | 3 +-
gnu/packages/gnome.scm | 32 ++-
gnu/packages/kde-frameworks.scm | 290 +++++++++++----------
gnu/packages/patches/kio-CVE-2017-6410.patch | 53 ----
...networkmanager-qt-activeconnection-test-1.patch | 60 +++++
...networkmanager-qt-activeconnection-test-2.patch | 57 ++++
6 files changed, 293 insertions(+), 202 deletions(-)
delete mode 100644 gnu/packages/patches/kio-CVE-2017-6410.patch
create mode 100644 gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch
create mode 100644 gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch
--
2.7.4
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2.
2017-04-03 18:54 bug#26352: [PATCH 0/3] Update KDE Frameworks to 5.32 Hartmut Goebel
@ 2017-04-03 18:56 ` Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 2/3] gnu: Update phonon to 4.9.1 Hartmut Goebel
` (2 more replies)
2017-04-03 19:12 ` bug#26352: [PATCH 4/4] gnu: kde-frameworks: No longer setenv CTEST_OUTPUT_ON_FAILURE Hartmut Goebel
1 sibling, 3 replies; 11+ messages in thread
From: Hartmut Goebel @ 2017-04-03 18:56 UTC (permalink / raw)
To: 26352
* gnu/packages/gnome.scm (networkmanager): [source] Update to 1.6.2
[pre-configure]: Adopt to now used single Makefile.in.
[fix-docbook]: New phase, required for docbook-xsl catalogs.
[install]: Also pass "nmstatedir".
[native-inputs]: Add docbook-xsl, libxslt.
[inputs]: Add jansson.
---
gnu/packages/gnome.scm | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b94c366..51d84a4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -23,6 +23,7 @@
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
+;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -4549,7 +4550,7 @@ users.")
(define-public network-manager
(package
(name "network-manager")
- (version "1.4.4")
+ (version "1.6.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/NetworkManager/"
@@ -4557,7 +4558,7 @@ users.")
"NetworkManager-" version ".tar.xz"))
(sha256
(base32
- "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2"))
+ "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj"))
(snippet
'(begin
(use-modules (guix build utils))
@@ -4574,7 +4575,7 @@ users.")
(outputs '("out"
"doc")) ; 8 MiB of gtk-doc HTML
(arguments
- '(#:configure-flags
+ `(#:configure-flags
(let ((out (assoc-ref %outputs "out"))
(doc (assoc-ref %outputs "doc"))
(dhclient (string-append (assoc-ref %build-inputs "isc-dhcp")
@@ -4601,13 +4602,22 @@ users.")
;; cope with being already in the Guix build jail as that jail
;; lacks some features that they would like to proxy over (like
;; a /sys mount).
- (substitute* '("src/platform/Makefile.in"
- "src/devices/Makefile.in")
- (("SUBDIRS = tests") ""))
- (substitute* '("src/tests/Makefile.in")
- (("\ttest-route-manager-linux") "\t")
- (("\ttest-route-manager-fake") "\t"))
+ (substitute* '("Makefile.in")
+ (("src/platform/tests/test-address-linux") " ")
+ (("src/platform/tests/test-cleanup-linux") " ")
+ (("src/platform/tests/test-link-linux") " ")
+ (("src/platform/tests/test-route-linux") " ")
+ (("src/devices/tests/test-arping") " ")
+ (("src/devices/tests/test-lldp") " ")
+ (("src/tests/test-route-manager-linux") " "))
#t))
+ (add-before 'configure 'fix-docbook
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "XML_CATALOG_FILES"
+ (string-append
+ (assoc-ref %build-inputs "docbook-xsl")
+ "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl)
+ "/catalog.xml"))))
(add-before 'check 'pre-check
(lambda _
;; For the missing /etc/machine-id.
@@ -4619,13 +4629,16 @@ users.")
"sysconfdir=/tmp"
"rundir=/tmp"
"statedir=/tmp"
+ "nmstatedir=/tmp/nm"
"install")))))))
(propagated-inputs
`(("glib" ,glib)))
(native-inputs
`(("glib:bin" ,glib "bin") ; for gdbus-codegen
("gobject-introspection" ,gobject-introspection)
+ ("docbook-xsl" ,docbook-xsl)
("intltool" ,intltool)
+ ("libxslt" ,libxslt)
("pkg-config" ,pkg-config)
;; For testing.
("python" ,python-wrapper)
@@ -4637,6 +4650,7 @@ users.")
("gnutls" ,gnutls)
("iptables" ,iptables)
("isc-dhcp" ,isc-dhcp)
+ ("jansson" ,jansson)
("libgcrypt" ,libgcrypt)
("libgudev" ,libgudev)
("libndp" ,libndp)
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* bug#26352: [PATCH 2/3] gnu: Update phonon to 4.9.1
2017-04-03 18:56 ` bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2 Hartmut Goebel
@ 2017-04-03 18:56 ` Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 3/3] gnu: Update kde-frameworks to 5.32.0 Hartmut Goebel
2017-04-10 10:04 ` bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2 Ludovic Courtès
2 siblings, 0 replies; 11+ messages in thread
From: Hartmut Goebel @ 2017-04-03 18:56 UTC (permalink / raw)
To: 26352
* gnu/packages/kde-frameworks.scm (phonon): Update to 4.9.1.
---
gnu/packages/kde-frameworks.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 1001813..b431a85 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -103,7 +103,7 @@ common build settings used in software produced by the KDE community.")
(define-public phonon
(package
(name "phonon")
- (version "4.9.0")
+ (version "4.9.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -112,7 +112,7 @@ common build settings used in software produced by the KDE community.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v"))))
+ "177647r2jqfm32hqcz2nqfqv6v48hn5ab2vc31svba2wz23fkgk7"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* bug#26352: [PATCH 3/3] gnu: Update kde-frameworks to 5.32.0
2017-04-03 18:56 ` bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2 Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 2/3] gnu: Update phonon to 4.9.1 Hartmut Goebel
@ 2017-04-03 18:56 ` Hartmut Goebel
2017-04-10 10:04 ` bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2 Ludovic Courtès
2 siblings, 0 replies; 11+ messages in thread
From: Hartmut Goebel @ 2017-04-03 18:56 UTC (permalink / raw)
To: 26352
* gnu/packages/kde-frameworks.scm
(breeze-icons): Update to 5.32.0. [arguments]: Re-enable tests.
(kio): Update to 5.32.0. [source]: Remove patch.
(ktexteditor): Update to 5.32.0. [inputs]: Add ksyntaxhighlighting.
(networkmanager-qt): Update to 5.32.0. [source]: Add patches.
(kunitconversion): Update to 5.32.0. [disable-a-failing-test-case]: New
phase.
(ksyntaxhighlighting): Update to 5.32.0.[native-iputs]: Add qtools.
(knewstuff): Update to 5.32.0. [inputs]: Add qtdeclarative.
(attica, baloo, bluez-qt, extra-cmake-modules, kactivities,
kactivities-stats, kapidox, karchive, kauth, kbookmarks, kcmutils, kcodecs,
kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons,
kdeclarative, kded, kdesignerplugin, kdesu, kdnssd, kdoctools, kemoticons,
kfilemetadata, kglobalaccel, kguiaddons, ki18n, kiconthemes, kidletime,
kimageformats, kinit, kitemmodels, kitemviews, kjobwidgets, knotifications,
knotifyconfig, kpackage, kparts, kpeople, kplotting, kpty, krunner,
kservice, ktextwidgets, kwallet, kwayland, kwidgetsaddons, kwindowsystem,
kxmlgui, kxmlrpcclient, modemmanager-qt, oxygen-icons, plasma-framework,
solid, sonnet, threadweaver): Update to 5.32.0.
* gnu/packages/patches/kio-CVE-2017-6410.patch: Delete file.
* gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch,
gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch:
New files.
* gnu/local.mk (dist_patch_DATA): Remove resp. add the patch files.
---
gnu/local.mk | 3 +-
gnu/packages/kde-frameworks.scm | 286 +++++++++++----------
gnu/packages/patches/kio-CVE-2017-6410.patch | 53 ----
...networkmanager-qt-activeconnection-test-1.patch | 60 +++++
...networkmanager-qt-activeconnection-test-2.patch | 57 ++++
5 files changed, 268 insertions(+), 191 deletions(-)
delete mode 100644 gnu/packages/patches/kio-CVE-2017-6410.patch
create mode 100644 gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch
create mode 100644 gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 9035753..71fec21 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -667,7 +667,6 @@ dist_patch_DATA = \
%D%/packages/patches/jq-CVE-2015-8863.patch \
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
%D%/packages/patches/khmer-use-libraries.patch \
- %D%/packages/patches/kio-CVE-2017-6410.patch \
%D%/packages/patches/kmod-module-directory.patch \
%D%/packages/patches/kobodeluxe-paths.patch \
%D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \
@@ -794,6 +793,8 @@ dist_patch_DATA = \
%D%/packages/patches/netsurf-system-utf8proc.patch \
%D%/packages/patches/netsurf-y2038-tests.patch \
%D%/packages/patches/netsurf-longer-test-timeout.patch \
+ %D%/packages/patches/networkmanager-qt-activeconnection-test-1.patch \
+ %D%/packages/patches/networkmanager-qt-activeconnection-test-2.patch \
%D%/packages/patches/ngircd-handle-zombies.patch \
%D%/packages/patches/ninja-zero-mtime.patch \
%D%/packages/patches/node-9077.patch \
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index b431a85..2c263e4 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2016,2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;;
@@ -59,7 +59,7 @@
(define-public extra-cmake-modules
(package
(name "extra-cmake-modules")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -68,7 +68,7 @@
name "-" version ".tar.xz"))
(sha256
(base32
- "0yi60qd08x5093wb8dv9cx370iaabn44hzcang92g9ssfmz0zd2h"))))
+ "1iqakxzr6bcs9wgyi8if1smpq6px0bvlcyddyk0hxhindzl7pn5i"))))
(build-system cmake-build-system)
(native-inputs
`(("qtbase" ,qtbase))) ; For tests (needs qmake)
@@ -240,7 +240,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
(define-public attica
(package
(name "attica")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -249,7 +249,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
name "-" version ".tar.xz"))
(sha256
(base32
- "14v6vi8awk1m58l9svpjd54ckd6milzavgfbkdspsz0km1cpqlks"))))
+ "16vl3gpwqcvfms82grv1bvqlxj085bqssv5ixjx007826pd8qhp5"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -272,7 +272,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
(define-public bluez-qt
(package
(name "bluez-qt")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -281,7 +281,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
name "-" version ".tar.xz"))
(sha256
(base32
- "1rfzwrvvkc5f4l943f4r235gdniqc7njyw4fx36v00daj2r4aqi9"))))
+ "0pl6cp0rgjkh7d06ik35rw7qd96j5sh2flgjx4vi21zl5vf3vgyh"))))
(build-system cmake-build-system)
(native-inputs
`(("dbus" ,dbus)
@@ -306,7 +306,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.")
(define-public breeze-icons
(package
(name "breeze-icons")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -315,7 +315,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.")
name "-" version ".tar.xz"))
(sha256
(base32
- "06zwg2g0157ac6xsgxs5f8s1sk8rh2j3y057iqmfg2ng2sh9byh2"))))
+ "1n51kahzk09v52yhi7k4kqgavqlz3ghqv5cx2ssz2djpyavs18r3"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -323,11 +323,6 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.")
("libxml2" ,libxml2)))
(inputs
`(("qtbase" ,qtbase)))
- ;; FIXME: Dupes test fails. Issue is fixed upstream
- ;; Remove when updating to 5.28.
- ;; https://github.com/KDE/breeze-icons/commit/22b383359e3a0e02d4828e6fa8ed8a3d213440b1
- (arguments
- `(#:tests? #f))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Default KDE Plasma 5 icon theme")
(description "Breeze provides a freedesktop.org compatible icon theme.
@@ -340,7 +335,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.")
(define-public kapidox
(package
(name "kapidox")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -349,7 +344,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1whkl9rzhjnnmpj532d23mlrwhp5wcfxfvq4z4bxyr64g9plbzyq"))))
+ "1z6hdsppwrmqkcanrppxhqcrjvblg9i02rh3bz5m3pn66wwz0sdw"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ; has no test target
@@ -382,7 +377,7 @@ documentation.")
(define-public karchive
(package
(name "karchive")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -391,7 +386,7 @@ documentation.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1s068z0ih6qk3m4lm10wm28y0nq5qwn4gpnx9vckar51xbrl4bb7"))))
+ "1dzvphqnc09mmaydqggpxg6zwwyr56p6l4jdf1rf6ns90fzxy0m4"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -416,7 +411,7 @@ GZip format, via a subclass of QIODevice.")
(define-public kcodecs
(package
(name "kcodecs")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -425,7 +420,7 @@ GZip format, via a subclass of QIODevice.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0r01raiva4iddiz5qqshmbmidgkf4q6illanz6zwmc4n66c6s3q3"))))
+ "0yybkp52i8nm4qjady6jqswn6v70cqbvjqwgrghjnc88b2cly253"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -451,7 +446,7 @@ Internet).")
(define-public kconfig
(package
(name "kconfig")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -460,7 +455,7 @@ Internet).")
name "-" version ".tar.xz"))
(sha256
(base32
- "0kdsaqv880wihxv6il8wailmymh0rh0jrbhg8iz2ljf3ir7g56zy"))))
+ "1pajh1l08b995shp6l75ri9z4vr6wjapvrkmrmv8hksnxvfi97dp"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -518,7 +513,7 @@ propagate their changes to their respective configuration files.")
(define-public kcoreaddons
(package
(name "kcoreaddons")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -527,7 +522,7 @@ propagate their changes to their respective configuration files.")
name "-" version ".tar.xz"))
(sha256
(base32
- "10x2sgd1acsg1kmb741zk8sbss1j9nncfr1ac2pq0fc236ivkiyb"))))
+ "1n1xzvwwji9pwyxrvwp4rmpc7qzp9nlis26xmn81k607jn587ksx"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -557,7 +552,7 @@ many more.")
(define-public kdbusaddons
(package
(name "kdbusaddons")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -566,7 +561,7 @@ many more.")
name "-" version ".tar.xz"))
(sha256
(base32
- "07mzb1xr8wyiid25p8kg6mjp6vq8ngvv1ikhq75zvd2cbax530c8"))
+ "1a15jjsrkza0ll2viyk834pgdxsdgdacm0982xxwl5z937f75609"))
(patches (search-patches "kdbusaddons-kinit-file-name.patch"))))
(build-system cmake-build-system)
(native-inputs
@@ -602,7 +597,7 @@ as well as an API to create KDED modules.")
(define-public kdnssd
(package
(name "kdnssd")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -611,7 +606,7 @@ as well as an API to create KDED modules.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1gkqfcz8glfa6krbayaay4kyq3zazcyr21zjg78la76vfnranh0r"))))
+ "1xakbs2wm627zn01ni8fyrz64xl5jw4by0pdrb70aad7w37dijrw"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -629,7 +624,7 @@ infrastructure.")
(define-public kguiaddons
(package
(name "kguiaddons")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -638,7 +633,7 @@ infrastructure.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1f3k6g8cqgq49ka9wsfflp0vnqgk81nlp012lb5v875yil6f9m3f"))))
+ "0rbfd0rykmwl9hs1q22pqg2by8vi9y1pgs2ishgnan4sc4w87wjb"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -662,7 +657,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
(define-public ki18n
(package
(name "ki18n")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -671,7 +666,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0ymg8mnpvas101war3pgm3wv8ssf1wxa6mxg9ym1xx24mx7xzhzw"))))
+ "068xvw2hy4hlpj85wgjjdj0nc37fygpd8wb1dnpqcvzzy8rc1rsf"))))
(build-system cmake-build-system)
(propagated-inputs
`(("gettext" ,gettext-minimal)
@@ -705,7 +700,7 @@ translation scripting.")
(define-public kidletime
(package
(name "kidletime")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -714,7 +709,7 @@ translation scripting.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0cwq8jvsimxriiazivls8yix9jyglk2giqwv34a1ic1cnackhwq7"))))
+ "0rkxx3bnspjwm4vcy4rdfahk6vcfpkh8fldww0zfdn7s7pigqwch"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -732,7 +727,7 @@ or user activity.")
(define-public kitemmodels
(package
(name "kitemmodels")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -741,7 +736,7 @@ or user activity.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0zi7wsqcmjd7fms8r2vqvwwvzw75p275qyn6whpgblb09l0pn78z"))))
+ "0lxld7jdixpq23sycv8n4ckzmdr34aycrsf2zffziw6r59f0mzki"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -793,7 +788,7 @@ model to observers
(define-public kitemviews
(package
(name "kitemviews")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -802,7 +797,7 @@ model to observers
name "-" version ".tar.xz"))
(sha256
(base32
- "0wrlwawgnz1yjav4hfirc3lcki0hqy0cgr8bwhr9nhm27ndgv28p"))))
+ "1h1zgawdi4vbgymdl5215lx7hpcx9jqxy7vjf5hwgs6b2cls1sws"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -834,7 +829,7 @@ to flat and hierarchical lists.")
(define-public kplotting
(package
(name "kplotting")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -843,7 +838,7 @@ to flat and hierarchical lists.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1vmwxj03qhrfnz3jg30ka28afpqg0hlgm46dbzyg86kg8hc2hgb2"))))
+ "0a0pfmdlx84526lb2jvx94i2pf85km57fm2ygis4z5mjgbzsmb6v"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -872,7 +867,7 @@ pixel units.")
(define-public ksyntaxhighlighting
(package
(name "ksyntaxhighlighting")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -881,11 +876,12 @@ pixel units.")
"syntax-highlighting-" version ".tar.xz"))
(sha256
(base32
- "0gf1ldlk4gav6bg5b1231hphaal4simyngirvr1yizcb1rrlygdy"))))
+ "1d9m7x53mwggwmhhba1c7b8v4f8qjql889y674ldpzs2nrk5y7x3"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("perl" ,perl)
+ ("qttools" ,qttools)
;; Optional, for compile-time validation of syntax definition files:
("qtxmlpatterns" ,qtxmlpatterns)))
(inputs
@@ -923,7 +919,7 @@ integration with a custom editor as well as a ready-to-use
(define-public kwayland
(package
(name "kwayland")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -932,7 +928,7 @@ integration with a custom editor as well as a ready-to-use
name "-" version ".tar.xz"))
(sha256
(base32
- "0xm4agsv8hyx8aaiv4zpa121s08ayhbps3pbfbds2ckk57k6ba8k"))))
+ "1kzvq7qx102rfdv975x5sd37lsl6wn0mzm2m1f9fnnn2rvii3h5d"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -962,7 +958,7 @@ represented by a QPoint or a QSize.")
(define-public kwidgetsaddons
(package
(name "kwidgetsaddons")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -971,7 +967,7 @@ represented by a QPoint or a QSize.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1p22s1cbwpwbm03qxs0wqb1i7w1s19b119diwkmb8xl90cqfdwnn"))))
+ "1aksy326ppdfcx20zl9hxsd8j0br32j6dlx4i1xxbd976csys9b2"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1011,7 +1007,7 @@ configuration pages, message boxes, and password requests.")
(define-public kwindowsystem
(package
(name "kwindowsystem")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1020,7 +1016,7 @@ configuration pages, message boxes, and password requests.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0lzafiwj58gg5vccnvwrhiwjq67y8cn3gllirgw13vz3f69sbr3i"))))
+ "1c3kd23c4wwzdhfcyhv41czw3y2kk1492xn6ah9n3r98akrhgar1"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1051,7 +1047,7 @@ lower level classes for interaction with the X Windowing System.")
(define-public modemmanager-qt
(package
(name "modemmanager-qt")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1060,7 +1056,7 @@ lower level classes for interaction with the X Windowing System.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1yfqqp596srvsi0yqrkpm5gzlwjf4szk6hy0wszr12gjjzqprilq"))))
+ "0ywyiq1kj4ya5knn0r12j9m1ig9mlyfypnrzihlvipddjrqs7jyd"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1089,7 +1085,7 @@ messages.")
(define-public networkmanager-qt
(package
(name "networkmanager-qt")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1098,7 +1094,12 @@ messages.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1iq8xrw55k2k9af57l4lfrw72gjxgk7pp7k3m7amjfp0hdqw8602"))))
+ "0bcy7nzfvx2xah3kxklmrjn08qbjddiny7wf7nkxsbc3kkhrxqyd"))
+ ;; TODO: Remove these patches when updating to 5.33.
+ (patches
+ (search-patches
+ "networkmanager-qt-activeconnection-test-1.patch"
+ "networkmanager-qt-activeconnection-test-2.patch"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1128,7 +1129,7 @@ which are used in DBus communication.")
(define-public oxygen-icons
(package
(name "oxygen-icons")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1137,7 +1138,7 @@ which are used in DBus communication.")
name "5" "-" version ".tar.xz"))
(sha256
(base32
- "05bypc4k86lsjp7d4lpbpsnms7k1gnjyahdbks420585ca0v4qkp"))))
+ "05v3blgs4qbjl8s6470baahy9a98cfi3mplzp462axcgkqdj1nwf"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1153,7 +1154,7 @@ which are used in DBus communication.")
(define-public solid
(package
(name "solid")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1162,7 +1163,7 @@ which are used in DBus communication.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0g6frc7hckbkvzgq40qrymllgp56a3v39l5d2ajqipwb4kabhdpy"))))
+ "1jhymivravgix0sa0szkax50j09l5fl55xi3fbyjxlb4cil114v5"))))
(build-system cmake-build-system)
(native-inputs
`(("bison" ,bison)
@@ -1182,7 +1183,7 @@ system.")
(define-public sonnet
(package
(name "sonnet")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1191,7 +1192,7 @@ system.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1vzn3kvi126jnkq2s5110yii8946kaxp452735fx0l0jqjn92dy8"))))
+ "17sjv48b3z5fgplsy16ilcw6p7mlqjs61ib6jqd1mqzv4xrr27yi"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1208,7 +1209,7 @@ ASpell and HUNSPELL.")
(define-public threadweaver
(package
(name "threadweaver")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1217,7 +1218,7 @@ ASpell and HUNSPELL.")
name "-" version ".tar.xz"))
(sha256
(base32
- "10hy4pvw84l2z8778gsfv5i8pqrfjidvlgd5rc8xffx65s3f28b5"))))
+ "1qpy2rzqyd4ap5fibkfk87z66ijh2h79cd7f0h506jh2dbx20g0h"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -1238,7 +1239,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way."
(define-public kauth
(package
(name "kauth")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1247,7 +1248,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way."
name "-" version ".tar.xz"))
(sha256
(base32
- "09m7dipkykw75dbka6mhsvrikbniwshl1l0qxcny3ywc0fkzgf40"))))
+ "00kdq16n9w6nf1bpwzl5lp5c2xq74g8nn6081kvnjcd4ld66ncmq"))))
(build-system cmake-build-system)
(native-inputs
`(("dbus" ,dbus)
@@ -1285,7 +1286,7 @@ utilities.")
(define-public kcompletion
(package
(name "kcompletion")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1294,7 +1295,7 @@ utilities.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1yrlhf6n7xlkid3xbpirf8n6kybc3sqp5fnb01kr1rcl89qs273f"))))
+ "0fn8imr3m219r38a0rafbnylcpjq4rqhz1w66mx80sc7l10mhcni"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1322,7 +1323,7 @@ integrated it into your application's other widgets.")
(define-public kcrash
(package
(name "kcrash")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1331,7 +1332,7 @@ integrated it into your application's other widgets.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0gsly5wvyh0d6yfk5yyv1pgaazwlwvahz245y9sliwzrbxhgj1yv"))))
+ "1zrkjrpj88ymdy5vbn9db73vxppswvmbn2gkn4gpx773dsmflhz3"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1360,7 +1361,7 @@ application crashes.")
(define-public kdoctools
(package
(name "kdoctools")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1369,7 +1370,7 @@ application crashes.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1mndmxy7vgdkii8axzkzclqqimg0ksn2dmwiqsljcjcik0zfx47c"))))
+ "0i7zgg7iw6w0sdr6cv3yf4blcr61i8zczgmyqa964ka6p3ywwjs9"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -1408,7 +1409,7 @@ from DocBook files.")
(define-public kfilemetadata
(package
(name "kfilemetadata")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1417,7 +1418,7 @@ from DocBook files.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0sxifxzyqq0haxfira8ldq9gwali7p5vbbh8jslj8wlxm0dczyw6"))))
+ "01d91gmrxlax0g13ib841vc4qwmv6r4qdr10wfs77rrxsvw7z08f"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1438,7 +1439,7 @@ by applications to write metadata.")
(define-public kimageformats
(package
(name "kimageformats")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1447,7 +1448,7 @@ by applications to write metadata.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1h17jm55r9ijmng5mb1w9nqk2hw6h965j9c2nrd8wl9dzy616kra"))))
+ "05hn8n4sc3rj5c30ki068f76k1gfgvq19zcw5jlqpnn1l5db5fvz"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1475,7 +1476,7 @@ formats.")
(define-public kjobwidgets
(package
(name "kjobwidgets")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1484,7 +1485,7 @@ formats.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0xh62bjd6qqbmx1jbv9qac1ng0h056mwrs8rkdqd8k10ghmsfx6a"))))
+ "0lhv3mg2liija0g8x14jpv1mdhb0zjh868p1cs24bs9xrw1l8984"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1503,7 +1504,7 @@ asynchronous jobs.")
(define-public knotifications
(package
(name "knotifications")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1512,7 +1513,7 @@ asynchronous jobs.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1a55c0abs9yg7qaajgidj8bmfbwkysf24300532lnia71n1ms25s"))))
+ "06ap7m8c2py49pqrnhadbyl69y3nsyamzahbpwipqgh9k62sy34y"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1546,7 +1547,7 @@ covers feedback and persistent events.")
(define-public kpackage
(package
(name "kpackage")
- (version "5.28.1")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1555,7 +1556,7 @@ covers feedback and persistent events.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0ym5fhhigp7argk7c1zyn2fvfjykgxh3miipidf142c8y3d98vbp"))))
+ "070zasl5c58n01fk18mjgccfizymc9griwicxizqjgzzbgvkns3r"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -1584,7 +1585,7 @@ were traditional plugins.")
(define-public kpty
(package
(name "kpty")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1593,7 +1594,7 @@ were traditional plugins.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1q22wzx5xpmbj56xg4miiscb1xqqk2lfkljfdi87zl05vwmnc7hn"))))
+ "0h4318rc9902cvqj69capb8lh7s84y44jd59d11fyhq21jhy152s"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -1621,7 +1622,7 @@ and communicating with them using a pty.")
(define-public kunitconversion
(package
(name "kunitconversion")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1630,8 +1631,18 @@ and communicating with them using a pty.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0n6ndy1yarilnk2l09h92qk32v02hknafif1i9mmwcibldvc963q"))))
+ "0crc8riwafcx6fwhgrc8vfbwmdygd6vlz1fbbgni09gamm8mbcin"))))
(build-system cmake-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-a-failing-test-case
+ (lambda _
+ ;; TODO: Re-enable this test-case. It was committed with the
+ ;; message: "tsan says it's clean, apart from issues in Qt
+ ;; (reported upstream)"
+ (substitute* "autotests/convertertest.cpp"
+ (("const int numThreads = 2") "const int numThreads = 0")))))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
@@ -1654,7 +1665,7 @@ gallons).")
(define-public baloo
(package
(name "baloo")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1663,7 +1674,7 @@ gallons).")
name "-" version ".tar.xz"))
(sha256
(base32
- "071in785y1qplm59fmsmifzbmczvlvkf5gxdb6d0iw93pb36r7h5"))))
+ "0a4qwinkp4gmcbx4j0qxbj5qb40h7594s39za7sc7bymadicasy1"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kcoreaddons" ,kcoreaddons)
@@ -1712,7 +1723,7 @@ maintaining an index of the contents of your files.")
(define-public kactivities
(package
(name "kactivities")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1721,7 +1732,7 @@ maintaining an index of the contents of your files.")
name "-" version ".tar.xz"))
(sha256
(base32
- "162ilqcfp8b3lb3gpzbw94ppsdqzn6i6ymiwh12xy5nrxixdpagb"))))
+ "0xin4shaj0zsfsww84mwk5n4ldaqy730jhc369px2j2nq57sg9g7"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -1759,7 +1770,7 @@ with other frameworks.")
(define-public kactivities-stats
(package
(name "kactivities-stats")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1768,7 +1779,7 @@ with other frameworks.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0pjgjl5bwmq0n23nwcqjp3b412fsibnvwsr3s3l67k9scmdpbm4v"))))
+ "1b3z7bcap3vjc0155y0a9xkbd477fklmpj8dr3rs0ccyc6qxxbvw"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -1789,7 +1800,7 @@ by which applications, and what documents have been linked to which activity.")
(define-public kbookmarks
(package
(name "kbookmarks")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1798,7 +1809,7 @@ by which applications, and what documents have been linked to which activity.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1lfvps0xzpzn42n7rpsdcmsiryclykz6h1hk8sp6nsbhqwzd0r65"))))
+ "03a024phcjv46afbp5lbmj2p8hb6srfzyaslc6ln6ms473bf5k4w"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kwidgetsaddons" ,kwidgetsaddons)))
@@ -1832,7 +1843,7 @@ using the XBEL format.")
(define-public kcmutils
(package
(name "kcmutils")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1841,7 +1852,7 @@ using the XBEL format.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0wj3f5ykzb7q9536y9wk8mnfcb6zay2mmc25dg67mdznzwdy36aa"))))
+ "1mr9h7wc22bfrbm92ajsjfcs16c5xpkrxbxzcma3a0s7jhy6qrm9"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kconfigwidgets" ,kconfigwidgets)
@@ -1871,7 +1882,7 @@ KCModules can be created with the KConfigWidgets framework.")
(define-public kconfigwidgets
(package
(name "kconfigwidgets")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1880,7 +1891,7 @@ KCModules can be created with the KConfigWidgets framework.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0cy53jaq15n8hw2m67l0y6x722ywg0ijfz5ak5vq3fjjhc9fmq8d"))))
+ "1cq0a3k6pvl9f098ssqqk2rddxh0xn1kk4p5kfyd7w0m3c604zw3"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kauth" ,kauth)
@@ -1913,7 +1924,7 @@ their settings.")
(define-public kdeclarative
(package
(name "kdeclarative")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1922,7 +1933,7 @@ their settings.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1g7bf3smdiwgfhdzwskp3l7l4bn838q1cdy4hp9mzqdssz956wmn"))))
+ "1y5g3yi1l0g1mkqhhakg265r25zm23qc2fqg55rq0g7l9ss7w7g9"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kconfig" ,kconfig)
@@ -1973,7 +1984,7 @@ that offer bindings to some of the Frameworks.")
(define-public kded
(package
(name "kded")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1982,7 +1993,7 @@ that offer bindings to some of the Frameworks.")
name "-" version ".tar.xz"))
(sha256
(base32
- "115ywk3vdyhwzna59bpiqfffcc128vafl823yh5fzkwbp8w7qdn5"))))
+ "0pmmsvqwkw86yvxxf9i6lg13vg80m0kmhjjs88lbm60cgvr5jhq6"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -2006,7 +2017,7 @@ started on demand.")
(define-public kdesignerplugin
(package
(name "kdesignerplugin")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2015,7 +2026,7 @@ started on demand.")
name "-" version ".tar.xz"))
(sha256
(base32
- "12v9pbfniljp23bllxxq6hfv6qnp2q8yjsix6fy6hwf8yrsq42m3"))))
+ "1hapj8x8nky3m6lx2ianmxwprf00jqyjsknjz3pi4vk3i714vhnf"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -2044,7 +2055,7 @@ ini-style description files.")
(define-public kdesu
(package
(name "kdesu")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2053,7 +2064,7 @@ ini-style description files.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1f6awbnqs14si13n1ryibb0z3mj90bg0vk320hgabd2zxma00vwp"))))
+ "0zsy1hivy5bbczrpkpgj72mlx0km2nm53kpgrj2hfdy3ss0vn3hl"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kpty" ,kpty)))
@@ -2075,7 +2086,7 @@ with su and ssh respectively.")
(define-public kemoticons
(package
(name "kemoticons")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2084,7 +2095,7 @@ with su and ssh respectively.")
name "-" version ".tar.xz"))
(sha256
(base32
- "10qxm9q7bsbbg419f8d0703mikd8w99a8fh501fpm3sgh6k7pbyv"))))
+ "1ncjs9iy6z6rhk83ff7fj1b68rkylnry0h698rh4jvs98gpw8sgj"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kservice" ,kservice)))
@@ -2117,7 +2128,7 @@ emoticons coming from different providers.")
(define-public kglobalaccel
(package
(name "kglobalaccel")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2126,7 +2137,7 @@ emoticons coming from different providers.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0a60f2bs7dhx0rsrgva2p97dcala6jrjfg4z2nv0m4bv82i4kchc"))))
+ "0dxwjznnqlgnvn15pl34rxlzk3i21cvzn8xbgqmxakny8qiib9ry"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -2160,7 +2171,7 @@ window does not need focus for them to be activated.")
(define-public kiconthemes
(package
(name "kiconthemes")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2169,7 +2180,7 @@ window does not need focus for them to be activated.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1i5cpsqfn1vcch8izbrgig2km580gdxf02qmib4ynbwzcfvrnbqc"))))
+ "00azbyk5y3jgdqv03a2nd0627kdkhq1bkghvw7w62kcnih9k8lq5"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -2209,7 +2220,7 @@ in applications using the KDE Frameworks.")
(define-public kinit
(package
(name "kinit")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2218,7 +2229,7 @@ in applications using the KDE Frameworks.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0hwa4anljh5v53gswziacwr6ryvhp136k6y85d10074lrckdr912"))))
+ "0103lflppdw55l9xiqs68lzaq9897m5qnkmy6fp7dm9wfh9aplqn"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -2253,17 +2264,16 @@ makes starting KDE applications faster and reduces memory consumption.")
(define-public kio
(package
(name "kio")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://kde/stable/frameworks/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
- (patches (search-patches "kio-CVE-2017-6410.patch"))
(sha256
(base32
- "1hqc88c2idi9fkb7jy82csb0i740lghv0p2fg1gaglcarjdz7nia"))))
+ "19da02l0aj0l07x9bbklhvx9slci3v1d8q80jvam4vyzs4qdyjin"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kbookmarks" ,kbookmarks)
@@ -2328,7 +2338,7 @@ KIO enabled infrastructure.")
(define-public knewstuff
(package
(name "knewstuff")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2337,7 +2347,7 @@ KIO enabled infrastructure.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0p5a6zprqfnhiim0l0qigjy7kky0m4w2nykhllwvr6lda1rg8qs3"))))
+ "1i3ldy9wwnjhpgdd2d0bg4304k88riin89zqzdl52lpqa6hjl3fp"))))
(build-system cmake-build-system)
(propagated-inputs
`(("attica" ,attica)
@@ -2362,6 +2372,7 @@ KIO enabled infrastructure.")
("ktextwidgets" ,ktextwidgets)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase)
+ ("qtdeclarative" ,qtdeclarative)
("solid" ,solid)
("sonnet" ,sonnet)))
(arguments
@@ -2385,7 +2396,7 @@ specification.")
(define-public knotifyconfig
(package
(name "knotifyconfig")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2394,7 +2405,7 @@ specification.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0riia9lvp33lqh8ld5r1r0adnfnxikbvmdi4k7kfc4pzra93h10f"))))
+ "14qc6wj4j5i45vzqsvl2wlc07c6x30hb2680gwfqsvwgiaszkzv4"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -2427,7 +2438,7 @@ notifications which can be embedded in your application.")
(define-public kparts
(package
(name "kparts")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2436,7 +2447,7 @@ notifications which can be embedded in your application.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1jghgddgz0ghq6n51l1i6jc1s10g0ckda5nlwh4myziv229g9pik"))))
+ "0hrx0mdvw301nbdyw5fkvgkw60ya6kmfw6hfzmj48bws8mi33rs5"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kio" ,kio)
@@ -2478,7 +2489,7 @@ widgets with a user-interface defined in terms of actions.")
(define-public kpeople
(package
(name "kpeople")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2487,7 +2498,7 @@ widgets with a user-interface defined in terms of actions.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0dqz6varz3nrnp8jfysdsp2r2mm46hn3vfcqcyyqk3nmv6sd9mpp"))))
+ "1xqi8zr76hajgyv016iaqlmnr5b84s71fbx412q153g92jglp4mk"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -2522,7 +2533,7 @@ to easily extend the contacts collection.")
(define-public krunner
(package
(name "krunner")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2531,7 +2542,7 @@ to easily extend the contacts collection.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1mmbrpgw090z41l2vg350hmm3ya2qkfkjmq7v5d90jpb7z7y6pr9"))))
+ "1k4rg9vqr6h5aj7v51fx3i5z9kxlfpacahs81hkwksi6if8ik4kr"))))
(build-system cmake-build-system)
(propagated-inputs
`(("plasma-framework" ,plasma-framework)))
@@ -2578,7 +2589,7 @@ typed.")
(define-public kservice
(package
(name "kservice")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2587,7 +2598,7 @@ typed.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0mlc3vw0vq1rwcg803dsybzlwxj1n6hg13z9sg0h28wsbyss3l4l"))))
+ "02xk3ajspprmx964zhwh2l3axm4gns9h0m0pvcb1v5j8pfh9v70q"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kconfig" ,kconfig)
@@ -2624,7 +2635,7 @@ types or handled by application specific code.")
(define-public ktexteditor
(package
(name "ktexteditor")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2633,7 +2644,7 @@ types or handled by application specific code.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1sl152xasbhgpph4f6apkc54b26smgxbd3cxbvch2hfi5cxgb8fq"))))
+ "1sybw8k3f36mcs5qh3b51v7ynbqn4pbiiabkyxfmyi82i09m2jgw"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kparts" ,kparts)))
@@ -2655,6 +2666,7 @@ types or handled by application specific code.")
("ki18n" ,ki18n)
("kjobwidgets" ,kjobwidgets)
("kservice" ,kservice)
+ ("ksyntaxhighlighting" ,ksyntaxhighlighting)
("ktextwidgets" ,ktextwidgets)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
@@ -2692,7 +2704,7 @@ library.")
(define-public ktextwidgets
(package
(name "ktextwidgets")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2701,7 +2713,7 @@ library.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0gwjb0isjfrqd15lvln6bwql1lpk2r1vp5f72zxygz2ay8ar1wxp"))))
+ "1s2fd4n4hfkzscxv0cdfjynjzi1f57pfi9a3fp6rrm5c5645zk7r"))))
(build-system cmake-build-system)
(propagated-inputs
`(("ki18n" ,ki18n)
@@ -2738,7 +2750,7 @@ It supports rich text as well as plain text.")
(define-public kwallet
(package
(name "kwallet")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2747,7 +2759,7 @@ It supports rich text as well as plain text.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0n25mvjwy3sv5bg2x75psz6d6f8yl53j3wfmx9ayh57jk4rq24rm"))))
+ "0psc4n6lck9gbx2nn7mgv33x4z2r0xp1mx1xcsgy8smvalrfv5xa"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -2779,7 +2791,7 @@ the passwords on KDE work spaces.")
(define-public kxmlgui
(package
(name "kxmlgui")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2788,7 +2800,7 @@ the passwords on KDE work spaces.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0plw6fckpssgwf18f5i4vhfp55jmdvfh2rc5lg8fwmlqgqkvrbac"))))
+ "1pxi4z7z3bzwcnfwq0pvjsmds401fkisyr353lyxf4rvcpwj3a65"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kconfig" ,kconfig)
@@ -2832,7 +2844,7 @@ descriptions for integrating actions from plugins.")
(define-public kxmlrpcclient
(package
(name "kxmlrpcclient")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2841,7 +2853,7 @@ descriptions for integrating actions from plugins.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1xrdh5ipldahcv0pxp7dnzjz1ihnkg4r2hpylg6bwvq81clw8xd1"))))
+ "1kaczibdfdph5mpg1dldsmqb1six57w7ch3v0v7av5h6j6sx0xaq"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kio" ,kio)))
@@ -2875,7 +2887,7 @@ setUrl, setUserAgent and call.")
(define-public plasma-framework
(package
(name "plasma-framework")
- (version "5.28.0")
+ (version "5.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2884,7 +2896,7 @@ setUrl, setUserAgent and call.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0j4mfd8wzrspvyy281lww981fly2rkbhnixb9b0pj5k9i8gvkh7q"))))
+ "1hrnmilc30d1kh20cky329i5ji3qyy7m4f8jzax5cgl7nrjca31h"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kpackage" ,kpackage)
diff --git a/gnu/packages/patches/kio-CVE-2017-6410.patch b/gnu/packages/patches/kio-CVE-2017-6410.patch
deleted file mode 100644
index 748636f..0000000
--- a/gnu/packages/patches/kio-CVE-2017-6410.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Fix CVE-2017-6410, "Information Leak when accessing https when using a
-malicious PAC file":
-
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6410
-https://www.kde.org/info/security/advisory-20170228-1.txt
-
-Patch copied from upstream source repository:
-
-https://cgit.kde.org/kio.git/commit/?id=f9d0cb47cf94e209f6171ac0e8d774e68156a6e4
-
-From f9d0cb47cf94e209f6171ac0e8d774e68156a6e4 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Tue, 28 Feb 2017 19:00:48 +0100
-Subject: Sanitize URLs before passing them to FindProxyForURL
-
-Remove user/password information
-For https: remove path and query
-
-Thanks to safebreach.com for reporting the problem
-
-CCMAIL: yoni.fridburg@safebreach.com
-CCMAIL: amit.klein@safebreach.com
-CCMAIL: itzik.kotler@safebreach.com
----
- src/kpac/script.cpp | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/kpac/script.cpp b/src/kpac/script.cpp
-index a0235f7..2485c54 100644
---- a/src/kpac/script.cpp
-+++ b/src/kpac/script.cpp
-@@ -754,9 +754,16 @@ QString Script::evaluate(const QUrl &url)
- }
- }
-
-+ QUrl cleanUrl = url;
-+ cleanUrl.setUserInfo(QString());
-+ if (cleanUrl.scheme() == QLatin1String("https")) {
-+ cleanUrl.setPath(QString());
-+ cleanUrl.setQuery(QString());
-+ }
-+
- QScriptValueList args;
-- args << url.url();
-- args << url.host();
-+ args << cleanUrl.url();
-+ args << cleanUrl.host();
-
- QScriptValue result = func.call(QScriptValue(), args);
- if (result.isError()) {
---
-cgit v0.11.2
-
diff --git a/gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch b/gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch
new file mode 100644
index 0000000..2dd3929
--- /dev/null
+++ b/gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch
@@ -0,0 +1,60 @@
+From 61337983ba74361938b7d5323de5d2819a235fdc Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Mon, 3 Apr 2017 12:53:12 +0200
+Subject: Fix unit test for active connections
+
+Instead of sending PropertiesChanged signal for an active connection we
+added recently we should set all properties initially and just advertise
+that we have a new active connection once everything is set
+---
+ src/fakenetwork/fakenetwork.cpp | 26 +++++++-------------------
+ 1 file changed, 7 insertions(+), 19 deletions(-)
+
+diff --git a/src/fakenetwork/fakenetwork.cpp b/src/fakenetwork/fakenetwork.cpp
+index bc1144e..261fe8e 100644
+--- a/src/fakenetwork/fakenetwork.cpp
++++ b/src/fakenetwork/fakenetwork.cpp
+@@ -215,8 +215,14 @@ void FakeNetwork::unregisterService()
+
+ QDBusObjectPath FakeNetwork::ActivateConnection(const QDBusObjectPath &connection, const QDBusObjectPath &device, const QDBusObjectPath &specific_object)
+ {
+- ActiveConnection *newActiveConnection = new ActiveConnection(this);
+ QString newActiveConnectionPath = QString("/org/kde/fakenetwork/ActiveConnection/") + QString::number(m_activeConnectionsCounter++);
++ ActiveConnection *newActiveConnection = new ActiveConnection(this);
++ newActiveConnection->addDevice(device);
++ newActiveConnection->setActiveConnectionPath(newActiveConnectionPath);
++ newActiveConnection->setConnection(connection);
++ newActiveConnection->setSpecificObject(specific_object);
++ newActiveConnection->setState(NetworkManager::ActiveConnection::Activating);
++
+ m_activeConnections.insert(QDBusObjectPath(newActiveConnectionPath), newActiveConnection);
+ QDBusConnection::sessionBus().registerObject(newActiveConnectionPath, newActiveConnection, QDBusConnection::ExportScriptableContents);
+
+@@ -227,24 +233,6 @@ QDBusObjectPath FakeNetwork::ActivateConnection(const QDBusObjectPath &connectio
+ map.insert(QLatin1Literal("ActivatingConnection"), QVariant::fromValue(QDBusObjectPath(newActiveConnectionPath)));
+ Q_EMIT PropertiesChanged(map);
+
+- newActiveConnection->addDevice(device);
+- newActiveConnection->setActiveConnectionPath(newActiveConnectionPath);
+- newActiveConnection->setConnection(connection);
+- newActiveConnection->setSpecificObject(specific_object);
+- newActiveConnection->setState(NetworkManager::ActiveConnection::Activating);
+-
+- map.clear();
+- const QList<QDBusObjectPath> deviceList { device };
+- map.insert(QLatin1Literal("Devices"), QVariant::fromValue<QList<QDBusObjectPath> >(deviceList));
+- map.insert(QLatin1Literal("Connection"), QVariant::fromValue<QDBusObjectPath>(connection));
+- if (!specific_object.path().isEmpty()) {
+- map.insert(QLatin1Literal("SpecificObject"), QVariant::fromValue<QDBusObjectPath>(connection));
+- }
+- map.insert(QLatin1Literal("State"), NetworkManager::ActiveConnection::Activating);
+- QDBusMessage message = QDBusMessage::createSignal(newActiveConnectionPath, QLatin1Literal("org.kde.fakenetwork.Connection.Active"), QLatin1Literal("PropertiesChanged"));
+- message << map;
+- QDBusConnection::sessionBus().send(message);
+-
+ Device *usedDevice = static_cast<Device *>(QDBusConnection::sessionBus().objectRegisteredAt(device.path()));
+ if (usedDevice) {
+ m_activatedDevice = usedDevice->devicePath();
+--
+cgit v0.11.2
+
diff --git a/gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch b/gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch
new file mode 100644
index 0000000..af3cdff
--- /dev/null
+++ b/gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch
@@ -0,0 +1,57 @@
+From 3f6155389abc8e2b3dafc5eefa1ce0c929b007fa Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Mon, 3 Apr 2017 14:13:54 +0200
+Subject: One more attempt to fix unit test for active connections
+
+---
+ src/activeconnection.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/activeconnection.cpp b/src/activeconnection.cpp
+index 05582fa..3a8e6b2 100644
+--- a/src/activeconnection.cpp
++++ b/src/activeconnection.cpp
+@@ -79,11 +79,13 @@ NetworkManager::ActiveConnection::ActiveConnection(const QString &path, QObject
+ connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged);
+ #endif
+
++#ifndef NMQT_STATIC
+ /*
+ * Workaround: Re-check connection state before we watch changes in case it gets changed too quickly
+ * BUG:352326
+ */
+ d->recheckProperties();
++#endif
+ }
+
+ NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd, QObject *parent)
+@@ -91,18 +93,26 @@ NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd,
+ {
+ Q_D(ActiveConnection);
+
++#ifndef NMQT_STATIC
+ #if NM_CHECK_VERSION(1, 4, 0)
+ QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->path, NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
+ QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList)));
+ #else
+ connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged);
+ #endif
++#endif
++
++#ifdef NMQT_STATIC
++ connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged);
++#endif
+
++#ifndef NMQT_STATIC
+ /*
+ * Workaround: Re-check connection state before we watch changes in case it gets changed too quickly
+ * BUG:352326
+ */
+ d->recheckProperties();
++#endif
+ }
+
+ NetworkManager::ActiveConnection::~ActiveConnection()
+--
+cgit v0.11.2
+
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* bug#26352: [PATCH 4/4] gnu: kde-frameworks: No longer setenv CTEST_OUTPUT_ON_FAILURE.
2017-04-03 18:54 bug#26352: [PATCH 0/3] Update KDE Frameworks to 5.32 Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2 Hartmut Goebel
@ 2017-04-03 19:12 ` Hartmut Goebel
1 sibling, 0 replies; 11+ messages in thread
From: Hartmut Goebel @ 2017-04-03 19:12 UTC (permalink / raw)
To: 26352
This is now done my the cmake-build-system.
* gnu/packages/kde-frameworks.scm (kcoreaddons, kwidgetsaddons, kpackage,
kemoticons kiconthemes, kio, knewstuff, kpeople, krunner,kservice,
ktexteditor, kxmlgui plasma-framework)[check-setup]: Remove setenv
CTEST_OUTPUT_ON_FAILURE.
(kpty)[patch-tests]: Remove setenv CTEST_OUTPUT_ON_FAILURE.
(ksyntaxhighlighting)[check-setup]: Remove phase.
---
gnu/packages/kde-frameworks.scm | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 2c263e4..78654a1 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -536,7 +536,6 @@ propagate their changes to their respective configuration files.")
(modify-phases %standard-phases
(add-before 'check 'check-setup
(lambda _
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug output
(setenv "HOME" (getcwd))
(setenv "TMPDIR" (getcwd))
#t)))))
@@ -902,10 +901,6 @@ pixel units.")
(substitute* '("autotests/input/highlight.pl"
"autotests/folding/highlight.pl.fold")
(((which "perl")) "/usr/bin/perl"))
- #t))
- (add-before 'check 'check-setup
- (lambda _
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug info
#t)))))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Syntax highlighting engine for Kate syntax definitions")
@@ -983,7 +978,6 @@ represented by a QPoint or a QSize.")
(lambda _
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug info
(setenv "DBUS_FATAL_WARNINGS" "0")
#t))
(add-before 'check 'start-xorg-server
@@ -1572,7 +1566,6 @@ covers feedback and persistent events.")
(modify-phases %standard-phases
(add-before 'check 'check-setup
(lambda _
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug output
(setenv "HOME" (getcwd))
#t)))))
(home-page "https://community.kde.org/Frameworks")
@@ -1608,7 +1601,6 @@ were traditional plugins.")
(modify-phases %standard-phases
(add-after 'unpack 'patch-tests
(lambda _
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
(substitute* "autotests/kptyprocesstest.cpp"
(("/bin/bash") (which "bash")))
#t)))))
@@ -2113,7 +2105,6 @@ with su and ssh respectively.")
(add-before 'check 'check-setup
(lambda _
(setenv "HOME" (getcwd))
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
#t)))))
@@ -2207,7 +2198,6 @@ window does not need focus for them to be activated.")
(string-append (assoc-ref inputs "shared-mime-info")
"/share"))
(setenv "HOME" (getcwd))
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
#t)))))
@@ -2316,7 +2306,6 @@ makes starting KDE applications faster and reduces memory consumption.")
(lambda _
(setenv "HOME" (getcwd))
(setenv "XDG_RUNTIME_DIR" (getcwd))
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
#t)))))
@@ -2382,7 +2371,6 @@ KIO enabled infrastructure.")
(add-before 'check 'check-setup
(lambda _ ; XDG_DATA_DIRS isn't set
(setenv "HOME" (getcwd))
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
#t)))))
@@ -2517,7 +2505,6 @@ widgets with a user-interface defined in terms of actions.")
(modify-phases %standard-phases
(add-before 'check 'check-setup
(lambda _
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
#t)))))
@@ -2574,7 +2561,6 @@ to easily extend the contacts collection.")
(modify-phases %standard-phases
(add-before 'check 'check-setup
(lambda _
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
#t)))))
@@ -2620,7 +2606,6 @@ typed.")
(add-before 'check 'check-setup
(lambda _
(setenv "HOME" (getcwd))
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
#t)))))
@@ -2691,7 +2676,6 @@ types or handled by application specific code.")
(setenv "HOME" (getcwd))
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
#t)))))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Full text editor component")
@@ -2830,7 +2814,6 @@ the passwords on KDE work spaces.")
(setenv "HOME" (getcwd))
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
#t)))))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Framework for managing menu and toolbar actions")
@@ -2940,7 +2923,6 @@ setUrl, setUserAgent and call.")
(add-before 'check 'check-setup
(lambda _
(setenv "HOME" (getcwd))
- (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
#t)))))
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2.
2017-04-03 18:56 ` bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2 Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 2/3] gnu: Update phonon to 4.9.1 Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 3/3] gnu: Update kde-frameworks to 5.32.0 Hartmut Goebel
@ 2017-04-10 10:04 ` Ludovic Courtès
2017-04-11 13:48 ` Hartmut Goebel
2 siblings, 1 reply; 11+ messages in thread
From: Ludovic Courtès @ 2017-04-10 10:04 UTC (permalink / raw)
To: Hartmut Goebel; +Cc: 26352
Hi Hartmut,
Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:
> * gnu/packages/gnome.scm (networkmanager): [source] Update to 1.6.2
> [pre-configure]: Adopt to now used single Makefile.in.
> [fix-docbook]: New phase, required for docbook-xsl catalogs.
> [install]: Also pass "nmstatedir".
> [native-inputs]: Add docbook-xsl, libxslt.
> [inputs]: Add jansson.
Note that ‘pre-configure’, ‘fix-docbook’, and ‘install’ are not fields
of <package>, so we normally don’t represent them this way in commit
logs.
> ;; cope with being already in the Guix build jail as that jail
> ;; lacks some features that they would like to proxy over (like
> ;; a /sys mount).
> - (substitute* '("src/platform/Makefile.in"
> - "src/devices/Makefile.in")
> - (("SUBDIRS = tests") ""))
> - (substitute* '("src/tests/Makefile.in")
> - (("\ttest-route-manager-linux") "\t")
> - (("\ttest-route-manager-fake") "\t"))
> + (substitute* '("Makefile.in")
> + (("src/platform/tests/test-address-linux") " ")
> + (("src/platform/tests/test-cleanup-linux") " ")
> + (("src/platform/tests/test-link-linux") " ")
> + (("src/platform/tests/test-route-linux") " ")
> + (("src/devices/tests/test-arping") " ")
> + (("src/devices/tests/test-lldp") " ")
> + (("src/tests/test-route-manager-linux") " "))
> #t))
A couple of new tests are being skipped, this is for the same reason as
the others, right?
> + (add-before 'configure 'fix-docbook
> + (lambda* (#:key inputs #:allow-other-keys)
> + (setenv "XML_CATALOG_FILES"
> + (string-append
> + (assoc-ref %build-inputs "docbook-xsl")
> + "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl)
> + "/catalog.xml"))))
Normally adding both libxml2 and libxslt as inputs would save you from
writing this phase. Could you check that this is the case?
If it is, please do that instead; otherwise, the new phase is OK, but
best call it ’set-xml-catalog-path’ and return #t.
Thank you!
Ludo’.
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2.
2017-04-10 10:04 ` bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2 Ludovic Courtès
@ 2017-04-11 13:48 ` Hartmut Goebel
2017-04-11 15:45 ` Ludovic Courtès
0 siblings, 1 reply; 11+ messages in thread
From: Hartmut Goebel @ 2017-04-11 13:48 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 26352
Hi Ludo,
your review came just in time, I was about to push it :-)
> Note that ‘pre-configure’, ‘fix-docbook’, and ‘install’ are not fields
> of <package>, so we normally don’t represent them this way in commit logs.
Fine for me. How do you want it?
>
> A couple of new tests are being skipped, this is for the same reason as
> the others, right?
Yes. Each of these tests is accompanied by a "fake" one which passes.
>
> Normally adding both libxml2 and libxslt as inputs would save you from
> writing this phase. Could you check that this is the case?
Indeed, adding libxml2 sets XML_CATALOG_FILES. But then it becomes curious:
- With both docbook-xsl and docbook-xml as inputs, the build fails.
(This did not happen with my patch, since I missed adding docbook-xml to
XML_CATALOG_FILES.)
GEN man/nmcli.1
I/O error : Attempt to load network entity
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
warning: failed to load external entity
"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
cannot parse
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
- With only docbook-xsl, the build passes while showing some errors,
which are only treated as warnings:
GEN man/nmcli.1
I/O error : Attempt to load network entity
http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd
man/nmcli.xml:7: warning: failed to load external entity
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
]>
^
man/nmcli.xml:2060: parser error : Entity 'ndash' not defined
<para>Success – indicates the operation
succeeded.</para>
^
man/nmcli.xml:2422: parser error : Entity 'mdash' not defined
https://bugzilla.gnome.org/ — product
<literal>NetworkManager</literal
I'm in favour of using the only docbook-xsl as input, as this makes the
build pass.
--
Regards
Hartmut Goebel
| Hartmut Goebel | h.goebel@crazy-compilers.com |
| www.crazy-compilers.com | compilers which you thought are impossible |
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2.
2017-04-11 13:48 ` Hartmut Goebel
@ 2017-04-11 15:45 ` Ludovic Courtès
2017-04-12 8:11 ` Hartmut Goebel
0 siblings, 1 reply; 11+ messages in thread
From: Ludovic Courtès @ 2017-04-11 15:45 UTC (permalink / raw)
To: Hartmut Goebel; +Cc: 26352
Hello!
Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:
>> Note that ‘pre-configure’, ‘fix-docbook’, and ‘install’ are not fields
>> of <package>, so we normally don’t represent them this way in commit logs.
>
> Fine for me. How do you want it?
Something like
<https://git.savannah.gnu.org/cgit/guix.git/commit/?id=81eaa3f8579df42dbf0410db78b45a718fc544e7>
would do. :-)
>> A couple of new tests are being skipped, this is for the same reason as
>> the others, right?
>
> Yes. Each of these tests is accompanied by a "fake" one which passes.
OK.
>> Normally adding both libxml2 and libxslt as inputs would save you from
>> writing this phase. Could you check that this is the case?
> Indeed, adding libxml2 sets XML_CATALOG_FILES. But then it becomes curious:
>
> - With both docbook-xsl and docbook-xml as inputs, the build fails.
> (This did not happen with my patch, since I missed adding docbook-xml to
> XML_CATALOG_FILES.)
>
> GEN man/nmcli.1
> I/O error : Attempt to load network entity
> http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
> warning: failed to load external entity
> "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
> cannot parse
> http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
>
>
> - With only docbook-xsl, the build passes while showing some errors,
> which are only treated as warnings:
>
> GEN man/nmcli.1
> I/O error : Attempt to load network entity
> http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd
> man/nmcli.xml:7: warning: failed to load external entity
> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
> ]>
> ^
> man/nmcli.xml:2060: parser error : Entity 'ndash' not defined
> <para>Success – indicates the operation
> succeeded.</para>
> ^
> man/nmcli.xml:2422: parser error : Entity 'mdash' not defined
> https://bugzilla.gnome.org/ — product
> <literal>NetworkManager</literal
>
>
> I'm in favour of using the only docbook-xsl as input, as this makes the
> build pass.
Let’s do that then, sounds good!
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2.
2017-04-11 15:45 ` Ludovic Courtès
@ 2017-04-12 8:11 ` Hartmut Goebel
2017-04-12 8:11 ` bug#26352: close Hartmut Goebel
0 siblings, 1 reply; 11+ messages in thread
From: Hartmut Goebel @ 2017-04-12 8:11 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 26352
Hi,
I applied the changes as discussed an pushed, see
1aab5e8320292f9414e1289173b5781422da3f14.
--
Regards
Hartmut Goebel
| Hartmut Goebel | h.goebel@crazy-compilers.com |
| www.crazy-compilers.com | compilers which you thought are impossible |
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26352: close
2017-04-12 8:11 ` Hartmut Goebel
@ 2017-04-12 8:11 ` Hartmut Goebel
2017-04-12 13:34 ` Clément Lassieur
0 siblings, 1 reply; 11+ messages in thread
From: Hartmut Goebel @ 2017-04-12 8:11 UTC (permalink / raw)
Cc: 26352
[-- Attachment #1: Type: text/plain, Size: 9 bytes --]
close
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 2430 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26352: close
2017-04-12 8:11 ` bug#26352: close Hartmut Goebel
@ 2017-04-12 13:34 ` Clément Lassieur
0 siblings, 0 replies; 11+ messages in thread
From: Clément Lassieur @ 2017-04-12 13:34 UTC (permalink / raw)
To: Hartmut Goebel; +Cc: 26352-close
Hartmut Goebel <h.goebel@goebel-consult.de> writes:
> close
In order to close a bug, you need either to:
- send a message to 26352-close@debbugs.gnu.org (which I just did),
- send a message to control@debbugs.gnu.org, with "close 26352" as
content.
The second method is quiet: people subscribing to the list won't receive
it, which is better IMHO if there is no content in the message.
See https://debbugs.gnu.org/server-refcard.html.
To see if it is really closed, you can have a look at:
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26352.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-04-12 13:35 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-03 18:54 bug#26352: [PATCH 0/3] Update KDE Frameworks to 5.32 Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2 Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 2/3] gnu: Update phonon to 4.9.1 Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 3/3] gnu: Update kde-frameworks to 5.32.0 Hartmut Goebel
2017-04-10 10:04 ` bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2 Ludovic Courtès
2017-04-11 13:48 ` Hartmut Goebel
2017-04-11 15:45 ` Ludovic Courtès
2017-04-12 8:11 ` Hartmut Goebel
2017-04-12 8:11 ` bug#26352: close Hartmut Goebel
2017-04-12 13:34 ` Clément Lassieur
2017-04-03 19:12 ` bug#26352: [PATCH 4/4] gnu: kde-frameworks: No longer setenv CTEST_OUTPUT_ON_FAILURE Hartmut Goebel
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.