Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2020-06-06 21:25:43 +02:00
commit 7ce1b5e7b7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
139 changed files with 4981 additions and 2034 deletions

View file

@ -1563,11 +1563,13 @@ integrated it into your application's other widgets.")
`(("extra-cmake-modules" ,extra-cmake-modules)
("xorg-server" ,xorg-server))) ; for the tests
(inputs
`(("kcodecs" ,kcodecs)
`(("qtbase" ,qtbase)))
(propagated-inputs
`(;; As required by KF5ContactsConfig.cmake.
("kcodecs" ,kcodecs)
("kconfig" ,kconfig)
("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
("qtbase" ,qtbase)))
("ki18n" ,ki18n)))
(arguments
`(#:phases
(modify-phases %standard-phases