[PATCHES] KDE updates.

  • Done
  • quality assurance status badge
Details
8 participants
  • Leo Famulari
  • Brendan Tildesley
  • Marek Pa?nikowski
  • Marius Bakke
  • Maxim Cournoyer
  • Maxime Devos
  • phodina
  • Anthony Wang
Owner
unassigned
Submitted by
Brendan Tildesley
Severity
normal
B
B
Brendan Tildesley wrote on 28 Sep 2021 07:24
(name . guix-patches@gnu.org)(address . guix-patches@gnu.org)
629540312.113485.1632806682555@office.mailbox.org
I've updated all packages in kde-*.scm files (may have missed something),
plus some KDE games in games.scm. I was hesitant about sending 235 patches
so I just attached them as a zip, and pushed the branch to my notabug
(subject to rebasing):


I used refresh -l to find all dependent packages and basically
everything build apart from some packages like openstack that are
already broken.

Since there are a lot of patches, it's probably I forgot something
important or left something incomplete.

In the grantleetheme package, there was a large C++ I deleted. I'm not
really sure if any patching is still need since it looks complicated

Other packages with changes to patches include
kdbusaddons, kpackage, kplasma-framework, grantleetheme, kmail.

* Reproducibility bugs
- The packages kparts, ktexteditor, plasma-framework, krunner, kio produce
.bz2 files in /share/kdevappwizard/templates/ that include timestamps on
the directories. Any ideas how to fix that?

- kdevelop looks even nastier, containing entire mime/application .xml
files in one build that weren't present in the previous.
- kdelibs4support produces .so's with symbols in varying order.
- sonnet: .so differences (already present in current guix version)

Package list:

akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes akonadi-search akregator ark attica audiocd-kio baloo baloo-widgets bluez-qt bomber bovo breeze breeze-icons dolphin dolphin-plugins dragon elisa extra-cmake-modules ffmpegthumbs granatier grantleetheme juk k3b kactivities kactivities-stats kaddressbook kajongg kalarmcal kamoso kapidox kapman karchive kate kauth kblackbox kblocks kbookmarks kbounce kbreakout kcachegrind kcalendarcore kcalendarsupport kcalutils kcmutils kcodecs kcompletion kconfig kconfigwidgets kcontacts kcoreaddons kcrash kdav kdbusaddons kdeclarative kdeconnect kdecoration kded kde-frameworkintegration kdegraphics-mobipocket kdelibs4support kdepim-runtime kdesignerplugin kdesu kdevelop kdewebkit kdf kdiagram kdiamond kdnssd kdoctools kemoticons keventviews kfilemetadata kfourinline kget kglobalaccel kgoldrunner kgpg kguiaddons khelpcenter kholidays khtml ki18n kiconthemes kidentitymanagement kidletime kigo killbots kimageformats kimap kincidenceed
itor kinit kio kirigami kiriki kitemmodels kitemviews kjobwidgets kjs kjsembed kjumpingcube kldap kleopatra klines kmag kmahjongg kmail kmailcommon kmailimporter kmailtransport kmbox kmediaplayer kmessagelib kmime kmines kmix kmousetool kmouth knavalbattle knetwalk knewstuff knotes knotifications knotifyconfig kolf kollision konquest konsole kontactinterface konversation kopete korganizer kpackage kparts kpeople kpimcommon kpimtextedit kplotting kpmcore kpty kqtquickcharts krdc kreversi krfb krita kross krunner kscreenlocker kservice kshisen ksirk ksmtp ksnakeduel kspaceduel ksquares ksshaskpass ksudoku ksyntaxhighlighting ksystemlog ktexteditor ktextwidgets ktnef ktorrent ktouch ktuberling kubrick kunitconversion kwallet kwave kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient libgravatar libkcddb libkcompactdisc libkdegames libkdepim libkexiv2 libkgapi libkleo libkmahjongg libkomparediff2 libkscreen libksieve libksysguard libktorrent lskat modemmanager-qt networkmanager-q
t okteta okular oxygen-icons palapeli picmi plasma-framework poxml prison pulseaudio-qt purpose qca qqc2-desktop-style smb4k solid sonnet sweeper syndication threadweaver yakuake zeroconf-ioslave
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:29
[PATCH core-updates-frozen 00/19]
(address . 50862@debbugs.gnu.org)
20211015093015.5834-1-mail@brendan.scot
I've made/remade a new patch series, but for core-updates-frozen instead of
master. This is because I found some programs like libksysguard need
<filesystem> and thus gcc>=9, so master with gcc-7 was a bit of a dead end. It
updates for the recent release of Frameworks 5.87.0, and other version 21.08.2
applications etc. I have provided everything in a smaller number of commits,
because I found myself spending too much time making all those commits and
rebsing them for 200+ packages.

I also fixed the template tarball reproducibility bug in
extra-cmake-modules I mentioned previously, and published my fix upstream.

yakuake still segfaults on launch as reported on master. Not sure why that is.

Was I right to prepare this for core-updates-frozen? Are these updates
something that can be pushed as soon as they are ready or do I have to wait on
other updates or merges to be done? I thought it would fascilitate merging
into master to prepare it all for core-updates-frozen now.

I also included at the start a qt-wrap patch I already sent previously.

If my grepping worked, this should be all the packages, but for completeness
one should try building all kde-*.scm packages

akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
akonadi-search akregator ark attica audiocd-kio baloo baloo-widgets bluez-qt
bomber bovo breeze breeze-icons dolphin dolphin-plugins dragon elisa
extra-cmake-modules ffmpegthumbs granatier grantleetheme juk k3b kactivities
kactivities-stats kaddressbook kajongg kalarmcal kamoso kapidox kapman
karchive kate kauth kblackbox kblocks kbookmarks kbounce kbreakout kcachegrind
kcalendarcore kcalendarsupport kcalutils kcmutils kcodecs kcompletion kconfig
kconfigwidgets kcontacts kcoreaddons kcrash kdav kdbusaddons kdeclarative
kdeconnect kdecoration kded kde-frameworkintegration kdegraphics-mobipocket
kdelibs4support kdepim-runtime kdesignerplugin kdesu kdevelop kdewebkit kdf
kdiagram kdiamond kdnssd kdoctools kemoticons keventviews kfilemetadata
kfourinline kget kglobalaccel kgoldrunner kgpg kguiaddons khelpcenter
kholidays khtml ki18n kiconthemes kidentitymanagement kidletime kigo killbots
kimageformats kimap kincidenceeditor kinit kio kiriki kitemmodels kitemviews
kjobwidgets kjs kjsembed kjumpingcube kldap kleopatra klines kmag kmahjongg
kmail kmailcommon kmailimporter kmailtransport kmbox kmediaplayer kmessagelib
kmime kmines kmix kmousetool kmouth knavalbattle knetwalk knewstuff knotes
knotifications knotifyconfig kolf kollision konquest konsole kontactinterface
konversation kopete korganizer kpackage kparts kpeople kpimcommon kpimtextedit
kplotting kpmcore kpty kqtquickcharts krdc kreversi krfb kross krunner
kscreenlocker kservice kshisen ksirk ksmtp ksnakeduel kspaceduel ksquares
ksshaskpass ksudoku ksyntaxhighlighting ksystemlog ktexteditor ktextwidgets
ktnef ktorrent ktouch ktuberling kubrick kunitconversion kwallet kwave
kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient libgravatar
libkcddb libkcompactdisc libkdegames libkdepim libkexiv2 libkgapi libkleo
libkmahjongg libkomparediff2 libkscreen libksieve libksysguard libktorrent
lskat modemmanager-qt networkmanager-qt okteta okular oxygen-icons palapeli
picmi plasma-framework poxml prison pulseaudio-qt purpose qca
qqc2-desktop-style smb4k solid sonnet sweeper syndication threadweaver yakuake
zeroconf-ioslave
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:29
[PATCH core-updates-frozen 01/19] build: qt-utils: Don't wrap .X-real files.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-2-mail@brendan.scot
* guix/build/qt-utils.scm (find-files-to-wrap): Exclude already wrapped
programs. This is forbidden in wrap-program now due to a738a663a99.
---
guix/build/qt-utils.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

Toggle diff (26 lines)
diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
index c2b80cab7d..e86442b79f 100644
--- a/guix/build/qt-utils.scm
+++ b/guix/build/qt-utils.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2020 Jakub K?dzio?ka <kuba@kadziolka.net>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -133,7 +134,10 @@ add a dependency of that output on Qt."
(define (find-files-to-wrap output-dir)
(append-map
(lambda (dir)
- (if (directory-exists? dir) (find-files dir ".*") (list)))
+ (if (directory-exists? dir)
+ (find-files dir (lambda (file stat)
+ (not (wrapped-program? file))))
+ (list)))
(list (string-append output-dir "/bin")
(string-append output-dir "/sbin")
(string-append output-dir "/libexec")
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:29
[PATCH core-updates-frozen 02/19] gnu: libdbusmenu-qt: Move (gnu packages qt).
(address . 50862@debbugs.gnu.org)
20211015093015.5834-3-mail@brendan.scot
* gnu/packages/lxqt.scm: Delete libdbusmenu-qt.
* gnu/packages/qt.scm: Readd libdbusmenu-qt.
This prevent amysterious module resolution issue when
attempting to use libdbusmenu in KDE modules.
---
gnu/packages/lxqt.scm | 32 +-------------------------------
gnu/packages/qt.scm | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 31 deletions(-)

Toggle diff (90 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 391d83b7c4..4230775dd0 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -68,36 +68,6 @@
;; Third party libraries
-(define-public libdbusmenu-qt
- (package
- (name "libdbusmenu-qt")
- (version "0.9.3+16.04.20160218-0ubuntu1")
- (source
- (origin
- (method git-fetch)
- ;; Download from github rather than launchpad because launchpad trunk
- ;; tarball hash is not deterministic.
- (uri (git-reference
- (url "https://github.com/unity8-team/libdbusmenu-qt")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0b7ii1cvmpcyl79gqal9c3va9m55h055s4hx7fpxkhhqs9463ggg"))))
- (build-system cmake-build-system)
- (arguments
- ;; XXX: Tests require a dbus session and some icons.
- '(#:tests? #f))
- (native-inputs
- `(("doxygen" ,doxygen)))
- (inputs
- `(("qtbase" ,qtbase-5)))
- (home-page "https://launchpad.net/libdbusmenu-qt")
- (synopsis "Qt implementation of the DBusMenu spec")
- (description "This library provides a Qt implementation of the DBusMenu
-protocol. The DBusMenu protocol makes it possible for applications to export
-and import their menus over DBus.")
- (license license:lgpl2.1+)))
-
(define-public libstatgrab
(package
(name "libstatgrab")
@@ -1425,7 +1395,7 @@ desktop.")
("lximage-qt" ,lximage-qt)
("obconf-qt" ,obconf-qt)
("openbox" ,openbox)
- ("oxygen-icons" ,oxygen-icons)
+ ("breeze-icons" ,breeze-icons)
("pavucontrol-qt" ,pavucontrol-qt)
("qps" ,qps)
("qterminal" ,qterminal)))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5ce4220cb0..962fb5a252 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3101,3 +3101,33 @@ being fully customizable and easy to extend.")
also compatible with SGI and TGS Open Inventor, and the API is based on the API
of the InventorXt GUI component toolkit.")
(license license:bsd-3))))
+
+(define-public libdbusmenu-qt
+ (package
+ (name "libdbusmenu-qt")
+ (version "0.9.3+16.04.20160218-0ubuntu1")
+ (source
+ (origin
+ (method git-fetch)
+ ;; Download from github rather than launchpad because launchpad trunk
+ ;; tarball hash is not deterministic.
+ (uri (git-reference
+ (url "https://github.com/unity8-team/libdbusmenu-qt")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0b7ii1cvmpcyl79gqal9c3va9m55h055s4hx7fpxkhhqs9463ggg"))))
+ (build-system cmake-build-system)
+ (arguments
+ ;; XXX: Tests require a dbus session and some icons.
+ '(#:tests? #f))
+ (native-inputs
+ `(("doxygen" ,doxygen)))
+ (inputs
+ `(("qtbase" ,qtbase-5)))
+ (home-page "https://launchpad.net/libdbusmenu-qt")
+ (synopsis "Qt implementation of the DBusMenu spec")
+ (description "This library provides a Qt implementation of the DBusMenu
+protocol. The DBusMenu protocol makes it possible for applications to export
+and import their menus over DBus.")
+ (license license:lgpl2.1+)))
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:29
[PATCH core-updates-frozen 03/19] gnu: Add plasma-wayland-protocols.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-4-mail@brendan.scot
* gnu/packages/kde-frameworks.scm (plasma-wayland-protocols): New variable.
---
gnu/packages/kde-frameworks.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)

Toggle diff (38 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 83bf7bd95a..ab04545ddd 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1061,6 +1061,31 @@ integration with a custom editor as well as a ready-to-use
(properties `((upstream-name . "syntax-highlighting")))
(license license:lgpl2.1+)))
+(define-public plasma-wayland-protocols
+ (package
+ (name "plasma-wayland-protocols")
+ (version "1.4.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/" name "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1a8v5cyny20g7z3g1qzfkjw66swk0r12kf5bf0vkk0qsjcfl7c1q"))))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)))
+ (arguments `(#:tests? #f)) ;; No tests
+ (home-page "https://community.kde.org/Frameworks")
+ (synopsis "KDE Plasma Wayland Protocols")
+ (description "Contains XML files describing non-standard wayland
+protocols used in KDE Plasma.")
+ (license (list license:bsd-3
+ license:lgpl2.1
+ license:lgpl2.1+
+ license:lgpl3
+ license:expat))))
+
(define-public kwayland
(package
(name "kwayland")
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 04/19] gnu: kdav: Move to (gnu packages kde-frameworks).
(address . 50862@debbugs.gnu.org)
20211015093015.5834-5-mail@brendan.scot
* gnu/packages/kde-pim.scm
* gnu/packages/kde-frameworks.scm
(kdav): Move to (gnu packages kde-frameworks).
---
gnu/packages/kde-frameworks.scm | 28 ++++++++++++++++++++++++++++
gnu/packages/kde-pim.scm | 28 ----------------------------
2 files changed, 28 insertions(+), 28 deletions(-)

Toggle diff (80 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index ab04545ddd..1bbfbddf6a 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2855,6 +2855,34 @@ the data accessible in all applications using the KDE file dialog or any other
KIO enabled infrastructure.")
(license license:lgpl2.1+)))
+(define-public kdav
+ (package
+ (name "kdav")
+ (version "20.04.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/kdav-" version ".tar.xz"))
+ (sha256
+ (base32 "0445gl4xm0h39igkxgb6vmq5iaa04wkgrgbs7nfd0zwngk8xaidn"))))
+ (build-system qt-build-system)
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)))
+ (inputs
+ `(("kcoreaddons" ,kcoreaddons)
+ ("ki18n" ,ki18n)
+ ("kio" ,kio)
+ ("qtbase" ,qtbase-5)
+ ("qtxmlpatterns" ,qtxmlpatterns)))
+ (home-page "https://invent.kde.org/frameworks/kdav")
+ (synopsis "DAV protocol implementation with KJobs")
+ (description "This is a DAV protocol implementation with KJobs. Calendars
+and todos are supported, using either GroupDAV or CalDAV, and contacts are
+supported using GroupDAV or CardDAV.")
+ (license ;; GPL for programs, LGPL for libraries
+ (list license:gpl2+ license:lgpl2.0+))))
+
(define-public knewstuff
(package
(name "knewstuff")
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index d0e67fa37a..9930f20bb1 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -616,34 +616,6 @@ data")
functions for accessing calendar data using the kcalcore API.")
(license license:lgpl2.0+)))
-(define-public kdav
- (package
- (name "kdav")
- (version "20.04.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/kdav-" version ".tar.xz"))
- (sha256
- (base32 "0445gl4xm0h39igkxgb6vmq5iaa04wkgrgbs7nfd0zwngk8xaidn"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)))
- (inputs
- `(("kcoreaddons" ,kcoreaddons)
- ("ki18n" ,ki18n)
- ("kio" ,kio)
- ("qtbase" ,qtbase-5)
- ("qtxmlpatterns" ,qtxmlpatterns)))
- (home-page "https://invent.kde.org/frameworks/kdav")
- (synopsis "DAV protocol implementation with KJobs")
- (description "This is a DAV protocol implementation with KJobs. Calendars
-and todos are supported, using either GroupDAV or CalDAV, and contacts are
-supported using GroupDAV or CardDAV.")
- (license ;; GPL for programs, LGPL for libraries
- (list license:gpl2+ license:lgpl2.0+))))
-
(define-public kdepim-apps-libs
(package
(name "kdepim-apps-libs")
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 05/19] gnu: kdav: Update to 5.87.0.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-6-mail@brendan.scot
* gnu/packages/kde-frameworks.scm (kdav): Update to 5.87.0.
[arguments]: Disable failing test.
---
gnu/packages/kde-frameworks.scm | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)

Toggle diff (41 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 1bbfbddf6a..35818d579b 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2858,14 +2858,15 @@ KIO enabled infrastructure.")
(define-public kdav
(package
(name "kdav")
- (version "20.04.3")
+ (version "5.87.0")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/kdav-" version ".tar.xz"))
+ (uri (string-append "mirror://kde/stable/frameworks/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
(sha256
- (base32 "0445gl4xm0h39igkxgb6vmq5iaa04wkgrgbs7nfd0zwngk8xaidn"))))
+ (base32 "0sb1g0wdpql5gw52nxhzkk1wa9md2k25lwyf902g3pf7ahdgdk5z"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -2875,6 +2876,14 @@ KIO enabled infrastructure.")
("kio" ,kio)
("qtbase" ,qtbase-5)
("qtxmlpatterns" ,qtxmlpatterns)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ ;; Inconsistent test failure: https://bugs.kde.org/show_bug.cgi?id=442935
+ (invoke "ctest" "-E" "kdav-davcollectionsmultifetchjobtest")))))))
(home-page "https://invent.kde.org/frameworks/kdav")
(synopsis "DAV protocol implementation with KJobs")
(description "This is a DAV protocol implementation with KJobs. Calendars
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 06/19] gnu: KDE Frameworks: Update to 5.87.0.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-7-mail@brendan.scot
* gnu/packages/kde-frameworks.scm (extra-cmake-modules, attica,
bluez-qt, breeze-icons, kapidox, karchive, kcalendarcore, kcodecs,
kconfig, kcoreaddons, kdbusaddons, kdnssd, kguiaddons, kholidays, ki18n,
kidletime, kirigami, kitemmodels, kitemviews, kplotting,
ksyntaxhighlighting, kwayland, kwidgetsaddons, kwindowsystem,
modemmanager-qt, networkmanager-qt, oxygen-icons, prison,
qqc2-desktop-style, solid, sonnet, threadweaver, kactivities, kauth,
kcompletion, kcontacts, kcrash, kdoctools, kfilemetadata, kimageformats,
kjobwidgets, knotifications, kpackage, kpty, kunitconversion,
syndication, baloo, kactivities-stats, kbookmarks, kcmutils,
kconfigwidgets, kdeclarative, kded, kdesignerplugin, kdesu, kdewebkit,
kemoticons, kglobalaccel, kiconthemes, kinit, kio, kdav, knewstuff,
knotifyconfig, kparts, kpeople, krunner, kservice, ktexteditor,
ktextwidgets, kwallet, kxmlgui, kxmlrpcclient, plasma-framework,
purpose, kde-frameworkintegration, kdelibs4support, khtml, kjs,
kjsembed, kmediaplayer, kross): Update to 5.87.0.

(extra-cmake-modules):[origin]: Add a patch to fix a reproducibility
issue in template .tar.bz files produced by some dependent packages,
such as kio, akonadi, plasma-framework, krunner, kparts, ktexteditor,
kirigami.
[native-inputs]: Add qtdeclarative to enable one more test.
[arguments]: Disable failing KDEFetchTranslations test. also we don't
need to run check after install anymore it seems.
Delete some comments that maybe aren't needed.

(bluez-qt): [arguments]: Enable tests with DBUS_FATAL_WARNINGS=0, since
they work now.
(breeze-icons): [native-inputs]: Add python, python-lxml. Remove libxml2.
[inputs]: Propagate qtsvg, since it's generally always needed by KDE
packages in order to make use of breeze.

(kapidox): [arguments]: make with DESTDIR=/ to fix installing to nowhere. Not sure
what is causing this...

(kcalendarcore): [arguments]: Remove test hacks that don't seem to be needed anymore. set
QT_QPA_PLATFORM=offscreen to make all tests work.

(kconfig): [native-inputs]: Remove extraneous dependencies.
[arguments]: Disable failing test. Respect #:tests?.

(kcoreaddons): [native-inputs]: Remove unused xorg-server-for-tests.
[arguments]: Remove upstreamed fix, Enable all tests but failing ones.

(kdbusaddons): [origin]: Remove kinit filename patch.
[arguments]: Since the patch went stale I found it easier to use a
substitute instead. Respect #:tests?.

(kguiaddons): [inputs]: Add wayland, qtwayland.

(kholidays): [arguments]: Reenable previously broken test.

(ki18n): [inputs]: Remove apparently uneeded input qtscript.

(ksyntaxhighlighting): [arguments]: Don't patch file that doesn't exist any more.

(kwayland): [inputs]: Add plasma-wayland-protocols.
[arguments]: Enable tests. Disable one failing test.

(kwindowsystem): [arguments]: Respect #:tests?.
(modemmanager-qt): [arguments]: Respect #:tests?.
(networkmanager-qt): [arguments]: Respect #:tests?.

(pulseaudio-qt): Update to 1.3.
[origin]: Use KDE mirror URI.

(solid): [arguments]: Respect #:tests?.
(kauth): [arguments]: Respect #:tests?.

(kfilemetadata): [native-inputs]: Remove python-2.
[arguments]: It's a different test that fails this time, disable that
instead.

(knotifications): [inputs]: Add libcanberra, qtdeclarative.
[phases]: Respect tests?.

(kpackage): [origin]: Remove uneeded macros patch. The patch was to fix
a build failure, but it no longer fails, so we don't need it.
[arguments]: Don't substitute packagejobthread.cpp since it no longer
contains the substituted text.

(kunitconversion): [arguments]: Disable tests since they require network.

(baloo): [arguments]: Reenable working tests. Simplfy test
phase. Respect #:tests?

(kcmutils): [arguments]: Set QT_QPA_PLATFORM=offscreen for tests.

(kconfigwidgets): [inputs]: Move qttools to native-inputs.

(kdeclarative): [inputs]: Add knotifications. Remove uneeded dependencies kbookmarks,
kcodecs, kcompletion ,kconfigwidgets, kitemviews, kxmlgui.

(kded): [inputs]: Remove uneeded dependency kinit.

(kdesignerplugin): [inputs]: Remove various unused inputs.

(kglobalaccel): [inputs]: Remove unused inputs kservice and libxcb.

(kio): [inputs]: Add kded, kguiaddons, qtdeclarative, ,util-linux:lib (for
libmount), and zlib.
[arguments]: Enable all tests that work. Respect #:tests?.

(knewstuff): [inputs]: Add kpackage.

(krunner): [phases]: Enable all tests that work. Respect #:tests?

(kservice): [arguments]: Enable all tests that work.
[naive-inputs]: Add shared-mime-info.

(ktexteditor): [arguments]: Enable all tests that work. Respect #:tests?

(kxmlgui): [inputs]: Add kguiaddons.

(plasma-framework): [origin]: Remove PlasaMacros patch.
[inputs]: Add libglvnd!!! Seems odd that this is needed here. We should
investigate.
[arguments]: Enable all tests that pass.

(purpose): [phases]: Remove substitution that no longer changes anything.

(kdelibs4support): [inputs]: Move qttools to to native-inputs.

* gnu/packages/patches/extra-cmake-modules-reproducible-tarballs.patch:
New file.
* gnu/packages/patches/kdbusaddons-kinit-file-name.patch: Delete file.
* gnu/packages/patches/kinit-kdeinit-extra_libs.patch: Fix patch
application. Remove unnecessary part of diff that breaks application of
patch.
* gnu/packages/patches/kinit-kdeinit-libpath.patch: Fix patch application.
* gnu/packages/patches/kio-search-smbd-on-PATH.patch: Use updated
simpler patch from Nix.
* gnu/packages/patches/kpackage-allow-external-paths.patch: Fix patch application.
* gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch: Delete file.
* gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch:
Delete file.

* gnu/local.mk:
Add reference to extra-cmake-modules-reproducible-tarballs.patch.
Remove references to:
- kpackage-fix-KF5PackageMacros.cmake.patch.
- kdbusaddons-kinit-file-name.patch
---
gnu/local.mk | 4 +-
gnu/packages/kde-frameworks.scm | 792 ++++++++----------
...-cmake-modules-reproducible-tarballs.patch | 19 +
.../patches/kdbusaddons-kinit-file-name.patch | 15 -
.../patches/kinit-kdeinit-extra_libs.patch | 21 -
.../patches/kinit-kdeinit-libpath.patch | 23 +-
.../patches/kio-search-smbd-on-PATH.patch | 46 +-
.../kpackage-allow-external-paths.patch | 17 +-
.../kpackage-fix-KF5PackageMacros.cmake.patch | 25 -
...-framework-fix-KF5PlasmaMacros.cmake.patch | 25 -
10 files changed, 427 insertions(+), 560 deletions(-)
create mode 100644 gnu/packages/patches/extra-cmake-modules-reproducible-tarballs.patch
delete mode 100644 gnu/packages/patches/kdbusaddons-kinit-file-name.patch
delete mode 100644 gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch
delete mode 100644 gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch

Toggle diff (300 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index c1f2399a46..3c6b4cf4d6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1039,6 +1039,7 @@ dist_patch_DATA = \
%D%/packages/patches/evolution-data-server-libical-compat.patch \
%D%/packages/patches/exercism-disable-self-update.patch \
%D%/packages/patches/extempore-unbundle-external-dependencies.patch \
+ %D%/packages/patches/extra-cmake-modules-reproducible-tarballs.patch \
%D%/packages/patches/extundelete-e2fsprogs-1.44.patch \
%D%/packages/patches/farstream-make.patch \
%D%/packages/patches/fastcap-mulGlobal.patch \
@@ -1307,7 +1308,6 @@ dist_patch_DATA = \
%D%/packages/patches/jfsutils-include-systypes.patch \
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
%D%/packages/patches/julia-tracker-16-compat.patch \
- %D%/packages/patches/kdbusaddons-kinit-file-name.patch \
%D%/packages/patches/libblockdev-glib-compat.patch \
%D%/packages/patches/libffi-3.3-powerpc-fixes.patch \
%D%/packages/patches/libffi-float128-powerpc64le.patch \
@@ -1327,7 +1327,6 @@ dist_patch_DATA = \
%D%/packages/patches/kmod-module-directory.patch \
%D%/packages/patches/kmscon-runtime-keymap-switch.patch \
%D%/packages/patches/kpackage-allow-external-paths.patch \
- %D%/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch \
%D%/packages/patches/kmplayer-aarch64.patch \
%D%/packages/patches/kmplayer-upstream_Fix-build-with-Qt-5.9.patch \
%D%/packages/patches/kobodeluxe-paths.patch \
@@ -1566,7 +1565,6 @@ dist_patch_DATA = \
%D%/packages/patches/pango-skip-libthai-test.patch \
%D%/packages/patches/pciutils-hurd-configure.patch \
%D%/packages/patches/pciutils-hurd-fix.patch \
- %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
%D%/packages/patches/pthreadpool-system-libraries.patch \
%D%/packages/patches/python-chai-drop-python2.patch \
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 35818d579b..42a7eb6f47 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021 Alexandros Theodotou <alex@zrythm.org>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -60,7 +61,7 @@
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages image)
#:use-module (gnu packages kerberos)
- #:use-module (gnu packages kde-plasma)
+ #:use-module (gnu packages libcanberra)
#:use-module (gnu packages libreoffice)
#:use-module (gnu packages linux)
#:use-module (gnu packages mp3)
@@ -86,7 +87,7 @@
(define-public extra-cmake-modules
(package
(name "extra-cmake-modules")
- (version "5.70.0")
+ (version "5.87.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -95,15 +96,18 @@
name "-" version ".tar.xz"))
(sha256
(base32
- "10c5xs5shk0dcshpdxg564ay5y8hgmvfvmlhmhjf0dy79kcah3c3"))))
+ "1axwz0p3ggjpcxpqqlyng3fa2pxmjxgybncgkp8i81i7iq6sf72l"))
+ (patches ;; https://bugs.kde.org/show_bug.cgi?id=443532
+ (search-patches "extra-cmake-modules-reproducible-tarballs.patch"))))
(build-system cmake-build-system)
(native-inputs
- ;; Add test dependency, except on armhf where building it is too
+ ;; Add test dependencies, except on armhf where building it is too
;; expensive.
(if (and (not (%current-target-system))
(string=? (%current-system) "armhf-linux"))
'()
- `(("qtbase" ,qtbase-5)))) ;for tests (needs qmake)
+ `(("qtbase" ,qtbase-5)
+ ("qtdeclarative" ,qtdeclarative))))
(arguments
`(#:tests? ,(not (null? (package-native-inputs this-package)))
#:phases
@@ -130,19 +134,11 @@
(("set\\(ECM_MKSPECS_INSTALL_DIR mkspecs/modules")
"set(ECM_MKSPECS_INSTALL_DIR lib/qt5/mkspecs/modules"))
#t))
- ;; install and check phase are swapped to prevent install from failing
- ;; after testsuire has run
- (add-after 'install 'check-post-install
- (assoc-ref %standard-phases 'check))
- (delete 'check))))
- ;; optional dependencies - to save space, we do not add these inputs.
- ;; Sphinx > 1.2:
- ;; Required to build Extra CMake Modules documentation in Qt Help format.
- ;; Qt5LinguistTools , Qt5 linguist tools. , <http://www.qt.io/>
- ;; Required to run tests for the ECMPoQmTools module.
- ;; Qt5Core
- ;; Required to run tests for the ECMQtDeclareLoggingCategory module,
- ;; and for some tests of the KDEInstallDirs module.
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests? ;; This test fails
+ (invoke "ctest" "-E" "KDEFetchTranslations"))
+ #t)))))
(home-page "https://community.kde.org/Frameworks")
(synopsis "CMake module files for common software used by KDE")
(description "The Extra CMake Modules package, or ECM, adds to the
@@ -186,7 +182,7 @@ common build settings used in software produced by the KDE community.")
((regex all dest)
(string-append dest (assoc-ref outputs "out")))))
#t)))))
- (home-page "https://phonon.kde.org")
+ (home-page "https://community.kde.org/Phonon")
(synopsis "KDE's multimedia library")
(description "KDE's multimedia library.")
(license license:lgpl2.1+)))
@@ -220,7 +216,7 @@ common build settings used in software produced by the KDE community.")
(arguments
`(#:configure-flags
'( "-DPHONON_BUILD_PHONON4QT5=ON")))
- (home-page "https://phonon.kde.org")
+ (home-page "https://community.kde.org/Phonon")
(synopsis "Phonon backend which uses GStreamer")
(description "Phonon makes use of backend libraries to provide sound.
Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
@@ -236,7 +232,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
(define-public attica
(package
(name "attica")
- (version "5.70.0")
+ (version "5.87.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -245,7 +241,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1njw1sifykyqldb5idaywdzi3xg7a6bvzkrvazwmyixd0npq12dx"))))
+ "0wjfrlmwg03js544xjlpznxxqv14cj40fpzbfnlj24kjgd1ai8dq"))))
(build-system cmake-build-system)
(arguments
`(#:phases
@@ -276,7 +272,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
(define-public bluez-qt
(package
(name "bluez-qt")
- (version "5.70.0")
+ (version "5.87.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -285,7 +281,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
name "-" version ".tar.xz"))
(sha256
(base32
- "1kqhps4qyvqm0qmk7fb3w41bib898amipchf8csdzacw4bzpri9k"))))
+ "1shk3riddgdb0i6f0603hbhww13z1b566rdaplxsbgk8cyhl5acz"))))
(build-system cmake-build-system)
(native-inputs
`(("dbus" ,dbus)
@@ -297,9 +293,13 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
`(#:configure-flags
(list (string-append
"-DUDEV_RULES_INSTALL_DIR=" %output "/lib/udev/rules.d"))
- ;; TODO: Make tests pass: DBUS_FATAL_WARNINGS=0 still yields 7/8 tests
- ;; failing. When running after install, tests hang.
- #:tests? #f))
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "DBUS_FATAL_WARNINGS" "0")
+ (invoke "dbus-launch" "ctest")))))))
(home-page "https://community.kde.org/Frameworks")
(synopsis "QML wrapper for BlueZ")
(description "bluez-qt is a Qt-style library for accessing the bluez
@@ -309,7 +309,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.")
(define-public breeze-icons
(package
(name "breeze-icons")
- (version "5.70.0")
+ (version "5.87.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -318,14 +318,18 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0lqglrjgjb4ralgmr7lb9k7acmn8q4jm18s4p3gbgd9iswyqgsbm"))))
+ "19f7n4r6b0b1l8hc79xbj8gc18xf488bk4i0wdbw22x9vwl4h58h"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("fdupes" ,fdupes)
- ("libxml2" ,libxml2)))
+ ("python-lxml" ,python-lxml)
+ ("python" ,python)))
(inputs
`(("qtbase" ,qtbase-5)))
+ (propagated-inputs
+ ;; KDE apps will need qtsvg to make use of breeze which is SVG only.
+ `(("qtsvg" ,qtsvg)))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Default KDE Plasma 5 icon theme")
(description "Breeze provides a freedesktop.org compatible icon theme.
@@ -338,7 +342,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.")
(define-public kapidox
(package
(name "kapidox")
- (version "5.70.0")
+ (version "5.87.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -347,12 +351,11 @@ It is the default icon theme for the KDE Plasma 5 desktop.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1irl25pf60frzrmm1ksgjq6y8kn3rd5snliq69l4c42yznl9qv1j"))))
+ "0iyla9i4ln6w9wkm4dand53ir6gzsm4180diwi9p2q5mfrk0rvja"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f)) ; has no test target
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)))
+ `(#:tests? #f ; has no test target
+ #:make-flags (list "DESTDIR=/"))) ;; Otherwise it doesn't install anything.
(propagated-inputs
;; kapidox is a python programm
;; TODO: check if doxygen has to be installed, the readme does not
@@ -380,7 +383,7 @@ documentation.")
(define-public karchive
(package
(name "karchive")
- (version "5.70.0")
+ (version "5.87.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -389,15 +392,19 @@ documentation.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0z8asn357pdbv4g9g0x18p72wskca1qanxljyix7wzc5rsi63wzm"))))
+ "0d8wqrynwmqazlf5v7qas9akrvcwr4lrqg3dcbnq61mmc252wgqh"))))
(build-system cmake-build-system)
(native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)))
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ; ("pkg-config" ,pkg-config) ;; for zstd
+ ))
(inputs
`(("bzip2" ,bzip2)
("qtbase" ,qtbase-5)
("xz" ,xz)
- ("zlib" ,zlib)))
+ ("zlib" ,zlib)
+ ; ("zstd:lib" ,zstd "lib") ;; Tests fail with zstd
+ ))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Qt 5 addon providing access to numerous types of archives")
(description "KArchive provides classes for easy reading, creation and
@@ -414,7 +421,7 @@ GZip format, via a subclass of QIODevice.")
(define-public kcalendarcore
(package
(name "kcalendarcore")
- (version "5.70.0")
+ (version "5.87.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -423,7 +430,7 @@ GZip format, via a subclass of QIODevice.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1y1f8gc1g9yn9kgmn53f1zvkizasfs667dfin3fyci657r5qwpw2"))))
+ "0ig2w0dxrf9ih9hqk5rvqqmyhg658m1hs4807zl66llplkr58q0n"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -435,26 +442,9 @@ GZip format, via a subclass of QIODevice.")
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-before 'configure 'disable-failing-libical3-tests
- (lambda _
- ;; testicaltimezones fails with some time-zone issue
- (substitute* "autotests/CMakeLists.txt"
- (("macro_unit_tests\\(testicaltimezones\\)" line)
- (string-append "## " line))
- (("target_link_libraries\\(testicaltimezones
This message was truncated. Download the full message here.
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 07/19] gnu: Add layer-shell-qt.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-8-mail@brendan.scot
* gnu/packages/kde-plasma.scm (layer-shell-qt): New variable.
---
gnu/packages/kde-plasma.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)

Toggle diff (48 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 96e7ec6907..eb463a498a 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -136,6 +137,33 @@ directly, you need to tell @code{ssh-add} about it. @code{ssh-add} will then
call it if it is not associated to a terminal.")
(license license:gpl2+)))
+(define-public layer-shell-qt
+ (package
+ (name "layer-shell-qt")
+ (version "5.22.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/layer-shell-qt-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0i9gsckqk9608drxvym6ghcwxqilcf6ilcxq48sbrnpswid71k7z"))))
+ (build-system qt-build-system)
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("libxkbcommon" ,libxkbcommon)
+ ("qtbase" ,qtbase-5)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtwayland" ,qtwayland)
+ ("wayland" ,wayland)
+ ("wayland-protocols" ,wayland-protocols)))
+ (home-page "https://invent.kde.org/plasma/layer-shell-qt")
+ (synopsis "Qt component for the Wayland ql-layer-shell protocol")
+ (description "Qt component for the Wayland ql-layer-shell protocol.")
+ (license license:gpl2+)))
+
(define-public kscreenlocker
(package
(name "kscreenlocker")
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 08/19] gnu: KDE Plasma: Update to 5.22.5.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-9-mail@brendan.scot
(breeze, kdecoration, libkscreen, ksshaskpass, kscreenlocker,
libksysguard): Update to 5.22.5.

(kscreenlocker):[inputs]: Add layer-shell-qt.

(libksysguard):[origin]: Fix typo in URI that affecs refresh script.
[native-inputs]: Add qttools.
[inputs]: Add libnl, libcap, libpcap, qtwebengine, qtwebchannel.
[arguments]: Remove uneeeded configure flags hack.
Remove Uneeded CMakeLists.txt substitution.
Respect #:tests?.
---
gnu/packages/kde-plasma.scm | 56 +++++++++++++++++++------------------
1 file changed, 29 insertions(+), 27 deletions(-)

Toggle diff (186 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index eb463a498a..be25fb6afb 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -28,6 +28,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cmake)
#:use-module (guix build-system qt)
+ #:use-module (gnu packages admin)
#:use-module (gnu packages compression)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib)
@@ -35,19 +36,20 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages qt)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg))
(define-public breeze
(package
(name "breeze")
- (version "5.19.5")
+ (version "5.22.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version "/"
name "-" version ".tar.xz"))
(sha256
(base32
- "0dpk1w7zcafrzf46j060i1qb0fwqpsflkfzr6gcar81llmjnc4b1"))))
+ "09ll0bddsbbhz7ihqcn0wbd2llbjrblgk90gp556kpy09jh4rz73"))))
(build-system qt-build-system)
;; TODO: Warning at /gnu/store/…-kpackage-5.34.0/…/KF5PackageMacros.cmake:
;; warnings during generation of metainfo for org.kde.breezedark.desktop:
@@ -87,14 +89,14 @@ the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.")
(define-public kdecoration
(package
(name "kdecoration")
- (version "5.19.5")
+ (version "5.22.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/kdecoration-" version ".tar.xz"))
(sha256
(base32
- "0pn8n7zyb0adzjnn92vmbcf7pmpss60k9k1rk5llamj016xzfgnf"))))
+ "1vqv44ls79x2d71ldkkkzpk4mzpv110y270wf1gbkmxaxwp20xxm"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -111,14 +113,14 @@ manager which re-parents a Client window to a window decoration frame.")
(define-public ksshaskpass
(package
(name "ksshaskpass")
- (version "5.19.5")
+ (version "5.22.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/ksshaskpass-" version ".tar.xz"))
(sha256
(base32
- "1k2va2v9051f71w78dn3gihk642iyy5yzrkcfnp97fag8g6dpisi"))))
+ "0ig2cx80ba57k9mq7bcnmriymjln7kvr81mgm5rsdi4asal2zpgp"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -167,14 +169,14 @@ call it if it is not associated to a terminal.")
(define-public kscreenlocker
(package
(name "kscreenlocker")
- (version "5.19.5")
+ (version "5.22.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/kscreenlocker-" version ".tar.xz"))
(sha256
(base32
- "1fd5sqaqx9kj3kr0bgxpllhcm5arf8bc9pkpd9yk9c8xjy0j0fxi"))))
+ "107icbr0cdcpbzi5npgx3fw2m2wp1z91k1iw26n595dp3n2czv98"))))
(build-system qt-build-system)
(arguments
`(#:tests? #f ;; TODO: make tests pass
@@ -192,7 +194,7 @@ call it if it is not associated to a terminal.")
(if tests?
(begin
(setenv "CTEST_OUTPUT_ON_FAILURE" "1")
- (invoke "dbus-launch" "ctest" ".")))
+ (invoke "dbus-launch" "ctest")))
#t)))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -212,6 +214,7 @@ call it if it is not associated to a terminal.")
("kwayland" ,kwayland)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
+ ("layer-shell-qt" ,layer-shell-qt)
("libseccomp" ,libseccomp) ;for sandboxing the look'n'feel package
("libxcursor" ,libxcursor) ;missing in CMakeList.txt
("libxi" ,libxi) ;XInput, required for grabbing XInput2 devices
@@ -232,14 +235,14 @@ call it if it is not associated to a terminal.")
(define-public libkscreen
(package
(name "libkscreen")
- (version "5.19.5")
+ (version "5.22.5")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0rf1pm0yyc069f4n5s9ipdx4glzfr9zvv5cbrmn4q9i4v6z1qd8i"))))
+ (base32 "1qqnra28r698kbps6ywk22ncac4sm3f9d9wrwmicp963mkmwlksv"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -262,17 +265,18 @@ basic needs and easy to configure for those who want special setups.")
(define-public libksysguard
(package
(name "libksysguard")
- (version "5.19.5")
+ (version "5.22.5")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://kde//stable/plasma/" version
+ (uri (string-append "mirror://kde/stable/plasma/" version
"/libksysguard-" version ".tar.xz"))
(sha256
- (base32 "1kd0h3p8bf9k5pqp0frhr81pa0yyrpkckg9zznirk9p1v88v7bfq"))))
+ (base32 "1hkjsjfl4hsxbk998hpq4f38rahqfx6nmznbh0dqrymadfbsn8m5"))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ("qttools" ,qttools)))
(inputs
`(("kconfigwidgets" ,kconfigwidgets)
("kiconthemes" ,kiconthemes)
@@ -288,30 +292,28 @@ basic needs and easy to configure for those who want special setups.")
("knewstuff" ,knewstuff)
("kwidgetsaddons" ,kwidgetsaddons)
("kservice" ,kservice)
+ ("libnl" ,libnl)
+ ("libcap" ,libcap)
+ ("libpcap" ,libpcap)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtscript" ,qtscript)
+ ("qtwebengine" ,qtwebengine)
+ ("qtwebchannel" ,qtwebchannel)
("qtwebkit" ,qtwebkit)
("qtx11extras" ,qtx11extras)
("plasma" ,plasma-framework)
("zlib" ,zlib)))
(build-system qt-build-system)
(arguments
- `(#:configure-flags
- `(,(string-append "-DKDE_INSTALL_DATADIR="
- (assoc-ref %outputs "out") "/share"))
- #:phases
+ `(#:phases
(modify-phases %standard-phases
- (add-before 'configure 'patch-cmakelists
- (lambda _
- ;; TODO: Verify: This should no longer be necessary, since
- ;; KF5AuthConfig.cmake.in contains this already.
- (substitute* "processcore/CMakeLists.txt"
- (("KAUTH_HELPER_INSTALL_DIR") "KDE_INSTALL_LIBEXECDIR"))))
(replace 'check
- (lambda _
+ (lambda* (#:key tests? #:allow-other-keys)
;; TODO: Fix this failing test-case
- (invoke "ctest" "-E" "processtest"))))))
+ (when tests?
+ (invoke "ctest" "-E" "processtest"))
+ #t)))))
(home-page "https://userbase.kde.org/KSysGuard")
(synopsis "Network enabled task and system monitoring")
(description "KSysGuard can obtain information on system load and
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 09/19] gnu: libgravatar: Move to (gnu packages kde-pim).
(address . 50862@debbugs.gnu.org)
20211015093015.5834-10-mail@brendan.scot
Remove uneeded (gnu packages kde-internet) import.
* gnu/packages/kde-internet.scm: Move libgravatar ...
* gnu/packages/kde-pim.scm ...here
---
gnu/packages/kde-internet.scm | 32 --------------------------------
gnu/packages/kde-pim.scm | 34 +++++++++++++++++++++++++++++++++-
2 files changed, 33 insertions(+), 33 deletions(-)

Toggle diff (104 lines)
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index 223e1aab7a..af0aba5b9a 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -426,38 +426,6 @@ 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 libgravatar
- (package
- (name "libgravatar")
- (version "20.04.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/libgravatar-" version ".tar.xz"))
- (sha256
- (base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2"))))
- (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-5)))
- (arguments
- `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
- (home-page "https://invent.kde.org/pim/libgravatar")
- (synopsis "Online avatar lookup library")
- (description "This library retrieves 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")
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 9930f20bb1..671286022d 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,7 +35,6 @@
#:use-module (gnu packages gnupg)
#:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks)
- #:use-module (gnu packages kde-internet)
#:use-module (gnu packages openldap)
#:use-module (gnu packages qt)
#:use-module (gnu packages search)
@@ -1682,6 +1682,38 @@ Virtual Contact File}) files to the KPeople contact management library.")
(license ;; GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0+))))
+(define-public libgravatar
+ (package
+ (name "libgravatar")
+ (version "20.04.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/libgravatar-" version ".tar.xz"))
+ (sha256
+ (base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2"))))
+ (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-5)))
+ (arguments
+ `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
+ (home-page "https://invent.kde.org/pim/libgravatar")
+ (synopsis "Online avatar lookup library")
+ (description "This library retrieves 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 kpimtextedit
(package
(name "kpimtextedit")
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 10/19] gnu: KDE PIM: Update to 21.08.2.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-11-mail@brendan.scot
* gnu/packages/kde-pim.scm

(akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
akonadi-search kincidenceeditor kaddressbook kalarmcal
kcalendarsupport kcalutils kdepim-runtime keventviews kgpg
kidentitymanagement kimap kldap kleopatra kmail kmailcommon
kmailimporter kmailtransport kmbox kmessagelib kmime knotes
kontactinterface korganizer libgravatar kpimcommon kpimtextedit ksmtp
ktnef libkdepim libkgapi libkleo libksieve): Update to 21.08.2

(akonadi): [arguments]: Don't use %outputs and %build-inputs.
(akonadi-calendar): [inputs]: Add grantleetheme.
[home-page]: Lint URL.

(akonadi-contacts): [inputs]: Add grantlee, grantleetheme, kcmutils, libkleo

(kincidenceeditor): [native-inputs]: Add dbus for tests.
[inputs]: Add grantleetheme, kimap. Replace obsolete kdepim-apps-libs
with kpimcommon.
[arguments]: launch dbus, and disable failing tests.

(kalarmcal): [home-page]: Lint URL.
(kblog): [home-page]: Lint URL.
(kcalendarsupport): [inputs]: Remove kdepim-apps-libs.
[home-page]: Lint URL.

(kcalcutils): [home-page]: Lint URL.
[inputs]: Replace oxygen-icons with breeze-icons as default.
(kdepim-apps-libs): Delete variable.

(kdepim-runtime): [inputs]: Add grantleetheme, kcmutils, kldap,
libkdepim, qtkeychain
[arguments]: Enable all tests that pass. Use dbus-launch. Revert to old
include path hack since it doesn't work with search-input-directory. Not
sure why.

(kgpg): [inputs]: Add grantleetheme.
[arguments]: Disable failing tests.
[inputs]: Replace oxygen-icons with breeze-icons as default.
[home-page]: Lint URL.

(kimap): [home-page]: Lint URL.

(kldap): [inputs]: Add qtkeychain.
[home-page]: Lint URL.
[description]: Lint.

(kleopatra): [inputs]: Replace oxygen-icons with breeze-icons as default.
[home-page]: Lint URL.

(kmail): [origin]: Remove patch. Doesn't appear to be needed anymore?
[inputs]: Add grantleetheme, kuserfeedback, qtchain. Remove
kdepim-apps-lib, duplicate kmime entry. Replace oxygen-icons with
breeze-icons as default.
[arguments]: Unfortunately a few tests fail. Disable them for now.

(kmailcommon)[arguments]: Enable all tests that pass. Use dbus-launch.

(kmailimporter): [inputs]: Add adonadi-contacts, grantleetheme,
kcontacts, kimap, kpimcommon.

(kmailtransport): [home-page]: Lint URL.
[inputs]: Add qtkeychain.

(kmbox): [home-page]: Lint URL.

(kmessagelib)[inputs]: Remove kdepim-apps-lib. Add kguiaddons

[arguments]: Now QPrinter fails to be found instead. Revert to old
CPLUS_INCLUDE_PATH fix since it doesn't work otherwise for some unknown
reason.

(kmime): [home-page]: Lint URL.

(knotes) [inputs]: Remove kmime. Replace oxygen-icons with breeze-icons
as default.

(kontactinterface): [home-page]: Lint URL.

(korganizer): [inputs]: Add grantleetheme. Remove obsolete
kdepim-apps-libs. Replace oxygen-icons with breeze-icons as default.
[synopsis]: Lint.

(kpimcommon): [inputs]: Add akonadi-search, grantleetheme, kcalendarcore,
kcmutils, kldap. Remove grantlee.

(kpimtextedit): [home-page]: Lint URL.
(ktnef): [home-page]: Lint URL.

(libkleo): [inputs]: Remove gpgme.
[arguments]: Disable failing tests for now.

(libksieve): [phases]: Enable a tests that works now.
[phases]: Enable a tests that works now.

* gnu/packages/patches/kmail-Fix-missing-link-libraries.patch: Delete file.
* gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch: Fix
patch using Upstream suggestion in https://phabricator.kde.org/D26818
* gnu/packages/patches/akonadi-not-relocatable.patch: Import updated
patch from Nix.
* gnu/packages/patches/akonadi-paths.patch: Fix.
* gnu/packages/patches/akonadi-timestamps.patch: Fix.
* gnu/local.mk: Remove reference to kmail patch.
---
gnu/local.mk | 1 -
gnu/packages/kde-pim.scm | 414 ++++++++++--------
.../patches/akonadi-not-relocatable.patch | 51 +--
gnu/packages/patches/akonadi-paths.patch | 30 +-
gnu/packages/patches/akonadi-timestamps.patch | 6 +-
.../kmail-Fix-missing-link-libraries.patch | 41 --
...libksieve-Fix-missing-link-libraries.patch | 76 +---
7 files changed, 284 insertions(+), 335 deletions(-)
delete mode 100644 gnu/packages/patches/kmail-Fix-missing-link-libraries.patch

Toggle diff (397 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 3c6b4cf4d6..10b97c8bc3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1323,7 +1323,6 @@ dist_patch_DATA = \
%D%/packages/patches/kinit-kdeinit-extra_libs.patch \
%D%/packages/patches/kinit-kdeinit-libpath.patch \
%D%/packages/patches/kio-search-smbd-on-PATH.patch \
- %D%/packages/patches/kmail-Fix-missing-link-libraries.patch \
%D%/packages/patches/kmod-module-directory.patch \
%D%/packages/patches/kmscon-runtime-keymap-switch.patch \
%D%/packages/patches/kpackage-allow-external-paths.patch \
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 671286022d..c65dcf714f 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -44,14 +44,14 @@
(define-public akonadi
(package
(name "akonadi")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/akonadi-" version ".tar.xz"))
(sha256
- (base32 "0kkn7lh3akkk9cdi8qdk9kqzs1cgv916mkl440x4ykqd1v8brzqb"))
+ (base32 "0jwhjdqha82hbyg2wmzjl5qi2rgmyd2sghdw85s77y63bxm9f0s2"))
(patches (search-patches
"akonadi-paths.patch"
"akonadi-timestamps.patch"
@@ -90,10 +90,10 @@
#: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")))
+ (lambda* (#:key outputs build-inputs #:allow-other-keys)
+ (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
@@ -121,14 +121,14 @@ programs.")
(define-public akonadi-calendar
(package
(name "akonadi-calendar")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/akonadi-calendar-" version ".tar.xz"))
(sha256
- (base32 "1mq76qyd3jcngb2yfanpn7qvklzllza399fxwii0mqppp1vmnb2b"))))
+ (base32 "0k4cbcr6cw9rcrzidlbjbpshmsfh0p2m8bd9inkgzxi08drwizsa"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -137,6 +137,7 @@ programs.")
("akonadi-contacts" ,akonadi-contacts)
("akonadi-mime" ,akonadi-mime)
("boost" ,boost)
+ ("grantleetheme" ,grantleetheme)
("kcalendarcore" ,kcalendarcore)
("kcalutils" ,kcalutils)
("kcodecs" ,kcodecs)
@@ -155,7 +156,7 @@ programs.")
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f)) ;; TODO: 1/1 test fails
- (home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
+ (home-page "https://api.kde.org/kdepim/akonadi/html/")
(synopsis "Library providing calendar helpers for Akonadi items")
(description "This library manages calendar specific actions for
collection and item views.")
@@ -164,21 +165,24 @@ collection and item views.")
(define-public akonadi-contacts
(package
(name "akonadi-contacts")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/akonadi-contacts-" version ".tar.xz"))
(sha256
- (base32 "0igggarnl99s5pl73dgrpha4lf7vnr000iy69vcwmqs5lxb7cyli"))))
+ (base32 "1ap2c16c0z4m7f3zsp5w5wqwcdr3fn1n2kvb6d647c3knszgibvg"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("akonadi" ,akonadi)
("boost" ,boost)
+ ("grantlee" ,grantlee)
+ ("grantleetheme" ,grantleetheme)
("kauth" ,kauth)
+ ("kcmutils" ,kcmutils)
("kcodecs" ,kcodecs)
("kcompletion" ,kcompletion)
("kconfigwidgets" ,kconfigwidgets)
@@ -195,6 +199,7 @@ collection and item views.")
("ktextwidgets" ,ktextwidgets)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
+ ("libkleo" ,libkleo)
("prison" ,prison)
("kio" ,kio)
("qtbase" ,qtbase-5)
@@ -215,14 +220,14 @@ to list and filter contacts.")
(define-public akonadi-mime
(package
(name "akonadi-mime")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/akonadi-mime-" version ".tar.xz"))
(sha256
- (base32 "1wd776ia3z22a79biq04y4m83n8xpvfmyg8bcsslr7lmc3avdg8w"))))
+ (base32 "0fkv26zl92xijkibpxvbqcmip24qrq58lan3w9s642gqh972a6x3"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -268,14 +273,14 @@ with emails through Akonadi easier.")
(define-public akonadi-notes
(package
(name "akonadi-notes")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/akonadi-notes-" version ".tar.xz"))
(sha256
- (base32 "04y293kjrmjjcbb7fkjl7hl4vrks4cjjxnvc6ibzyv81rn6cdhh2"))))
+ (base32 "0r19g9a0asqlw1qsh9vidbwpgbslfwqc8g577hdkhahfvg7hplmq"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -297,14 +302,14 @@ wrapping notes into KMime::Message objects.")
(define-public akonadi-search
(package
(name "akonadi-search")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/akonadi-search-" version ".tar.xz"))
(sha256
- (base32 "1h5p44y244gzf7ndzw7afrvq9c76ybp8ddvg82p3lzjh02rrvd50"))))
+ (base32 "1a1pf9q93z0cv7v2fxksiw3vn5dylg0lgniv98z9p6zv0wijxhn5"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -353,46 +358,58 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.")
(define-public kincidenceeditor
(package
(name "kincidenceeditor")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/incidenceeditor-" version ".tar.xz"))
(sha256
- (base32 "1xpp5lw60mvpjsjsxmicfa5y2d68wnb9vm4yb1krwkihm852ziny"))))
+ (base32 "0xrz3kzf4mc37zgfbjgc23l7wxry9m6d5igvyf1qm33yxwr4w78q"))))
(properties `((upstream-name . "incidenceeditor")))
(build-system qt-build-system)
(native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)))
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ("dbus" ,dbus)))
(inputs
`(("akonadi" ,akonadi)
("akonadi-calendar" ,akonadi-calendar)
("akonadi-contacts" ,akonadi-contacts)
("akonadi-mime" ,akonadi-mime)
("boost" ,boost)
+ ("grantleetheme" ,grantleetheme)
("kcalendarcore" ,kcalendarcore)
("kcalendarsupport" ,kcalendarsupport)
("kcalutils" ,kcalutils)
("kcodecs" ,kcodecs)
("kcontacts" ,kcontacts)
("kdbusaddons" ,kdbusaddons)
- ("kdepim-apps-libs" ,kdepim-apps-libs)
("kdiagram" ,kdiagram)
("keventviews" ,keventviews)
("ki18n" ,ki18n)
("kiconthemes" ,kiconthemes)
("kidentitymanagement" ,kidentitymanagement)
+ ("kimap" ,kimap)
("kio" ,kio)
("kitemmodels" ,kitemmodels)
("kldap" ,kldap)
("kmailtransport" ,kmailtransport)
("kmime" ,kmime)
+ ("kpimcommon" ,kpimcommon)
("kpimtextedit" ,kpimtextedit)
("ktextwidgets" ,ktextwidgets)
("kwallat" ,kwallet)
("libkdepim" ,libkdepim)
("qtbase" ,qtbase-5)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "dbus-launch" "ctest" ;; FIXME: test fails.
+ "-E" "akonadi-sqlite-incidencedatetimetest"))
+ #t)))))
(home-page "https://invent.kde.org/pim/incidenceeditor")
(synopsis "KDE PIM library for editing incidences")
(description "This library provides an incidence editor for KDE PIM.")
@@ -402,14 +419,14 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.")
(define-public kaddressbook
(package
(name "kaddressbook")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kaddressbook-" version ".tar.xz"))
(sha256
- (base32 "1vpdhdj87ai2sxjn2jk3mh6bzfr1n3yzydnkgv7nc8v1m2fdawap"))))
+ (base32 "1pvd31zpam13jv0mhxzaagdlvnav60znd68l24y1dw5i98wk7n72"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -428,7 +445,6 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.")
("kcontacts" ,kcontacts)
("kcrash" ,kcrash)
("kdbusaddons" ,kdbusaddons)
- ("kdepim-apps-libs" ,kdepim-apps-libs)
("kdoctools" ,kdoctools)
("ki18n" ,ki18n)
("kiconthemes" ,kiconthemes)
@@ -444,7 +460,7 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.")
("kxmlgui" ,kxmlgui)
("libkdepim" ,libkdepim)
("libkleo" ,libkleo)
- ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
+ ("breeze-icons" ,breeze-icons) ; default icon set, required for tests
("prison" ,prison)
("qgpgme" ,qgpgme)
("qtbase" ,qtbase-5)))
@@ -459,14 +475,14 @@ CalDAV server.")
(define-public kalarmcal
(package
(name "kalarmcal")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kalarmcal-" version ".tar.xz"))
(sha256
- (base32 "0g0bm4zzzcpl2pqqf609349zagwrgj6a4ibxpgg4zf21aacdq8bi"))))
+ (base32 "0xdcazbbkm2z0r2g1avwh9bvdkvv0fy6qhhddlmfzj4cwh4c9vih"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -491,7 +507,7 @@ CalDAV server.")
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f)) ;; TODO: TZ setup
- (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
+ (home-page "https://github.com/KDE/kalarmcal")
(synopsis "Library for handling kalarm calendar data")
(description "This library provides access to and handling of kalarm
calendar data.")
@@ -520,7 +536,7 @@ calendar data.")
("qtbase" ,qtbase-5)
("syndication" ,syndication)))
;; Note: Some tests take up to 90 sec.
- (home-page "https://invent.kde.org/pim/kblog")
+ (home-page "https://apps.kde.org/kblog/")
(synopsis "Client-side support library for web application remote blogging
APIs")
(description "KBlog is a library for calling functions on Blogger 1.0,
@@ -534,14 +550,14 @@ one of the APIs mentioned above.")
(define-public kcalendarsupport
(package
(name "kcalendarsupport")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/calendarsupport-" version ".tar.xz"))
(sha256
- (base32 "1yv3hs7qw481cxw4kzbx5l8vv18bgzm1b0vj3zrlqqxwl5ac6xvy"))))
+ (base32 "01plq4qzp94lxcc2gp04afnlvmni8993c8mf6kl256158z0y24ik"))))
(properties `((upstream-name . "calendarsupport")))
(build-system qt-build-system)
(native-inputs
@@ -551,12 +567,12 @@ one of the APIs mentioned above.")
`(("akonadi" ,akonadi)
("akonadi-calendar" ,akonadi-calendar)
("akonadi-mime" ,akonadi-mime)
+ ("akonadi-notes" ,akonadi-notes)
("boost" ,boost)
("kcalendarcore" ,kcalendarcore)
("kcalutils" ,kcalutils)
("kcompletion" ,kcompletion)
("kdbusaddons" ,kdbusaddons)
- ("kdepim-apps-libs" ,kdepim-apps-libs)
("kguiaddons" ,kguiaddons)
("kholidays" ,kholidays)
("ki18n" ,ki18n)
@@ -570,7 +586,7 @@ one of the APIs mentioned above.")
("ktextwidgets" ,ktextwidgets)
("kxmlgui" ,kxmlgui)
("qtbase" ,qtbase-5)))
- (home-page "https://api.kde.org/stable/calendarsupport/")
+ (home-page "https://github.com/KDE/calendarsupport")
(synopsis "Calendar Support library for KDE PIM")
(description "The Calendar Support library provides helper utilities for
calendaring applications.")
@@ -580,14 +596,14 @@ calendaring applications.")
(define-public kcalutils
(package
(name "kcalutils")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kcalutils-" version ".tar.xz"))
(sha256
- (base32 "0v268w8vhgqxq1nwv9b9cy4h7zqgjrv19r44g3zc9w5j76ivix86"))))
+ (base32 "0kvfpsz6zxdbgl4qvk3q55fjgjql1chx844cys26anhza0ld9afz"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -605,72 +621,28 @@ calendaring applications.")
("kpimtextedit" ,kpimtextedit)
("ktextwidgets" ,ktextwidgets)
("kwidgetsaddons" ,kwidgetsaddons)
- ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
+ ("breeze-icons" ,breeze-icons) ; default icon set, required for tests
("qtbase" ,qtbase-5)))
(arguments
`(#:tests? #f)) ;; TODO: seem to pull in some wrong theme
- (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
+ (home-page "https://github.com/KDE/kcalutils")
(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 kdepim-apps-libs
- (package
- (name "kdepim-apps-libs")
- (version "20.04.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/kdepim-apps-libs-" version ".tar.xz"))
- (sha256
- (base32 "0m9qrfjs97anh9h6ibggx23ddlm1zkxjap2iyf3gf672ip01fvci"))))
- (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" ,kconfigwid
This message was truncated. Download the full message here.
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 12/19] gnu: Remove libraw-0.18.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-13-mail@brendan.scot
* gnu/packages/photo.scm (libraw-0.18): Delete variable.
This package is unused by krita now.
---
gnu/packages/photo.scm | 12 ------------
1 file changed, 12 deletions(-)

Toggle diff (25 lines)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index e85af9305a..9331b83298 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -203,18 +203,6 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).")
;; both two licensing modes for your changes/additions."
(license (list license:lgpl2.1 license:cddl1.0))))
-(define-public libraw-0.18
- (package (inherit libraw)
- (name "libraw")
- (version "0.18.12")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://www.libraw.org/data/LibRaw-"
- version ".tar.gz"))
- (sha256
- (base32
- "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap"))))))
-
(define-public libexif
(package
(name "libexif")
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 11/19] gnu: KDE: Update to 21.08.2.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-12-mail@brendan.scot
(baloo-widgets grantleetheme akregator kdevelop-pg-qt
kdiagram massif-visualizer libkomparediff2 qca kpmcore snorenotify
kdeconnect labplot kqtquickcharts kdf kcachegrind libkdegames okular
poxml kdegraphics-mobipocket libkexiv2 zeroconf-ioslave kuserfeedback):
Update to 21.08.2.

(kdevelop): Update to 5.6.2.
[inputs]: Add ksyntaxhighlighting.
Replace oxygen-icons with breeze-icons as default.
[home-page]: Lint URL.

(kdenlive): Specify version the usual way, without let form.

(grantleetheme): [origin]: Remove merge-theme-dirs patch. The code
appears to be integrated upstream so the patch doesn't apply. Not 100%
sure if any of it is still needed.

(akregator): [home-page]: Lint URL.

(krita): [inputs]: Use latest libraw. Add libheif.
[build-system]: Use qt-build-system. Simplify.
[configure-flags]: Use gexp instead of %build-inputs.
[phases]: Don't wrap QT_PLUGIN_PATH, since it should be done by
qt-build-system.
[home-page]: Lint URL.

(kpmcore): [inputs]: Add polkit-qt.
[arguments]: Don't install to polkits store path.

(kdeconnect): [inputs]: Add qqc2-desktop-style, qtwayland, wayland.

(kdf): [home-page]: Lint URL.
(okular): [home-page]: Lint URL.
(poxml): [home-page]: Lint URL.
(kdegraphics-mobipocket): [home-page]: Lint URL.
(zeroconf-ioslave): [home-page]: Lint URL.

* gnu/packages/patches/grantlee-merge-theme-dirs.patch: Delete file.
* gnu/local.mk: Remove reference to patch.
---
gnu/local.mk | 1 -
gnu/packages/kde.scm | 298 +++++++++---------
.../patches/grantlee-merge-theme-dirs.patch | 163 ----------
3 files changed, 149 insertions(+), 313 deletions(-)
delete mode 100644 gnu/packages/patches/grantlee-merge-theme-dirs.patch

Toggle diff (454 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 10b97c8bc3..7433e1e7ea 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1193,7 +1193,6 @@ dist_patch_DATA = \
%D%/packages/patches/gpm-glibc-2.26.patch \
%D%/packages/patches/gpodder-disable-updater.patch \
%D%/packages/patches/gpsbabel-fix-i686-test.patch \
- %D%/packages/patches/grantlee-merge-theme-dirs.patch \
%D%/packages/patches/grep-timing-sensitive-test.patch \
%D%/packages/patches/grocsvs-dont-use-admiral.patch \
%D%/packages/patches/gromacs-tinyxml2.patch \
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index dcb91fdb0b..e6146f0f85 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2021 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2021 la snesne <lasnesne@lagunposprasihopre.org>
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -36,6 +37,7 @@
#:use-module (guix build-system qt)
#:use-module (guix deprecation)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
@@ -57,6 +59,8 @@
#:use-module (gnu packages ebook)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
@@ -74,6 +78,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages polkit)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages tls)
@@ -87,14 +92,14 @@
(define-public baloo-widgets
(package
(name "baloo-widgets")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/baloo-widgets-" version ".tar.xz"))
(sha256
- (base32 "1x4v79vhvc5ixkbsf3jyjz5ig1lf78rfw3r7g3llpb4j1kcp3wh0"))))
+ (base32 "1fk8qvqh1xx6139wvyfk607vkb7w3d79gc3v3c8s96pkp5b228ax"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -120,17 +125,15 @@ This package contains GUI widgets for baloo.")
(define-public grantleetheme
(package
(name "grantleetheme")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/grantleetheme-" version ".tar.xz"))
(sha256
- (base32 "0gabc5cb0sf00s7m5v2jnq55qsrdbrq6nqd15y1i15p788zifsjx"))
- (patches (search-patches "grantlee-merge-theme-dirs.patch"))))
- (build-system qt-build-system)
- (arguments `(#:tests? #f)) ; unexpected error in the test suite.
+ (base32 "0xm19a21y8b4cqiqg6mhxip1xxk7hrz88z1sijhhgc8d14i7mkdk"))))
+ (build-system qt-build-system) ; unexpected error in the test suite.
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("libxml2" ,libxml2))) ;; xmllint required for tests
@@ -150,14 +153,14 @@ This package contains GUI widgets for baloo.")
(define-public akregator
(package
(name "akregator")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/akregator-" version ".tar.xz"))
(sha256
- (base32 "1711yhwsdq9iyc3wm3a4xmz81p73hvvc0h58sasc89ifpry50k2p"))))
+ (base32 "15qkkfrxiwcd1gz5skqj8sb8fkr1mkc51wc2chqr4jv6aa0lbf5r"))))
(build-system qt-build-system)
(arguments
`(#:phases
@@ -207,7 +210,7 @@ This package contains GUI widgets for baloo.")
("qtwebchannel" ,qtwebchannel)
("qtwebengine" ,qtwebengine)
("syndication" ,syndication)))
- (home-page "https://apps.kde.org/en/akregator")
+ (home-page "https://apps.kde.org/akregator/")
(synopsis "KDE Feed Reader")
(description
"Akregator is a news feed reader. It enables you to follow news
@@ -219,91 +222,90 @@ browser for easy news reading.")
(license license:gpl2+)))
(define-public kdenlive
- (let ((version "21.08.2"))
- (package
- (name "kdenlive")
- (version version)
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://invent.kde.org/multimedia/kdenlive")
- (commit (string-append "v" version))))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32 "1l78xjdf1bmj3s8kysaqqgh67mb3vrc96rsdnp0i4awlyfsh89d7"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("pkg-config" ,pkg-config)
- ("qttools" ,qttools)))
- (inputs
- `(("breeze" ,breeze) ; make dark them available easily
- ("breeze-icons" ,breeze-icons) ; recommended icon set
- ("ffmpeg" ,ffmpeg)
- ("frei0r-plugins" ,frei0r-plugins)
- ("karchive" ,karchive)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("kdeclarative" ,kdeclarative)
- ("kdoctools" ,kdoctools)
- ("kfilemetadata" ,kfilemetadata)
- ("kguiaddons" ,kguiaddons)
- ("kiconthemes" ,kiconthemes)
- ("knewstuff" ,knewstuff)
- ("knotifications" ,knotifications)
- ("knotifyconfig" ,knotifyconfig)
- ("kparts" ,kparts)
- ("kplotting" ,kplotting)
- ("mlt" ,mlt)
- ("purpose" ,purpose)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)
- ("qtgraphicaleffects" ,qtgraphicaleffects)
- ("qtmultimedia" ,qtmultimedia)
- ("qtnetworkauth" ,qtnetworkauth)
- ("qtquickcontrols" ,qtquickcontrols)
- ("qtquickcontrols2" ,qtquickcontrols2)
- ("qtscript" ,qtscript)
- ("qtsvg" ,qtsvg)
- ("qtwebkit" ,qtwebkit)
- ("shared-mime-info" ,shared-mime-info)))
- (arguments
- ;; XXX: there is a single test that spawns other tests and
- ;; 1/3 tests failed and 1/327 assertions failed. It seems
- ;; that individual tests can't be skipped.
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'wrap-executable
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (qtbase (assoc-ref inputs "qtbase"))
- (frei0r (assoc-ref inputs "frei0r-plugins"))
- (ffmpeg (assoc-ref inputs "ffmpeg")))
- (wrap-program (string-append out "/bin/kdenlive")
- `("PATH" ":" prefix
- ,(list (string-append ffmpeg "/bin")))
- `("FREI0R_PATH" ":" =
- (,(string-append frei0r "/lib/frei0r-1/")))
- `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" =
- (,(string-append qtbase "/lib/qt5/plugins/platforms")))
- `("MLT_PREFIX" ":" =
- (,(assoc-ref inputs "mlt"))))))))))
- (home-page "https://kdenlive.org")
- (synopsis "Non-linear video editor")
- (description "Kdenlive is an acronym for KDE Non-Linear Video Editor.
+ (package
+ (name "kdenlive")
+ (version "21.08.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://invent.kde.org/multimedia/kdenlive")
+ (commit (string-append "v" version))))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32 "1l78xjdf1bmj3s8kysaqqgh67mb3vrc96rsdnp0i4awlyfsh89d7"))))
+ (build-system qt-build-system)
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)
+ ("qttools" ,qttools)))
+ (inputs
+ `(("breeze" ,breeze) ; make dark theme available easily
+ ("breeze-icons" ,breeze-icons) ; recommended icon set
+ ("ffmpeg" ,ffmpeg)
+ ("frei0r-plugins" ,frei0r-plugins)
+ ("karchive" ,karchive)
+ ("kcrash" ,kcrash)
+ ("kdbusaddons" ,kdbusaddons)
+ ("kdeclarative" ,kdeclarative)
+ ("kdoctools" ,kdoctools)
+ ("kfilemetadata" ,kfilemetadata)
+ ("kguiaddons" ,kguiaddons)
+ ("kiconthemes" ,kiconthemes)
+ ("knewstuff" ,knewstuff)
+ ("knotifications" ,knotifications)
+ ("knotifyconfig" ,knotifyconfig)
+ ("kparts" ,kparts)
+ ("kplotting" ,kplotting)
+ ("mlt" ,mlt)
+ ("purpose" ,purpose)
+ ("qtbase" ,qtbase-5)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtgraphicaleffects" ,qtgraphicaleffects)
+ ("qtmultimedia" ,qtmultimedia)
+ ("qtnetworkauth" ,qtnetworkauth)
+ ("qtquickcontrols" ,qtquickcontrols)
+ ("qtquickcontrols2" ,qtquickcontrols2)
+ ("qtscript" ,qtscript)
+ ("qtsvg" ,qtsvg)
+ ("qtwebkit" ,qtwebkit)
+ ("shared-mime-info" ,shared-mime-info)))
+ (arguments
+ ;; XXX: there is a single test that spawns other tests and
+ ;; 1/3 tests failed and 1/327 assertions failed. It seems
+ ;; that individual tests can't be skipped.
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-executable
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (qtbase (assoc-ref inputs "qtbase"))
+ (frei0r (assoc-ref inputs "frei0r-plugins"))
+ (ffmpeg (assoc-ref inputs "ffmpeg")))
+ (wrap-program (string-append out "/bin/kdenlive")
+ `("PATH" ":" prefix
+ ,(list (string-append ffmpeg "/bin")))
+ `("FREI0R_PATH" ":" =
+ (,(string-append frei0r "/lib/frei0r-1/")))
+ `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" =
+ (,(string-append qtbase "/lib/qt5/plugins/platforms")))
+ `("MLT_PREFIX" ":" =
+ (,(assoc-ref inputs "mlt"))))))))))
+ (home-page "https://kdenlive.org")
+ (synopsis "Non-linear video editor")
+ (description "Kdenlive is an acronym for KDE Non-Linear Video Editor.
Non-linear video editing is much more powerful than beginner's (linear)
editors, hence it requires a bit more organization before starting. However,
it is not reserved to specialists and can be used for small personal
projects.")
- (license license:gpl2+))))
+ (license license:gpl2+)))
(define-public kdevelop
(package
(name "kdevelop")
- (version "5.6.1")
+ (version "5.6.2")
(source
(origin
(method url-fetch)
@@ -311,7 +313,7 @@ projects.")
"/" version "/src/kdevelop-"
version ".tar.xz"))
(sha256
- (base32 "02ip5r67hjfpywkm3mz86n6wbqcr7996ifzfd2fyzsvm4998hi4y"))))
+ (base32 "1xiv6vs7d7vj5v7i1wxzx0xl6h8cg9bl8x9z7qg1qxizwlzvr1hg"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -338,11 +340,12 @@ projects.")
("knotifyconfig" ,knotifyconfig)
("kparts" ,kparts)
("kservice" ,kservice)
+ ("ksyntaxhighlighting" ,ksyntaxhighlighting)
("ktexteditor" ,ktexteditor)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("libkomparediff2" ,libkomparediff2)
- ("oxygen-icons" ,oxygen-icons)
+ ("breeze-icons" ,breeze-icons)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement
@@ -384,7 +387,7 @@ projects.")
(("^\\s*PATHS \"\\$\\{CLANG_LIBRARY_DIRS\\}\"" line)
(string-append line " " (assoc-ref inputs "clang") "/lib")))
#t)))))
- (home-page "https://kdevelop.org")
+ (home-page "https://www.kdevelop.org/")
(synopsis "IDE for C, C++, Python, Javascript and PHP")
(description "The KDevelop IDE provides semantic syntax highlighting, as
well as code navigation and completion for C, C++ (using Clang/LLVM), QML,
@@ -423,14 +426,14 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
(define-public kdiagram
(package
(name "kdiagram")
- (version "2.7.0")
+ (version "2.8.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/kdiagram/" version
"/kdiagram-" version ".tar.xz"))
(sha256
- (base32 "1pgvf2q8b59hw0jg5ajmj5nrn4q8cgnifpvdd0fynk2ml6zym8k3"))
+ (base32 "07s3kwv0mqvb64x8nz4w1yb3hbk28yzkw4qg1jibai7as4xsv7ap"))
(patches (search-patches
"kdiagram-Fix-missing-link-libraries.patch"))))
(build-system qt-build-system)
@@ -463,29 +466,13 @@ illustrate project schedules.")
(sha256
(base32
"1y0d8gnxfdg5nfwk8dgx8fc2bwskvnys049napb1a9fr25bqmimw"))))
- (build-system cmake-build-system)
+ (build-system qt-build-system)
(arguments
`(#:tests? #f
#:configure-flags
- (list "-DBUILD_TESTING=OFF"
- (string-append "-DCMAKE_CXX_FLAGS=-I"
- (assoc-ref %build-inputs "openexr")
- "/include/OpenEXR"))
- #:phases
- (modify-phases %standard-phases
- ;; Ensure that icons are found at runtime.
- ;; This works around <https://bugs.gnu.org/22138>.
- (add-after 'install 'wrap-executable
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (qt '("qtbase" "qtsvg")))
- (wrap-program (string-append out "/bin/krita")
- `("QT_PLUGIN_PATH" ":" prefix
- ,(map (lambda (label)
- (string-append (assoc-ref inputs label)
- "/lib/qt5/plugins/"))
- qt)))
- #t))))))
+ ,#~(list "-DBUILD_TESTING=OFF"
+ (string-append "-DCMAKE_CXX_FLAGS=-I" #$openexr
+ "/include/OpenEXR"))))
(native-inputs
`(("curl" ,curl)
("eigen" ,eigen)
@@ -515,9 +502,10 @@ illustrate project schedules.")
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("lcms" ,lcms)
+ ("libheif" ,libheif)
("libjpeg-turbo" ,libjpeg-turbo)
("libpng" ,libpng)
- ("libraw" ,libraw-0.18)
+ ("libraw" ,libraw)
("libtiff" ,libtiff)
("libx11" ,libx11)
("libxcb" ,libxcb)
@@ -568,7 +556,7 @@ features include brush stabilizers, brush engines and wrap-around mode.")
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("qtxmlpatterns" ,qtxmlpatterns)))
- (home-page "https://apps.kde.org/en/massif-visualizer")
+ (home-page "https://apps.kde.org/massif-visualizer/")
(synopsis "Visualize massif data generated by Valgrind")
(description
"Massif Visualizer is a tool that visualizes massif data.
@@ -580,14 +568,14 @@ compressed massif files can also be opened transparently.")
(define-public libkomparediff2
(package
(name "libkomparediff2")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/libkomparediff2-" version ".tar.xz"))
(sha256
- (base32 "0m8m7sgpf2f4nxpaaymyvihlk0pcyblyd99mcbibrnyr5kzkzzdc"))))
+ (base32 "08y9p3il0i5sayq42v9p1v9f6yynp7ljb5d4ls1hf5ww4xxvx10x"))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
@@ -612,14 +600,14 @@ used in KDE development tools Kompare and KDevelop.")
(define-public qca
(package
(name "qca")
- (version "2.3.3")
+ (version "2.3.4")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/qca/" version
"/qca-" version ".tar.xz"))
(sha256
- (base32 "0rvvf97la95lah67jcj0p06n4br0pc2mri0q1hn4x522hndqybjn"))))
+ (base32 "1i7m5y3dfwij9cyjp72ya5zd2skgp7mfmrmf7bvrbzg3ly0mhsbb"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -637,16 +625,16 @@ cards.")
(define-public kpmcore
(package
(name "kpmcore")
- (version "4.1.0")
+ (version "21.08.2")
(source (origin
(method url-fetch)
- (uri (string-append
- "mirror://kde/stable/kpmcore"
- "/" version "/src/"
- name "-" version ".tar.xz"))
+ (uri (string-append "mirror://kde/stable/release-service/"
+ version "/src/kpmcore-"
+ version ".tar.xz"))
+
(sha256
(base32
- "0jsig7algmab9h0fb09my0axjqzw83zgscamhzl8931lribs6idm"))))
+ "0rn8x0add1qflsbgppmhz1zbnjvy39d5wckxga0vmhdix2m3d60g"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -656,9 +644,18 @@ cards.")
("kcoreaddons" ,kcoreaddons)
("ki18n" ,ki18n)
("kwidgetsaddons" ,kwidgetsaddons)
+ ("polkit-qt" ,polkit-qt)
("qtbase" ,qtbase-5)
("qca" ,qca)
("util-linux" ,util-linux "lib")))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-cmake-install-directories
+
This message was truncated. Download the full message here.
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 13/19] gnu: KDE Internet: Update to 21.08.2.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-14-mail@brendan.scot
(kget konversation kopete krdc ktorrent libktorrent): Update to 21.08.2.

(choqok): [inputs]: Use breeze-icons instead of oxygen-icons as default.
[home-page]: Lint URL.

(kget): [inputs]: Use breeze-icons instead of oxygen-icons as default.
[native-inputs]: Move kdoctools here.
[arguments]: Disable one failing test.
[description]: Lint.

(konversation): [inputs]: Add karchive, knewstuff. Use breeze-icons
instead of oxygen-icons as default.
[home-page]: Lint URL.

(kopete): [inputs]: Add ksyntaxhighlighting, mediastreamer2.
[home-page]: Lint URL.

(krdc): [inputs]: Add kbookmarks. Use breeze-icons instead of
oxygen-icons as default.
[home-page]: Lint URL.

(ktorrent): [inputs]: Add qtwebengine. Use breeze-icons instead of
oxygen-icons as default.
[native-inputs]: Add pkg-config.
[home-page]: Lint URL.

(libktorrent): [arguments]: Disable failing test.
---
gnu/packages/kde-internet.scm | 92 +++++++++++++++++++++--------------
1 file changed, 56 insertions(+), 36 deletions(-)

Toggle diff (316 lines)
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index af0aba5b9a..146f33f695 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -33,6 +34,7 @@
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages kde-pim)
#:use-module (gnu packages libidn)
+ #:use-module (gnu packages linphone)
#:use-module (gnu packages linux)
#:use-module (gnu packages messaging)
#:use-module (gnu packages mp3)
@@ -69,6 +71,7 @@
("pkg-config" ,pkg-config)))
(inputs
`(("attica" ,attica)
+ ("breeze-icons" ,breeze-icons) ; default icon set
("kcmutils" ,kcmutils)
("kconfigwidgets" ,kconfigwidgets)
("kcoreaddons" ,kcoreaddons)
@@ -86,7 +89,6 @@
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
;; TODO: telepathy
- ("oxygen-icons" ,oxygen-icons) ; default icon set
("purpose" ,purpose)
("qca" ,qca)
("qoauth" ,qoauth)
@@ -94,7 +96,7 @@
("qtnetworkauth" ,qtnetworkauth)
("qtwebkit" ,qtwebkit)
("sonnet" ,sonnet)))
- (home-page "https://kde.org/applications/internet/org.kde.choqok")
+ (home-page "https://apps.kde.org/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
@@ -117,20 +119,22 @@ Other notable features include:
(define-public kget
(package
(name "kget")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kget-" version ".tar.xz"))
(sha256
- (base32 "1swx58wcig8zq8ibhczhcw7l8mqjm7pq8zca9gmny9kda5q04f5m"))))
+ (base32 "11h073nkk5axr263wz5wjq8pdad2wk3nmhixx12ilkqqinb0pi6h"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
+ ("kdoctools" ,kdoctools)
("pkg-config" ,pkg-config)))
(inputs
`(("boost" ,boost)
+ ("breeze-icons" ,breeze-icons) ; default icon set
("gmp" ,gmp)
("gpgme" ,gpgme)
("kcmutils" ,kcmutils)
@@ -141,7 +145,6 @@ Other notable features include:
("kcrash" ,kcrash)
("kdbusaddons" ,kdbusaddons)
("kdelibs4support" ,kdelibs4support) ;; KLocale
- ("kdoctools" ,kdoctools)
("ki18n" ,ki18n)
("kiconthemes" ,kiconthemes)
("kio" ,kio)
@@ -159,16 +162,22 @@ Other notable features include:
("libktorrent" ,libktorrent)
;; TODO: libmms
;; TODO: LibKWorkspace - plasma-workspace?
- ("oxygen-icons" ,oxygen-icons) ; default icon set
("qca" ,qca)
("qgpgme" ,qgpgme)
- ("qtbase" ,qtbase-5)
- ))
+ ("qtbase" ,qtbase-5)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests? ;; FIXME: One test fails.
+ (invoke "ctest" "-E" "schedulertest"))
+ #t)))))
(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
+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.")
@@ -178,20 +187,21 @@ This package is part of the KDE networking module.")
(define-public konversation
(package
(name "konversation")
- (version "1.7.7")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://kde/stable/konversation/" version
+ (uri (string-append "mirror://kde/stable/release-service/" version
"/src/konversation-" version ".tar.xz"))
(sha256
- (base32 "19qqq9s8k0cl71ib33xn07f26j5ji2g4336jk65im6452cf1dv27"))))
+ (base32 "1blaxxpp0831frw2v4ylvq23ffyqabbq1zcqj0v4kq736acdl8pa"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("kdoctools" ,kdoctools)))
(inputs
- `(("karchive" ,karchive)
+ `(("breeze-icons" ,breeze-icons) ; default icon set
+ ("karchive" ,karchive)
("kbookmarks" ,kbookmarks)
("kconfig" ,kconfig)
("kconfigwidgets" ,kconfigwidgets)
@@ -205,19 +215,19 @@ This package is part of the KDE networking module.")
("kidletime" ,kidletime)
("kio" ,kio)
("kitemviews" ,kitemviews)
+ ("knewstuff" ,knewstuff)
("knotifications" ,knotifications)
("knotifyconfig" ,knotifyconfig)
("kparts" ,kparts)
("kwallet" ,kwallet)
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
- ("oxygen-icons" ,oxygen-icons) ; default icon set
("phonon" ,phonon)
("qtbase" ,qtbase-5)
("qca" ,qca)
("solid" ,solid)
("sonnet" ,sonnet)))
- (home-page "https://kde.org/applications/internet/org.kde.konversations")
+ (home-page "https://konversation.kde.org/")
(synopsis "Graphical Internet Relay Chat (IRC) client for KDE")
(description "Konversation is a graphical Internet Relay Chat client (IRC)
with KDE support.
@@ -249,14 +259,14 @@ Features are:
(define-public kopete
(package
(name "kopete")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kopete-" version ".tar.xz"))
(sha256
- (base32 "149gi9hkyl825kf046iqkam3gkzfwdc2sihbf8gs6njachzvb81y"))))
+ (base32 "015pjfc5kxhm5nmjv8fx4jlczp0l3vhqrkxgfvq83a200nlvg2pm"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -286,6 +296,7 @@ Features are:
("knotifyconfig" ,knotifyconfig)
("kparts" ,kparts)
("kpimtextedit" ,kpimtextedit)
+ ("ksyntaxhighlighting" ,ksyntaxhighlighting)
("ktexteditor" ,ktexteditor)
("kwallet" ,kwallet)
;; TODO: Libgadu
@@ -296,7 +307,7 @@ Features are:
("libsrtp" ,libsrtp)
("libxml2" ,libxml2)
("libxstl" ,libxslt)
- ;; TODO: Mediastreamer
+ ("mediastreamer2" ,mediastreamer2)
("openssl" ,openssl)
("ortp" ,ortp)
("phonon" ,phonon)
@@ -308,7 +319,7 @@ Features are:
;; TODO: Xmms
("zlib" ,zlib)))
;; TODO: enable video support
- (home-page "https://kde.org/applications/internet/org.kde.kopete")
+ (home-page "https://apps.kde.org/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
@@ -327,21 +338,22 @@ This package is part of the KDE networking module.")
(define-public krdc
(package
(name "krdc")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/krdc-" version ".tar.xz"))
(sha256
- (base32 "1hp23k3nsrcxpv2qiynjgm71zn3l6ds00cpd4frc68szgiblrw9r"))))
+ (base32 "0zrpfbs4r0d4wnficmhn0av7877hbrl4jvxpi0qiy2gdc7zksnbd"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("kdoctools" ,kdoctools)))
(inputs
- `(("kbookmarks" ,kbookmarks)
+ `(("breeze-icons" ,breeze-icons) ; default icon set
("freerdp" ,freerdp)
+ ("kbookmarks" ,kbookmarks)
("kcmutils" ,kcmutils)
("kcompletion" ,kcompletion)
("kconfig" ,kconfig)
@@ -357,9 +369,8 @@ This package is part of the KDE networking module.")
("kxmlgui" ,kxmlgui)
("libssh2" ,libssh)
;; TODO: libvnc{server,client} - is not tigervnc-{server,client}
- ("oxygen-icons" ,oxygen-icons) ; default icon set
("qtbase" ,qtbase-5)))
- (home-page "https://kde.org/applications/internet/org.kde.krdc")
+ (home-page "https://apps.kde.org/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
@@ -372,20 +383,22 @@ This package is part of the KDE networking module.")
(define-public ktorrent
(package
(name "ktorrent")
- (version "5.1.2")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://kde/stable/ktorrent/" version
- "/ktorrent-" version ".tar.xz"))
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/ktorrent-" version ".tar.xz"))
(sha256
- (base32 "0kwd0npxfg4mdh7f3xadd2zjlqalpb1jxk61505qpcgcssijf534"))))
+ (base32 "1nd72jcvsc0kabd23ddy93dxp59ihg5npa8r3vbzvic89xlpkivi"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
- ("kdoctools" ,kdoctools)))
+ ("kdoctools" ,kdoctools)
+ ("pkg-config" ,pkg-config)))
(inputs
`(("boost" ,boost)
+ ("breeze-icons" ,breeze-icons) ; default icon set
("gmp" ,gmp)
("karchive" ,karchive)
("kcmutils" ,kcmutils)
@@ -410,15 +423,15 @@ This package is part of the KDE networking module.")
("libgcrypt" ,libgcrypt)
("libktorrent" ,libktorrent)
;; TODO: LibKWorkspace -> plasma-workspace?
- ("oxygen-icons" ,oxygen-icons) ; default icon set
("phonon" ,phonon)
("qtbase" ,qtbase-5)
("qtscript" ,qtscript)
+ ("qtwebengine" ,qtwebengine)
("qtwebkit" ,qtwebkit)
("solid" ,solid)
("syndication" ,syndication)
("taglib" ,taglib)))
- (home-page "https://kde.org/applications/internet/org.kde.ktorrent")
+ (home-page "https://apps.kde.org/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
@@ -429,15 +442,14 @@ a full-featured client for BitTorrent.")
(define-public libktorrent
(package
(name "libktorrent")
- (version "2.1.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://kde//stable/ktorrent/"
- (package-version ktorrent)
- "/libktorrent-" version ".tar.xz"))
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/libktorrent-" version ".tar.xz"))
(sha256
- (base32 "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w"))))
+ (base32 "16rx0na7gy03c0qbwy07q7si35z62p0pq7fcvf3ggr594akwz4kl"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -452,6 +464,14 @@ a full-featured client for BitTorrent.")
("qca" ,qca)
("qtbase" ,qtbase-5)
("solid" ,solid)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests? ;; FIXME: test fails inconsistently.
+ (invoke "ctest" "-E" "superseedtest"))
+ #t)))))
(home-page "https://invent.kde.org/network/libktorrent")
(synopsis "BitTorrent protocol library for C++ / Qt 5 / KDE Frameworks")
(description "The KTorrent library supports connectivity to HTTP and UDP
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 14/19] gnu: KDE Utils: Update to 21.08.2.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-15-mail@brendan.scot
(ark kate kmag kmousetool kmouth okteta sweeper): Update to 21.08.2.

(ark): [home-page]: Lint URL.

(kate): [inputs]: Add ksyntaxhighlighting.
Use breeze-icons over oxygen-icons as default.
[arguments]: Enable all tests that pass.

(kmag): [inputs]: Use breeze-icons over oxygen-icons as default.
[home-page]: Lint URL.

(kmousetool, kmouth, kronometer, krusader, rsibreak, sweeper):
[inputs]: Use breeze-icons over oxygen-icons as default.
[home-page]: Lint URL.

(kxstitch): [home-page]: Lint URL.

(okteta): Update to 0.26.6.
[origin]: Update URI.
[inputs]: Use breeze-icons over oxygen-icons as default. Add
qtdeclarative.
[home-page]: Lint URL.

(smb4k): Update to 3.1.1.
[origin]: File downloads as "download" and thus can't be extracted
without renaming it.
[inputs]: Add kdnssd. Use breeze-icons over oxygen-icons as default.
---
gnu/packages/kde-utils.scm | 91 +++++++++++++++++++++-----------------
1 file changed, 50 insertions(+), 41 deletions(-)

Toggle diff (329 lines)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 47e25409ee..1e50a9618f 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -40,14 +40,14 @@
(define-public ark
(package
(name "ark")
- (version "20.04.1")
+ (version "21.08.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/ark-" version ".tar.xz"))
(sha256
(base32
- "0g5bfa1lc7mhrc2ngd4ldf33dpwr7gqrj95kp897pf632wwj23iw"))
+ "0hxzd0qr07wyz5v76nj4qj4db4lav53xapknmakif1fkghj1r51g"))
;; The libarchive package in Guix does not support
;; xar; disable related tests.
(patches (search-patches "ark-skip-xar-test.patch"))))
@@ -106,7 +106,7 @@
("unzip" ,unzip)
("zip" ,zip)
("zstd" ,zstd)))
- (home-page "https://apps.kde.org/en/ark")
+ (home-page "https://apps.kde.org/ark/")
(synopsis "Graphical archiving tool")
(description "Ark is a graphical file compression/decompression utility
with support for multiple formats, including tar, gzip, bzip2, rar and zip, as
@@ -116,14 +116,14 @@ well as CD-ROM images.")
(define-public kate
(package
(name "kate")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kate-" version ".tar.xz"))
(sha256
- (base32 "0nrby307syrqlxrf9lwdzc9c15ifw47418qwszqwg345ma2pww7i"))))
+ (base32 "1cm6iq3cqmp0kvsxhv0vlqy1dyzmis9fb0a6298q0lyjkmsri26n"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -142,23 +142,30 @@ well as CD-ROM images.")
("kio" ,kio)
("kjobwidgets" ,kjobwidgets)
("kparts" ,kparts)
+ ("ksyntaxhighlighting" ,ksyntaxhighlighting)
("ktexteditor" ,ktexteditor)
("kwallet" ,kwallet)
("plasma-framework" ,plasma-framework)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("qtbase" ,qtbase-5)
("qtscript" ,qtscript)))
(arguments
- `(#:tests? #f ;; 2/7 tests fail
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-before 'check 'check-setup
(lambda _
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
(setenv "XDG_CACHE_HOME" "/tmp/xdg-cache")
+ #t))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests? ;; Test looks for /usr/bin. Other ones hang.
+ (invoke "ctest" "-E" "(plugin-externaltools_test|\
+kateapp-session_manager_test|\
+kateapp-sessions_action_test)"))
#t)))))
(home-page "https://kate-editor.org/")
(synopsis "Multi-document, multi-view text editor")
@@ -183,14 +190,14 @@ Kate's features include:
(define-public kmag
(package
(name "kmag")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kmag-" version ".tar.xz"))
(sha256
- (base32 "18lk8i2r90gvw8q5j179xgpniih92mwk06krk7w4jv98yinqf6m5"))))
+ (base32 "0y68vg95fjhfsjvvn2i214jrv06f6811j1asjxrgvwcmwdf0fnc0"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -199,10 +206,10 @@ Kate's features include:
`(("ki18n" ,ki18n)
("kio" ,kio)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
;; TODO: QAccessibilityClient - libqaccessibilityclien
("qtbase" ,qtbase-5)))
- (home-page "https://kde.org/applications/utilities/org.kde.kmag")
+ (home-page "https://apps.kde.org/kmag/")
(synopsis "Screen magnifier tool")
(description "You can use KMagnifier to magnify a part of the screen just
as you would use a lens to magnify a newspaper fine-print or a photograph.
@@ -214,14 +221,14 @@ artists to web-designers to people with low vision.")
(define-public kmousetool
(package
(name "kmousetool")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kmousetool-" version ".tar.xz"))
(sha256
- (base32 "01j6bx8zihns4ip8maj0gb3w3bhx1ha2ljhfmsm6lcyay531ay98"))))
+ (base32 "1b09z6793zjjspcrhz4f1vxk3zbs4qdrkdp59q61i7ganm49znma"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -239,9 +246,9 @@ artists to web-designers to people with low vision.")
("libxtst" ,libxtst)
("libxt" ,libxt)
("phonon" ,phonon)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("qtbase" ,qtbase-5)))
- (home-page "https://kde.org/applications/utilities/org.kde.kmousetool")
+ (home-page "https://apps.kde.org/kmousetool/")
(synopsis "Automatic mouse click and mouse manipulation tool for the
disabled")
(description "KMouseTool clicks the mouse whenever the mouse cursor pauses
@@ -253,14 +260,14 @@ whom pressing buttons hurts.")
(define-public kmouth
(package
(name "kmouth")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kmouth-" version ".tar.xz"))
(sha256
- (base32 "1afgxlys9mvmc3rd33g7gchfb0ylx83x3x0a0qf3dra6cpgsgcg7"))))
+ (base32 "1b9bc0vnqihaqa4wfa9sqcrq92q1kyw0w1ikkx3pb8rzdzkk4cv2"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -275,10 +282,10 @@ whom pressing buttons hurts.")
("kio" ,kio)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("qtbase" ,qtbase-5)
("qtspeech" ,qtspeech)))
- (home-page "https://kde.org/applications/utilities/org.kde.kmouth")
+ (home-page "https://apps.kde.org/kmouth/")
(synopsis "Type-and-say frontend for speech synthesizers")
(description "KMouth is a program which enables persons that cannot speak
to let their computer speak, e.g. mutal people or people who have lost their
@@ -314,9 +321,9 @@ sentences to be re-spoken.")
("ki18n" ,ki18n)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("qtbase" ,qtbase-5)))
- (home-page "https://kde.org/applications/utilities/org.kde.kronometer")
+ (home-page "https://apps.kde.org/kronometer/")
(synopsis "Simple stopwatch application")
(description "Kronometer is a stopwatch application. It features the
basic stopwatch actions (pause, resume, reset, laps), as well as the ability
@@ -358,11 +365,11 @@ to save the times and resume them later.")
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("qtbase" ,qtbase-5)
("solid" ,solid)
("zlib" ,zlib)))
- (home-page "https://www.krusader.org")
+ (home-page "https://krusader.org/")
(synopsis "Twin-panel (commander-style) file manager")
(description "Krusader is a simple, easy, yet powerful,
twin-panel (commander-style) file manager, similar to Midnight Commander or
@@ -400,7 +407,7 @@ great on your desktop.")
("imagemagick" ,imagemagick)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)))
- (home-page "https://kde.org/applications/en/graphics/org.kde.kxstitch")
+ (home-page "https://apps.kde.org/kxstitch/")
(synopsis "Create and print cross stitch patterns")
(description
"KXStitch allows creating and printing cross stitch patterns, which can
@@ -410,15 +417,14 @@ either be created or generated from a image.")
(define-public okteta
(package
(name "okteta")
- (version "17.12.3")
+ (version "0.26.6")
(source
(origin
(method url-fetch)
- ;; TODO: Why is this not in "stable" anymore
- (uri (string-append "mirror://kde/Attic/applications/" version
+ (uri (string-append "mirror://kde/stable/okteta/" version
"/src/okteta-" version ".tar.xz"))
(sha256
- (base32 "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"))))
+ (base32 "0k0lw2z5iii6z7rg7ijjm8kc9248n1i92p2v3bglcgjhamdwssf5"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -441,9 +447,10 @@ either be created or generated from a image.")
("kservice" ,kservice)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("qca" ,qca)
("qtbase" ,qtbase-5)
+ ("qtdeclarative" ,qtdeclarative)
("qtscript" ,qtscript)))
(arguments
`(#:phases
@@ -454,7 +461,7 @@ either be created or generated from a image.")
(setenv "QT_QPA_PLATFORM" "offscreen")
(setenv "HOME" "/tmp/dummy-home")
#t)))))
- (home-page "https://kde.org/applications/utilities/org.kde.okteta")
+ (home-page "https://apps.kde.org/okteta/")
(synopsis "Hexadecimal editor for binary files")
(description "Okteta is a simple editor for the raw data of files. This
type of program is also called hex editor or binary editor.
@@ -500,9 +507,9 @@ redone.")
("ktextwidgets" ,ktextwidgets)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("qtbase" ,qtbase-5)))
- (home-page "https://kde.org/applications/utilities/org.kde.rsibreak")
+ (home-page "https://apps.kde.org/rsibreak/")
(synopsis "Assists in the Recovery and Prevention of Repetitive Strain
Injury")
(description "Repetitive Strain Injury is an illness which can occur as a
@@ -514,14 +521,15 @@ remind you to take a break now and then.")
(define-public smb4k
(package
(name "smb4k")
- (version "3.0.6")
+ (version "3.1.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://sourceforge.net/projects/smb4k/files/"
version "/smb4k-" version ".tar.xz/download"))
+ (file-name (string-append name "-" version ".tar.xz"))
(sha256
- (base32 "0hz6nfd845bykf78s4g2qs77szl96gy6g8rpg44pqd39a0k0xbh7"))))
+ (base32 "189h5znan2kfqflik308ghqc2z55s5z8kwpq8gjz2y0lwyqdiw0b"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -533,6 +541,7 @@ remind you to take a break now and then.")
("kcompletion" ,kcompletion)
("kcoreaddons" ,kcoreaddons)
("kcrash" ,kcrash)
+ ("kdnssd" ,kdnssd)
("kdbusaddons" ,kdbusaddons)
("ki18n" ,ki18n)
("kiconthemes" ,kiconthemes)
@@ -546,12 +555,12 @@ remind you to take a break now and then.")
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("libsmbclient" ,samba)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("plasma-framework" ,plasma-framework)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("solid" ,solid)))
- (home-page "https://kde.org/applications/utilities/org.kde.smb4k")
+ (home-page "https://apps.kde.org/smb4k/")
(synopsis "Samba (SMB) share advanced browser")
(description "Smb4K is an network neighborhood browser for the KDE
Software Compilation and a frontend to the programs of the Samba software
@@ -586,14 +595,14 @@ Features:
(define-public sweeper
(package
(name "sweeper")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/sweeper-" version ".tar.xz"))
(sha256
- (base32 "1az3c2khnh51bbmqpamj4p26d3a0ff4l5rd3vcrylg94mk7wgh59"))))
+ (base32 "1yvcfdhapml1vzqns67v6j2c39g752f8czxs7bnczi69fq1ksh0b"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -609,9 +618,9 @@ Features:
("kio" ,kio)
("ktextwidgets" ,ktextwidgets)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("qtbase" ,qtbase-5)))
- (home-page "https://kde.org/applications/utilities/org.kde.sweeper")
+ (home-page "https://apps.kde.org/sweeper/")
(synopsis "Temporary file and history cleaner")
(description "
Sweeper helps to clean unwanted traces the user leaves on the system and to
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 15/19] gnu: KDE System Tools: Update to 21.08.2.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-16-mail@brendan.scot
(dolphin dolphin-plugins khelpcenter konsole krfb ksystemlog yakuake):
Update to 21.08.2.
[inputs]: Use breeze-icons over oxygen-icons as default.
[home-page]: Lint URL.

(dolphin-plugins): [inputs]: Add ksyntaxhighlighting.
---
gnu/packages/kde-systemtools.scm | 52 +++++++++++++++++---------------
1 file changed, 27 insertions(+), 25 deletions(-)

Toggle diff (229 lines)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index 86f169e819..40aeab64d8 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -39,14 +40,14 @@
(define-public dolphin
(package
(name "dolphin")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/dolphin-" version ".tar.xz"))
(sha256
- (base32 "0xr5s0s40i2bsfjfapvpa7dxh9s4604cxirg97xcaacd6fdvhpds"))))
+ (base32 "18aiqpf8qsig64gpcn6b1f0fs5mvzbdg8ncbhcjq0gy8gh3xamj2"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -56,6 +57,7 @@
(inputs
`(("baloo" ,baloo)
("baloo-widgets" ,baloo-widgets)
+ ("breeze-icons" ,breeze-icons)
("kactivities" ,kactivities)
("kbookmarks" ,kbookmarks)
("kcmutils" ,kcmutils)
@@ -73,13 +75,12 @@
("kparts" ,kparts)
("ktextwidgets" ,ktextwidgets)
("kwindowsystem" ,kwindowsystem)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
("phonon" ,phonon)
("qtbase" ,qtbase-5)
("solid" ,solid)))
(arguments
`(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen
- (home-page "https://kde.org/applications/system/org.kde.dolphin")
+ (home-page "https://apps.kde.org/dolphin/")
(synopsis "File manager for KDE")
(description "Dolphin is a file manager for KDE focusing on usability.
The main features of Dolphin are:
@@ -98,14 +99,14 @@ The main features of Dolphin are:
(define-public dolphin-plugins
(package
(name "dolphin-plugins")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/dolphin-plugins-" version ".tar.xz"))
(sha256
- (base32 "12g44s6g7ma6avp15l45l42qyzbglswvahm2wji79zdls5vjnz7r"))))
+ (base32 "0278pmakd4xqc8ckyxkzvf1xj1jp7jdq3a86i0n0k691zfljnan7"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -113,9 +114,10 @@ The main features of Dolphin are:
`(("dolphin" ,dolphin)
("ki18n" ,ki18n)
("kio" ,kio)
+ ("ksyntaxhighlighting" ,ksyntaxhighlighting)
("ktexteditor" ,ktexteditor)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("qtbase" ,qtbase-5)))
(home-page "http://www.kde.org/")
(synopsis "VCS-Plugins for Dolphin")
@@ -126,14 +128,14 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.")
(define-public khelpcenter
(package
(name "khelpcenter")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/khelpcenter-" version ".tar.xz"))
(sha256
- (base32 "0wxzjragvjcfc7c4qja8wzpshhaywficj7f7wkmppzybcsxwn9qb"))))
+ (base32 "0ivm1z7c6yy6dm9sb88ggiww9c2k526lhpipkgiwm6kslzallxsn"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -155,12 +157,12 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.")
("kservice" ,kservice)
("kwindowsystem" ,kwindowsystem)
("libxml2" ,libxml2)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("qtbase" ,qtbase-5)
("xapian" ,xapian)))
(arguments
`(#:tests? #f)) ;; 1/1 test fails
- (home-page "https://kde.org/applications/system/org.kde.Help")
+ (home-page "https://apps.kde.org/help/")
(synopsis "KDE documentation viewer")
(description "KHelpCenter uses meta data files which describe the
documentation available in the system. Each document is represented by a meta
@@ -176,14 +178,14 @@ document meta data file.")
(define-public konsole
(package
(name "konsole")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/konsole-" version ".tar.xz"))
(sha256
- (base32 "0ckr7bjkyaw0gr5kx569jfnhkhwmlk4lqk41ng61qwxlb4bsdbdm"))))
+ (base32 "1lhpgags85y0s5p44dpa2k0b9vq46m7h19pha59w1wy72an884ig"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -212,7 +214,7 @@ document meta data file.")
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("qtbase" ,qtbase-5)
("qtscript" ,qtscript)))
(arguments
@@ -231,14 +233,14 @@ This package is part of the KDE base applications module.")
(define-public krfb
(package
(name "krfb")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/krfb-" version ".tar.xz"))
(sha256
- (base32 "092ijn88jpmgk2zwz37vzf35jisl234mc3krc9jl7bd955akx51k"))))
+ (base32 "1hn21d0cp2k6zair2wwf492y0ip69f1b5axaaz9fqgmgqn0l47qb"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -260,13 +262,13 @@ This package is part of the KDE base applications module.")
("libvnc" ,libvnc)
("libxcb" ,libxcb)
("libxtst" ,libxtst)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("pipewire" ,pipewire)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)
("xcb-util-image" ,xcb-util-image)
("zlib" ,zlib)))
- (home-page "https://kde.org/applications/internet/org.kde.krfb")
+ (home-page "https://apps.kde.org/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
@@ -283,14 +285,14 @@ This package is part of the KDE networking module.")
(define-public ksystemlog
(package
(name "ksystemlog")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/ksystemlog-" version ".tar.xz"))
(sha256
- (base32 "1826h89ynvlxdwzyqil2d79cvynglww6fax7qp41wxasgarxhsni"))))
+ (base32 "1qnnhbi75glgvcvpmpy5zrq6x6hygl7r7v4h99lfm48jdfpyxilj"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -308,9 +310,9 @@ This package is part of the KDE networking module.")
("ktextwidgets" ,ktextwidgets)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ;; default icon set
+ ("breeze-icons" ,breeze-icons) ;; default icon set
("qtbase" ,qtbase-5)))
- (home-page "https://kde.org/applications/system/org.kde.ksystemlog")
+ (home-page "https://apps.kde.org/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
@@ -323,14 +325,14 @@ This package is part of the KDE administration module.")
(define-public yakuake
(package
(name "yakuake")
- (version "20.12.1")
+ (version "21.08.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/yakuake-" version ".tar.xz"))
(sha256
(base32
- "02pal9xx1wbpw7dimvs2aw1xnyjqlvbjlybkkfhf8x7c6m1r63aa"))))
+ "1d8dh10jkpm4pm8fh1bmkdwvv59gk0fg6dr3gahlspnh4hhzy4hg"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -356,7 +358,7 @@ This package is part of the KDE administration module.")
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("qtx11extras" ,qtx11extras)))
- (home-page "https://www.kde.org/applications/system/yakuake/")
+ (home-page "https://apps.kde.org/yakuake/")
(synopsis "Quad-style terminal emulator for KDE")
(description "Yakuake is a drop-down terminal emulator based on KDE Konsole
technology. Features include:
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 17/19] gnu: ktouch: Update to 21.08.2.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-18-mail@brendan.scot
* gnu/packages/education.scm (ktouch): Update to 21.08.2.
---
gnu/packages/education.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 716f15a9db..4fc86c9078 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -718,14 +718,14 @@ language and very flexible regarding to new or unknown keyboard layouts.")
(define-public ktouch
(package
(name "ktouch")
- (version "20.12.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/ktouch-" version ".tar.xz"))
(sha256
- (base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib"))))
+ (base32 "16r3hj160y1517dk1nzvikwkjlfbzmjpx54k9jc98csaplbv683l"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
--
2.33.0
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 16/19] gnu: KDE Multimedia: Update to 21.08.2.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-17-mail@brendan.scot
(audiocd-kio dragon elisa ffmpegthumbs juk k3b kaffeine kamoso kmix
kwave libkcddb libkcompactdisc): Update to 21.08.2.

(kmplayer): Remove unmaintained program.

(audiocd-kio):
[home-page]: Lint URL.

(dragon): [inputs]: Add gst-plugins-{base,good}.
[arguments]: Wrap plugins.
[home-page]: Lint URL.

(elisa): [inputs]: Add kiconthemes. Use breeze-icons over oxygen-icons as
default.
[home-page]: Lint URL.

(ffmpegthumbs): [inputs]: Add taglib.
[home-page]: Lint URL.

(juk, kaffeine, kmix):
[inputs]: Use breeze-icons over oxygen-icons as default.
[home-page]: Lint URL.

(k3b): [arguments]: Don't use %build-inputs or %outputs.
[inputs]: Use breeze-icons over oxygen-icons as
[home-page]: Lint URL.

(kamoso): [inputs]: Use breeze-icons over oxygen-icons as default.
[arguments]: Don't use %build-inputs.
[home-page]: Lint URL.

(kwave): [native-inputs]: Add gzip (used in arguments)
[inputs]: Use breeze-icons over oxygen-icons as default.
[arguments]: Fix/workaround kwave being unable to find some icons.
[home-page]: Lint URL.
---
gnu/packages/kde-multimedia.scm | 213 ++++++++++++++------------------
1 file changed, 95 insertions(+), 118 deletions(-)

Toggle diff (429 lines)
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 4e28fe1367..48ca9635b3 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -48,14 +49,14 @@
(define-public audiocd-kio
(package
(name "audiocd-kio")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/audiocd-kio-" version ".tar.xz"))
(sha256
- (base32 "0qlnxxbayqhz25jbvzis27jw2zbw1pmacp8rv7v5wa7zfqn3kmyk"))))
+ (base32 "1l0wym8gisgwv2mg2jsvpj8hb2yvmzd7dcximg540ljphv3hp1p2"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -72,7 +73,7 @@
("libvorbis" ,libvorbis)
("phonon" ,phonon)
("qtbase" ,qtbase-5)))
- (home-page "https://kde.org/applications/multimedia/org.kde.kio_audiocd")
+ (home-page "https://apps.kde.org/kio_audiocd/")
(synopsis "Transparent audio CD integration for applications using the KDE
Platform")
(description "KIO AudioCD is a KIO slave that enables KIO-aware
@@ -88,14 +89,14 @@ This package is part of the KDE multimedia module.")
(define-public dragon
(package
(name "dragon")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/dragon-" version ".tar.xz"))
(sha256
- (base32 "1sssg20a1vpwk816lp5jgwahilaswb9f3hgfqvc73il4g11ky1xj"))))
+ (base32 "0ddijz96z58582w298jp11vns9fx3rmzqd3x1qplxvp4sl0hp9l7"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -114,12 +115,24 @@ This package is part of the KDE multimedia module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ; default icon set
+ ("breeze-icons" ,breeze-icons) ; default icon set
("phonon" ,phonon)
("phonon-backend-gstreamer" ,phonon-backend-gstreamer)
+ ("gst-plugins-base" ,gst-plugins-base)
+ ("gst-plugins-good" ,gst-plugins-good)
("qtbase" ,qtbase-5)
("solid" ,solid)))
- (home-page "https://kde.org/applications/multimedia/org.kde.dragonplayer")
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'qt-wrap 'gst-wrap
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+ (wrap-program (string-append out "/bin/dragon")
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))
+ #t))))))
+ (home-page "https://apps.kde.org/dragonplayer/")
(synopsis "Simple video player")
(description "Dragon Player is a multimedia player where the focus is on
simplicity, instead of features. Dragon Player does one thing, and only one
@@ -134,14 +147,14 @@ This package is part of the KDE multimedia module.")
(define-public elisa
(package
(name "elisa")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/elisa-" version ".tar.xz"))
(sha256
- (base32 "02450lsnbd37fms1i2bb9qc9wir4vym6qqd9p5hr6a6s6qwfs6qf"))))
+ (base32 "14wi7dva0bfagxw49bs80qszqcv6k16s0569mh1c4m97gzlzgv35"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -159,6 +172,7 @@ This package is part of the KDE multimedia module.")
("kdbusaddons" ,kdbusaddons)
("kdeclarative" ,kdeclarative)
("kfilemetadata" ,kfilemetadata)
+ ("kiconthemes" ,kiconthemes)
("ki18n" ,ki18n)
("kio" ,kio)
("kirigami" ,kirigami)
@@ -167,7 +181,7 @@ This package is part of the KDE multimedia module.")
("kpackage" ,kpackage)
("kwidgetsaddons" ,kwidgetsaddons)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ; default icon set
+ ("breeze-icons" ,breeze-icons) ; default icon set
("phonon" ,phonon)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
@@ -195,7 +209,7 @@ This package is part of the KDE multimedia module.")
(setenv "CTEST_OUTPUT_ON_FAILURE" "1")
(invoke "dbus-launch" "make" test-target))
#t)))))
- (home-page "https://kde.org/applications/multimedia/org.kde.elisa")
+ (home-page "https://apps.kde.org/elisa/")
(synopsis "Powerful music player for Plasma 5")
(description "Elisa is a simple music player aiming to provide a nice
experience for its users. Elisa browses music by album, artist or
@@ -208,14 +222,14 @@ its own database. You can build and play your own playlist.")
(define-public ffmpegthumbs
(package
(name "ffmpegthumbs")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/ffmpegthumbs-" version ".tar.xz"))
(sha256
- (base32 "17l50z33a1h5zkrrfkb261yi2hms66qj36l1mndq7mvs97y2ggmc"))))
+ (base32 "1gsxcm86aq3r485ivk532a949z5l4129kildbd752c2qy0hdy5z1"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -225,8 +239,9 @@ its own database. You can build and play your own playlist.")
("kconfig" ,kconfig)
("ki18n" ,ki18n)
("kio" ,kio)
+ ("taglib" ,taglib)
("qtbase" ,qtbase-5)))
- (home-page "https://kde.org/applications/multimedia/org.kde.ffmpegthumbs")
+ (home-page "https://apps.kde.org/ffmpegthumbs/")
(synopsis "Video thumbnail generator for KDE using ffmpeg")
(description "
FFMpegThumbs is a video thumbnail generator for KDE file managers
@@ -239,14 +254,14 @@ This package is part of the KDE multimedia module.")
(define-public juk
(package
(name "juk")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/juk-" version ".tar.xz"))
(sha256
- (base32 "06vsh7knyhcbcbf632jhldbqpzfkdyils2l8dbcdw5nj5hhgzzmr"))))
+ (base32 "0c74s9ylx1xh1y581ygm6zyafwv3l5d7297wfg50f64nyr5npxm2"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -268,13 +283,13 @@ This package is part of the KDE multimedia module.")
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
- ("oxygen-icons" ,oxygen-icons) ; default icon set
+ ("breeze-icons" ,breeze-icons) ; default icon set
("phonon" ,phonon)
("phonon-backend-gstreamer" ,phonon-backend-gstreamer)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg)
("taglib" ,taglib)))
- (home-page "https://kde.org/applications/multimedia/org.kde.juk")
+ (home-page "https://apps.kde.org/juk/")
(synopsis "Music jukebox / music player")
(description "JuK is a powerful music player capable of managing a large
music collection.
@@ -294,24 +309,24 @@ This package is part of the KDE multimedia module.")
(define-public k3b
(package
(name "k3b")
- (version "20.04.2")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/k3b-" version ".tar.xz"))
(sha256
- (base32 "15wm987hz6rfs9ds9l1gbs6gdsardj1ywvk6zmpvj2i2190y4b3q"))))
+ (base32 "1g9xgzklsyard3ghcmr9irixcilga6kcj46jav884y8w7zxb4mrd"))))
(build-system qt-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-absolute-library-paths
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
;; Set absolute paths for dlopened libraries. We can’t use k3b’s
;; runpath as they are loaded by the Qt library.
- (let ((libcdio-paranoia (assoc-ref %build-inputs "libcdio-paranoia"))
- (libdvdcss (assoc-ref %build-inputs "libdvdcss")))
+ (let ((libcdio-paranoia (assoc-ref inputs "libcdio-paranoia"))
+ (libdvdcss (assoc-ref inputs "libdvdcss")))
(substitute* "libk3b/tools/k3bcdparanoialib.cpp"
(("\"(cdio_cdda|cdio_paranoia)\"" _ library)
(string-append "\"" libcdio-paranoia "/lib/" library "\"")))
@@ -320,12 +335,12 @@ This package is part of the KDE multimedia module.")
(string-append "\"" libdvdcss "/lib/" library "\""))))
#t))
(add-after 'qt-wrap 'wrap-path
- (lambda _
+ (lambda* (#:key inputs outputs #:allow-other-keys)
;; Set paths to backend programs.
- (wrap-program (string-append (assoc-ref %outputs "out") "/bin/k3b")
+ (wrap-program (string-append (assoc-ref outputs "out") "/bin/k3b")
`("PATH" ":" prefix
,(map (lambda (input)
- (string-append (assoc-ref %build-inputs input) "/bin"))
+ (string-append (assoc-ref inputs input) "/bin"))
'("cdrdao" "dvd+rw-tools" "libburn" "sox"))))
#t)))))
(native-inputs
@@ -366,7 +381,7 @@ This package is part of the KDE multimedia module.")
("libsamplerate" ,libsamplerate)
("libsndfile" ,libsndfile)
("libvorbis" ,libvorbis)
- ("oxygen-icons" ,oxygen-icons) ; default icon set
+ ("breeze-icons" ,breeze-icons) ; default icon set
("qtbase" ,qtbase-5)
("qtwebkit" ,qtwebkit)
("shared-mime-info" ,shared-mime-info)
@@ -374,7 +389,7 @@ This package is part of the KDE multimedia module.")
("sox" ,sox)
("taglib" ,taglib)
("zlib" ,zlib)))
- (home-page "https://kde.org/applications/multimedia/org.kde.k3b")
+ (home-page "https://apps.kde.org/k3b/")
(synopsis "Sophisticated CD/DVD burning application")
(description "K3b is CD-writing software which intends to be feature-rich
and provide an easily usable interface. Features include burning audio CDs
@@ -412,7 +427,7 @@ available CD drives.")
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("libxscrnsaver" ,libxscrnsaver)
- ("oxygen-icons" ,oxygen-icons) ; default icon set
+ ("breeze-icons" ,breeze-icons) ; default icon set
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)
("solid" ,solid)
@@ -427,7 +442,7 @@ available CD drives.")
(("\\s*qPrintable\\(transponder\\.getTransmissionType\\(\\)\\)\\);")
"transponder.getTransmissionType());"))
#t)))))
- (home-page "https://kde.org/applications/multimedia/org.kde.kaffeine")
+ (home-page "https://apps.kde.org/kaffeine/")
(synopsis "Versatile media player for KDE")
(description "Kaffeine is a media player for KDE. While it supports
multiple Phonon backends, its default backend is Xine, giving Kaffeine a wide
@@ -442,14 +457,14 @@ autoloading of subtitle files for use while playing video.")
(define-public kamoso
(package
(name "kamoso")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kamoso-" version ".tar.xz"))
(sha256
- (base32 "0c47j315kjfikd3b6x18786k3gqymicjjslpm0a58zdxl3wpqfay"))))
+ (base32 "0rkd9mk7rgha40j19rwpyqmn8lchqahakn4p3sbab7h3p3cq2b7p"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -465,7 +480,7 @@ autoloading of subtitle files for use while playing video.")
("kirigami" ,kirigami)
("knotifications" ,knotifications)
("kparts" ,kparts)
- ("oxygen-icons" ,oxygen-icons) ; default icon set
+ ("breeze-icons" ,breeze-icons) ; default icon set
("purpose" ,purpose)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
@@ -473,13 +488,8 @@ autoloading of subtitle files for use while playing video.")
("qtquickcontrols" ,qtquickcontrols)
("qtquickcontrols2" ,qtquickcontrols2) ; not listed as dependency
("qtx11extras" ,qtx11extras)))
- (arguments
- `(#:tests? #f ; test program gets built, but is not found
- #:configure-flags
- (list (string-append "-DCMAKE_CXX_FLAGS=-I"
- (assoc-ref %build-inputs "gst-plugins-base")
- "/include/gstreamer-1.0"))))
- (home-page "https://kde.org/applications/multimedia/org.kde.kamoso")
+ (arguments `(#:tests? #f)) ; test program gets built, but is not found
+ (home-page "https://apps.kde.org/kamoso/")
(synopsis "Take pictures and videos out of your webcam")
(description "Kamoso is a simple and friendly program to use your
camera. Use it to take pictures and make videos to share.")
@@ -489,14 +499,14 @@ camera. Use it to take pictures and make videos to share.")
(define-public kmix
(package
(name "kmix")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kmix-" version ".tar.xz"))
(sha256
- (base32 "1na52ypp57wqrc6pl1khinx9i6fidv1k97nnxcy8zb4l7d5sh1nd"))))
+ (base32 "1srv1alrq2w87rmv9jriz1y37rb0fp7w14291ky64gf23phwmfdq"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -519,12 +529,12 @@ camera. Use it to take pictures and make videos to share.")
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("libcanberra" ,libcanberra)
- ("oxygen-icons" ,oxygen-icons) ; default icon set
+ ("breeze-icons" ,breeze-icons) ; default icon set
("plasma-framework" ,plasma-framework)
("pulseaudio" ,pulseaudio)
("qtbase" ,qtbase-5)
("solid" ,solid)))
- (home-page "https://kde.org/applications/multimedia/org.kde.kmix")
+ (home-page "https://apps.kde.org/kmix/")
(synopsis "Volume control and mixer")
(description "KMix is an audio device mixer, used to adjust volume, select
recording inputs, and set other hardware options.
@@ -533,86 +543,21 @@ This package is part of the KDE multimedia module.")
(license ;; GPL for programs, LGPL for libraries, FDL for documentation
(list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
-(define-public kmplayer
- (package
- (name "kmplayer")
- (version "0.12.0b")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/kmplayer/0.12"
- "/kmplayer-" version ".tar.bz2"))
- (sha256
- (base32 "0wzdxym4fc83wvqyhcwid65yv59a2wvp1lq303cn124mpnlwx62y"))
- (patches (search-patches
- "kmplayer-aarch64.patch"
- "kmplayer-upstream_Fix-build-with-Qt-5.9.patch"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("pkg-config" ,pkg-config)
- ("kdoctools" ,kdoctools)))
- (inputs
- `(("kconfig" ,kconfig)
- ("kcoreaddons" ,kcoreaddons)
- ("kdelibs4support" ,kdelibs4support)
- ("ki18n" ,ki18n)
- ("kinit" ,kinit)
- ("kio" ,kio)
- ("kparts" ,kparts)
- ("kmediaplayer" ,kmediaplayer)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("libxcb" ,libxcb) ;; FIXME: why does cmake not find XEVIE and XPRINT?
- ("oxygen-icons" ,oxygen-icons) ; default icon set
- ("phonon" ,phonon)
- ("qtbase" ,qtbase-5)
- ("cairo" ,cairo)
- ("qtsvg" ,qtsvg)
- ("qtx11extras" ,qtx11extras)
- ("xcb-util" ,xcb-util)
- ("xcb-util-cursor" ,xcb-util-cursor)
- ("xcb-util-errors" ,xcb-util-errors)
- ("xcb-util-image" ,xcb-util-image)
- ("xcb-util-keysyms" ,xcb-util-keysyms)
- ("xcb-util-wm" ,xcb-util-wm)))
- (arguments
- `(#:configure-flags
- (list (string-append
- "-DCMAKE_CXX_FLAGS=-I"
- (assoc-ref %build-inputs "qtx11extras") "/include/qt5"))))
- (home-page "https://kde.org/applications/multimedia/org.kde.kmplayer")
- (synopsis "Media player using mplayer/phonon as backend")
- (description "Kmplayer can play all the audio/video supported by
-mplayer/phonon from a local file or URL and be embedded in Konqueror and
-KHTML. It also plays DVDs.
-
-Some features:
-@itemize
-@item play DVD/VCD movies (from file or url and from a video device)
-@item embed inside konqueror (movie is played inside konqueror)
-@item embed inside khtml (movie playback inside a html page)
-@item Movie recording using mencoder (part of the mplayer package)
-@item No video during recording, but you can always open a new window and play it
-@item Broadcasting, http streaming, using ffserver/ffmpeg
-@item For TV sources, you need v4lctl (part of the xawtv package)
-@end itemize")
- (license ;; GPL for programs, LGPL for libraries, FDL for documentation
- (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
-
(define-public kwave
(package
(name "kwave")
- (version "20.04.1")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kwave-" version ".tar.xz"))
(sha256
- (base32 "0ysa873pc2gip95cxr8yv7ifd9qql5zg6h67i9n9q3iqa6v58iyw"))))
+ (base32 "0sivhgcypwpdi6g0mkdzf1k2hqkj1vj4b5cdcvn8chs2gk9pisgh"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
+ ("gzip" ,gzip)
This message was truncated. Download the full message here.
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 18/19] gnu: Move KDE games to (gnu packages kde-games).
(address . 50862@debbugs.gnu.org)
20211015093015.5834-19-mail@brendan.scot
* gnu/packages/games.scm:
(ktuberling picmi kolf libkmahjongg kmahjongg kshisen kajongg kbreakout
kmines konquest kbounce kblocks ksudoku klines kgoldrunner kdiamond
kfourinline kblackbox knetwalk bomber granatier ksirk palapeli kiriki
kigo kubrick lskat kapman kspaceduel bovo killbots ksnakeduel kollision
knavalbattle kreversi ksquares kjumpingcube):
Move to gnu/packages/kde-games.scm.
[define-module]: Remove (gnu packages kde), (gnu packages
kde-frameworks).

* gnu/packages/kde-games.scm.
[header]: Copy over any copyrights I could find that affected these games.

Why? games.scm is very large, and will only get larger, so splitting it
helps. Also, it is convenient for singling out and updating KDE games.
---
gnu/local.mk | 1 +
gnu/packages/games.scm | 1554 -----------------------------------
gnu/packages/kde-games.scm | 1594 ++++++++++++++++++++++++++++++++++++
3 files changed, 1595 insertions(+), 1554 deletions(-)
create mode 100644 gnu/packages/kde-games.scm

Toggle diff (523 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 7433e1e7ea..11f9c62b55 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -328,6 +328,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/kawa.scm \
%D%/packages/kde.scm \
%D%/packages/kde-frameworks.scm \
+ %D%/packages/kde-games.scm \
%D%/packages/kde-internet.scm \
%D%/packages/kde-multimedia.scm \
%D%/packages/kde-pim.scm \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2931d60954..9ce6489a56 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -146,8 +146,6 @@
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages javascript)
- #:use-module (gnu packages kde)
- #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages less)
#:use-module (gnu packages libcanberra)
#:use-module (gnu packages libedit)
@@ -10255,1558 +10253,6 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
(home-page "https://github.com/bernds/q5Go")
(license license:gpl2+)))
-(define-public ktuberling
- (package
- (name "ktuberling")
- (version "20.12.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/ktuberling-" version ".tar.xz"))
- (sha256
- (base32 "0mlv9qllg70p26dbrcsr820c70d3ib88hapc1z6wgjhdpmc12ni1"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("kdoctools" ,kdoctools)
- ("perl" ,perl)))
- (inputs
- `(("kcompletion" ,kcompletion)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("ki18n" ,ki18n)
- ("kio" ,kio)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("kxmlgui" ,kxmlgui)
- ("libkdegames" ,libkdegames)
- ("python" ,python-wrapper)
- ("qtbase" ,qtbase-5)
- ("qtmultimedia" ,qtmultimedia)
- ("qtdeclarative" ,qtdeclarative)
- ("qtsvg" ,qtsvg)))
- (home-page "https://games.kde.org/")
- (synopsis "Stamp drawing toy")
- (description "KTuberling is a drawing toy intended for small children and
-adults who remain young at heart. The game has no winner; the only purpose is
-to make the funniest faces you can. Several activities are possible, e.g.:
-
-@itemize
-@item Give the potato a funny face, clothes, and other goodies
-@item Build a small town, complete with school, zoo, and fire department
-@item Create a fantastic moonscape with spaceships and aliens
-@item Top a pizza
-@end itemize
-
-KTuberling can speak the name of each the object in several languages,
-to assist in learning basic vocabulary.
-
-This package is part of the KDE games module.")
- (license (list license:gpl2+ license:fdl1.2+))))
-
-(define-public picmi
- (package
- (name "picmi")
- (version "20.12.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/picmi-" version ".tar.xz"))
- (sha256
- (base32 "1dfq9m4njh0czz8zws46rkz6xq2n6xra5w223m3s2f5civiw5msz"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("kdoctools" ,kdoctools)))
- (inputs
- `(("kcoreaddons" ,kcoreaddons)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("kdeclarative" ,kdeclarative)
- ("ki18n" ,ki18n)
- ("kio" ,kio)
- ("knewstuff" ,knewstuff)
- ("kxmlgui" ,kxmlgui)
- ("libkdegames" ,libkdegames)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)
- ("qtsvg" ,qtsvg)))
- (home-page "https://games.kde.org/")
- (synopsis "Number logic game")
- (description "Picmi is a number logic game in which cells in a grid have
-to be colored or left blank according to numbers given at the side of the
-grid. The aim is to reveal a hidden picture.
-
-This package is part of the KDE games module.")
- (license (list license:gpl2+ license:fdl1.2+))))
-
-(define-public kolf
- (package
- (name "kolf")
- (version "20.12.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/kolf-" version ".tar.xz"))
- (sha256
- (base32 "1lpp6pzr5dgd4si4a8c7hcvgxgqy0bgyhkx9m6jqb0zhll6dxj10"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("kdoctools" ,kdoctools)))
- (inputs
- `(("kcompletion" ,kcompletion)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("ki18n" ,ki18n)
- ("kio" ,kio)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("kxmlgui" ,kxmlgui)
- ("ktextwidgets" ,ktextwidgets)
- ("libkdegames" ,libkdegames)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)))
- (home-page "https://games.kde.org/")
- (synopsis "Miniature golf game")
- (description "Kolf is a miniature golf game for one to ten players. The
-game is played from an overhead view, with a short bar representing the golf
-club. Kolf features many different types of objects, such as water hazards,
-slopes, sand traps, and black holes (warps), among others.
-
-Features are:
-@itemize
-@item Single and Multi-player (up to ten players) modes
-@item High scores table
-@item Dynamic courses
-@item Third-party courses
-@item Course editor
-@end itemize
-
-This package is part of the KDE games module.")
- (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
-
-(define-public libkmahjongg
- (package
- (name "libkmahjongg")
- (version "20.12.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/"
- version "/src/libkmahjongg-" version ".tar.xz"))
- (sha256
- (base32 "10ljzbf7qki5flydankrbksaihhkqpfyljb8c71fbwqwmkr7rgfq"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)))
- (inputs
- `(("kauth" ,kauth)
- ("kcompletion" ,kcompletion)
- ;("kconfig" ,kconfig)
- ("kcodecs" ,kcodecs)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("ki18n" ,ki18n)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("qtbase" ,qtbase-5)
- ("qtsvg" ,qtsvg)))
- (home-page "https://games.kde.org/")
- (synopsis "Shared library for kmahjongg and kshisen")
- (description "Shared library and common files for kmahjongg, kshisen and
-other Mah Jongg like games.")
- (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
-
-(define-public kmahjongg
- (package
- (name "kmahjongg")
- (version "20.12.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/"
- version "/src/kmahjongg-" version ".tar.xz"))
- (sha256
- (base32 "1fcj4jb2zzbaxp7cp04w36y0c7lh77yzin66fmvrcxkl11xi2wwd"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("kdoctools" ,kdoctools)))
- (inputs
- `(("kcompletion" ,kcompletion)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("kdeclarative" ,kdeclarative)
- ("ki18n" ,ki18n)
- ("knewstuff" ,knewstuff)
- ("kxmlgui" ,kxmlgui)
- ("libkdegames" ,libkdegames)
- ("libkmahjongg" ,libkmahjongg)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)
- ("qtsvg" ,qtsvg)))
- (home-page "https://games.kde.org/")
- (synopsis "Tile laying patience")
- (description "In KMahjongg the tiles are scrambled and staked on top of
-each other to resemble a certain shape. The player is then expected to remove
-all the tiles off the game board by locating each tile's matching pair.
-
-A variety of tile layouts are included, as well as an editor to create new
-layouts.
-
-This package is part of the KDE games module.")
- (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
-
-(define-public kshisen
- (package
- (name "kshisen")
- (version "20.12.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/"
- version "/src/kshisen-" version ".tar.xz"))
- (sha256
- (base32 "1hrwr0f1kidivsp8lnwdbqz3xxagjvjwh72r3gma8smfilybygfb"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ;("perl" ,perl)
- ;("pkg-config" ,pkg-config)
- ("kdoctools" ,kdoctools)))
- (inputs
- `(("kauth" ,kauth)
- ("kcompletion" ,kcompletion)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("ki18n" ,ki18n)
- ("kxmlgui" ,kxmlgui)
- ("libkdegames" ,libkdegames)
- ("libkmahjongg" ,libkmahjongg)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)))
- (home-page "https://games.kde.org/")
- (synopsis "Shisen-Sho solitaire game")
- (description "KShisen is a solitaire-like game played using the standard
-set of Mahjong tiles. Unlike Mahjong however, KShisen has only one layer of
-scrambled tiles
-
-This package is part of the KDE games module.")
- (license license:gpl2+)))
-
-(define-public kajongg
- (package
- (name "kajongg")
- (version "20.12.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/"
- version "/src/kajongg-" version ".tar.xz"))
- (sha256
- (base32 "03fdbnx7zx7vgcxvwd1h1098ks9gq162bwz35fhpyzpynr667m5r"))))
- (build-system qt-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/mjresource.py"
- (("'share', 'kmahjongglib'" all)
- (string-append "'" (assoc-ref inputs "libkmahjongg")
- "/share', 'kmahjongglib'")))))
- (add-after 'qt-wrap 'wrap
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (for-each (lambda (program)
- (wrap-program program
- `("GUIX_PYTHONPATH" ":" prefix
- (,(getenv "GUIX_PYTHONPATH")))))
- (list (string-append out "/bin/kajongg")
- (string-append out "/bin/kajonggserver")))))))))
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ;("perl" ,perl)
- ("kdoctools" ,kdoctools)))
- (inputs
- `(("kconfig" ,kconfig)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("ki18n" ,ki18n)
- ("libkmahjongg" ,libkmahjongg)
- ("python" ,python)
- ("python-twisted" ,python-twisted)
- ("python-pyqt" ,python-pyqt)
- ("python-zope-interface" ,python-zope-interface)
- ("qtbase" ,qtbase-5)
- ("qtsvg" ,qtsvg)))
- (home-page "https://games.kde.org/")
- (synopsis "Classical Mah Jongg game for 4 players")
- (description "Kajongg is the ancient Chinese board game for 4 players.
-
-If you are looking for the Mah Jongg solitaire please use the application
-kmahjongg.
-
-Kajongg can be used in two different ways: Scoring a manual game where you
-play as always and use Kajongg for the computation of scores and for
-bookkeeping. Or you can use Kajongg to play against any combination of other
-human players or computer players.
-
-This package is part of the KDE games module.")
- (license (list license:gpl2+ license:fdl1.2+))))
-
-(define-public kbreakout
- (package
- (name "kbreakout")
- (version "20.12.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/kbreakout-" version ".tar.xz"))
- (sha256
- (base32 "0kqj2cx0ny3qq65c6w5fpnzmrwl9irg8slzvpd3anck5cnvma3j4"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("kdoctools" ,kdoctools)))
- (inputs
- `(("kcompletion" ,kcompletion)
- ("kconfig" ,kconfig)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("ki18n" ,ki18n)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("kxmlgui" ,kxmlgui)
- ("libkdegames" ,libkdegames)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)))
- (home-page "https://games.kde.org/")
- (synopsis "Breakout like game")
- (description "KBreakout is similar to the classics breakout and xboing,
-featuring a number of added graphical enhancements and effects. You control a
-paddle at the bottom of the playing-field, and must destroy bricks at the top
-by bouncing balls against them.
-
-This package is part of the KDE games module.")
- (license (list license:gpl2+ license:fdl1.2+))))
-
-(define-public kmines
- (package
- (name "kmines")
- (version "20.12.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/kmines-" version ".tar.xz"))
- (sha256
- (base32 "0hqjwh3jq2npqwkvh67fyn2xnq8swiasdw5jz8f0ikl0k28id775"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("kdoctools" ,kdoctools)))
- (inputs
- `(("kcompletion" ,kcompletion)
- ("kconfig" ,kconfig)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("ki18n" ,ki18n)
- ("ktextwidgets" ,ktextwidgets)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("kxmlgui" ,kxmlgui)
- ("libkdegames" ,libkdegames)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)))
- (home-page "https://games.kde.org/")
- (synopsis "Classical mine sweeper game")
- (description "KMines is a classic Minesweeper game. The idea is to
-uncover all the squares without blowing up any mines. When a mine is blown
-up, the game is over.
-
-This package is part of the KDE games module.")
- (license (list license:gpl2+ license:fdl1.2+))))
-
-(define-public konquest
- (package
- (name "konquest")
- (version "20.12.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/"
- version "/src/konquest-" version ".tar.xz"))
- (sha256
- (base32 "0lnwj06vv4qx05hr8pzysnvrxh8y04asajrph0rsj37v8hs9g5lh"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("kdoctools" ,kdoctools)))
- (inputs
- `(("kcompletion" ,kcompletion)
- ("kconfig" ,kconfig)
- ("kcoreaddons" ,kcoreaddons)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("kguiaddons" ,kguiaddons)
- ("ki18n" ,ki18n)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("kxmlgui" ,kxmlgui)
- ("libkdegames" ,libkdegames)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)
- ("qtsvg" ,qtsvg)))
- (home-page "https://games.kde.org/")
- (synopsis "Simple turn-based strategy game")
- (description "Konquest is the KDE version of Gnu-Lactic Konquest. Players
-conquer other planets by sending ships to them. The goal is to build an
-interstellar empire and ultimately conquer all other player's planets. The
-game can be played with up to nine empires, commanded either by the computer
-or by puny earthlings.
-
-This package is part of the KDE games module.")
- (license (list license:gpl2+ license:fdl1.2+))))
-
-(define-public kbounce
- (package
- (name "kbounce")
- (version "20.12.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/"
- version "/src/kbounce-" version ".tar.xz"))
- (sha256
- (base32 "0ymy0z1qlw3n653xs3dsa1xm78q4xaj09dnnci4km77rzis26vb6"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("kdoctools" ,kdoctools)))
- (inputs
- `(("kcompletion" ,kcompletion)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("ki18n" ,ki18n)
- ("kio" ,kio)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("kxmlgui" ,kxmlgui)
- ("libkdegames" ,libkdegames)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)
- ("qtsvg" ,qtsvg)))
- (home-page "https://games.kde.org/")
- (synopsis "Jezzball arcade game")
- (description "KBounce is a single player arcade game with the elements of
-puzzle. It is played on a field, surrounded by wall, with two or more balls
-bouncing around within the walls. The object of the game is to build new
-walls to decrease the size of the active field.
-
-This package is part of the KDE games module.")
- (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
-
-(define-public kblocks
- (package
- (name "kblocks")
- (version "20.12.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/"
- version "/src/kblocks-" version ".tar.xz"))
- (sha256
- (base32 "09yfm9mzbamp294cvc5finq6ilxvxr68i0dnb0m72pa4sfzmij32"))))
- (build-system qt-build-system)
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("kdoctools" ,kdoctools)))
- (inputs
- `(("kcompletion" ,kcompletion)
- ("kconfig" ,kconfig)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("ki18n" ,ki18n)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("kxmlgui" ,kxmlgui)
- ("libkdegames" ,libkdegames)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)
- ("qtsvg" ,qtsvg)))
- (home-page "https://games.kde.org/")
- (synopsis "Single player falling blocks puzzle game")
- (description "KBlocks is the classic Tetris-lik
This message was truncated. Download the full message here.
B
B
Brendan Tildesley wrote on 15 Oct 2021 11:30
[PATCH core-updates-frozen 19/19] gnu: KDE Games: Update to 21.08.2.
(address . 50862@debbugs.gnu.org)
20211015093015.5834-20-mail@brendan.scot
(ktuberling picmi kolf libkmahjongg kmahjongg kshisen kajongg kbreakout
kmines konquest kbounce kblocks ksudoku klines kgoldrunner kdiamond
kfourinline kblackbox knetwalk bomber granatier ksirk palapeli kiriki
kigo kubrick lskat kapman kspaceduel bovo killbots ksnakeduel kollision
knavalbattle kreversi ksquares kjumpingcube): Update to 21.08.2.
---
gnu/packages/kde-games.scm | 148 ++++++++++++++++++-------------------
1 file changed, 74 insertions(+), 74 deletions(-)

Toggle diff (516 lines)
diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm
index 77b2e12f42..e5d79cfb70 100644
--- a/gnu/packages/kde-games.scm
+++ b/gnu/packages/kde-games.scm
@@ -40,14 +40,14 @@
(define-public ktuberling
(package
(name "ktuberling")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/ktuberling-" version ".tar.xz"))
(sha256
- (base32 "0mlv9qllg70p26dbrcsr820c70d3ib88hapc1z6wgjhdpmc12ni1"))))
+ (base32 "0h7vhvh03w11dr17zxdmb5j2vz8flwahvz70h9kw8a63sxpw0x6f"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -91,14 +91,14 @@ This package is part of the KDE games module.")
(define-public picmi
(package
(name "picmi")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/picmi-" version ".tar.xz"))
(sha256
- (base32 "1dfq9m4njh0czz8zws46rkz6xq2n6xra5w223m3s2f5civiw5msz"))))
+ (base32 "0qvz4fl4jb256rwmaw0bszr3x2b5jd8priilc3jr33v393f3pd6q"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -128,14 +128,14 @@ This package is part of the KDE games module.")
(define-public kolf
(package
(name "kolf")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kolf-" version ".tar.xz"))
(sha256
- (base32 "1lpp6pzr5dgd4si4a8c7hcvgxgqy0bgyhkx9m6jqb0zhll6dxj10"))))
+ (base32 "1dziji28syv7rirm959ahcch6696sc4y6pnfp40v11j1pw58jm8p"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -176,14 +176,14 @@ This package is part of the KDE games module.")
(define-public libkmahjongg
(package
(name "libkmahjongg")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/libkmahjongg-" version ".tar.xz"))
(sha256
- (base32 "10ljzbf7qki5flydankrbksaihhkqpfyljb8c71fbwqwmkr7rgfq"))))
+ (base32 "195c7bgn4jp2whqrg7l8g147kj92bvdcvcrh7n186kac9q0jqr3b"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -207,14 +207,14 @@ other Mah Jongg like games.")
(define-public kmahjongg
(package
(name "kmahjongg")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kmahjongg-" version ".tar.xz"))
(sha256
- (base32 "1fcj4jb2zzbaxp7cp04w36y0c7lh77yzin66fmvrcxkl11xi2wwd"))))
+ (base32 "1fx4almqcz8x3pzbrjv9yd9kfb7akrfy45z7idhyb31dkdaxi40w"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -249,14 +249,14 @@ This package is part of the KDE games module.")
(define-public kshisen
(package
(name "kshisen")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kshisen-" version ".tar.xz"))
(sha256
- (base32 "1hrwr0f1kidivsp8lnwdbqz3xxagjvjwh72r3gma8smfilybygfb"))))
+ (base32 "12mi59n8sm7wqf53wbi2nlh4d2i673x93rlqz6qxkaqznlpf7lrr"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -288,14 +288,14 @@ This package is part of the KDE games module.")
(define-public kajongg
(package
(name "kajongg")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kajongg-" version ".tar.xz"))
(sha256
- (base32 "03fdbnx7zx7vgcxvwd1h1098ks9gq162bwz35fhpyzpynr667m5r"))))
+ (base32 "0c8kxh6kbk7ml16df4gmr142rjllc7v0v7m3kw4ksngk93f7vz2s"))))
(build-system qt-build-system)
(arguments
`(#:phases
@@ -351,14 +351,14 @@ This package is part of the KDE games module.")
(define-public kbreakout
(package
(name "kbreakout")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kbreakout-" version ".tar.xz"))
(sha256
- (base32 "0kqj2cx0ny3qq65c6w5fpnzmrwl9irg8slzvpd3anck5cnvma3j4"))))
+ (base32 "1gj37ryhak1czv95ksigssmbmicdpirzi1l5zsv1w7jdh4nqcz54"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -389,14 +389,14 @@ This package is part of the KDE games module.")
(define-public kmines
(package
(name "kmines")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kmines-" version ".tar.xz"))
(sha256
- (base32 "0hqjwh3jq2npqwkvh67fyn2xnq8swiasdw5jz8f0ikl0k28id775"))))
+ (base32 "0vzspy446pwbd04zyq7x0s7q6nrhmdnzq3jfvv6nnazhjmxpfafv"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -427,14 +427,14 @@ This package is part of the KDE games module.")
(define-public konquest
(package
(name "konquest")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/konquest-" version ".tar.xz"))
(sha256
- (base32 "0lnwj06vv4qx05hr8pzysnvrxh8y04asajrph0rsj37v8hs9g5lh"))))
+ (base32 "0shky9cys79prdgr6bcmi50gvfmqr0famdq6gqacv9krbja4pl20"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -467,14 +467,14 @@ This package is part of the KDE games module.")
(define-public kbounce
(package
(name "kbounce")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kbounce-" version ".tar.xz"))
(sha256
- (base32 "0ymy0z1qlw3n653xs3dsa1xm78q4xaj09dnnci4km77rzis26vb6"))))
+ (base32 "06zd4p8glpzp7q4a8qcmnj1lszgfdircfkgc8ay5abmfx2rr9hcw"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -506,14 +506,14 @@ This package is part of the KDE games module.")
(define-public kblocks
(package
(name "kblocks")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/kblocks-" version ".tar.xz"))
(sha256
- (base32 "09yfm9mzbamp294cvc5finq6ilxvxr68i0dnb0m72pa4sfzmij32"))))
+ (base32 "0p4k3wr8756qfxr09daqp7z3461ljnd3yv34h893j5dini1lfy3d"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -547,14 +547,14 @@ This package is part of the KDE games module.")
(define-public ksudoku
(package
(name "ksudoku")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/ksudoku-" version ".tar.xz"))
(sha256
- (base32 "0pj6ry7ak1rnpb93mqypaxrcbmrhwg9ir6zhb3ybzfkfcrh67g12"))))
+ (base32 "15svd1paf1hx5aqmdrh6bcdag7k8iq18fpjflk3vkkip6s76lrv6"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -608,14 +608,14 @@ This package is part of the KDE games module.")
(define-public klines
(package
(name "klines")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/klines-" version ".tar.xz"))
(sha256
- (base32 "0y8lnwawrkl4ixn7v4dg48k2zpr083krv7dv4d94b2dpkh7xfvih"))))
+ (base32 "1gxaadl8gnbaliwbnr6ychp1da5dgppk58jgv5z0zngacwy80d97"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -652,14 +652,14 @@ This package is part of the KDE games module.")
(define-public kgoldrunner
(package
(name "kgoldrunner")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kgoldrunner-" version ".tar.xz"))
(sha256
- (base32 "17ra5d3r9ajy2inj17gwd5xphzhvbzx5kpvdwyj6msx4dd9wxgfi"))))
+ (base32 "13y8a1zxfy16sbdf2c94wdx15ghmb436pzx7kvvsfv8d5yizlzdz"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -693,14 +693,14 @@ This package is part of the KDE games module.")
(define-public kdiamond
(package
(name "kdiamond")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kdiamond-" version ".tar.xz"))
(sha256
- (base32 "1iyxrx3422asa58kh0siwvi1svds5kccrym6gdfpdhlmhmciqlzi"))))
+ (base32 "1k458rs0x82jf4sjzcry4xzazwfn9drg41736749nc5d26k6csz1"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -732,14 +732,14 @@ This package is part of the KDE games module.")
(define-public kfourinline
(package
(name "kfourinline")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kfourinline-" version ".tar.xz"))
(sha256
- (base32 "0plx3lv35fc8q9svbyl71mms3ji6zn58j306bvm1f8kkgg0x395b"))))
+ (base32 "0z28lzx9jqp2krgwf6cpwv4hhyl8q8azgw3ni24c8hjl81sxidvb"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -771,14 +771,14 @@ This package is part of the KDE games module.")
(define-public kblackbox
(package
(name "kblackbox")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kblackbox-" version ".tar.xz"))
(sha256
- (base32 "0la5w44b0gl72g3wfp0pw8gwnm287lh7nd9k5ikpszw5nn49db0h"))))
+ (base32 "093k42259lwbhmq6pm5hv1iqm4maqd63qic80p748wmh88bsh8yg"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -812,14 +812,14 @@ This package is part of the KDE games module.")
(define-public knetwalk
(package
(name "knetwalk")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/knetwalk-" version ".tar.xz"))
(sha256
- (base32 "060kj06vpigdy570izsjfgnmqqrpmb8bkr9arqc109hg3avl5wjz"))))
+ (base32 "1jb6w790jfngifhgp4clgakiacw0lbn40jnj00zlzcg751vl6ajl"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -854,14 +854,14 @@ This package is part of the KDE games module.")
(define-public bomber
(package
(name "bomber")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/bomber-" version ".tar.xz"))
(sha256
- (base32 "1fjcwm591jgx3bgqpi0j5fnb2l2r2h3r6lav3vhaxz4rkf56pg2a"))))
+ (base32 "0wk6j89m8lbp83yfz2xwy78x99cvph9p36jzscpp4i894j6fad61"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -896,14 +896,14 @@ This package is part of the KDE games module.")
(define-public granatier
(package
(name "granatier")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/granatier-" version ".tar.xz"))
(sha256
- (base32 "1fyh7zyacb3pnlfd29jw2jmyl8a7sjw354pi234nd5x5999xw5z6"))))
+ (base32 "1bly3jlmn9d2im05srr3v28mw8wmr3hnw180wi8lpfzianh589v7"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -934,14 +934,14 @@ This package is part of the KDE games module.")
(define-public ksirk
(package
(name "ksirk")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/ksirk-" version ".tar.xz"))
(sha256
- (base32 "10y7nm0x6zcc0gh3am69bbxyyb8azbbfyrdqsa023ggr7n04cn21"))))
+ (base32 "1j6nzyl3ppi68d1y84yals0y90km5mxzz4x44frn3k3bb1n1imzc"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -990,14 +990,14 @@ This package is part of the KDE games module.")
(define-public palapeli
(package
(name "palapeli")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/palapeli-" version ".tar.xz"))
(sha256
- (base32 "0xxz9g4zxljlg20g88a5lkbwzzm9yg4vxnrfigk8m018cz0nqd5b"))))
+ (base32 "0pl6hi0c5fa6zs3gdicm1s7rmzzdjjvrm8s8ds6f4ghq6dmlknqj"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1038,14 +1038,14 @@ This package is part of the KDE games module.")
(define-public kiriki
(package
(name "kiriki")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kiriki-" version ".tar.xz"))
(sha256
- (base32 "0milc8fl1rj4yrwdvm60ampd47dyiys1xvqi5f0g7y6mgymgyk4x"))))
+ (base32 "1l3sc3fi4b8hc9dyrsi66src52wygckngiwqq8hf4mj2h0hf9s55"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1077,14 +1077,14 @@ This package is part of the KDE games module.")
(define-public kigo
(package
(name "kigo")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kigo-" version ".tar.xz"))
(sha256
- (base32 "088752yzmfsnppd27p8hld4x5s7sw5fagm08024l5ra1mlicdfz9"))))
+ (base32 "0ss15k2qpmrf4xvsjpqpvf9pvw8wijmk4zqqhvsjrbd5xrk53bkf"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1124,14 +1124,14 @@ This package is part of the KDE games module.")
(define-public kubrick
(package
(name "kubrick")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kubrick-" version ".tar.xz"))
(sha256
- (base32 "0h3mypwd67sss08j5vvrih5f5ss85m9kax6412y40xmsm51lz2pq"))))
+ (base32 "0kvd8dsg9hdgid70jd5b1vngqpmi9rigkvxl2v4h2ps1ziqqxa78"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1166,14 +1166,14 @@ This package is part of the KDE games module.")
(define-public lskat
(package
(name "lskat")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/lskat-" version ".tar.xz"))
(sha256
- (base32 "1wg9zxp64kwjxqs4qw0h7j8yhgffbmvh8j9d4dgmz45dscngnjli"))))
+ (base32 "03www1ix31ifmn6hvzymvhg157rdhahjfwvc9arns23zxpn1sq9p"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1205,14 +1205,14 @@ This package is part of the KDE games module.")
(define-public kapman
(package
(name "kapman")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kapman-" version ".tar.xz"))
(sha256
- (base32 "14x3v6li4r3gzzwfd6ar9saq2rhc7yxs0sp9ygalzq8vq4d7i1kh"))))
+ (base32 "04yv6j2bjlgclp916k2gibhhv5d64sxk181cqw7sh5j4aq555a3r"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1245,14 +1245,14 @@ This package is part of the KDE games module.")
(define-public kspaceduel
(package
(name "kspaceduel")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kspaceduel-" version ".tar.xz"))
(sha256
- (base32 "1aixh6ygif2cm1a5g32sl5y6b5x68139pzihaxq4334c6avamdai"))))
+ (base32 "1gjb23dw8fh61b7s23b2bfkgcfxqvndrv1x7lkk2bpi4i4g6sqz3"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1281,14 +1281,14 @@ This package is part of the KDE games module.")
(define-public bovo
(package
(name "bovo")
- (version "20.12.0")
+ (version "21.08.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/bovo-" version ".tar.xz"))
(sha256
- (base32 "18qbac366m0xma3ary11q9zxz0wgnysppcl7kpypl6ic3nf61wqz"))))
+ (base32 "1k5ncxxx64yj2b71jlpz7ll935mrilhrhphwz1h8n8pdr6dn91mf"))))
(build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
@@ -1318,14 +1318,14 @@ This package is part of the KDE games module.")
(define-public killbots
This message was truncated. Download the full message here.
P
P
phodina wrote on 28 Jan 2022 18:47
[PATCH v3 01/10] gnu: extra-cmake-modules: Update to 5.90.0.
(name . 50862@debbugs.gnu.org)(address . 50862@debbugs.gnu.org)
DSwYELHrcO9c3scdI0y1_5yUBO2jkHFz_S6iKp8bE-ApvRhrCwGacNJFlVWWqYgdZxeHPtmFsTyup85D5I05GDVnz0hEk0zNKbCBfAg41AM=@protonmail.com
Hi,

thanks for the patches. I've just started applying them.

However, there has been a merge of core-updates-frozen into master in commit 6dffced09ecda024e0884e352778c221ad066fd6.

Also the syntax for inputs has changed so the patches now fail.

I've been slowly applying them to the latest master as well as updating the package version if needed.

Here are the few I've been through.

----
Petr
Attachment: file
From ee754bed0b2f310089ee8fa5dc1cdc15446ef050 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 28 Jan 2022 15:48:21 +0100
Subject: [PATCH v3 01/10] gnu: extra-cmake-modules: Update to 5.90.0.

* gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.90.0.
[phases]: Respect #:tests?. No need to run check after install anymore.

Toggle diff (50 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 65937f8970..85dfa319c8 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -9,6 +9,8 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021 Alexandros Theodotou <alex@zrythm.org>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -87,7 +89,7 @@ (define-module (gnu packages kde-frameworks)
(define-public extra-cmake-modules
(package
(name "extra-cmake-modules")
- (version "5.70.0")
+ (version "5.90.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -96,7 +98,7 @@ (define-public extra-cmake-modules
name "-" version ".tar.xz"))
(sha256
(base32
- "10c5xs5shk0dcshpdxg564ay5y8hgmvfvmlhmhjf0dy79kcah3c3"))))
+ "1c5wza7srib3mdkf29ygmyj5b6jq322s6h7k5hlljqm5xhy7q07k"))))
(build-system cmake-build-system)
(native-inputs
;; Add test dependency, except on armhf where building it is too
@@ -131,11 +133,11 @@ (define-public extra-cmake-modules
(("set\\(ECM_MKSPECS_INSTALL_DIR mkspecs/modules")
"set(ECM_MKSPECS_INSTALL_DIR lib/qt5/mkspecs/modules"))
#t))
- ;; install and check phase are swapped to prevent install from failing
- ;; after testsuire has run
- (add-after 'install 'check-post-install
- (assoc-ref %standard-phases 'check))
- (delete 'check))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests? ;; This test fails
+ (invoke "ctest" "-E" "KDEFetchTranslations"))
+ #t)))))
;; optional dependencies - to save space, we do not add these inputs.
;; Sphinx > 1.2:
;; Required to build Extra CMake Modules documentation in Qt Help format.
--
2.34.0
From a5a748a3b58ef6f4e0b9c15228021eff98a4f6b4 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 28 Jan 2022 16:03:27 +0100
Subject: [PATCH v3 03/10] gnu: bluez-qt: Update to 5.90.0.

* gnu/packages/kde-frameworks.scm (bluez-qt): Update to 5.90.0.
[phases]: Enable tests. They work now.

Toggle diff (47 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 1ff7219aed..f6259d0749 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -275,7 +275,7 @@ (define-public attica
(define-public bluez-qt
(package
(name "bluez-qt")
- (version "5.70.0")
+ (version "5.90.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -284,7 +284,7 @@ (define-public bluez-qt
name "-" version ".tar.xz"))
(sha256
(base32
- "1kqhps4qyvqm0qmk7fb3w41bib898amipchf8csdzacw4bzpri9k"))))
+ "056i5ndrg5fqm1bx49a0plfhlladphha128wi766zdhcm6np11z3"))))
(build-system cmake-build-system)
(native-inputs
(list dbus extra-cmake-modules))
@@ -292,12 +292,16 @@ (define-public bluez-qt
;; TODO: qtdeclarative (yields one failing test)
(list qtbase-5))
(arguments
- (list #:configure-flags
- #~(list (string-append
- "-DUDEV_RULES_INSTALL_DIR=" #$output "/lib/udev/rules.d"))
- ;; TODO: Make tests pass: DBUS_FATAL_WARNINGS=0 still yields 7/8 tests
- ;; failing. When running after install, tests hang.
- #:tests? #f))
+ `(#:configure-flags
+ (list (string-append
+ "-DUDEV_RULES_INSTALL_DIR=" %output "/lib/udev/rules.d"))
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "DBUS_FATAL_WARNINGS" "0")
+ (invoke "dbus-launch" "ctest" ".")))))))
(home-page "https://community.kde.org/Frameworks")
(synopsis "QML wrapper for BlueZ")
(description "bluez-qt is a Qt-style library for accessing the bluez
--
2.34.0
From 2eccec9d24c8bc438f7e83b3c3fca544af5940c5 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 28 Jan 2022 15:51:10 +0100
Subject: [PATCH v3 02/10] gnu: attica: Update to 5.90.0.

* gnu/packages/kde-frameworks.scm (attica): Update to 5.90.0.

Toggle diff (24 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 85dfa319c8..1ff7219aed 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -235,7 +235,7 @@ (define-public phonon-backend-gstreamer
(define-public attica
(package
(name "attica")
- (version "5.70.0")
+ (version "5.90.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -244,7 +244,7 @@ (define-public attica
name "-" version ".tar.xz"))
(sha256
(base32
- "1njw1sifykyqldb5idaywdzi3xg7a6bvzkrvazwmyixd0npq12dx"))))
+ "0zs37qyh9biafk76ps2xfc41hbd1n4dq42qqqcvbqcrwfgqz2wlk"))))
(build-system cmake-build-system)
(arguments
`(#:phases
--
2.34.0
From adb19906a6b5569f9df0d3283d465f14cc7b058a Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 28 Jan 2022 17:14:02 +0100
Subject: [PATCH v3 05/10] gnu: kapidox: Update to 5.90.0.

* gnu/packages/kde-frameworks.scm (kapidox): Update to 5.90.0.

Toggle diff (31 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index dacdcdf0d3..d76dd7e193 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -343,7 +343,7 @@ (define-public breeze-icons
(define-public kapidox
(package
(name "kapidox")
- (version "5.70.0")
+ (version "5.90.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -352,12 +352,11 @@ (define-public kapidox
name "-" version ".tar.xz"))
(sha256
(base32
- "1irl25pf60frzrmm1ksgjq6y8kn3rd5snliq69l4c42yznl9qv1j"))))
+ "16jl519sx7pirjp5x57x5gbgv477457063rrbwpvyf2ldb6lc29p"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f)) ; has no test target
- (native-inputs
- (list extra-cmake-modules))
+ `(#:tests? #f ; has no test target
+ #:make-flags (list "DESTDIR=/"))) ;; Otherwise it doesn't install anything.
(propagated-inputs
;; kapidox is a python programm
;; TODO: check if doxygen has to be installed, the readme does not
--
2.34.0
From e79fbe37b8d9aac70f93080e899caf8211386ed0 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 28 Jan 2022 17:29:13 +0100
Subject: [PATCH v3 07/10] gnu: kcalendarcore: Update to 5.90.0.

* gnu/packages/kde-frameworks.scm (kcalendarcore): Update to 5.90.0.
[arguments]: Create dir in '/tmp' and set it to XDG_RUNTIME_DIR.

Toggle diff (60 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index a7c6cb1b1a..1a3d722848 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -413,7 +413,7 @@ (define-public karchive
(define-public kcalendarcore
(package
(name "kcalendarcore")
- (version "5.70.0")
+ (version "5.90.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -422,35 +422,23 @@ (define-public kcalendarcore
name "-" version ".tar.xz"))
(sha256
(base32
- "1y1f8gc1g9yn9kgmn53f1zvkizasfs667dfin3fyci657r5qwpw2"))))
+ "0qbds2ysjv9rqwpvrhisvdd6wyhq5qwhbw5xcbj7ndxwpf8lpa8w"))))
(build-system cmake-build-system)
(native-inputs
(list extra-cmake-modules perl tzdata-for-tests))
(inputs
(list libical qtbase-5))
(arguments
- `(#:phases
+ `(#:tests? #f ; testdateserialization fails
+ ;; https://invent.kde.org/frameworks/kcalendarcore/-/issues/2
+ #:phases
(modify-phases %standard-phases
- (add-before 'configure 'disable-failing-libical3-tests
- (lambda _
- ;; testicaltimezones fails with some time-zone issue
- (substitute* "autotests/CMakeLists.txt"
- (("macro_unit_tests\\(testicaltimezones\\)" line)
- (string-append "## " line))
- (("target_link_libraries\\(testicaltimezones " line)
- (string-append "## " line)))
- (for-each
- delete-file
- (list
- ;; test cases are generated for each .ics file. These fail:
- "autotests/data/Compat-libical3/AppleICal_1.5.ics"
- "autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics"
- "autotests/data/Compat-libical3/KOrganizer_3.1a.ics"
- "autotests/data/Compat-libical3/MSExchange.ics"
- "autotests/data/Compat-libical3/Mozilla_1.0.ics"))
- #t))
- (add-before 'check 'set-timezone
+ (add-before 'check 'check-setup
(lambda* (#:key inputs #:allow-other-keys)
+ ;; setenv for testdateserialization
+ (mkdir-p "/tmp/runtime")
+ (setenv "XDG_RUNTIME_DIR" "/tmp/runtime")
+ (setenv "QT_QPA_PLATFORM" "offscreen")
(setenv "TZ" "Europe/Prague")
(setenv "TZDIR"
(search-input-directory inputs
--
2.34.0
From f523507fd5bcec3c4207796eb668bc23b98af348 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 28 Jan 2022 17:32:07 +0100
Subject: [PATCH v3 08/10] gnu: kcodecs: Update to 5.90.0.

* gnu/packages/kde-frameworks.scm (kcodecs): Update to 5.90.0.

Toggle diff (24 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 1a3d722848..82045cc31c 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -458,7 +458,7 @@ (define-public kcalendarcore
(define-public kcodecs
(package
(name "kcodecs")
- (version "5.70.0")
+ (version "5.90.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -467,7 +467,7 @@ (define-public kcodecs
name "-" version ".tar.xz"))
(sha256
(base32
- "0y9n2a5n18pasdmrp0xb84hla9l27yj2x3k4p1c041sd9nkwixpk"))))
+ "0kwqyhjs63pqslqcmv3sngyqvl6ah8iaa6nn045sb8a58xb09inh"))))
(build-system cmake-build-system)
(native-inputs
(list extra-cmake-modules gperf qttools))
--
2.34.0
From 4810be7f81212617e0224bbd10c21bd6e2fbb828 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 28 Jan 2022 18:26:32 +0100
Subject: [PATCH v3 10/10] gnu: kcoreaddons: Update to 5.90.0.

* gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.90.0.
[arguments]: Enable benchNotifyWatcher tests since it seems to work.
[native-inputs]: Remove xorg-server-for-tests. Doesn't seem to be used.

Toggle diff (48 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index ed2e03c198..993ed73acf 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -556,7 +556,7 @@ (define-public kconfig
(define-public kcoreaddons
(package
(name "kcoreaddons")
- (version "5.70.0")
+ (version "5.90.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -565,12 +565,11 @@ (define-public kcoreaddons
name "-" version ".tar.xz"))
(sha256
(base32
- "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps"))))
+ "02m4h4r0kdy94zq8c6d2fhnd8qwrp4a0v5i4wf6khk4yf4fqy5kf"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules qttools shared-mime-info
+ (list extra-cmake-modules qttools shared-mime-info))
;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam
- xorg-server-for-tests)) ; for the tests
(inputs
(list qtbase-5))
(arguments
@@ -583,16 +582,7 @@ (define-public kcoreaddons
(lambda _
;; FIXME: Make it pass. Test failure caused by stout/stderr
;; being interleaved.
- (display "[test_channels]\n*\n")
- ;; This fails with ENOSPC because of too many inotify watches.
- (display "[benchNotifyWatcher]\n*\n")))
- #t))
- ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e
- (add-after 'unpack 'fix-broken-test
- (lambda _
- (substitute* "autotests/kdirwatch_unittest.cpp"
- (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m)
- (string-append m "\nwaitUntilNewSecond();")))
+ (display "[test_channels]\n*\n")))
#t))
(add-before 'check 'check-setup
(lambda _
--
2.34.0
From a79f103129b28a883772f0eb44ff22bd1e295c28 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 28 Jan 2022 17:16:54 +0100
Subject: [PATCH v3 06/10] gnu: karchive: Update to 5.90.0.

* gnu/packages/kde-frameworks.scm (karchive): Update to 5.90.0.
[native-inputs]: Add pkg-config.
[inputs]: Add zstd.

Toggle diff (31 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index d76dd7e193..a7c6cb1b1a 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -382,7 +382,7 @@ (define-public kapidox
(define-public karchive
(package
(name "karchive")
- (version "5.70.0")
+ (version "5.90.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -391,12 +391,12 @@ (define-public karchive
name "-" version ".tar.xz"))
(sha256
(base32
- "0z8asn357pdbv4g9g0x18p72wskca1qanxljyix7wzc5rsi63wzm"))))
+ "0411rpgr9dy0zf9mmhj7n7ax0afrn7zvkpzpnjvpvvqsrfkz7qm6"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules))
+ (list extra-cmake-modules pkg-config)) ; for zstd
(inputs
- (list bzip2 qtbase-5 xz zlib))
+ (list bzip2 qtbase-5 xz zlib zstd))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Qt 5 addon providing access to numerous types of archives")
(description "KArchive provides classes for easy reading, creation and
--
2.34.0
From 3c85ff4f58ddb29affce783cb953a22178d7ac01 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 28 Jan 2022 17:36:19 +0100
Subject: [PATCH v3 09/10] gnu: kconfig: Update to 5.90.0.

* gnu/packages/kde-frameworks.scm (kconfig): Update to 5.90.0.
[native-inputs]: Remove apparently unneeded inputs.
[arguments]: Disable failing test: kconfigcore-kconfigtest.
set QT_QPA_PLATFORM=offscreen for tests.

Toggle diff (45 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 82045cc31c..ed2e03c198 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -492,7 +492,7 @@ (define-public kcodecs
(define-public kconfig
(package
(name "kconfig")
- (version "5.70.0")
+ (version "5.90.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -501,11 +501,10 @@ (define-public kconfig
name "-" version ".tar.xz"))
(sha256
(base32
- "1s3h4hfpw7c0894cifj66bj1yhx8g94ckvl71jm7qqsb5x5h6y9n"))))
+ "0yqs3ydxzhhb7rrl01swjc9xw8j1bs3n204bf9slb2bs7lfz56rn"))))
(build-system cmake-build-system)
(native-inputs
- (list dbus extra-cmake-modules inetutils qttools
- xorg-server-for-tests))
+ (list extra-cmake-modules qttools))
(inputs
(list qtbase-5))
(arguments
@@ -517,9 +516,12 @@ (define-public kconfig
(setenv "TMPDIR" (getcwd))
#t))
(replace 'check
- (lambda _
- (setenv "QT_QPA_PLATFORM" "offscreen")
- (invoke "dbus-launch" "ctest" "."))))))
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests? ;; kconfigcore-kconfigtest fails inconsistently!!
+ (setenv "HOME" (getcwd))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (invoke "ctest" "-E" "kconfigcore-kconfigtest" "."))
+ #t)))))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Kconfiguration settings framework for Qt")
(description "KConfig provides an advanced configuration system.
--
2.34.0
L
L
Leo Famulari wrote on 29 Jan 2022 20:55
(name . phodina via Guix-patches via)(address . guix-patches@gnu.org)(name . 50862@debbugs.gnu.org)(address . 50862@debbugs.gnu.org)
YfWbqYAylV9K2JcY@jasmine.lan
Attachment: file
L
L
Leo Famulari wrote on 29 Jan 2022 20:58
(name . phodina via Guix-patches via)(address . guix-patches@gnu.org)(name . 50862@debbugs.gnu.org)(address . 50862@debbugs.gnu.org)
YfWcawH3R/fDLdvO@jasmine.lan
On Sat, Jan 29, 2022 at 02:55:21PM -0500, Leo Famulari wrote:
Toggle quote (2 lines)
> Let us know when the patches are rebased to current master.

Oops, I meant to write more in my message...

Once the patches have been rebased, I think we could probably handle
these updates on a 'kde-updates' Cuirass job, rather than going through
staging or core-updates. So, it shouldn't be delayed for much longer.

As part of that, I'd like to try removing QtWebKit from the KDE packages
entirely:

P
P
phodina wrote on 4 Feb 2022 10:25
[PATCHES] KDE updates
(name . 50862@debbugs.gnu.org)(address . 50862@debbugs.gnu.org)
r5Xt8IcH67rk36l7i96jH1Wyh3BqwG-wvn9QpTL5Pn3yWWR5wSebaJKJ0naTHazkOSfRvL7yL1btglLoghVoNyeHkpZL2wcgfDGNvr4jgw4=@protonmail.com
Hi Leo,

It's unfortunately not the most glamorous thing to do but guess it has to be done :-D
Also huge applause to Brendan Tildesley as he has done more progress on this issue.

I'll investigate the issue you mentioned with QtWebKit.

The 'kde-updates' branch sounds as a great idea.

FIY I'm interested in this update as I'd like to use Guix on my Pinephone (switch form Mobile NixOS). I've attempted to port Phosh but the issue there is Rust as it's unable to compile for Aarch64 from source :-/ So I'm hoping with Plasma Mobile being mostly C++ it would work.

----
Petr
Attachment: file
B
B
Brendan Tildesley wrote on 6 Feb 2022 09:10
PATCHES] KDE updates (5.90, 22.12.2)
1258308056.205761.1644135041727@office.mailbox.org
I remade them here with the latest versions. You can help by building everything and testing programs. Also, I'm currently using guix refresh -l extra-cmake-modules to build everything that depends on that. I haven't done any extensive testing.


Do you want me to email all of these patches?
P
P
phodina wrote on 6 Feb 2022 09:30
(name . Brendan Tildesley)(address . mail@brendan.scot)
J-e-MoTBV9EuOBfoSJbi1A2gT4s0_th_HNkpWNHQ5s3dgsZAdmZ-Rm_Wk30GvN3bhvdzzAAjOaIdFXUkyCfiR62J95eAzDuEcFupIT5YXjg=@protonmail.com
Hi Brendan,

On Sunday, February 6th, 2022 at 9:10 AM, Brendan Tildesley <mail@brendan.scot> wrote:

Toggle quote (6 lines)
> I remade them here with the latest versions. You can help by building everything and testing programs. Also, I'm currently using guix refresh -l extra-cmake-modules to build everything that depends on that. I haven't done any extensive testing.
>
> https://notabug.org/Brendan/guix/commits/kde-updates
>
> Do you want me to email all of these patches?

Wow, thanks for the effort. I'll go through them and test them.

I just checked and seems that extra-cmake-modules are used in 429 packages.

guix refresh -l extra-cmake-modules | wc -w
429

I'm fine with cloning the repo and getting the patches from there.

----
Petr
B
B
Brendan Tildesley wrote on 6 Feb 2022 11:40
(name . phodina)(address . phodina@protonmail.com)
718080502.212802.1644144020686@office.mailbox.org
Toggle quote (3 lines)
> On 02/06/2022 9:30 AM phodina <phodina@protonmail.com> wrote:
> Wow, thanks for the effort. I'll go through them and test them.
>
No worries. Just note that that branch is subject to rebasing and updating. For example currently I'm linting 50+ home page urls, so try fetching and checking if anything has changed every now and then.
B
B
Brendan Tildesley wrote on 16 Mar 2022 06:42
Re: [PATCHES] KDE updates (5.90, 22.12.2)
836191564.431838.1647409371331@office.mailbox.org
Anyone mind giving me a hand with something?
I've been trying to package libaccounts-qt but I've been stuck for far too long
unable to figure out why it can't find libaccounts-glib, it should use pkg-config
to like it finds glib and gobject, but qmake just reports

Project ERROR: libaccounts-glib development package not found


From Accounts.pro, there is:
PKGCONFIG += \
glib-2.0 \
gobject-2.0 \
libaccounts-glib

I was running qmake with strace but it wasn't showing anything that seemed all that useful,
and I can't see anything wrong with the libaccounts-glib package

any ideas?
From eafcfea1d7e30b1bcea12f64a2d0c20afb88d806 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Wed, 2 Mar 2022 08:29:54 +1100
Subject: [PATCH 1/2] gnu: Add libaccounts-glib.

* gnu/packages/qt.scm (libaccounts-glib): New variable.
---
gnu/packages/qt.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)

Toggle diff (83 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0163d02bc0..6d2e54783a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -48,6 +48,7 @@ (define-module (gnu packages qt)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (guix gexp)
@@ -57,6 +58,7 @@ (define-module (gnu packages qt)
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages cups)
@@ -3123,3 +3125,60 @@ (define-public soqt
also compatible with SGI and TGS Open Inventor, and the API is based on the API
of the InventorXt GUI component toolkit.")
(license license:bsd-3))))
+
+(define-public libaccounts-glib
+ (package
+ (name "libaccounts-glib")
+ (version "1.25")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/accounts-sso/libaccounts-glib")
+ (commit (string-append version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "19rhk9f97m736d5ia26vfcbjp5kgi454558yhf9mrwm4iw5d9pk4"))))
+ (build-system meson-build-system)
+ (native-inputs
+ (list dbus pkg-config))
+ (inputs (list check
+ gobject-introspection
+ gtk-doc
+ libxml2
+ python
+ python-pygobject
+ sqlite
+ glib
+ `(,glib "bin")
+ vala))
+ (arguments
+ (list
+ #:tests? #f ; one test fails.
+ #:imported-modules `((guix build python-build-system)
+ ,@%meson-build-system-modules)
+ #:modules '(((guix build python-build-system) #:select
+ (python-version))
+ (guix build meson-build-system)
+ (guix build utils))
+ ;; don't try installing to python store path.
+ #:configure-flags
+ #~(list (string-append
+ "-Dpy-overrides-dir=" #$output "/lib/python"
+ (python-version #$(this-package-input "python"))
+ "/site-packages/gi/overrides"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "dbus-run-session" "--" "meson" "test"
+ "--print-errorlogs")))))))
+ (home-page "https://accounts-sso.gitlab.io/")
+ (synopsis "Accounts SSO (Single Sign-On) management library for GLib
+applications")
+ (description "Accounts SSO is a framework for application developers who
+wish to acquire, use and store web account details and credentials. It
+handles the authentication process of an account and securely stores the
+credentials and service-specific settings.")
+ (license license:lgpl2.1+)))
--
2.34.0
From 7c0860a147d3b72f718ac3c06a202cd8181094d4 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 5 Mar 2022 11:46:47 +1100
Subject: [PATCH 2/2] . libaccounts-qt

---
gnu/packages/qt.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)

Toggle diff (40 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6d2e54783a..eebede4176 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3182,3 +3182,33 @@ (define-public libaccounts-glib
handles the authentication process of an account and securely stores the
credentials and service-specific settings.")
(license license:lgpl2.1+)))
+
+(define-public libaccounts-qt
+ (package
+ (name "libaccounts-qt")
+ (version "1.16")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/accounts-sso/libaccounts-qt")
+ (commit (string-append "VERSION_" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1vmpjvysm0ld8dqnx8msa15hlhrkny02cqycsh4k2azrnijg0xjz"))))
+ (build-system gnu-build-system)
+ (native-inputs (list pkg-config qtbase-5 strace qttools))
+ (inputs (list doxygen
+ libaccounts-glib
+ glib))
+ (arguments
+ (list
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda _ (invoke "qmake"))))))
+ (home-page "https://accounts-sso.gitlab.io/")
+ (synopsis "Qt5 bindings for libaccounts-glib")
+ (description (package-description libaccounts-glib))
+ (license #f)))
--
2.34.0
M
M
Maxime Devos wrote on 16 Mar 2022 12:01
Re: [bug#50862] [PATCHES] KDE updates (5.90, 22.12.2)
b50f96347b4f38d3ddfce6c80ba8bc653720dc61.camel@telenet.be
Brendan Tildesley schreef op wo 16-03-2022 om 06:42 [+0100]:
Toggle quote (2 lines)
> +                  gtk-doc

This one is a build tool, so for cross-compilation it needs to be
native-inputs.

Toggle quote (2 lines)
> +                  vala))

This is a compiler, so native-inputs.

(not really relevant to the pkg-config issue though ...)

Greetings,
Maxime.
-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYjHDgBccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7iI7AP9nxeu664FG6dLSuXlzQPYWzqZt
q0aYsBuEMd9l/quIcQEA5X+kcQ6sjG1qoKQBXUexGrhLEkF1nlHyAeNlXQJh8ws=
=fFuq
-----END PGP SIGNATURE-----


M
M
Maxime Devos wrote on 16 Mar 2022 12:03
9b6ccc382725441c2fa53e83de00991f596b0b35.camel@telenet.be
Brendan Tildesley schreef op wo 16-03-2022 om 06:42 [+0100]:
Toggle quote (2 lines)
> +                  glib

glib needs to be propagated here because the pkg-config file of
libaccounts-glib asks for a 'glib-2.0', by name and not by
some absolute file name.

Greetings,
Maxime.
-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYjHD5RccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7laqAQCwAEpmSumop9fhgv1Tj5f7wp83
3gOHlKeUUB3lcp4v4gEAz/BM592J8/CL5ua2oDlROQtP9qN86JtnnTFF9yAitQw=
=A5py
-----END PGP SIGNATURE-----


P
P
phodina wrote on 14 Apr 2022 18:04
(name . 50862@debbugs.gnu.org)(address . 50862@debbugs.gnu.org)
sX5-q2MFbv-VmPAK1VVeVvgFKXbmfJqcICKTpVssAMN5BDUF9RRAv6oD936ZX8bosRGFXdpp2zMOMbor5IWPfvXRPKpI-hZnhWAPr0wBoeY=@protonmail.com
Hi,
I've been going through the patches - not yet finished, there are also some more applied on top mostly concerning Plasma Mobile [1].

I'll focus on finishing going through them all in the upcoming week.


----
Petr
B
B
Brendan Tildesley wrote on 19 Apr 2022 04:50
be20d6c1-3dfd-b42d-e0c3-b56ab386d901@brendan.scot
On 15/4/22 02:04, phodina wrote:

Toggle quote (10 lines)
> Hi,
> I've been going through the patches - not yet finished, there are also some more applied on top mostly concerning Plasma Mobile [1].
>
> I'll focus on finishing going through them all in the upcoming week.
>
> [1]https://github.com/phodina/guix/tree/patch/plasma-mobile
>
> ----
> Petr

Since the patches are still a bit broken I thought it would be good try get plasma working to test things, and attract interest,

but i got stuck failing to build libaccounts-qt.

I updated to frameworks 5.92 and kde 21.12.3, ended up squashing all the commits down since it it was a pain to rebase

many patches. please pull the branch again.

In particular KDE Connnect was not working for me.

So please treat the patches as WIP rather than a complete patch set for review and feel free to test and fix programs.

I will be away for the next 2 weeks wont be working on it any time soon.
Attachment: file
M
M
Marek Pa?nikowski wrote on 3 May 2022 11:45
[PATCHES] KDE updates.
(name . 50862@debbugs.gnu.org)(address . 50862@debbugs.gnu.org)
1QGf4RQMqZ6-5LqDD2KNcXYoeEqGEY-SNkUk5AYpmgOd6Kn48Ta23e-5BtL3mEHx0xIUWX96cCw0l4FVPfa4nafd61QmvrPmeDSOpbjI0Vw=@protonmail.com
Thank you for the hard work to enable KDE in Guix. I would love to help with this effort, but I only know basics of Scheme and even less about Guix development. The best I could offer right now is bug reporting.

However, there is one fundamental question that I have about this patch set. Does it include a service definition for the Plasma Desktop? I would rather start with a relatively empty Plasma session, rather than running KDE applications inside GNOME. The GNOME's design is very uncomfortable for me.
A
A
Anthony Wang wrote on 12 May 2022 04:44
(name . 50862@debbugs.gnu.org)(address . 50862@debbugs.gnu.org)
6yjTcMTKHQIQn2PWK6tttBM4TLwlBUGtjiWGp6HyMQr8jey3VsEV4soh-WzCTz90b_aY8ahZet9GyiSw0zLBDvLf8_ykVYleirgbn2dT1fc=@protonmail.com
@Marek Pa?nikowski Yes, this patch set does include a service: https://notabug.org/Brendan/guix/src/kde-updates/gnu/services/desktop.scm#L1363

I'd also love to help out with this effort and I can also help with bug reporting and testing builds. On the mailing list two weeks ago, Hartmut Goebel mentioned that he had worked on packaging Plasma for Guix about a year ago, but he was unable to get the Plasma desktop to actually start. (https://lists.gnu.org/archive/html/guix-devel/2022-05/msg00014.html)Have you guys been able to get the desktop to start?
Attachment: signature.asc
P
P
phodina wrote on 26 Jul 2022 19:47
Re: [bug#50862] [PATCHES] KDE updates (5.90, 22.12.2)
(name . 50862@debbugs.gnu.org)(address . 50862@debbugs.gnu.org)
SBPtopeaZeRjjm8ky-0TTYYSPNx5_rf6ilBbUzrihVGbKOfmfT2x6WL1Ghd48zrUX7_askh7UDKdUabDp0DSuYHGfxwEzdkAQoRg_U98oHQ=@protonmail.com
Hi,

took me quite long to go through all the commits and the lint messages.

Here are the revised patches. They are still not the latest as that requires other dependencies (updated version of Qt, which I attempted to do as well but failed on the QtWebEngine [1]). Help also welcome.

On top there are also packages related to plasma-mobile.

I've tried to verify all the commits - the changes and the message, build the package, lint it and check if it affects other packages.

@Brendan I've fixed order of some commits as it was unable to build everything in each single commit.
However, it's daunting task. Could somebody apply these patches and check them?

In case you don't want to use the patches included in the email you can checkout the branch [2]


----
Petr
Attachment: file
From ba39eb475fbe64b5246dd40ed9c166678b8dbe89 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 14 Sep 2021 21:18:06 +1000
Subject: [PATCH v2 01/75] gnu: Add plasma-wayland-protocols.

* gnu/packages/kde-frameworks.scm (plasma-wayland-protocols): New variable.

Toggle diff (37 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 9f957692cb..9f5eee1ab2 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1036,6 +1036,30 @@ (define-public ksyntaxhighlighting
(properties `((upstream-name . "syntax-highlighting")))
(license license:lgpl2.1+)))
+(define-public plasma-wayland-protocols
+ (package
+ (name "plasma-wayland-protocols")
+ (version "1.6.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/" name "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "07zhf2dzacj4xlhackpzaxqnp0d1ldkqlx0f313pw1pgd74zlkxp"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (arguments `(#:tests? #f)) ;; No tests
+ (home-page "https://community.kde.org/Frameworks")
+ (synopsis "KDE Plasma Wayland Protocols")
+ (description "Contains XML files describing non-standard wayland
+protocols used in KDE Plasma.")
+ (license (list license:bsd-3
+ license:lgpl2.1
+ license:lgpl2.1+
+ license:lgpl3
+ license:expat))))
+
(define-public kwayland
(package
(name "kwayland")
--
2.37.0
From c7106e3a4736d741eda53ae129992ba6bb26ab7b Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 11:11:57 +0200
Subject: [PATCH v2 33/75] gnu: ark: Add bash-minimal to inputs.

* gnu/packages/kde-utils.scm (ark): [inputs]: Add bash-minimal.

Toggle diff (32 lines)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 60e516f85c..ae8f7ee4ce 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -26,6 +27,7 @@ (define-module (gnu packages kde-utils)
#:use-module (guix packages)
#:use-module (gnu packages)
#:use-module (gnu packages backup)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages gnome)
@@ -80,7 +82,8 @@ (define-public ark
(native-inputs
(list extra-cmake-modules pkg-config kdoctools xorg-server))
(inputs
- (list breeze-icons
+ (list bash-minimal
+ breeze-icons
karchive
kconfig
kcrash
--
2.37.0
From c3196cec4cdafee99145edddfa4552bbe0b66ba2 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 11:37:17 +0100
Subject: [PATCH v2 70/75] gnu: Add plasma-mobile-settings.

* gnu/pacakges/kde-plasma.scm (plasma-mobile-settings): New variable.

Toggle diff (41 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 27be62d14e..f215f9af4f 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -623,6 +623,34 @@ (define-public plasma-mobile
customizable platform for mobile devices.")
(license (list license:gpl3+ license:lgpl2.1+))))
+(define-public plasma-mobile-settings
+ (package
+ (name "plasma-mobile-settings")
+ (version "22.02")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://download.kde.org/stable/plasma-mobile/" version
+ "/plasma-settings-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0b7lj3r9z9cz2vr0h15sqqxdaa7m07hsk8i2p8nf4a3yh02ywsxy"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (inputs (list qtbase-5
+ qtdeclarative
+ kio
+ modemmanager-qt
+ networkmanager-qt
+ ki18n
+ plasma-framework
+ kdeclarative
+ kdbusaddons))
+ (home-page "https://plasma-mobile.org/")
+ (synopsis "Settings application for Plasma Mobile")
+ (description "This package provides Settings application for Plasma Mobile.")
+ (license (list license:gpl2+ license:gpl3+ license:lgpl2.1+))))
+
(define-public plasma-phone-components
(package
(name "plasma-phone-components")
--
2.37.0
From 53da55b6f40ed6c58aba0e4401d0e469cc205333 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 30 Jan 2022 10:56:07 +0100
Subject: [PATCH v2 65/75] gnu: Add plasma-phone-components.

* gnu/packages/kde-plasma.scm (plasma-phone-components): New variable.

Toggle diff (70 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 629826fdb8..b6981d1724 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -43,6 +43,7 @@ (define-module (gnu packages kde-plasma)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages linux)
#:use-module (gnu packages maths)
+ #:use-module (gnu packages messaging)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages pkg-config)
@@ -581,6 +582,55 @@ (define-public kwin
license:lgpl2.1
license:lgpl3))))
+(define-public plasma-phone-components
+ (package
+ (name "plasma-phone-components")
+ (version "5.23.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/plasma-phone-components-" version
+ ".tar.xz"))
+ (sha256
+ (base32
+ "0ml5pyi90nlmx5550sf3x9263f8mypj4jmdskzabzhnz44ck8vy9"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config qttools))
+ (inputs (list qtbase-5
+ qtdeclarative
+ kactivities
+ kauth
+ kbookmarks
+ kwin
+ kcodecs
+ kcompletion
+ kconfig
+ kconfigwidgets
+ kcoreaddons
+ kdbusaddons
+ kdeclarative
+ ki18n
+ kio
+ kitemviews
+ kjobwidgets
+ knotifications
+ kpackage
+ kpeople
+ kservice
+ kwayland
+ kwidgetsaddons
+ kwindowsystem
+ kxmlgui
+ libphonenumber
+ modemmanager-qt
+ plasma-framework
+ solid))
+ (home-page "https://plasma-mobile.org/")
+ (synopsis "Modules providing phone functionality for Plasma")
+ (description "This package provides user-friendly, privacy-enabling
+and customizable platform for mobile devices.")
+ (license (list license:gpl3+ license:lgpl2.1+))))
+
(define-public plasma-workspace
(package
(name "plasma-workspace")
--
2.37.0
From b7167a2b33317f421b427c17555f3b4766ef134d Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 11:16:10 +0200
Subject: [PATCH v2 35/75] gnu: KDE Utils: Remove trailing booleans.

* gnu/packages/kde-utils.scm (kate, okteta): [arguments]: Remove trailing booleans.

Toggle diff (26 lines)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index a319cb3010..4a09828628 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -159,8 +159,7 @@ (define-public kate
(lambda _
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache")
- #t)))))
+ (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache"))))))
(home-page "https://kate-editor.org/")
(synopsis "Multi-document, multi-view text editor")
(description "Kate is a powerful text editor that can open multiple files
@@ -440,8 +439,7 @@ (define-public okteta
(lambda _
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "HOME" "/tmp/dummy-home")
- #t)))))
+ (setenv "HOME" "/tmp/dummy-home"))))))
(home-page "https://apps.kde.org/okteta/")
(synopsis "Hexadecimal editor for binary files")
(description "Okteta is a simple editor for the raw data of files. This
--
2.37.0
From 2cf5f879c93bce8b4ef4f9da62d4cc3091e756b3 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:36:58 +0200
Subject: [PATCH v2 09/75] gnu: kfilemetadata: Remove input labels.

* gnu/packages/kde-frameworks.scm (kfilemetadata): Remove input labels.

Toggle diff (17 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 2edeb81182..8eb540b8b3 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1712,9 +1712,7 @@ (define-public kfilemetadata
;; (but it can find audio/x-speex+ogg).
(invoke "ctest" "-E"
"(usermetadatawritertest|embeddedimagedatatest|taglibextractortest)")))))))
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("pkg-config" ,pkg-config)))
+ (native-inputs (list extra-cmake-modules pkg-config))
(inputs
(list attr
;; TODO: EPub http://sourceforge.net/projects/ebook-tools
--
2.37.0
From b9a56e26ce073af53d6c6f80e52e8a563986fd00 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:40:42 +0200
Subject: [PATCH v2 11/75] gnu: kwindowsystem: Remove input labels.

* gnu/packages/kde-frameworks.scm (kwindowsystem): Remove input labels.

Toggle diff (23 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 4e71d6db23..6c57261231 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1127,11 +1127,11 @@ (define-public kwindowsystem
qttools
xorg-server-for-tests)) ; for the tests
(inputs
- `(("libxrender" ,libxrender)
- ("qtbase" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)
- ("xcb-utils-keysyms" ,xcb-util-keysyms)
- ("xcb-util-wm" ,xcb-util-wm)))
+ (list libxrender
+ qtbase-5
+ qtx11extras
+ xcb-util-keysyms
+ xcb-util-wm))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.37.0
From f88fe41ceb61f8c7401f689ed408692419654311 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:34:36 +0200
Subject: [PATCH v2 08/75] gnu: kio: Remove input labels.

* gnu/packages/kde-frameworks.scm (kio): Remove input labels.

Toggle diff (62 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index fee4827dea..2edeb81182 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2628,31 +2628,30 @@ (define-public kio
solid))
(native-inputs
(list extra-cmake-modules dbus kdoctools qttools))
- (inputs
- `(;; TODO: LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars>
- ("krb5" ,mit-krb5)
- ("karchive" ,karchive)
- ("kauth" ,kauth)
- ("kcodecs" ,kcodecs)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("kdoctools" ,kdoctools)
- ("kguiaddons" ,kguiaddons)
- ("kiconthemes" ,kiconthemes)
- ("ki18n" ,ki18n)
- ("knotifications" ,knotifications)
- ("ktextwidgets" ,ktextwidgets)
- ("kwallet" ,kwallet)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("libxml2" ,libxml2)
- ("libxslt" ,libxslt)
- ("qtbase" ,qtbase-5)
- ("qtscript" ,qtscript)
- ("qtx11extras" ,qtx11extras)
- ("sonnet" ,sonnet)
- ("util-linux:lib" ,util-linux "lib") ; libmount
- ("zlib" ,zlib)))
+ (inputs (list ;; TODO: LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars>
+ mit-krb5
+ karchive
+ kauth
+ kcodecs
+ kconfigwidgets
+ kcrash
+ kdbusaddons
+ kdoctools
+ kguiaddons
+ kiconthemes
+ ki18n
+ knotifications
+ ktextwidgets
+ kwallet
+ kwidgetsaddons
+ libxml2
+ libxslt
+ qtbase-5
+ qtscript
+ qtx11extras
+ sonnet
+ `(,util-linux "lib") ; libmount
+ zlib))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.37.0
From 5cc1624addbc482748892ee44a0faf19db8e36d7 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:43:43 +0200
Subject: [PATCH v2 12/75] gnu: ki18n: Remove input labels.

* gnu/packages/kde-frameworks.scm (ki18n): Remove input labels.

Toggle diff (16 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 6c57261231..99611d0f70 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -773,8 +773,7 @@ (define-public ki18n
"0xsp77iaxf72i0ri3pb6x5rrdz3cv8rxcaqcrynisvsmx7l35005"))))
(build-system cmake-build-system)
(propagated-inputs
- `(("gettext" ,gettext-minimal)
- ("python" ,python)))
+ (list gettext-minimal python))
(native-inputs
(list extra-cmake-modules))
(inputs
--
2.37.0
From 33f18bbfeefb097f15b7110278f25a1f0dc63b42 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 5 Mar 2022 11:47:21 +1100
Subject: [PATCH v2 63/75] . service


Toggle diff (36 lines)
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index a3e1318e21..48dd4fdd97 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -1431,6 +1431,29 @@ (define-deprecated (xfce-desktop-service #:key (config
(service xfce-desktop-service-type config))
+
+
+;;;
+;;; KDE Plasma desktop service.
+;;;
+
+(define-record-type* <plasma-desktop-configuration> plasma-desktop-configuration
+ make-plasma-desktop-configuration
+ plasma-desktop-configuration?
+ (plasma plasma-package
+ (default plasma-workspace))) ;; do we need a union package?
+
+(define plasma-desktop-service-type
+ (service-type
+ (name 'plasma-desktop)
+ (extensions
+ (list ;; (service-extension polkit-service-type
+ ;; plasma-polkit-settings)
+ (service-extension profile-service-type
+ (compose list plasma-workspace))))
+ (default-value (plasma-desktop-configuration))
+ (description "Run Plasma desktop environment.")))
+
+
;;;
;;; Lxqt desktop service.
;;;
--
2.37.0
From 22711dcda1a76ce1f8ea39945624ce72921f85f3 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Wed, 2 Feb 2022 13:55:44 +1100
Subject: [PATCH v2 15/75] gnu: kgraphviewer: Fix home page.

* gnu/packages/kde-frameworks.scm (kgraphviewer): Fix home page.

Toggle diff (15 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 0b6c6dff96..77c93e7a6a 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -701,7 +701,7 @@ (define-public kgraphviewer
qtsvg))
(native-inputs
(list pkg-config extra-cmake-modules kdoctools))
- (home-page "https://apps.kde.org/en/kgraphviewer")
+ (home-page "https://apps.kde.org/kgraphviewer/")
(synopsis "Graphviz dot graph viewer for KDE")
(description "KGraphViewer is a Graphviz DOT graph file viewer, aimed to
replace the other outdated Graphviz tools.")
--
2.37.0
From 3061d8d8600bca0ce6772f56744aea59ab66fa87 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Wed, 2 Feb 2022 13:54:26 +1100
Subject: [PATCH v2 13/75] gnu: phonon: Update home page.

* gnu/packages/kde-frameworks.scm (phonon): Update home page.

Toggle diff (15 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 99611d0f70..3223b1a674 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -206,7 +206,7 @@ (define-public phonon
(substitute* "cmake_install.cmake"
((regex all dest)
(string-append dest (assoc-ref outputs "out"))))))))))
- (home-page "https://phonon.kde.org")
+ (home-page "https://community.kde.org/Phonon")
(synopsis "KDE's multimedia library")
(description "KDE's multimedia library.")
(license license:lgpl2.1+)))
--
2.37.0
From 55ae06f9a5d77fd34602712cd16d24153bd19e80 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Wed, 2 Feb 2022 13:55:13 +1100
Subject: [PATCH v2 14/75] gnu: phonon-backend-gstreamer: Update home page.

* gnu/packages/kde-frameworks.scm (phonon-backend-gstreamer): Update home page.

Toggle diff (15 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 3223b1a674..0b6c6dff96 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -238,7 +238,7 @@ (define-public phonon-backend-gstreamer
(arguments
`(#:configure-flags
'( "-DPHONON_BUILD_PHONON4QT5=ON")))
- (home-page "https://phonon.kde.org")
+ (home-page "https://community.kde.org/Phonon")
(synopsis "Phonon backend which uses GStreamer")
(description "Phonon makes use of backend libraries to provide sound.
Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
--
2.37.0
From 64cc2a125cf8b6146f15138a55a82d14af3444e2 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:14:35 +0200
Subject: [PATCH v2 06/75] gnu: kde-frameworkintegration: Remove input labels.

* gnu/packages/kde-frameworks.scm (kde-frameworkintegration): Remove input
labels.

Toggle diff (38 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 3f8e1135a4..ee6f4a58dc 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3417,19 +3417,18 @@ (define-public kde-frameworkintegration
(native-inputs
(list extra-cmake-modules pkg-config))
;; TODO: Optional packages not yet in Guix: packagekitqt5, AppStreamQt
- (inputs
- `(("kconfig" ,kconfig)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("ki18n" ,ki18n)
- ("kiconthemes" ,kiconthemes)
- ("kitemviews" ,kitemviews)
- ("knewstuff" ,knewstuff)
- ("knotificantions" ,knotifications)
- ("kpackage" ,kpackage)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("qtbase" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)))
+ (inputs (list kconfig
+ kconfigwidgets
+ kcoreaddons
+ ki18n
+ kiconthemes
+ kitemviews
+ knewstuff
+ knotifications
+ kpackage
+ kwidgetsaddons
+ qtbase-5
+ qtx11extras))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.37.0
From 1225713838afd1bd4ad6d6ce3afc2f14cc277e14 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 15 Mar 2022 10:52:19 +1100
Subject: [PATCH v2 64/75] !!! DELETE ME AFTER


Toggle diff (15 lines)
diff --git a/guix/import/kde.scm b/guix/import/kde.scm
index 6873418d62..11c75a3320 100644
--- a/guix/import/kde.scm
+++ b/guix/import/kde.scm
@@ -51,7 +51,7 @@ (define (tarball->version tarball)
(define %kde-file-list-uri
;; URI of the file list (ls -lR format) for download.kde.org.
- (string->uri "https://download.kde.org/ls-lR.bz2"))
+ (string->uri "https://mirrors.ocf.berkeley.edu/kde/ls-lR.bz2"))
(define (download.kde.org-files)
;;"Return the list of files available at download.kde.org."
--
2.37.0
From c03dd389886fd0e1c77b69fd2b1c5f196c5ab175 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 10:25:42 +0200
Subject: [PATCH v2 25/75] gnu: kdenlive, marble-qt: Add kdoctools.

* gnu/packages/kde.scm (kdenlive)[native-inputs]: Add kdoctools.
(marble-qt): Move kdoctools from inputs to native-inputs.

Toggle diff (30 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index c248e6ea8d..3684740b1a 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -258,7 +258,7 @@ (define-public kdenlive
`("MLT_PREFIX" ":" =
(,#$(this-package-input "mlt"))))))))))
(native-inputs
- (list extra-cmake-modules pkg-config qttools))
+ (list extra-cmake-modules kdoctools pkg-config qttools))
(inputs
(list bash-minimal
breeze ; make dark them available easily
@@ -1009,13 +1009,12 @@ (define-public marble-qt
"-DBUILD_TOUCH=YES"
"-DBUILD_MARBLE_TESTS=FALSE")))
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules kdoctools qttools))
;; One optional dependency missing: libwlocate.
(inputs
(list gpsd
kcoreaddons
kcrash
- kdoctools
ki18n
kio
knewstuff
--
2.37.0
From 6d4276eabb20951789f6fd5d04f517e28bf29e39 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:39:17 +0200
Subject: [PATCH v2 10/75] gnu: solid: Remove input labels.

* gnu/packages/kde-frameworks.scm (solid): Remove input labels.

Toggle diff (17 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 8eb540b8b3..4e71d6db23 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1376,9 +1376,7 @@ (define-public solid
(native-inputs
(list bison dbus extra-cmake-modules flex qttools))
(inputs
- `(("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)
- ("udev" ,eudev)))
+ (list qtbase-5 qtdeclarative eudev))
;; TODO: Add runtime-only dependency MediaPlayerInfo
(home-page "https://community.kde.org/Frameworks")
(synopsis "Desktop hardware abstraction")
--
2.37.0
From 05b9dd4ec4b8cd20175edc832ee188a22ef64c63 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 5 Mar 2022 11:46:10 +1100
Subject: [PATCH v2 57/75] gnu: kmessagelib: Remove qtwebkit as an input.

* gnu/packages/kde-pim.scm (kmessagelib): qtwebkit is unmaintained so it
should be removed where possible.

Toggle diff (14 lines)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 7b78b2d859..fae01bb339 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -1310,7 +1310,6 @@ (define-public kmessagelib
qtdeclarative
qtwebchannel
qtwebengine
- qtwebkit
sonnet))
(arguments
`(#:tests? #f ;TODO many test fail for quite different reasons
--
2.37.0
From 9aef6e3a8dfd1e89ed076273ee9d6bc9d1eddec9 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 1 Feb 2022 18:22:59 +1100
Subject: [PATCH v2 03/75] gnu: kdav: Move to (gnu packages kde-frameworks).

* gnu/packages/kde-pim.scm
* gnu/packages/kde-frameworks.scm
(kdav): Move to (gnu packages kde-frameworks). It's considered a
framework component now.

Toggle diff (77 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 9f5eee1ab2..35c3b68bda 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021 Alexandros Theodotou <alex@zrythm.org>
+;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3808,3 +3809,27 @@ (define-public kross
;; under a variety of licenses.
(license (list license:lgpl2.0+ license:lgpl2.1+
license:lgpl2.0 license:gpl3+))))
+
+(define-public kdav
+ (package
+ (name "kdav")
+ (version "20.04.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/kdav-" version ".tar.xz"))
+ (sha256
+ (base32 "0445gl4xm0h39igkxgb6vmq5iaa04wkgrgbs7nfd0zwngk8xaidn"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules))
+ (inputs
+ (list kcoreaddons ki18n kio qtbase-5 qtxmlpatterns))
+ (home-page "https://invent.kde.org/frameworks/kdav")
+ (synopsis "DAV protocol implementation with KJobs")
+ (description "This is a DAV protocol implementation with KJobs. Calendars
+and todos are supported, using either GroupDAV or CalDAV, and contacts are
+supported using GroupDAV or CardDAV.")
+ (license ;; GPL for programs, LGPL for libraries
+ (list license:gpl2+ license:lgpl2.0+))))
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index a5acbb0da8..4937ed3594 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -606,30 +606,6 @@ (define-public kcalutils
functions for accessing calendar data using the kcalcore API.")
(license license:lgpl2.0+)))
-(define-public kdav
- (package
- (name "kdav")
- (version "20.04.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/kdav-" version ".tar.xz"))
- (sha256
- (base32 "0445gl4xm0h39igkxgb6vmq5iaa04wkgrgbs7nfd0zwngk8xaidn"))))
- (build-system qt-build-system)
- (native-inputs
- (list extra-cmake-modules))
- (inputs
- (list kcoreaddons ki18n kio qtbase-5 qtxmlpatterns))
- (home-page "https://invent.kde.org/frameworks/kdav")
- (synopsis "DAV protocol implementation with KJobs")
- (description "This is a DAV protocol implementation with KJobs. Calendars
-and todos are supported, using either GroupDAV or CalDAV, and contacts are
-supported using GroupDAV or CardDAV.")
- (license ;; GPL for programs, LGPL for libraries
- (list license:gpl2+ license:lgpl2.0+))))
-
(define-public kdepim-apps-libs
(package
(name "kdepim-apps-libs")
--
2.37.0
From 7013b27d19c89bc979894e2c7832bf1e1d0af660 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 1 Apr 2022 23:00:37 +0200
Subject: [PATCH v2 74/75] gnu: Add kwin-effects-yet-another-magic-lamp.

* gnu/packages/kde-frameworks.scm (kwin-effects-yet-another-magic-lamp): New
variable.

Toggle diff (42 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 47d300e7b5..3db3255bbe 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1522,6 +1522,35 @@ (define-public threadweaver
uses a job-based interface to queue tasks and execute them in an efficient way.")
(license license:lgpl2.1+)))
+(define-public kwin-effects-yet-another-magic-lamp
+ (package
+ (name "kwin-effects-yet-another-magic-lamp")
+ (version "5.24.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
+ "https://github.com/zzag/kwin-effects-yet-another-magic-lamp")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0aggi3p10kaa8lann0j7cp2g76qh83s1r7akjcjc2y4anv0asz68"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (inputs (list qtbase-5
+ kwindowsystem
+ kconfigwidgets
+ kcoreaddons
+ kconfig
+ kwin
+ libepoxy))
+ (home-page "https://github.com/zzag/kwin-effects-yet-another-magic-lamp")
+ (synopsis "Just Yet Another Magic Lamp Kwin plugin")
+ (description "This package provides a window minimization effect
+for KWin. Whenever a window is minimized, it'll get sucked down into
+the dock/panel.")
+ (license license:gpl2+)))
;; Tier 2
;;
--
2.37.0
From 669fedd87e237e131c32486119ebb89d85dc939c Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 10:47:21 +0200
Subject: [PATCH v2 31/75] gnu: KDE Internet: Update home-page links.

* gnu/packages/kde-internet.scm (konversation, kopete, krdc, ktorrent): Update
home-page.

Toggle diff (59 lines)
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index 1f91ede969..2744ab1d9c 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -172,7 +173,7 @@ (define-public kget
(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
+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.")
@@ -221,7 +222,7 @@ (define-public konversation
qca
solid
sonnet))
- (home-page "https://kde.org/applications/internet/org.kde.konversations")
+ (home-page "https://apps.kde.org/konversation/")
(synopsis "Graphical Internet Relay Chat (IRC) client for KDE")
(description "Konversation is a graphical Internet Relay Chat client (IRC)
with KDE support.
@@ -311,7 +312,7 @@ (define-public kopete
;; TODO: Xmms
zlib))
;; TODO: enable video support
- (home-page "https://kde.org/applications/internet/org.kde.kopete")
+ (home-page "https://apps.kde.org/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
@@ -362,7 +363,7 @@ (define-public krdc
qtbase-5))
(arguments ;; FIXEME: libvnc can't be found for some reason.
(list #:configure-flags #~(list "-DWITH_VNC=NO")))
- (home-page "https://kde.org/applications/internet/org.kde.krdc")
+ (home-page "https://apps.kde.org/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
@@ -419,7 +420,7 @@ (define-public ktorrent
solid
syndication
taglib))
- (home-page "https://kde.org/applications/internet/org.kde.ktorrent")
+ (home-page "https://apps.kde.org/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
--
2.37.0
From 9f1740623c1200f2e1b20198a6ff62461f4cd99f Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Thu, 14 Oct 2021 18:25:20 +1100
Subject: [PATCH v2 18/75] gnu: libgravatar: Move to (gnu packages kde-pim).

Remove uneeded (gnu packages kde-internet) import.
* gnu/packages/kde-internet.scm: Move libgravatar ...
* gnu/packages/kde-pim.scm ...here

Toggle diff (104 lines)
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index 9de2c54ad3..40b8e93b3c 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -415,38 +415,6 @@ (define-public ktorrent
a full-featured client for BitTorrent.")
(license license:gpl2+)))
-(define-public libgravatar
- (package
- (name "libgravatar")
- (version "20.04.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/libgravatar-" version ".tar.xz"))
- (sha256
- (base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2"))))
- (build-system qt-build-system)
- (native-inputs
- (list extra-cmake-modules))
- (inputs
- (list kconfig
- ki18n
- kio
- kpimcommon
- ktextwidgets
- kwidgetsaddons
- qtbase-5))
- (arguments
- `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
- (home-page "https://invent.kde.org/pim/libgravatar")
- (synopsis "Online avatar lookup library")
- (description "This library retrieves 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")
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 4937ed3594..5da25bfad8 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,7 +35,6 @@ (define-module (gnu packages kde-pim)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks)
- #:use-module (gnu packages kde-internet)
#:use-module (gnu packages openldap)
#:use-module (gnu packages qt)
#:use-module (gnu packages search)
@@ -1641,6 +1641,38 @@ (define-public kpimcommon
(license ;; GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0+))))
+(define-public libgravatar
+ (package
+ (name "libgravatar")
+ (version "20.04.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/libgravatar-" version ".tar.xz"))
+ (sha256
+ (base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2"))))
+ (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-5)))
+ (arguments
+ `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
+ (home-page "https://invent.kde.org/pim/libgravatar")
+ (synopsis "Online avatar lookup library")
+ (description "This library retrieves 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 kpimtextedit
(package
(name "kpimtextedit")
--
2.37.0
From d9a51318e773d58e2226755cbcec8db00b4b584d Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Thu, 21 Jul 2022 10:24:50 +0200
Subject: [PATCH v2 28/75] gnu: labplot: Remove input labels.

* gnu/packages/kde-pim.scm (labplot): Remove input labels.

Toggle diff (27 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 3e4fbe8e0b..45da96a9c0 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -798,14 +798,12 @@ (define-public labplot
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; This test fails, I don't know why.
- (invoke "ctest" "-E" "parsertest"))
- #t)))))
- (native-inputs
- `(("bison" ,bison)
- ("extra-cmake-modules" ,extra-cmake-modules)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
- ("qttools" ,qttools)))
+ (invoke "ctest" "-E" "parsertest")))))))
+ (native-inputs (list bison
+ extra-cmake-modules
+ pkg-config
+ python-wrapper
+ qttools))
(inputs
(list breeze ;for dark themes
breeze-icons ;for icons
--
2.37.0
From ed057aa8641e3facf6e34ade9da4071414ef1f4a Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 1 Feb 2022 18:14:24 +1100
Subject: [PATCH v2 02/75] gnu: libdbusmenu-qt: Move to (gnu packages qt).

* gnu/packages/lxqt.scm: Remove libdbusmenu-qt.
* gnu/packages/qt.scm: Re-add libdbusmenu-qt.

Toggle diff (99 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index a0a3a0f15b..89d588da29 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2019, 2020 Reza Alizadeh Majd <r.majd@pantherx.org>
;;; Copyright © 2020 Fakhri Sajadi <f.sajadi@pantherx.org>
;;; Copyright © 2020 André Batista <nandre@riseup.net>
-;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -68,36 +68,6 @@ (define-module (gnu packages lxqt)
;; Third party libraries
-(define-public libdbusmenu-qt
- (package
- (name "libdbusmenu-qt")
- (version "0.9.3+16.04.20160218-0ubuntu1")
- (source
- (origin
- (method git-fetch)
- ;; Download from github rather than launchpad because launchpad trunk
- ;; tarball hash is not deterministic.
- (uri (git-reference
- (url "https://github.com/unity8-team/libdbusmenu-qt")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0b7ii1cvmpcyl79gqal9c3va9m55h055s4hx7fpxkhhqs9463ggg"))))
- (build-system cmake-build-system)
- (arguments
- ;; XXX: Tests require a dbus session and some icons.
- '(#:tests? #f))
- (native-inputs
- (list doxygen))
- (inputs
- (list qtbase-5))
- (home-page "https://launchpad.net/libdbusmenu-qt")
- (synopsis "Qt implementation of the DBusMenu spec")
- (description "This library provides a Qt implementation of the DBusMenu
-protocol. The DBusMenu protocol makes it possible for applications to export
-and import their menus over DBus.")
- (license license:lgpl2.1+)))
-
(define-public libstatgrab
(package
(name "libstatgrab")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 9593009ae3..00abaf2fe1 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -20,7 +20,7 @@
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com>
@@ -3119,3 +3119,33 @@ (define-public soqt
also compatible with SGI and TGS Open Inventor, and the API is based on the API
of the InventorXt GUI component toolkit.")
(license license:bsd-3))))
+
+(define-public libdbusmenu-qt
+ (package
+ (name "libdbusmenu-qt")
+ (version "0.9.3+16.04.20160218-0ubuntu1")
+ (source
+ (origin
+ (method git-fetch)
+ ;; Download from github rather than launchpad because launchpad trunk
+ ;; tarball hash is not deterministic.
+ (uri (git-reference
+ (url "https://github.com/unity8-team/libdbusmenu-qt")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0b7ii1cvmpcyl79gqal9c3va9m55h055s4hx7fpxkhhqs9463ggg"))))
+ (build-system cmake-build-system)
+ (arguments
+ ;; XXX: Tests require a dbus session and some icons.
+ '(#:tests? #f))
+ (native-inputs
+ (list doxygen))
+ (inputs
+ (list qtbase-5))
+ (home-page "https://launchpad.net/libdbusmenu-qt")
+ (synopsis "Qt implementation of the DBusMenu spec")
+ (description "This library provides a Qt implementation of the DBusMenu
+protocol. The DBusMenu protocol makes it possible for applications to export
+and import their menus over DBus.")
+ (license license:lgpl2.1+)))
--
2.37.0
From d49389cc0613c1c9033cc08b6fd1f52fe5f3f1d9 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 10:27:37 +0200
Subject: [PATCH v2 26/75] gnu: KDE: Update home-page links.

* gnu/packages/kde.scm (massif-visualizer, libkdegames, okular, poxml,
zeroconf-ioslave): Update home-page link.

Toggle diff (59 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 3684740b1a..6ac614e422 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2021 la snesne <lasnesne@lagunposprasihopre.org>
;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -574,7 +575,7 @@ (define-public massif-visualizer
qtbase-5
qtsvg
qtxmlpatterns))
- (home-page "https://apps.kde.org/en/massif-visualizer")
+ (home-page "https://apps.kde.org/massif-visualizer/")
(synopsis "Visualize massif data generated by Valgrind")
(description
"Massif Visualizer is a tool that visualizes massif data.
@@ -981,7 +982,7 @@ (define-public libkdegames
qtbase-5
qtdeclarative
qtsvg))
- (home-page "https://games.kde.org/")
+ (home-page "https://apps.kde.org/categories/games/")
(synopsis "Runtime library for kdegames")
(description "Runtime library for kdegames")
(license (list license:gpl2+ license:fdl1.2+))))
@@ -1100,7 +1101,7 @@ (define-public okular
threadweaver
kcrash
kjs))
- (home-page "https://kde.org/applications/graphics/okular/")
+ (home-page "https://apps.kde.org/okular/")
(synopsis "Document viewer")
(description
"Okular is a document viewer developed for KDE. It can display files in
@@ -1124,7 +1125,7 @@ (define-public poxml
(list extra-cmake-modules kdoctools))
(inputs
(list gettext-minimal qtbase-5))
- (home-page "https://kde.org/applications/development")
+ (home-page "https://apps.kde.org/development/")
(synopsis "Tools for translating DocBook XML files with Gettext")
(description "This is a collection of tools that facilitate translating
DocBook XML files using Gettext message files (PO files). Also included are
@@ -1192,7 +1193,7 @@ (define-public zeroconf-ioslave
(list extra-cmake-modules))
(inputs
(list kdbusaddons kdnssd ki18n kio qtbase-5))
- (home-page "https://kde.org/applications/internet/org.kde.zeroconf_ioslave")
+ (home-page "https://apps.kde.org/kio_zeroconf/")
(synopsis "DNS-SD Service Discovery Monitor")
(description "Adds an entry to Dolphin's Network page to show local
services such as printers which advertise themselves with DNSSD (called Avahi
--
2.37.0
From be0c5fd214f5f3eff6017d7f31dd724d8d1d031d Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 14:13:22 +0200
Subject: [PATCH v2 47/75] gnu: kajongg: Add bash-minimal to inputs.

* gnu/packages/kde-games.scm (kajongg): [inputs]: Add bash-minimal.

Toggle diff (24 lines)
diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm
index ae1273d28f..d9e00851cc 100644
--- a/gnu/packages/kde-games.scm
+++ b/gnu/packages/kde-games.scm
@@ -27,6 +27,7 @@ (define-module (gnu packages kde-games)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system qt)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages gl)
#:use-module ((gnu packages gnome) #:select (shared-mime-info))
@@ -314,7 +315,8 @@ (define-public kajongg
;("perl" ,perl)
kdoctools))
(inputs
- (list kconfig
+ (list bash-minimal
+ kconfig
kconfigwidgets
kcoreaddons
ki18n
--
2.37.0
From e9cf1c5d34f69071958a840caca8f02f78d51f45 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 12:21:56 +0100
Subject: [PATCH v2 73/75] gnu: Add plasma-mobile-sounds.

* gnu/packages/kde-plasma.scm (plasma-mobile-sounds): New variable.

Toggle diff (33 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index f215f9af4f..86d241498f 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -700,6 +700,26 @@ (define-public plasma-phone-components
and customizable platform for mobile devices.")
(license (list license:gpl3+ license:lgpl2.1+))))
+(define-public plasma-mobile-sounds
+ (package
+ (name "plasma-mobile-sounds")
+ (version "0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/plasma-mobile-sounds/"
+ version "/plasma-mobile-sounds-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1br6kzicrr45vgg0ciqczxlcid21n5lfjm6zc06rw86ys7fx7bpi"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (home-page "https://plasma-mobile.org/")
+ (synopsis "Sounds for Plasma Mobile devices")
+ (description "")
+ ;; TODO: Multiple
+ (license (list license:gpl3+ license:lgpl2.1+))))
+
(define-public plasma-workspace
(package
(name "plasma-workspace")
--
2.37.0
From 8983d00613d42ad640571490fbef6fa5d13ea0d1 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 12:22:39 +0100
Subject: [PATCH v2 66/75] gnu: libmbim: Update to 1.26.4.

* gnu/packages/freedesktop.scm (libmbim): Update to 1.26.4.

Toggle diff (24 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index b69a078d35..1dd72700ff 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1467,7 +1467,7 @@ (define-public accountsservice
(define-public libmbim
(package
(name "libmbim")
- (version "1.20.2")
+ (version "1.26.4")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1475,7 +1475,7 @@ (define-public libmbim
"libmbim-" version ".tar.xz"))
(sha256
(base32
- "16q550sy84izi5ic3sbbhjnnka2fwhj8vvdrirpn9xspbsgbc3sm"))))
+ "1ncaarl4lgc7i52rwz50yq701wk2rr478cjybxbifsjqqk2cx27n"))))
(build-system gnu-build-system)
(native-inputs
(list `(,glib "bin") ; for glib-mkenums
--
2.37.0
From 1385dd596792aa5b4f26ed8931bf805950e87671 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Thu, 3 Feb 2022 19:00:31 +1100
Subject: [PATCH v2 29/75] gnu: Remove libraw-0.18.

* gnu/packages/photo.scm (libraw-0.18): Delete unused old version.

Toggle diff (24 lines)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index eda9eadca2..d2c246b983 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -204,17 +204,6 @@ (define-public libraw
;; both two licensing modes for your changes/additions."
(license (list license:lgpl2.1 license:cddl1.0))))
-(define-public libraw-0.18
- (package (inherit libraw)
- (name "libraw")
- (version "0.18.12")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://www.libraw.org/data/LibRaw-"
- version ".tar.gz"))
- (sha256
- (base32
- "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap"))))))
(define-public libexif
(package
--
2.37.0
From 5f84ada9e21e84497e25a3833938f787887f45d3 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 11:33:21 +0200
Subject: [PATCH v2 37/75] gnu: KDE Systemtools: Update home-page links.

* gnu/packages/kde-systemtools.scm (dolphin, khelpcenter, krfb, ksystemlog,
yakuake): Update home-page.

Toggle diff (59 lines)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index aa0ed53a80..90260c2630 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -79,7 +80,7 @@ (define-public dolphin
solid))
(arguments
`(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen
- (home-page "https://kde.org/applications/system/org.kde.dolphin")
+ (home-page "https://apps.kde.org/dolphin/")
(synopsis "File manager for KDE")
(description "Dolphin is a file manager for KDE focusing on usability.
The main features of Dolphin are:
@@ -160,7 +161,7 @@ (define-public khelpcenter
xapian))
(arguments
`(#:tests? #f)) ;; 1/1 test fails
- (home-page "https://kde.org/applications/system/org.kde.Help")
+ (home-page "https://apps.kde.org/khelpcenter/")
(synopsis "KDE documentation viewer")
(description "KHelpCenter uses meta data files which describe the
documentation available in the system. Each document is represented by a meta
@@ -267,7 +268,7 @@ (define-public krfb
wayland
xcb-util-image
zlib))
- (home-page "https://kde.org/applications/internet/org.kde.krfb")
+ (home-page "https://apps.kde.org/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
@@ -310,7 +311,7 @@ (define-public ksystemlog
kxmlgui
oxygen-icons ;; default icon set
qtbase-5))
- (home-page "https://kde.org/applications/system/org.kde.ksystemlog")
+ (home-page "https://apps.kde.org/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
@@ -356,7 +357,7 @@ (define-public yakuake
qtbase-5
qtsvg
qtx11extras))
- (home-page "https://www.kde.org/applications/system/yakuake/")
+ (home-page "https://apps.kde.org/yakuake/")
(synopsis "Quad-style terminal emulator for KDE")
(description "Yakuake is a drop-down terminal emulator based on KDE Konsole
technology. Features include:
--
2.37.0
From ffbfd49a77803b46c42c85f58fdbfcd8e91a5fc0 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Thu, 14 Oct 2021 18:11:57 +1100
Subject: [PATCH v2 16/75] gnu: Add layer-shell-qt.

* gnu/packages/kde-plasma.scm (layer-shell-qt): New variable.

Toggle diff (55 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 2317cbec5a..2c723d34f8 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +38,7 @@ (define-module (gnu packages kde-plasma)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages qt)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (gnu packages web))
@@ -157,6 +159,32 @@ (define-public ksshaskpass
call it if it is not associated to a terminal.")
(license license:gpl2+)))
+(define-public layer-shell-qt
+ (package
+ (name "layer-shell-qt")
+ (version "5.24.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/layer-shell-qt-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1aq089pws39w9ncsiqzgg3qvfg5hc5a74pzra0smdpy5ipfsb6a4"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules pkg-config))
+ (inputs
+ (list libxkbcommon
+ qtbase-5
+ qtdeclarative
+ qtwayland
+ wayland
+ wayland-protocols))
+ (home-page "https://invent.kde.org/plasma/layer-shell-qt")
+ (synopsis "Qt component for the Wayland ql-layer-shell protocol")
+ (description "Qt component for the Wayland ql-layer-shell protocol.")
+ (license license:gpl2+)))
+
(define-public kscreenlocker
(package
(name "kscreenlocker")
--
2.37.0
From 12a2562ef9142e8a7252e051c215c2f920b52973 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 12:20:11 +0200
Subject: [PATCH v2 42/75] gnu: kmplayer: Update home-page.

* gnu/packages/kde-multimedia.scm (kmplayer): Update home-page.

Toggle diff (15 lines)
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 4a9c6e54b0..9a9ec4b8be 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -639,7 +639,7 @@ (define-public kmplayer
"-DCMAKE_CXX_FLAGS=-I"
#$(this-package-input "qtx11extras")
"/include/qt5"))))
- (home-page "https://kde.org/applications/multimedia/org.kde.kmplayer")
+ (home-page "https://apps.kde.org/kmplayer/")
(synopsis "Media player using mplayer/phonon as backend")
(description "Kmplayer can play all the audio/video supported by
mplayer/phonon from a local file or URL and be embedded in Konqueror and
--
2.37.0
From c4b325159e852854e497cad68e51f564add68159 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Thu, 21 Jul 2022 10:22:52 +0200
Subject: [PATCH v2 27/75] gnu: KDE: Remove trailing booleans.

* gnu/packages/kde.scm (akregator, kdevelop)[arguments]: Remove trailing booleans.

Toggle diff (26 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 6ac614e422..3e4fbe8e0b 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -171,8 +171,7 @@ (define-public akregator
(assoc-ref inputs "qtwebengine")
"/lib/qt5/libexec/QtWebEngineProcess")))
(wrap-program bin
- `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
- #t))))))
+ `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))))))))
(native-inputs
(list extra-cmake-modules kdoctools))
(inputs
@@ -379,8 +378,7 @@ (define-public kdevelop
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "cmake/modules/FindClang.cmake"
(("^\\s*PATHS \"\\$\\{CLANG_LIBRARY_DIRS\\}\"" line)
- (string-append line " " (assoc-ref inputs "clang") "/lib")))
- #t)))))
+ (string-append line " " (assoc-ref inputs "clang") "/lib"))))))))
(home-page "https://kdevelop.org")
(synopsis "IDE for C, C++, Python, Javascript and PHP")
(description "The KDevelop IDE provides semantic syntax highlighting, as
--
2.37.0
From 60664c0318383142ab58906b8d58c1bbd9de0bd6 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 5 Mar 2022 11:46:54 +1100
Subject: [PATCH v2 62/75] ! gnu: Add plasma-desktop.

* gnu/packages/kde-plasma.scm (plasma-desktop): New variable.

Toggle diff (133 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 08294acb6e..629826fdb8 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -712,3 +712,114 @@ (define-public plasma-workspace
activities effectively, without being distracting.")
(license (list license:bsd-3 license:gpl2+ license:gpl3 license:lgpl2.1+
license:lgpl3))))
+
+(define-public plasma-desktop
+ (package
+ (name "plasma-desktop")
+ (version "5.24.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1lwizprs6nk6nibydwkwmpi9c7c50lvg2k188pb6ddz2sb7pwgjq"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules
+ kdoctools
+ pkg-config
+ qtsvg
+ qttools))
+ (inputs
+ (list ;kplasma
+ ;kplasmaquick
+ ;packagekit-qt
+
+ kdelibs4support
+ ;kaccounts
+ plasma-workspace
+
+ appstream-qt
+ baloo
+ breeze
+ breeze-icons
+ fontconfig
+ iso-codes
+ kactivities
+ kactivities-stats
+ karchive
+ kcmutils
+ kcoreaddons
+ kcrash
+ kdbusaddons
+ kdeclarative
+ kded
+ kdesu
+ kglobalaccel
+ kguiaddons
+ kholidays
+ ki18n
+ kiconthemes
+ kidletime
+ kinit
+ kio
+ kirigami
+ kitemmodels
+ knewstuff
+ knotifications
+ knotifyconfig
+ kpackage
+ kpeople
+ kqtquickcharts ;; XXX: not found?
+ krunner
+ kscreenlocker
+ ktexteditor
+ ktextwidgets
+ kunitconversion
+ kuserfeedback
+ kwallet
+ kwayland
+ kwin
+ layer-shell-qt
+ libkscreen
+ libksysguard
+ libqalculate gmp mpfr
+ libsm
+ libxft
+ libxkbcommon
+ libxrender
+ libxtst
+ networkmanager-qt
+ phonon
+ pipewire-0.3
+ plasma-wayland-protocols
+ prison
+ qtbase-5
+ qtdeclarative
+ qtwayland
+ qtx11extras
+ wayland
+ wayland-protocols
+ xcb-util
+ xcb-util-image))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" (getcwd))
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (setenv "XDG_CACHE_HOME" (getcwd))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ ;; Disable failing tests for now.
+ (invoke "ctest"))
+ #t)))))
+ (home-page "https://kde.org/plasma-desktop/")
+ (synopsis "")
+ (description "")
+ (license (list license:bsd-3 license:gpl2+ license:gpl3 license:lgpl2.1+
+license:lgpl3))))
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 29a3722f1b..a3e1318e21 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -53,6 +53,7 @@ (define-module (gnu services desktop)
#:use-module (gnu packages admin)
#:use-module (gnu packages cups)
#:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages kde-plasma)
#:use-module (gnu packages gnome)
#:use-module (gnu packages xfce)
#:use-module (gnu packages avahi)
--
2.37.0
From 90c8cd25e4b93cc53ec218265c79ad481d767f3c Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 16:45:56 +0200
Subject: [PATCH v2 55/75] gnu: appstream: Move itstool to native-inputs.

* gnu/packages/freedesktop.scm (appstream): Move itstool to native-inputs.

Toggle diff (20 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 4b81a1f5c0..6427a2b95e 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -175,11 +175,12 @@ (define-public appstream
gobject-introspection
gperf
gtk-doc/stable
+ itstool
pkg-config
python-wrapper
libxslt))
(inputs
- (list curl itstool libsoup-minimal-2 libstemmer libxmlb libxml2 libyaml lmdb))
+ (list curl libsoup-minimal-2 libstemmer libxmlb libxml2 libyaml lmdb))
(propagated-inputs
(list glib))
(synopsis "Tools and libraries to work with AppStream metadata")
--
2.37.0
From d614a426322eaa40fab4762d40b88cdf006c30cc Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 28 Sep 2021 15:25:49 +1000
Subject: [PATCH v2 50/75] gnu: Add kdsoap.

* gnu/packages/qt.scm (kdsoap): New variable.

Toggle diff (41 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 00abaf2fe1..15edccbe07 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3149,3 +3149,34 @@ (define-public libdbusmenu-qt
protocol. The DBusMenu protocol makes it possible for applications to export
and import their menus over DBus.")
(license license:lgpl2.1+)))
+
+(define-public kdsoap
+ (package
+ (name "kdsoap")
+ (version "2.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/KDAB/KDSoap/releases/download/"
+ "kdsoap-" version "/kdsoap-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1vh4rzb09kks1ilay1y60q7gf64gwzdwsca60hmx1xx69w8672fi"))))
+ (build-system qt-build-system)
+ (inputs `(("qtbase" ,qtbase-5)))
+ (arguments
+ '(#:configure-flags '("-DKDSoap_TESTS=true")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "ctest" "-E" ;; These tests try connect to the internet.
+ "(kdsoap-webcalls|kdsoap-webcalls_wsdl|kdsoap-test_calc)"))
+ #t)))))
+ (home-page "https://www.kdab.com/development-resources/qt-tools/kd-soap/")
+ (synopsis "Qt SOAP component")
+ (description "KD SOAP is a tool for creating client applications for web
+services using the XML based SOAP protocol and without the need for a dedicated
+web server.")
+ (license (list license:gpl2 license:gpl3))))
--
2.37.0
From 9fdcf1d7e3a637140eae41fa57831df32cd40882 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sun, 6 Feb 2022 16:25:08 +1100
Subject: [PATCH v2 43/75] gnu: ktouch: Update to 21.12.2.

* gnu/packages/education.scm (ktouch): Update to 21.12.2.

Toggle diff (23 lines)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 9e5a17a6ae..5551f9141b 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -643,14 +643,14 @@ (define-public klavaro
(define-public ktouch
(package
(name "ktouch")
- (version "20.12.1")
+ (version "21.12.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/ktouch-" version ".tar.xz"))
(sha256
- (base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib"))))
+ (base32 "1rq2n8395sb17rqd295axv2pbwzhqs8ikjqx5ryn4lv1713alabl"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools pkg-config))
--
2.37.0
From f18d40d15c7fb7a601ca9072e1cd11b1dc272e1b Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sun, 6 Feb 2022 18:32:30 +1100
Subject: [PATCH v2 48/75] gnu: khelpcenter: Fix program.

* gnu/packages/kde-systemtools.scm (khelpcenter): Wrap XDG_DATA_DIRS to
point to khtml where it can find the html4.css file, otherwise
khelpcenter fails to launch.

Toggle diff (25 lines)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index 90260c2630..c9b29ec907 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -160,7 +160,17 @@ (define-public khelpcenter
qtbase-5
xapian))
(arguments
- `(#:tests? #f)) ;; 1/1 test fails
+ `(#:tests? #f ;; 1/1 test fails
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-executable
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ ;; Since qt-wrap selectors do not wrap for /share/kf5
+ ;; directories, we need this so khelpcenter can find html4.css.
+ (wrap-program (string-append out "/bin/khelpcenter")
+ `("XDG_DATA_DIRS" suffix
+ (,(string-append (assoc-ref inputs "khtml") "/share"))))))))))
(home-page "https://apps.kde.org/khelpcenter/")
(synopsis "KDE documentation viewer")
(description "KHelpCenter uses meta data files which describe the
--
2.37.0
From 188108d746e0c31992ec5867359cea20d97930b4 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 5 Mar 2022 11:46:47 +1100
Subject: [PATCH v2 60/75] ! gnu: Add libaccounts-qt.

* gnu/packages/qt.scm (libaccounts-qt): New variable.

Toggle diff (50 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 406e6dc984..c5aef0a8e8 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3236,3 +3236,43 @@ (define-public libaccounts-glib
handles the authentication process of an account and securely stores the
credentials and service-specific settings.")
(license license:lgpl2.1+)))
+
+(define-public libaccounts-qt
+ (package
+ (name "libaccounts-qt")
+ (version "1.16")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/accounts-sso/libaccounts-qt")
+ (commit (string-append "VERSION_" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1vmpjvysm0ld8dqnx8msa15hlhrkny02cqycsh4k2azrnijg0xjz"))))
+ (build-system gnu-build-system)
+ (native-inputs (list doxygen pkg-config qtbase-5 strace qttools))
+ (inputs (list glib
+ libaccounts-glib))
+ (arguments
+ (list
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;(delete 'configure)
+ (replace 'configure
+ (lambda _ (invoke "qmake")))
+ ;; (replace 'build
+ ;; (lambda _
+ ;; (with-directory-excursion "Accounts"
+ ;; (invoke "strace" "qmake" "-o" "Makefile" "Accounts.pro")
+ ;; (system "make" "-f" "Makefile"))
+ ;; ;; (invoke ;"strace"
+ ;; ;; "make")
+ ;; ))
+ )))
+ (home-page "https://accounts-sso.gitlab.io/")
+ (synopsis "Qt5 bindings for libaccounts-glib")
+ (description (package-description libaccounts-glib))
+ ; * SignOnQt5 (required version >= 8.55), D-Bus service which performs user authentication on behalf of its clients, <https://gitlab.com/accounts-sso/signond>
+ (license license:lgpl2.1+)))
--
2.37.0
From d029567fae7be07f98a75a3e8f9ccf22c49aff8a Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 11:36:00 +0100
Subject: [PATCH v2 69/75] ! gnu: Add plasma-mobile.

* gnu/packages/kde-plasma.scm (plasma-mobile): New variable.

Toggle diff (61 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index b6981d1724..27be62d14e 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -30,6 +30,7 @@ (define-module (gnu packages kde-plasma)
#:use-module (guix build-system cmake)
#:use-module (guix build-system qt)
#:use-module (gnu packages admin)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
@@ -582,6 +583,46 @@ (define-public kwin
license:lgpl2.1
license:lgpl3))))
+(define-public plasma-mobile
+ (package
+ (name "plasma-mobile")
+ (version "5.24.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.kde.org/stable/plasma/"
+ version "/plasma-mobile-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1bwmy7xvd8wmh0snqqjh9jjgawib8ks2g30w48sqxwhplhf3da58"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-script
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (wrap-program (string-append #$output
+ "/bin/kwinwrapper")
+ `("PATH" ":" prefix
+ (,(string-append #$plasma-framework
+ "/bin")))))))))
+ (native-inputs (list extra-cmake-modules pkg-config qttools))
+ (inputs (list bash-minimal
+ kdeclarative
+ ki18n
+ kio
+ knotifications
+ kwayland
+ kwin
+ modemmanager-qt
+ networkmanager-qt
+ plasma-framework
+ qtbase-5))
+ (home-page "https://plasma-mobile.org/")
+ (synopsis
+ "General UI components for Plasma Phone including shell, containment and applets")
+ (description "This package provides user-friendly, privacy-enabling and
+customizable platform for mobile devices.")
+ (license (list license:gpl3+ license:lgpl2.1+))))
+
(define-public plasma-phone-components
(package
(name "plasma-phone-components")
--
2.37.0
From 98aefcec542b571632d3ed57ac7b06ad3b09ec55 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Thu, 21 Jul 2022 08:26:59 +0200
Subject: [PATCH v2 19/75] gnu: libgravatar: Remove input labels.

* gnu/packages/kde-pim.scm (libgravatar): Remove input labels.

Toggle diff (31 lines)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 5da25bfad8..0fa120e075 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -1653,16 +1653,14 @@ (define-public libgravatar
(sha256
(base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2"))))
(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-5)))
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list kconfig
+ ki18n
+ kio
+ kpimcommon
+ ktextwidgets
+ kwidgetsaddons
+ qtbase-5))
(arguments
`(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
(home-page "https://invent.kde.org/pim/libgravatar")
--
2.37.0
From 1ddc5cb5e88b952764cbf5550d08055c43cb4a48 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 12:15:41 +0200
Subject: [PATCH v2 40/75] gnu: KDE Multimedia: Add bash-minimal and kdoctools.

* gnu/packages/kde-multimedia.scm (juk, kmix): Move kdoctools from inputs to
native-inputs.

(dragon, k3b): [inputs]: Add bash-minimal.

Toggle diff (59 lines)
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 7a082b127a..f4f7852677 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -108,7 +108,8 @@ (define-public dragon
(native-inputs
(list extra-cmake-modules kdoctools))
(inputs
- (list kconfig
+ (list bash-minimal
+ kconfig
kconfigwidgets
kcoreaddons
kcrash
@@ -262,14 +263,13 @@ (define-public juk
(base32 "1ipzx031996h83f9w3fzbx5vf5nnskq9kf71a6aypqckk65vcqcs"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules))
+ (list extra-cmake-modules kdoctools))
(inputs
(list kcoreaddons
kcompletion
kconfig
kcrash
kdbusaddons
- kdoctools
kglobalaccel
ki18n
kiconthemes
@@ -402,7 +402,8 @@ (define-public k3b
(native-inputs
(list extra-cmake-modules pkg-config kdoctools))
(inputs
- (list cdrdao
+ (list bash-minimal
+ cdrdao
dvd+rw-tools
ffmpeg
flac
@@ -560,7 +561,7 @@ (define-public kmix
(base32 "1zk2xljis1pv3m4vs5zr6wza6iv5y6wmh1csx3rn8ylfkrpk7h8k"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules pkg-config))
+ (list extra-cmake-modules kdoctools pkg-config))
(inputs
(list alsa-lib
glib
@@ -570,7 +571,6 @@ (define-public kmix
kconfigwidgets
kcrash
kdbusaddons
- kdoctools
kglobalaccel
ki18n
kiconthemes
--
2.37.0
From d390b44976a1cec740662fea9e71f1d78522e5ab Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:18:27 +0200
Subject: [PATCH v2 07/75] gnu: plasma-framework: Remove input labels.

* gnu/packages/kde-frameworks.scm (plasma-framework): Remove input
labels.

Toggle diff (82 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index ee6f4a58dc..fee4827dea 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3280,41 +3280,40 @@ (define-public plasma-framework
(list kpackage kservice))
(native-inputs
(list extra-cmake-modules kdoctools pkg-config))
- (inputs
- `(("kactivities" ,kactivities)
- ("karchive" ,karchive)
- ("kauth" ,kauth)
- ("kbookmarks" ,kbookmarks)
- ("kcodecs" ,kcodecs)
- ("kcompletion" ,kcompletion)
- ("kconfig" ,kconfig)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("kdbusaddons" ,kdbusaddons)
- ("kdeclarative" ,kdeclarative)
- ("kdoctools" ,kdoctools)
- ("kglobalaccel" ,kglobalaccel)
- ("kguiaddons" ,kguiaddons)
- ("kiconthemes" ,kiconthemes)
- ("kirigami" ,kirigami)
- ("kitemviews" ,kitemviews)
- ("kio" ,kio)
- ("ki18n" ,ki18n)
- ("kjobwidgets" ,kjobwidgets)
- ("knotifications" ,knotifications)
- ("kwayland" ,kwayland)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("kwindowsystem" ,kwindowsystem)
- ("kxmlgui" ,kxmlgui)
- ;; XXX: "undefined reference to `glGetString'" errors occur without libglvnd,
- ("libglvnd" ,libglvnd)
- ("phonon" ,phonon)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)
- ("qtquickcontrols2" ,qtquickcontrols2)
- ("qtsvg" ,qtsvg)
- ("qtx11extras" ,qtx11extras)
- ("solid" ,solid)))
+ (inputs (list kactivities
+ karchive
+ kauth
+ kbookmarks
+ kcodecs
+ kcompletion
+ kconfig
+ kconfigwidgets
+ kcoreaddons
+ kdbusaddons
+ kdeclarative
+ kdoctools
+ kglobalaccel
+ kguiaddons
+ kiconthemes
+ kirigami
+ kitemviews
+ kio
+ ki18n
+ kjobwidgets
+ knotifications
+ kwayland
+ kwidgetsaddons
+ kwindowsystem
+ kxmlgui
+ ;; XXX: "undefined reference to `glGetString'" errors occur without libglvnd,
+ libglvnd
+ phonon
+ qtbase-5
+ qtdeclarative
+ qtquickcontrols2
+ qtsvg
+ qtx11extras
+ solid))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.37.0
From af4a59efaf1a870fde8da81dfba81ccaf60281b4 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 11:38:20 +0100
Subject: [PATCH v2 71/75] gnu: Add maliit-framework.

* gnu/pacakges/kde-frameworks.scm (maliit-framework): New variable.

Toggle diff (72 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 77c93e7a6a..47fc170133 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages kde-frameworks)
#:use-module (guix build-system qt)
#:use-module (guix build-system trivial)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -50,6 +51,7 @@ (define-module (gnu packages kde-frameworks)
#:use-module (gnu packages calendar)
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
+ #:use-module (gnu packages documentation)
#:use-module (gnu packages docbook)
#:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop)
@@ -86,6 +88,7 @@ (define-module (gnu packages kde-frameworks)
#:use-module (gnu packages video)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (srfi srfi-1))
@@ -1168,6 +1171,41 @@ (define-public kwindowsystem
;; the lgpl2.1. Some source files are under non-copyleft licenses.
(license license:lgpl2.1+)))
+(define-public maliit-framework
+ (package
+ (name "maliit-framework")
+ (version "2.3.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/maliit/framework")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1dkjxvfxg56hfy70j6ibfklfyv57jiha4vgc3ggl60r5kjx65s5b"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules
+ wayland-protocols
+ pkg-config
+ doxygen
+ graphviz
+ `(,glib "bin"))) ;for gdbus-codegen))
+ (inputs (list qtbase-5
+ qtdeclarative
+ qtwayland
+ wayland
+ libxkbcommon
+ dbus
+ eudev
+ glib))
+ ;; ki18n plasma-framework knotifications networkmanager-qt kwin))
+ (home-page "https://github.com/maliit/framework")
+ (synopsis "Core libraries of Maliit")
+ (description "This package provides Maliit provides a flexible input
+method framework.")
+ (license license:lgpl2.1)))
+
(define-public modemmanager-qt
(package
(name "modemmanager-qt")
--
2.37.0
From 712e23fd01825e334437b1282739e380499fb0c7 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 8 Apr 2022 13:24:20 +0200
Subject: [PATCH v2 75/75] gnu: Add plasma-phonebook.

* gnu/packages/kde-plasma.scm (plasma-phonebook): New variable.

Toggle diff (42 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 86d241498f..54ee310f8e 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -700,6 +700,35 @@ (define-public plasma-phone-components
and customizable platform for mobile devices.")
(license (list license:gpl3+ license:lgpl2.1+))))
+(define-public plasma-phonebook
+ (package
+ (name "plasma-phonebook")
+ (version "0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma-phonebook/"
+ version "/plasma-phonebook-" version
+ ".tar.xz"))
+ (sha256
+ (base32
+ "13nnzdzpganlp319sc9dm9w5hsjhw4f3w8rb80q3nd8q6nyrpky8"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (inputs (list kpeoplevcard
+ kirigami
+ kpeople
+ kcoreaddons
+ kcontacts
+ qtbase-5
+ qtdeclarative
+ qtquickcontrols2
+ qtsvg))
+ (home-page "https://plasma-mobile.org/")
+ (synopsis "Phonebook for Plasma Mobile devices")
+ (description "This package provides contacts application which allows
+adding, modifying and removing contacts.")
+ (license (list license:gpl3+ license:lgpl2.1+))))
+
(define-public plasma-mobile-sounds
(package
(name "plasma-mobile-sounds")
--
2.37.0
From 4693ad63c89bc203c5b998c32ff9f6db57216bfc Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 8 Feb 2022 17:36:22 +1100
Subject: [PATCH v2 56/75] gnu: appstream-qt: Add package variant.

* gnu/packages/freedesktop.scm (appstream-qt): Add a build of appstream
with Qt support.

Toggle diff (27 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 6427a2b95e..b69a078d35 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -197,6 +197,20 @@ (define-public appstream
;; there are also some (irrelevant) wtfpl2 examples
(license (list license:gpl2+ license:lgpl2.1+))))
+(define-public appstream-qt
+ (package/inherit appstream
+ (name "appstream-qt")
+ (native-inputs
+ (cons (list "qttools" qttools)
+ (package-native-inputs appstream)))
+ (inputs
+ (cons (list "qtbase" qtbase-5)
+ (package-inputs appstream)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments appstream)
+ ((#:configure-flags flags)
+ '(list "-Dqt=true"))))))
+
(define-public farstream
(package
(name "farstream")
--
2.37.0
From 9c03ffaae8c4c0627c4eb7d9b6f06c7c8590e6c3 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 5 Mar 2022 11:46:20 +1100
Subject: [PATCH v2 61/75] ! gnu: Add kaccounts-integration.

* gnu/packages/kde.scm (kaccounts-integration): New variable.

Toggle diff (46 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 03343e2774..a786cb5b60 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1237,3 +1237,39 @@ (define-public kuserfeedback
@item A management and analytics application.
@end itemize")
(license license:expat)))
+
+
+(define-public kaccounts-integration
+ (package
+ (name "kaccounts-integration")
+ (version "21.12.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/" name "-" version ".tar.xz"))
+ (sha256
+ (base32 "13q4d7ln98vdpb6ryk49zakx5bysdnjxifi7cma10fgk9gcqqhpb"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules))
+ (inputs
+ (list kcmutils
+ kcoreaddons
+ kdbusaddons
+ kdeclarative
+ ki18n
+ kio
+ kwallet
+ libaccounts-qt
+ qtbase-5))
+ (home-page "https://invent.kde.org/network/kaccounts-integration")
+ (synopsis "Online account management system and Plasma Integration")
+ (description "KAccounts Integration provides a way to share accounts data
+such as login tokens and general user information (like usernames and such)
+between various applications.
+
+The KAccounts library is a KDE Frameworks style abstraction layer on top of
+the Accounts-SSO and SignOnD libraries, which uses a combination of models and
+jobs to expose the functionality of those.")
+ (license (list license:gpl2+ license:gpl3+ license:lgpl2.0+))))
--
2.37.0
From 4fe06de9ca8a2608c1567206610e4bf627117667 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sun, 3 Oct 2021 13:42:31 +1100
Subject: [PATCH v2 52/75] gnu: Add kwayland-server.

* gnu/packages/kde-plasma.scm (kwayland-server): New variable.

Toggle diff (58 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 7ebc08b965..f582c8529c 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -335,3 +335,51 @@ (define-public libksysguard
with a ksysguardd daemon, which may also run on a remote system.")
(license license:gpl3+)))
+(define-public kwayland-server
+ (package
+ (name "kwayland-server")
+ (version "5.24.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1279nqhy1qyz84dkn23rvzak8bg71hbrp09jlhv9mkjdb3bhnyfi"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules pkg-config))
+ (inputs
+ (list plasma-wayland-protocols
+ qtbase-5
+ qtwayland
+ kwayland
+ wayland
+ wayland-protocols-next))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-install-path
+ (lambda _
+ ;; Fixes errors including nonexistant /include/KF5
+ (substitute* "src/server/CMakeLists.txt"
+ (("KF5_INSTALL") "KDE_INSTALL"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" (getcwd))
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (invoke "ctest" "-E" ;; Test fails inconsistently.
+ "kwayland-testDragAndDrop"))
+ #t)))))
+ (home-page "https://api.kde.org/kwayland-server/html/index.html")
+ (synopsis "KDE wayland server component")
+ (description "KWayland is a Qt-style API to interact with the wayland-client and
+wayland-server API.")
+ (license (list license:lgpl2.1
+ license:lgpl2.1+
+ license:lgpl3
+ license:expat
+ license:bsd-3))))
--
2.37.0
From 9194ec610820b83ef78a9264d47251089d807afa Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Mon, 21 Feb 2022 21:03:44 +1100
Subject: [PATCH v2 51/75] !!DELETE gnu: Add wayland-protocols 1.26.

* gnu/packages/freedesktop.scm (wayland-protocols-next): New variable.

Toggle diff (28 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 4d06235771..925b1fb5f4 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1051,6 +1051,21 @@ (define-public wayland-protocols
. "https://wayland.freedesktop.org/releases.html")))
(license license:expat)))
+;;; This is just a temporary package that should be deleted
+(define-public wayland-protocols-next
+ (package
+ (inherit wayland-protocols)
+ (name "wayland-protocols")
+ (version "1.26")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://wayland.freedesktop.org/releases/"
+ "wayland-protocols-" version ".tar.xz"))
+ (sha256
+ (base32
+ "04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5"))))))
+
(define-public waylandpp
(package
(name "waylandpp")
--
2.37.0
From a70346d2535db4cfa14a2103a8e240c94fe4bec9 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 12:24:36 +0100
Subject: [PATCH v2 68/75] gnu: modem-manager: Update to 1.18.6.

* gnu/packages/freedesktop.scm (modem-manager) Update to 1.18.6. Disable tests
due failing tests.

Toggle diff (30 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 9747a1da82..677ec52c04 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1527,7 +1527,7 @@ (define-public libqmi
(define-public modem-manager
(package
(name "modem-manager")
- (version "1.12.10")
+ (version "1.18.6")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1535,10 +1535,12 @@ (define-public modem-manager
"ModemManager-" version ".tar.xz"))
(sha256
(base32
- "1apq9camys2gaw6y6ic1ld20cncfwpmxnzvh4j5zkbbjpf5hbcxj"))))
+ "02j7d8a6vb4df41vbaz93sx0rh4m43376j8xbyf2617m3jrh9y6l"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags
+ ; multiple tests fail
+ '(#:tests? #f
+ #:configure-flags
`(,(string-append "--with-udev-base-dir=" %output "/lib/udev"))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums
--
2.37.0
From 481b385448f9e2cfa48c51ae98ae1b50b8fd3860 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 11:38:50 +0100
Subject: [PATCH v2 72/75] gnu: Add maliit-keyboard.

* gnu/pacakges/kde-frameworks.scm (maliit-keyboard): New variable.

Toggle diff (78 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 47fc170133..47d300e7b5 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -53,6 +53,8 @@ (define-module (gnu packages kde-frameworks)
#:use-module (gnu packages databases)
#:use-module (gnu packages documentation)
#:use-module (gnu packages docbook)
+ #:use-module (gnu packages documentation)
+ #:use-module (gnu packages fcitx)
#:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
@@ -65,9 +67,11 @@ (define-module (gnu packages kde-frameworks)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages image)
+ #:use-module (gnu packages ibus)
#:use-module (gnu packages iso-codes)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages kde-plasma)
+ #:use-module (gnu packages language)
#:use-module (gnu packages libcanberra)
#:use-module (gnu packages libreoffice)
#:use-module (gnu packages linux)
@@ -1206,6 +1210,50 @@ (define-public maliit-framework
method framework.")
(license license:lgpl2.1)))
+(define-public maliit-keyboard
+ (package
+ (name "maliit-keyboard")
+ (version "2.3.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/maliit/keyboard")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0g89lckl4wzwamc89hs8871fbiyrsjwzk5b6ic4vhc4d1clyqzaw"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f
+ #:phases (modify-phases %standard-phases
+ (add-after 'install 'install-gschema
+ (lambda* (#:key source outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (schemas (string-append out
+ "/share/glib-2.0/schemas")))
+ ;; TODO: No GSettings schemas
+ (install-file (string-append source
+ "/data/schemas/org.maliit.keyboard.maliit.gschema.xml")
+ schemas)))))))
+ (native-inputs (list extra-cmake-modules gsettings-desktop-schemas pkg-config gettext-minimal
+ `(,glib "bin")))
+ (inputs (list hunspell
+ glib
+ libchewing
+ libpinyin
+ maliit-framework
+ presage
+ qtbase-5
+ qtdeclarative
+ qtmultimedia
+ qtquickcontrols2))
+ (home-page "https://github.com/maliit/keyboard")
+ (synopsis "Maliit Keyboard")
+ (description "This package provides virtual keyboard for Wayland and X11
+display servers. It supports many different languages and emoji.")
+ (license license:gpl3+)))
+
(define-public modemmanager-qt
(package
(name "modemmanager-qt")
--
2.37.0
From a05443e74e84b71e6704cd5d0687544facadd1e5 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 12:23:30 +0100
Subject: [PATCH v2 67/75] gnu: libqmi: Update to 1.30.8.

* gnu/packages/freedesktop.scm (libqmi): Update to 1.30.8.

Toggle diff (24 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 1dd72700ff..9747a1da82 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1497,7 +1497,7 @@ (define-public libmbim
(define-public libqmi
(package
(name "libqmi")
- (version "1.24.14")
+ (version "1.30.8")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1505,7 +1505,7 @@ (define-public libqmi
"libqmi-" version ".tar.xz"))
(sha256
(base32
- "0zshxqbm9ldybgrzh7pjmwmfjvvvfd0xh8qhgl8xiqdb9ply73r0"))))
+ "140rmjw436rh6rqmnfw6yaflpffd27ilwcv4s9jvvl1skv784946"))))
(build-system gnu-build-system)
(inputs
(list libgudev))
--
2.37.0
From c1670eec4af2b165695470b28481175521e803af Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Wed, 2 Mar 2022 08:29:54 +1100
Subject: [PATCH v2 59/75] gnu: Add libaccounts-glib.

* gnu/packages/qt.scm (libaccounts-glib): New variable.

Toggle diff (80 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 15edccbe07..406e6dc984 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -48,6 +48,7 @@ (define-module (gnu packages qt)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (guix gexp)
@@ -57,6 +58,7 @@ (define-module (gnu packages qt)
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages cups)
@@ -3180,3 +3182,57 @@ (define-public kdsoap
services using the XML based SOAP protocol and without the need for a dedicated
web server.")
(license (list license:gpl2 license:gpl3))))
+
+(define-public libaccounts-glib
+ (package
+ (name "libaccounts-glib")
+ (version "1.25")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/accounts-sso/libaccounts-glib")
+ (commit (string-append version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "19rhk9f97m736d5ia26vfcbjp5kgi454558yhf9mrwm4iw5d9pk4"))))
+ (build-system meson-build-system)
+ (native-inputs
+ (list dbus `(,glib "bin") gobject-introspection gtk-doc pkg-config vala))
+ (inputs (list check
+ libxml2
+ python
+ python-pygobject
+ sqlite))
+ (propagated-inputs
+ (list glib))
+ (arguments
+ (list
+ #:tests? #f ; one test fails.
+ #:imported-modules `((guix build python-build-system)
+ ,@%meson-build-system-modules)
+ #:modules '(((guix build python-build-system) #:select
+ (python-version))
+ (guix build meson-build-system)
+ (guix build utils))
+ ;; don't try installing to python store path.
+ #:configure-flags
+ #~(list (string-append
+ "-Dpy-overrides-dir=" #$output "/lib/python"
+ (python-version #$(this-package-input "python"))
+ "/site-packages/gi/overrides"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "dbus-run-session" "--" "meson" "test"
+ "--print-errorlogs")))))))
+ (home-page "https://accounts-sso.gitlab.io/")
+ (synopsis "Accounts SSO (Single Sign-On) management library for GLib
+applications")
+ (description "Accounts SSO is a framework for application developers who
+wish to acquire, use and store web account details and credentials. It
+handles the authentication process of an account and securely stores the
+credentials and service-specific settings.")
+ (license license:lgpl2.1+)))
--
2.37.0
P
P
phodina wrote on 7 Aug 2022 13:05
Re: [bug#50862] [PATCHESv3] KDE updates (5.90, 22.12.2)
(name . 50862@debbugs.gnu.org)(address . 50862@debbugs.gnu.org)
En4KqcrcEyninR2sZclVYdKPOjMEo4oiDgAl7KOapqSYRMgwd8mt1bhMxOi6mFFU62oARV9uVw4uMGlRNu1-LaN3rRPE_lFjxQPLZT4hUPk=@protonmail.com
Here's update to the latest released version of KDE. I submit all the patches as I rebased the updates.

@Maxim thanks for the work on updating the packages from Qt5 to Qt6.

Do you know who would be the best reviewer for these patches?

----
Petr

------- Original Message -------
On Tuesday, July 26th, 2022 at 7:47 PM, phodina <phodina@protonmail.com> wrote:

Toggle quote (20 lines)
> Hi,
>
> took me quite long to go through all the commits and the lint messages.
>
> Here are the revised patches. They are still not the latest as that requires other dependencies (updated version of Qt, which I attempted to do as well but failed on the QtWebEngine [1]). Help also welcome.
>
> On top there are also packages related to plasma-mobile.
>
> I've tried to verify all the commits - the changes and the message, build the package, lint it and check if it affects other packages.
>
> @Brendan I've fixed order of some commits as it was unable to build everything in each single commit.
> However, it's daunting task. Could somebody apply these patches and check them?
>
> In case you don't want to use the patches included in the email you can checkout the branch [2]
>
> [1] https://issues.guix.gnu.org/56293
> [2] https://github.com/phodina/guix/tree/patch/plasma-mobile
>
> ----
> Petr
Attachment: file
From ab05342a339f0e8cf6bb6c50b5b5fb3d152c4f49 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 14 Sep 2021 21:18:06 +1000
Subject: [PATCH v3 01/86] gnu: Add plasma-wayland-protocols.

* gnu/packages/kde-frameworks.scm (plasma-wayland-protocols): New variable.

Toggle diff (37 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 9f957692cb..9f5eee1ab2 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1036,6 +1036,30 @@ (define-public ksyntaxhighlighting
(properties `((upstream-name . "syntax-highlighting")))
(license license:lgpl2.1+)))
+(define-public plasma-wayland-protocols
+ (package
+ (name "plasma-wayland-protocols")
+ (version "1.6.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/" name "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "07zhf2dzacj4xlhackpzaxqnp0d1ldkqlx0f313pw1pgd74zlkxp"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (arguments `(#:tests? #f)) ;; No tests
+ (home-page "https://community.kde.org/Frameworks")
+ (synopsis "KDE Plasma Wayland Protocols")
+ (description "Contains XML files describing non-standard wayland
+protocols used in KDE Plasma.")
+ (license (list license:bsd-3
+ license:lgpl2.1
+ license:lgpl2.1+
+ license:lgpl3
+ license:expat))))
+
(define-public kwayland
(package
(name "kwayland")
--
2.37.0
From c1b89921af1343ee36b24811d28d72ab63871b73 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 5 Mar 2022 11:46:10 +1100
Subject: [PATCH v3 68/86] gnu: kmessagelib: Remove qtwebkit as an input.

* gnu/packages/kde-pim.scm (kmessagelib): qtwebkit is unmaintained so it
should be removed where possible.

Toggle diff (14 lines)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 3615246c8f..213539e1f8 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -1274,7 +1274,6 @@ (define-public kmessagelib
qtdeclarative
qtwebchannel
qtwebengine
- qtwebkit
sonnet))
(arguments
`(#:tests? #f ;TODO many test fail for quite different reasons
--
2.37.0
From b3db44a8f94dfd0e660afb48cc642a1590e358b3 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 11:11:57 +0200
Subject: [PATCH v3 33/86] gnu: ark: Add bash-minimal to inputs.

* gnu/packages/kde-utils.scm (ark): [inputs]: Add bash-minimal.

Toggle diff (32 lines)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index f6ddbb4390..5b027eb46f 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -26,6 +27,7 @@ (define-module (gnu packages kde-utils)
#:use-module (guix packages)
#:use-module (gnu packages)
#:use-module (gnu packages backup)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages gnome)
@@ -80,7 +82,8 @@ (define-public ark
(native-inputs
(list extra-cmake-modules pkg-config kdoctools xorg-server))
(inputs
- (list breeze-icons
+ (list bash-minimal
+ breeze-icons
karchive
kconfig
kcrash
--
2.37.0
From da2741ca3ce840338f90f1bdd407a9ec83d94ccd Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 2 Aug 2022 07:33:40 +0200
Subject: [PATCH v3 59/86] gnu: KDE Utils: Update to 22.04.3.

* gnu/packages/kde-utils.scm (ark, kate, kmag, kmousetool, kmouth, okteta,
sweeper): Update to 22.04.3.

Toggle diff (125 lines)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 10cfa6f5b5..7b414afc22 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -43,14 +43,14 @@ (define-module (gnu packages kde-utils)
(define-public ark
(package
(name "ark")
- (version "21.12.3")
+ (version "22.04.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/ark-" version ".tar.xz"))
(sha256
(base32
- "1p30bgnb3aw0f2jnaksz7jfqqcz45b2x3bjrri0w5w580204a5s8"))
+ "1wjy90qkkzafwcw8d4v9cyhmc3sgfipc1085hq2ghqhvrgdyzs00"))
;; The libarchive package in Guix does not support
;; xar; disable related tests.
(patches (search-patches "ark-skip-xar-test.patch"))))
@@ -117,14 +117,14 @@ (define-public ark
(define-public kate
(package
(name "kate")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kate-" version ".tar.xz"))
(sha256
- (base32 "1pp0k00kvih0xkkv1q1gha4na2bwqc7dhyyrla7c2vvln8gi99dg"))))
+ (base32 "0dnlr1cld6lqanqv98bss66w2bi2y78vqb8jx26addn2r1w4ygkf"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -183,14 +183,14 @@ (define-public kate
(define-public kmag
(package
(name "kmag")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kmag-" version ".tar.xz"))
(sha256
- (base32 "067x65gmip89rdgii2nwnxn7zi96cf7vfbhqzg0499pd2d69p3sl"))))
+ (base32 "08jwv2wnb67vjgz5pv1nn6rwl9ldj8dfd74l6va9vz4x5pk7d859"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -213,14 +213,14 @@ (define-public kmag
(define-public kmousetool
(package
(name "kmousetool")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kmousetool-" version ".tar.xz"))
(sha256
- (base32 "013qr1md3gbin7hcahnv14y9i2cg35r433s2w81fvgcakd38qvkj"))))
+ (base32 "13pvdhhf3fdkaiyjp0ijqm5qdffabyw7qq2051l1nqv6i7w6lgwx"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -251,14 +251,14 @@ (define-public kmousetool
(define-public kmouth
(package
(name "kmouth")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kmouth-" version ".tar.xz"))
(sha256
- (base32 "0xvkp2pm2szbgzdsfmwrykma8npmlwmx2pb1iakbx3x1wyyjsbim"))))
+ (base32 "0lzaw7qqvpqzfz4nb2lk8l06c4yxacfg5982yk33g5q0j7r19bpy"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -400,14 +400,14 @@ (define-public kxstitch
(define-public okteta
(package
(name "okteta")
- (version "0.26.7")
+ (version "0.26.9")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/okteta/" version
"/src/okteta-" version ".tar.xz"))
(sha256
- (base32 "1qrhsnglvkiq480c0b6hgcpahab7l8wbfpcsgra5zkynj1bba8zi"))))
+ (base32 "1yszs3w78dqdr5d8djf6gp4abzc5lcms859imqcq50wl9r6lr18n"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools qttools shared-mime-info))
@@ -571,14 +571,14 @@ (define-public smb4k
(define-public sweeper
(package
(name "sweeper")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/sweeper-" version ".tar.xz"))
(sha256
- (base32 "1l4ag2nhy0da9z4nlf7fmjrim7pmwpm3m4v4y50jlpdv73f63246"))))
+ (base32 "0kda4a5d9a11am2y6f91bx8v3nb8mw9qh671nskvgkx46x1pww21"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
--
2.37.0
From 7952dabb339bacbaf93b61fe45cb1611913c8ffb Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 11:37:17 +0100
Subject: [PATCH v3 81/86] gnu: Add plasma-mobile-settings.

* gnu/pacakges/kde-plasma.scm (plasma-mobile-settings): New variable.

Toggle diff (41 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 7ac323f501..c073e3deba 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -625,6 +625,34 @@ (define-public plasma-mobile
customizable platform for mobile devices.")
(license (list license:gpl3+ license:lgpl2.1+))))
+(define-public plasma-mobile-settings
+ (package
+ (name "plasma-mobile-settings")
+ (version "22.02")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://download.kde.org/stable/plasma-mobile/" version
+ "/plasma-settings-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0b7lj3r9z9cz2vr0h15sqqxdaa7m07hsk8i2p8nf4a3yh02ywsxy"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (inputs (list qtbase-5
+ qtdeclarative
+ kio
+ modemmanager-qt
+ networkmanager-qt
+ ki18n
+ plasma-framework
+ kdeclarative
+ kdbusaddons))
+ (home-page "https://plasma-mobile.org/")
+ (synopsis "Settings application for Plasma Mobile")
+ (description "This package provides Settings application for Plasma Mobile.")
+ (license (list license:gpl2+ license:gpl3+ license:lgpl2.1+))))
+
(define-public plasma-phone-components
(package
(name "plasma-phone-components")
--
2.37.0
From 9cbbb6c8b8b8e3f35810d9e87877724978a9f673 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 12:23:30 +0100
Subject: [PATCH v3 78/86] gnu: libqmi: Update to 1.30.8.

* gnu/packages/freedesktop.scm (libqmi): Update to 1.30.8.

Toggle diff (24 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 1dd72700ff..9747a1da82 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1497,7 +1497,7 @@ (define-public libmbim
(define-public libqmi
(package
(name "libqmi")
- (version "1.24.14")
+ (version "1.30.8")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1505,7 +1505,7 @@ (define-public libqmi
"libqmi-" version ".tar.xz"))
(sha256
(base32
- "0zshxqbm9ldybgrzh7pjmwmfjvvvfd0xh8qhgl8xiqdb9ply73r0"))))
+ "140rmjw436rh6rqmnfw6yaflpffd27ilwcv4s9jvvl1skv784946"))))
(build-system gnu-build-system)
(inputs
(list libgudev))
--
2.37.0
From ce6665c65c46deec8945165b2a67d83876077a02 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Wed, 2 Feb 2022 13:54:26 +1100
Subject: [PATCH v3 13/86] gnu: phonon: Update home page.

* gnu/packages/kde-frameworks.scm (phonon): Update home page.

Toggle diff (15 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 99611d0f70..3223b1a674 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -206,7 +206,7 @@ (define-public phonon
(substitute* "cmake_install.cmake"
((regex all dest)
(string-append dest (assoc-ref outputs "out"))))))))))
- (home-page "https://phonon.kde.org")
+ (home-page "https://community.kde.org/Phonon")
(synopsis "KDE's multimedia library")
(description "KDE's multimedia library.")
(license license:lgpl2.1+)))
--
2.37.0
From bbb9739dbba7fa24196a771608f00ce20dee3eb3 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:14:35 +0200
Subject: [PATCH v3 06/86] gnu: kde-frameworkintegration: Remove input labels.

* gnu/packages/kde-frameworks.scm (kde-frameworkintegration): Remove input
labels.

Toggle diff (38 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 3f8e1135a4..ee6f4a58dc 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3417,19 +3417,18 @@ (define-public kde-frameworkintegration
(native-inputs
(list extra-cmake-modules pkg-config))
;; TODO: Optional packages not yet in Guix: packagekitqt5, AppStreamQt
- (inputs
- `(("kconfig" ,kconfig)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("ki18n" ,ki18n)
- ("kiconthemes" ,kiconthemes)
- ("kitemviews" ,kitemviews)
- ("knewstuff" ,knewstuff)
- ("knotificantions" ,knotifications)
- ("kpackage" ,kpackage)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("qtbase" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)))
+ (inputs (list kconfig
+ kconfigwidgets
+ kcoreaddons
+ ki18n
+ kiconthemes
+ kitemviews
+ knewstuff
+ knotifications
+ kpackage
+ kwidgetsaddons
+ qtbase-5
+ qtx11extras))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.37.0
From 1f186a0a7a4b1e020d2f1c1f03161ab843101dc6 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 15 Mar 2022 10:52:19 +1100
Subject: [PATCH v3 75/86] !!! DELETE ME AFTER


Toggle diff (15 lines)
diff --git a/guix/import/kde.scm b/guix/import/kde.scm
index 6873418d62..11c75a3320 100644
--- a/guix/import/kde.scm
+++ b/guix/import/kde.scm
@@ -51,7 +51,7 @@ (define (tarball->version tarball)
(define %kde-file-list-uri
;; URI of the file list (ls -lR format) for download.kde.org.
- (string->uri "https://download.kde.org/ls-lR.bz2"))
+ (string->uri "https://mirrors.ocf.berkeley.edu/kde/ls-lR.bz2"))
(define (download.kde.org-files)
;;"Return the list of files available at download.kde.org."
--
2.37.0
From 862dc704531509500ea9e2a18c9783fe687eaa2b Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:39:17 +0200
Subject: [PATCH v3 10/86] gnu: solid: Remove input labels.

* gnu/packages/kde-frameworks.scm (solid): Remove input labels.

Toggle diff (17 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 8eb540b8b3..4e71d6db23 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1376,9 +1376,7 @@ (define-public solid
(native-inputs
(list bison dbus extra-cmake-modules flex qttools))
(inputs
- `(("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)
- ("udev" ,eudev)))
+ (list qtbase-5 qtdeclarative eudev))
;; TODO: Add runtime-only dependency MediaPlayerInfo
(home-page "https://community.kde.org/Frameworks")
(synopsis "Desktop hardware abstraction")
--
2.37.0
From e5f47471c864a2e0c95e00ef73960fcf5348e555 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sun, 6 Feb 2022 16:25:08 +1100
Subject: [PATCH v3 43/86] gnu: ktouch: Update to 21.12.2.

* gnu/packages/education.scm (ktouch): Update to 21.12.2.

Toggle diff (23 lines)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 9e5a17a6ae..5551f9141b 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -643,14 +643,14 @@ (define-public klavaro
(define-public ktouch
(package
(name "ktouch")
- (version "20.12.1")
+ (version "21.12.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/ktouch-" version ".tar.xz"))
(sha256
- (base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib"))))
+ (base32 "1rq2n8395sb17rqd295axv2pbwzhqs8ikjqx5ryn4lv1713alabl"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools pkg-config))
--
2.37.0
From 7ad802c1192fe277c01f2033c6aa10d82e226932 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 10:47:21 +0200
Subject: [PATCH v3 31/86] gnu: KDE Internet: Update home-page links.

* gnu/packages/kde-internet.scm (konversation, kopete, krdc, ktorrent): Update
home-page.

Toggle diff (59 lines)
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index 1f91ede969..2744ab1d9c 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -172,7 +173,7 @@ (define-public kget
(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
+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.")
@@ -221,7 +222,7 @@ (define-public konversation
qca
solid
sonnet))
- (home-page "https://kde.org/applications/internet/org.kde.konversations")
+ (home-page "https://apps.kde.org/konversation/")
(synopsis "Graphical Internet Relay Chat (IRC) client for KDE")
(description "Konversation is a graphical Internet Relay Chat client (IRC)
with KDE support.
@@ -311,7 +312,7 @@ (define-public kopete
;; TODO: Xmms
zlib))
;; TODO: enable video support
- (home-page "https://kde.org/applications/internet/org.kde.kopete")
+ (home-page "https://apps.kde.org/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
@@ -362,7 +363,7 @@ (define-public krdc
qtbase-5))
(arguments ;; FIXEME: libvnc can't be found for some reason.
(list #:configure-flags #~(list "-DWITH_VNC=NO")))
- (home-page "https://kde.org/applications/internet/org.kde.krdc")
+ (home-page "https://apps.kde.org/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
@@ -419,7 +420,7 @@ (define-public ktorrent
solid
syndication
taglib))
- (home-page "https://kde.org/applications/internet/org.kde.ktorrent")
+ (home-page "https://apps.kde.org/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
--
2.37.0
From 268a30da5506d8b19edbf2e3f113b79639930648 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:34:36 +0200
Subject: [PATCH v3 08/86] gnu: kio: Remove input labels.

* gnu/packages/kde-frameworks.scm (kio): Remove input labels.

Toggle diff (62 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index fee4827dea..2edeb81182 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2628,31 +2628,30 @@ (define-public kio
solid))
(native-inputs
(list extra-cmake-modules dbus kdoctools qttools))
- (inputs
- `(;; TODO: LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars>
- ("krb5" ,mit-krb5)
- ("karchive" ,karchive)
- ("kauth" ,kauth)
- ("kcodecs" ,kcodecs)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("kdoctools" ,kdoctools)
- ("kguiaddons" ,kguiaddons)
- ("kiconthemes" ,kiconthemes)
- ("ki18n" ,ki18n)
- ("knotifications" ,knotifications)
- ("ktextwidgets" ,ktextwidgets)
- ("kwallet" ,kwallet)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("libxml2" ,libxml2)
- ("libxslt" ,libxslt)
- ("qtbase" ,qtbase-5)
- ("qtscript" ,qtscript)
- ("qtx11extras" ,qtx11extras)
- ("sonnet" ,sonnet)
- ("util-linux:lib" ,util-linux "lib") ; libmount
- ("zlib" ,zlib)))
+ (inputs (list ;; TODO: LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars>
+ mit-krb5
+ karchive
+ kauth
+ kcodecs
+ kconfigwidgets
+ kcrash
+ kdbusaddons
+ kdoctools
+ kguiaddons
+ kiconthemes
+ ki18n
+ knotifications
+ ktextwidgets
+ kwallet
+ kwidgetsaddons
+ libxml2
+ libxslt
+ qtbase-5
+ qtscript
+ qtx11extras
+ sonnet
+ `(,util-linux "lib") ; libmount
+ zlib))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.37.0
From 601c379924200f9fa066388ccb4c4df7b16bad40 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:43:43 +0200
Subject: [PATCH v3 12/86] gnu: ki18n: Remove input labels.

* gnu/packages/kde-frameworks.scm (ki18n): Remove input labels.

Toggle diff (16 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 6c57261231..99611d0f70 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -773,8 +773,7 @@ (define-public ki18n
"0xsp77iaxf72i0ri3pb6x5rrdz3cv8rxcaqcrynisvsmx7l35005"))))
(build-system cmake-build-system)
(propagated-inputs
- `(("gettext" ,gettext-minimal)
- ("python" ,python)))
+ (list gettext-minimal python))
(native-inputs
(list extra-cmake-modules))
(inputs
--
2.37.0
From 62a58fef9aeec99a83cae4af7c453a669d8826c6 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Wed, 2 Mar 2022 08:29:54 +1100
Subject: [PATCH v3 70/86] gnu: Add libaccounts-glib.

* gnu/packages/qt.scm (libaccounts-glib): New variable.

Toggle diff (80 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e55a07bbe5..a83d3f0d03 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -48,6 +48,7 @@ (define-module (gnu packages qt)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (guix gexp)
@@ -58,6 +59,7 @@ (define-module (gnu packages qt)
#:use-module (gnu packages bash)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages cups)
@@ -3193,3 +3195,57 @@ (define-public kdsoap
services using the XML based SOAP protocol and without the need for a dedicated
web server.")
(license (list license:gpl2 license:gpl3))))
+
+(define-public libaccounts-glib
+ (package
+ (name "libaccounts-glib")
+ (version "1.25")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/accounts-sso/libaccounts-glib")
+ (commit (string-append version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "19rhk9f97m736d5ia26vfcbjp5kgi454558yhf9mrwm4iw5d9pk4"))))
+ (build-system meson-build-system)
+ (native-inputs
+ (list dbus `(,glib "bin") gobject-introspection gtk-doc pkg-config vala))
+ (inputs (list check
+ libxml2
+ python
+ python-pygobject
+ sqlite))
+ (propagated-inputs
+ (list glib))
+ (arguments
+ (list
+ #:tests? #f ; one test fails.
+ #:imported-modules `((guix build python-build-system)
+ ,@%meson-build-system-modules)
+ #:modules '(((guix build python-build-system) #:select
+ (python-version))
+ (guix build meson-build-system)
+ (guix build utils))
+ ;; don't try installing to python store path.
+ #:configure-flags
+ #~(list (string-append
+ "-Dpy-overrides-dir=" #$output "/lib/python"
+ (python-version #$(this-package-input "python"))
+ "/site-packages/gi/overrides"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "dbus-run-session" "--" "meson" "test"
+ "--print-errorlogs")))))))
+ (home-page "https://accounts-sso.gitlab.io/")
+ (synopsis "Accounts SSO (Single Sign-On) management library for GLib
+applications")
+ (description "Accounts SSO is a framework for application developers who
+wish to acquire, use and store web account details and credentials. It
+handles the authentication process of an account and securely stores the
+credentials and service-specific settings.")
+ (license license:lgpl2.1+)))
--
2.37.0
From 052f96475f4eb57787dc210e60d78949eacb58f2 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 10:25:42 +0200
Subject: [PATCH v3 25/86] gnu: kdenlive, marble-qt: Add kdoctools.

* gnu/packages/kde.scm (kdenlive)[native-inputs]: Add kdoctools.
(marble-qt): Move kdoctools from inputs to native-inputs.

Toggle diff (30 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index c248e6ea8d..3684740b1a 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -258,7 +258,7 @@ (define-public kdenlive
`("MLT_PREFIX" ":" =
(,#$(this-package-input "mlt"))))))))))
(native-inputs
- (list extra-cmake-modules pkg-config qttools))
+ (list extra-cmake-modules kdoctools pkg-config qttools))
(inputs
(list bash-minimal
breeze ; make dark them available easily
@@ -1009,13 +1009,12 @@ (define-public marble-qt
"-DBUILD_TOUCH=YES"
"-DBUILD_MARBLE_TESTS=FALSE")))
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules kdoctools qttools))
;; One optional dependency missing: libwlocate.
(inputs
(list gpsd
kcoreaddons
kcrash
- kdoctools
ki18n
kio
knewstuff
--
2.37.0
From c1d58764dc499b2bc9d21d5a006224a85efea621 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 1 Feb 2022 18:22:59 +1100
Subject: [PATCH v3 03/86] gnu: kdav: Move to (gnu packages kde-frameworks).

* gnu/packages/kde-pim.scm
* gnu/packages/kde-frameworks.scm
(kdav): Move to (gnu packages kde-frameworks). It's considered a
framework component now.

Toggle diff (77 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 9f5eee1ab2..35c3b68bda 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021 Alexandros Theodotou <alex@zrythm.org>
+;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3808,3 +3809,27 @@ (define-public kross
;; under a variety of licenses.
(license (list license:lgpl2.0+ license:lgpl2.1+
license:lgpl2.0 license:gpl3+))))
+
+(define-public kdav
+ (package
+ (name "kdav")
+ (version "20.04.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/kdav-" version ".tar.xz"))
+ (sha256
+ (base32 "0445gl4xm0h39igkxgb6vmq5iaa04wkgrgbs7nfd0zwngk8xaidn"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules))
+ (inputs
+ (list kcoreaddons ki18n kio qtbase-5 qtxmlpatterns))
+ (home-page "https://invent.kde.org/frameworks/kdav")
+ (synopsis "DAV protocol implementation with KJobs")
+ (description "This is a DAV protocol implementation with KJobs. Calendars
+and todos are supported, using either GroupDAV or CalDAV, and contacts are
+supported using GroupDAV or CardDAV.")
+ (license ;; GPL for programs, LGPL for libraries
+ (list license:gpl2+ license:lgpl2.0+))))
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index a5acbb0da8..4937ed3594 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -606,30 +606,6 @@ (define-public kcalutils
functions for accessing calendar data using the kcalcore API.")
(license license:lgpl2.0+)))
-(define-public kdav
- (package
- (name "kdav")
- (version "20.04.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/kdav-" version ".tar.xz"))
- (sha256
- (base32 "0445gl4xm0h39igkxgb6vmq5iaa04wkgrgbs7nfd0zwngk8xaidn"))))
- (build-system qt-build-system)
- (native-inputs
- (list extra-cmake-modules))
- (inputs
- (list kcoreaddons ki18n kio qtbase-5 qtxmlpatterns))
- (home-page "https://invent.kde.org/frameworks/kdav")
- (synopsis "DAV protocol implementation with KJobs")
- (description "This is a DAV protocol implementation with KJobs. Calendars
-and todos are supported, using either GroupDAV or CalDAV, and contacts are
-supported using GroupDAV or CardDAV.")
- (license ;; GPL for programs, LGPL for libraries
- (list license:gpl2+ license:lgpl2.0+))))
-
(define-public kdepim-apps-libs
(package
(name "kdepim-apps-libs")
--
2.37.0
From 5cd8a1ead5d5d9443e77d0c21e5cf5c9809ccbbf Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 1 Feb 2022 18:14:24 +1100
Subject: [PATCH v3 02/86] gnu: libdbusmenu-qt: Move to (gnu packages qt).

* gnu/packages/lxqt.scm: Remove libdbusmenu-qt.
* gnu/packages/qt.scm: Re-add libdbusmenu-qt.

Toggle diff (99 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index a0a3a0f15b..89d588da29 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2019, 2020 Reza Alizadeh Majd <r.majd@pantherx.org>
;;; Copyright © 2020 Fakhri Sajadi <f.sajadi@pantherx.org>
;;; Copyright © 2020 André Batista <nandre@riseup.net>
-;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -68,36 +68,6 @@ (define-module (gnu packages lxqt)
;; Third party libraries
-(define-public libdbusmenu-qt
- (package
- (name "libdbusmenu-qt")
- (version "0.9.3+16.04.20160218-0ubuntu1")
- (source
- (origin
- (method git-fetch)
- ;; Download from github rather than launchpad because launchpad trunk
- ;; tarball hash is not deterministic.
- (uri (git-reference
- (url "https://github.com/unity8-team/libdbusmenu-qt")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0b7ii1cvmpcyl79gqal9c3va9m55h055s4hx7fpxkhhqs9463ggg"))))
- (build-system cmake-build-system)
- (arguments
- ;; XXX: Tests require a dbus session and some icons.
- '(#:tests? #f))
- (native-inputs
- (list doxygen))
- (inputs
- (list qtbase-5))
- (home-page "https://launchpad.net/libdbusmenu-qt")
- (synopsis "Qt implementation of the DBusMenu spec")
- (description "This library provides a Qt implementation of the DBusMenu
-protocol. The DBusMenu protocol makes it possible for applications to export
-and import their menus over DBus.")
- (license license:lgpl2.1+)))
-
(define-public libstatgrab
(package
(name "libstatgrab")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ae68317492..2f17ab91bd 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -20,7 +20,7 @@
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com>
@@ -3132,3 +3132,33 @@ (define-public soqt
also compatible with SGI and TGS Open Inventor, and the API is based on the API
of the InventorXt GUI component toolkit.")
(license license:bsd-3))))
+
+(define-public libdbusmenu-qt
+ (package
+ (name "libdbusmenu-qt")
+ (version "0.9.3+16.04.20160218-0ubuntu1")
+ (source
+ (origin
+ (method git-fetch)
+ ;; Download from github rather than launchpad because launchpad trunk
+ ;; tarball hash is not deterministic.
+ (uri (git-reference
+ (url "https://github.com/unity8-team/libdbusmenu-qt")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0b7ii1cvmpcyl79gqal9c3va9m55h055s4hx7fpxkhhqs9463ggg"))))
+ (build-system cmake-build-system)
+ (arguments
+ ;; XXX: Tests require a dbus session and some icons.
+ '(#:tests? #f))
+ (native-inputs
+ (list doxygen))
+ (inputs
+ (list qtbase-5))
+ (home-page "https://launchpad.net/libdbusmenu-qt")
+ (synopsis "Qt implementation of the DBusMenu spec")
+ (description "This library provides a Qt implementation of the DBusMenu
+protocol. The DBusMenu protocol makes it possible for applications to export
+and import their menus over DBus.")
+ (license license:lgpl2.1+)))
--
2.37.0
From 369d33babb811e5a38bcc491e5280476d8efa611 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 8 Apr 2022 13:24:20 +0200
Subject: [PATCH v3 86/86] gnu: Add plasma-phonebook.

* gnu/packages/kde-plasma.scm (plasma-phonebook): New variable.

Toggle diff (42 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index a61d7e0dd6..dd266140a6 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -702,6 +702,35 @@ (define-public plasma-phone-components
and customizable platform for mobile devices.")
(license (list license:gpl3+ license:lgpl2.1+))))
+(define-public plasma-phonebook
+ (package
+ (name "plasma-phonebook")
+ (version "0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma-phonebook/"
+ version "/plasma-phonebook-" version
+ ".tar.xz"))
+ (sha256
+ (base32
+ "13nnzdzpganlp319sc9dm9w5hsjhw4f3w8rb80q3nd8q6nyrpky8"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (inputs (list kpeople
+ kirigami
+ kpeople
+ kcoreaddons
+ kcontacts
+ qtbase-5
+ qtdeclarative
+ qtquickcontrols2
+ qtsvg))
+ (home-page "https://plasma-mobile.org/")
+ (synopsis "Phonebook for Plasma Mobile devices")
+ (description "This package provides contacts application which allows
+adding, modifying and removing contacts.")
+ (license (list license:gpl3+ license:lgpl2.1+))))
+
(define-public plasma-mobile-sounds
(package
(name "plasma-mobile-sounds")
--
2.37.0
From f003a36879eff65c8a43671ad535620e0a9b69bf Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Thu, 14 Oct 2021 18:25:20 +1100
Subject: [PATCH v3 18/86] gnu: libgravatar: Move to (gnu packages kde-pim).

Remove uneeded (gnu packages kde-internet) import.
* gnu/packages/kde-internet.scm: Move libgravatar ...
* gnu/packages/kde-pim.scm ...here

Toggle diff (104 lines)
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index 9de2c54ad3..40b8e93b3c 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -415,38 +415,6 @@ (define-public ktorrent
a full-featured client for BitTorrent.")
(license license:gpl2+)))
-(define-public libgravatar
- (package
- (name "libgravatar")
- (version "20.04.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/libgravatar-" version ".tar.xz"))
- (sha256
- (base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2"))))
- (build-system qt-build-system)
- (native-inputs
- (list extra-cmake-modules))
- (inputs
- (list kconfig
- ki18n
- kio
- kpimcommon
- ktextwidgets
- kwidgetsaddons
- qtbase-5))
- (arguments
- `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
- (home-page "https://invent.kde.org/pim/libgravatar")
- (synopsis "Online avatar lookup library")
- (description "This library retrieves 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")
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 4937ed3594..5da25bfad8 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,7 +35,6 @@ (define-module (gnu packages kde-pim)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks)
- #:use-module (gnu packages kde-internet)
#:use-module (gnu packages openldap)
#:use-module (gnu packages qt)
#:use-module (gnu packages search)
@@ -1641,6 +1641,38 @@ (define-public kpimcommon
(license ;; GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0+))))
+(define-public libgravatar
+ (package
+ (name "libgravatar")
+ (version "20.04.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/libgravatar-" version ".tar.xz"))
+ (sha256
+ (base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2"))))
+ (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-5)))
+ (arguments
+ `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
+ (home-page "https://invent.kde.org/pim/libgravatar")
+ (synopsis "Online avatar lookup library")
+ (description "This library retrieves 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 kpimtextedit
(package
(name "kpimtextedit")
--
2.37.0
From 6b0662c703c8c5ca70ef157593ec805d9c920029 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Wed, 2 Feb 2022 13:55:13 +1100
Subject: [PATCH v3 14/86] gnu: phonon-backend-gstreamer: Update home page.

* gnu/packages/kde-frameworks.scm (phonon-backend-gstreamer): Update home page.

Toggle diff (15 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 3223b1a674..0b6c6dff96 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -238,7 +238,7 @@ (define-public phonon-backend-gstreamer
(arguments
`(#:configure-flags
'( "-DPHONON_BUILD_PHONON4QT5=ON")))
- (home-page "https://phonon.kde.org")
+ (home-page "https://community.kde.org/Phonon")
(synopsis "Phonon backend which uses GStreamer")
(description "Phonon makes use of backend libraries to provide sound.
Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
--
2.37.0
From b29420a3e1c6555488f727be57c35bffb44f37aa Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Thu, 21 Jul 2022 08:26:59 +0200
Subject: [PATCH v3 19/86] gnu: libgravatar: Remove input labels.

* gnu/packages/kde-pim.scm (libgravatar): Remove input labels.

Toggle diff (31 lines)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 5da25bfad8..0fa120e075 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -1653,16 +1653,14 @@ (define-public libgravatar
(sha256
(base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2"))))
(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-5)))
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list kconfig
+ ki18n
+ kio
+ kpimcommon
+ ktextwidgets
+ kwidgetsaddons
+ qtbase-5))
(arguments
`(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
(home-page "https://invent.kde.org/pim/libgravatar")
--
2.37.0
From 8cc4eb81f8f7ab09649f61c8c126adbd40a5b14d Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 12:15:41 +0200
Subject: [PATCH v3 40/86] gnu: KDE Multimedia: Add bash-minimal and kdoctools.

* gnu/packages/kde-multimedia.scm (juk, kmix): Move kdoctools from inputs to
native-inputs.

(dragon, k3b): [inputs]: Add bash-minimal.

Toggle diff (49 lines)
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index e4c3ffab10..225d181dd5 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -108,7 +108,8 @@ (define-public dragon
(native-inputs
(list extra-cmake-modules kdoctools))
(inputs
- (list kconfig
+ (list bash-minimal
+ kconfig
kconfigwidgets
kcoreaddons
kcrash
@@ -262,14 +263,13 @@ (define-public juk
(base32 "1ipzx031996h83f9w3fzbx5vf5nnskq9kf71a6aypqckk65vcqcs"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules))
+ (list extra-cmake-modules kdoctools))
(inputs
(list kcoreaddons
kcompletion
kconfig
kcrash
kdbusaddons
- kdoctools
kglobalaccel
ki18n
kiconthemes
@@ -572,7 +572,7 @@ (define-public kmix
(base32 "1zk2xljis1pv3m4vs5zr6wza6iv5y6wmh1csx3rn8ylfkrpk7h8k"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules pkg-config))
+ (list extra-cmake-modules kdoctools pkg-config))
(inputs
(list alsa-lib
glib
@@ -582,7 +582,6 @@ (define-public kmix
kconfigwidgets
kcrash
kdbusaddons
- kdoctools
kglobalaccel
ki18n
kiconthemes
--
2.37.0
From daa73d195c171caf423a42720ded51f7e3031a4c Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 11:33:21 +0200
Subject: [PATCH v3 37/86] gnu: KDE Systemtools: Update home-page links.

* gnu/packages/kde-systemtools.scm (dolphin, khelpcenter, krfb, ksystemlog,
yakuake): Update home-page.

Toggle diff (59 lines)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index aa0ed53a80..90260c2630 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -79,7 +80,7 @@ (define-public dolphin
solid))
(arguments
`(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen
- (home-page "https://kde.org/applications/system/org.kde.dolphin")
+ (home-page "https://apps.kde.org/dolphin/")
(synopsis "File manager for KDE")
(description "Dolphin is a file manager for KDE focusing on usability.
The main features of Dolphin are:
@@ -160,7 +161,7 @@ (define-public khelpcenter
xapian))
(arguments
`(#:tests? #f)) ;; 1/1 test fails
- (home-page "https://kde.org/applications/system/org.kde.Help")
+ (home-page "https://apps.kde.org/khelpcenter/")
(synopsis "KDE documentation viewer")
(description "KHelpCenter uses meta data files which describe the
documentation available in the system. Each document is represented by a meta
@@ -267,7 +268,7 @@ (define-public krfb
wayland
xcb-util-image
zlib))
- (home-page "https://kde.org/applications/internet/org.kde.krfb")
+ (home-page "https://apps.kde.org/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
@@ -310,7 +311,7 @@ (define-public ksystemlog
kxmlgui
oxygen-icons ;; default icon set
qtbase-5))
- (home-page "https://kde.org/applications/system/org.kde.ksystemlog")
+ (home-page "https://apps.kde.org/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
@@ -356,7 +357,7 @@ (define-public yakuake
qtbase-5
qtsvg
qtx11extras))
- (home-page "https://www.kde.org/applications/system/yakuake/")
+ (home-page "https://apps.kde.org/yakuake/")
(synopsis "Quad-style terminal emulator for KDE")
(description "Yakuake is a drop-down terminal emulator based on KDE Konsole
technology. Features include:
--
2.37.0
From 6289cd15311c038301a46a29584862837cdfa330 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Thu, 14 Oct 2021 18:11:57 +1100
Subject: [PATCH v3 16/86] gnu: Add layer-shell-qt.

* gnu/packages/kde-plasma.scm (layer-shell-qt): New variable.

Toggle diff (55 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 2317cbec5a..2c723d34f8 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +38,7 @@ (define-module (gnu packages kde-plasma)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages qt)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (gnu packages web))
@@ -157,6 +159,32 @@ (define-public ksshaskpass
call it if it is not associated to a terminal.")
(license license:gpl2+)))
+(define-public layer-shell-qt
+ (package
+ (name "layer-shell-qt")
+ (version "5.24.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/layer-shell-qt-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1aq089pws39w9ncsiqzgg3qvfg5hc5a74pzra0smdpy5ipfsb6a4"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules pkg-config))
+ (inputs
+ (list libxkbcommon
+ qtbase-5
+ qtdeclarative
+ qtwayland
+ wayland
+ wayland-protocols))
+ (home-page "https://invent.kde.org/plasma/layer-shell-qt")
+ (synopsis "Qt component for the Wayland ql-layer-shell protocol")
+ (description "Qt component for the Wayland ql-layer-shell protocol.")
+ (license license:gpl2+)))
+
(define-public kscreenlocker
(package
(name "kscreenlocker")
--
2.37.0
From 4cf6a0739530ddc1c695f6a38051825fa219518d Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 5 Mar 2022 11:46:20 +1100
Subject: [PATCH v3 72/86] ! gnu: Add kaccounts-integration.

* gnu/packages/kde.scm (kaccounts-integration): New variable.

Toggle diff (46 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 4b7fbb5377..749b00a53c 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1240,3 +1240,39 @@ (define-public kuserfeedback
@item A management and analytics application.
@end itemize")
(license license:expat)))
+
+
+(define-public kaccounts-integration
+ (package
+ (name "kaccounts-integration")
+ (version "21.12.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/" name "-" version ".tar.xz"))
+ (sha256
+ (base32 "13q4d7ln98vdpb6ryk49zakx5bysdnjxifi7cma10fgk9gcqqhpb"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules))
+ (inputs
+ (list kcmutils
+ kcoreaddons
+ kdbusaddons
+ kdeclarative
+ ki18n
+ kio
+ kwallet
+ libaccounts-qt
+ qtbase-5))
+ (home-page "https://invent.kde.org/network/kaccounts-integration")
+ (synopsis "Online account management system and Plasma Integration")
+ (description "KAccounts Integration provides a way to share accounts data
+such as login tokens and general user information (like usernames and such)
+between various applications.
+
+The KAccounts library is a KDE Frameworks style abstraction layer on top of
+the Accounts-SSO and SignOnD libraries, which uses a combination of models and
+jobs to expose the functionality of those.")
+ (license (list license:gpl2+ license:gpl3+ license:lgpl2.0+))))
--
2.37.0
From 03f82ca9208e09533abbbf3842fbea3a0e03f1ca Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 10:27:37 +0200
Subject: [PATCH v3 26/86] gnu: KDE: Update home-page links.

* gnu/packages/kde.scm (massif-visualizer, libkdegames, okular, poxml,
zeroconf-ioslave): Update home-page link.

Toggle diff (59 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 3684740b1a..6ac614e422 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2021 la snesne <lasnesne@lagunposprasihopre.org>
;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -574,7 +575,7 @@ (define-public massif-visualizer
qtbase-5
qtsvg
qtxmlpatterns))
- (home-page "https://apps.kde.org/en/massif-visualizer")
+ (home-page "https://apps.kde.org/massif-visualizer/")
(synopsis "Visualize massif data generated by Valgrind")
(description
"Massif Visualizer is a tool that visualizes massif data.
@@ -981,7 +982,7 @@ (define-public libkdegames
qtbase-5
qtdeclarative
qtsvg))
- (home-page "https://games.kde.org/")
+ (home-page "https://apps.kde.org/categories/games/")
(synopsis "Runtime library for kdegames")
(description "Runtime library for kdegames")
(license (list license:gpl2+ license:fdl1.2+))))
@@ -1100,7 +1101,7 @@ (define-public okular
threadweaver
kcrash
kjs))
- (home-page "https://kde.org/applications/graphics/okular/")
+ (home-page "https://apps.kde.org/okular/")
(synopsis "Document viewer")
(description
"Okular is a document viewer developed for KDE. It can display files in
@@ -1124,7 +1125,7 @@ (define-public poxml
(list extra-cmake-modules kdoctools))
(inputs
(list gettext-minimal qtbase-5))
- (home-page "https://kde.org/applications/development")
+ (home-page "https://apps.kde.org/development/")
(synopsis "Tools for translating DocBook XML files with Gettext")
(description "This is a collection of tools that facilitate translating
DocBook XML files using Gettext message files (PO files). Also included are
@@ -1192,7 +1193,7 @@ (define-public zeroconf-ioslave
(list extra-cmake-modules))
(inputs
(list kdbusaddons kdnssd ki18n kio qtbase-5))
- (home-page "https://kde.org/applications/internet/org.kde.zeroconf_ioslave")
+ (home-page "https://apps.kde.org/kio_zeroconf/")
(synopsis "DNS-SD Service Discovery Monitor")
(description "Adds an entry to Dolphin's Network page to show local
services such as printers which advertise themselves with DNSSD (called Avahi
--
2.37.0
From c72eb3d36aedf1574263da667df2e7a4e3433401 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 8 Feb 2022 17:36:22 +1100
Subject: [PATCH v3 67/86] gnu: appstream-qt: Add package variant.

* gnu/packages/freedesktop.scm (appstream-qt): Add a build of appstream
with Qt support.

Toggle diff (27 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 6427a2b95e..b69a078d35 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -197,6 +197,20 @@ (define-public appstream
;; there are also some (irrelevant) wtfpl2 examples
(license (list license:gpl2+ license:lgpl2.1+))))
+(define-public appstream-qt
+ (package/inherit appstream
+ (name "appstream-qt")
+ (native-inputs
+ (cons (list "qttools" qttools)
+ (package-native-inputs appstream)))
+ (inputs
+ (cons (list "qtbase" qtbase-5)
+ (package-inputs appstream)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments appstream)
+ ((#:configure-flags flags)
+ '(list "-Dqt=true"))))))
+
(define-public farstream
(package
(name "farstream")
--
2.37.0
From 4dd38699d46acfab730552f43dc00b6b56a7c22d Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 11:38:20 +0100
Subject: [PATCH v3 82/86] gnu: Add maliit-framework.

* gnu/pacakges/kde-frameworks.scm (maliit-framework): New variable.

Toggle diff (72 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index c0e2e56138..ca608776c3 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages kde-frameworks)
#:use-module (guix build-system qt)
#:use-module (guix build-system trivial)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -50,6 +51,7 @@ (define-module (gnu packages kde-frameworks)
#:use-module (gnu packages calendar)
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
+ #:use-module (gnu packages documentation)
#:use-module (gnu packages docbook)
#:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop)
@@ -86,6 +88,7 @@ (define-module (gnu packages kde-frameworks)
#:use-module (gnu packages video)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (srfi srfi-1))
@@ -1168,6 +1171,41 @@ (define-public kwindowsystem
;; the lgpl2.1. Some source files are under non-copyleft licenses.
(license license:lgpl2.1+)))
+(define-public maliit-framework
+ (package
+ (name "maliit-framework")
+ (version "2.3.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/maliit/framework")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1dkjxvfxg56hfy70j6ibfklfyv57jiha4vgc3ggl60r5kjx65s5b"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules
+ wayland-protocols
+ pkg-config
+ doxygen
+ graphviz
+ `(,glib "bin"))) ;for gdbus-codegen))
+ (inputs (list qtbase-5
+ qtdeclarative
+ qtwayland
+ wayland
+ libxkbcommon
+ dbus
+ eudev
+ glib))
+ ;; ki18n plasma-framework knotifications networkmanager-qt kwin))
+ (home-page "https://github.com/maliit/framework")
+ (synopsis "Core libraries of Maliit")
+ (description "This package provides Maliit provides a flexible input
+method framework.")
+ (license license:lgpl2.1)))
+
(define-public modemmanager-qt
(package
(name "modemmanager-qt")
--
2.37.0
From 5e582c3c85d9300c6733d42a5137328f62e61a9d Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:18:27 +0200
Subject: [PATCH v3 07/86] gnu: plasma-framework: Remove input labels.

* gnu/packages/kde-frameworks.scm (plasma-framework): Remove input
labels.

Toggle diff (82 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index ee6f4a58dc..fee4827dea 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3280,41 +3280,40 @@ (define-public plasma-framework
(list kpackage kservice))
(native-inputs
(list extra-cmake-modules kdoctools pkg-config))
- (inputs
- `(("kactivities" ,kactivities)
- ("karchive" ,karchive)
- ("kauth" ,kauth)
- ("kbookmarks" ,kbookmarks)
- ("kcodecs" ,kcodecs)
- ("kcompletion" ,kcompletion)
- ("kconfig" ,kconfig)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("kdbusaddons" ,kdbusaddons)
- ("kdeclarative" ,kdeclarative)
- ("kdoctools" ,kdoctools)
- ("kglobalaccel" ,kglobalaccel)
- ("kguiaddons" ,kguiaddons)
- ("kiconthemes" ,kiconthemes)
- ("kirigami" ,kirigami)
- ("kitemviews" ,kitemviews)
- ("kio" ,kio)
- ("ki18n" ,ki18n)
- ("kjobwidgets" ,kjobwidgets)
- ("knotifications" ,knotifications)
- ("kwayland" ,kwayland)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("kwindowsystem" ,kwindowsystem)
- ("kxmlgui" ,kxmlgui)
- ;; XXX: "undefined reference to `glGetString'" errors occur without libglvnd,
- ("libglvnd" ,libglvnd)
- ("phonon" ,phonon)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative" ,qtdeclarative)
- ("qtquickcontrols2" ,qtquickcontrols2)
- ("qtsvg" ,qtsvg)
- ("qtx11extras" ,qtx11extras)
- ("solid" ,solid)))
+ (inputs (list kactivities
+ karchive
+ kauth
+ kbookmarks
+ kcodecs
+ kcompletion
+ kconfig
+ kconfigwidgets
+ kcoreaddons
+ kdbusaddons
+ kdeclarative
+ kdoctools
+ kglobalaccel
+ kguiaddons
+ kiconthemes
+ kirigami
+ kitemviews
+ kio
+ ki18n
+ kjobwidgets
+ knotifications
+ kwayland
+ kwidgetsaddons
+ kwindowsystem
+ kxmlgui
+ ;; XXX: "undefined reference to `glGetString'" errors occur without libglvnd,
+ libglvnd
+ phonon
+ qtbase-5
+ qtdeclarative
+ qtquickcontrols2
+ qtsvg
+ qtx11extras
+ solid))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.37.0
From 7daaba0f81ddb8ac06611fffa3a5eb68c0092160 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 1 Aug 2022 14:36:53 +0200
Subject: [PATCH v3 56/86] gnu: Remove kalarmcal.

* gnu/packages/kde-pim.scm: Remove kalarmcal.

Toggle diff (54 lines)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 81b1962c39..3615246c8f 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -463,47 +463,6 @@ (define-public kaddressbook
CalDAV server.")
(license (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
-(define-public kalarmcal
- (package
- (name "kalarmcal")
- (version "21.12.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/kalarmcal-" version ".tar.xz"))
- (sha256
- (base32 "160pmr702b68hys9l02azvrv6pagy1r2whw0zp3jlf6863p9fkqr"))))
- (build-system qt-build-system)
- (native-inputs
- (list extra-cmake-modules))
- (inputs
- (list akonadi
- boost
- kcalendarcore
- kcalutils
- kcompletion
- kconfig
- kconfigwidgets
- kcoreaddons
- kdbusaddons
- kholidays
- ki18n
- kidentitymanagement
- kio
- kitemmodels
- kpimtextedit
- ktextwidgets
- kxmlgui
- qtbase-5))
- (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 access to and handling of kalarm
-calendar data.")
- (license license:lgpl2.0+)))
-
(define-public kblog
(package
(name "kblog")
--
2.37.0
From 90048a0889e571c52150cf847f38d8c5e4e938d7 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 11:16:10 +0200
Subject: [PATCH v3 35/86] gnu: KDE Utils: Remove trailing booleans.

* gnu/packages/kde-utils.scm (kate, okteta): [arguments]: Remove trailing booleans.

Toggle diff (26 lines)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 4f3af0bcac..dc7ac33a0f 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -159,8 +159,7 @@ (define-public kate
(lambda _
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache")
- #t)))))
+ (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache"))))))
(home-page "https://kate-editor.org/")
(synopsis "Multi-document, multi-view text editor")
(description "Kate is a powerful text editor that can open multiple files
@@ -440,8 +439,7 @@ (define-public okteta
(lambda _
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "HOME" "/tmp/dummy-home")
- #t)))))
+ (setenv "HOME" "/tmp/dummy-home"))))))
(home-page "https://apps.kde.org/okteta/")
(synopsis "Hexadecimal editor for binary files")
(description "Okteta is a simple editor for the raw data of files. This
--
2.37.0
From 0faab995f38b8fd06c290a032efa415b06f13bb4 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 1 Apr 2022 23:00:37 +0200
Subject: [PATCH v3 85/86] gnu: Add kwin-effects-yet-another-magic-lamp.

* gnu/packages/kde-frameworks.scm (kwin-effects-yet-another-magic-lamp): New
variable.

Toggle diff (42 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index faa47c6783..789529f061 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1522,6 +1522,35 @@ (define-public threadweaver
uses a job-based interface to queue tasks and execute them in an efficient way.")
(license license:lgpl2.1+)))
+(define-public kwin-effects-yet-another-magic-lamp
+ (package
+ (name "kwin-effects-yet-another-magic-lamp")
+ (version "5.24.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
+ "https://github.com/zzag/kwin-effects-yet-another-magic-lamp")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0aggi3p10kaa8lann0j7cp2g76qh83s1r7akjcjc2y4anv0asz68"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (inputs (list qtbase-5
+ kwindowsystem
+ kconfigwidgets
+ kcoreaddons
+ kconfig
+ kwin
+ libepoxy))
+ (home-page "https://github.com/zzag/kwin-effects-yet-another-magic-lamp")
+ (synopsis "Just Yet Another Magic Lamp Kwin plugin")
+ (description "This package provides a window minimization effect
+for KWin. Whenever a window is minimized, it'll get sucked down into
+the dock/panel.")
+ (license license:gpl2+)))
;; Tier 2
;;
--
2.37.0
From f42b04067b79b2f1696bd9bc9fa122c84d8312cd Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Wed, 2 Feb 2022 13:55:44 +1100
Subject: [PATCH v3 15/86] gnu: kgraphviewer: Fix home page.

* gnu/packages/kde-frameworks.scm (kgraphviewer): Fix home page.

Toggle diff (15 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 0b6c6dff96..77c93e7a6a 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -701,7 +701,7 @@ (define-public kgraphviewer
qtsvg))
(native-inputs
(list pkg-config extra-cmake-modules kdoctools))
- (home-page "https://apps.kde.org/en/kgraphviewer")
+ (home-page "https://apps.kde.org/kgraphviewer/")
(synopsis "Graphviz dot graph viewer for KDE")
(description "KGraphViewer is a Graphviz DOT graph file viewer, aimed to
replace the other outdated Graphviz tools.")
--
2.37.0
From 36968bbe0b60ee5b5598c71c24b36bd71505e10a Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:36:58 +0200
Subject: [PATCH v3 09/86] gnu: kfilemetadata: Remove input labels.

* gnu/packages/kde-frameworks.scm (kfilemetadata): Remove input labels.

Toggle diff (17 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 2edeb81182..8eb540b8b3 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1712,9 +1712,7 @@ (define-public kfilemetadata
;; (but it can find audio/x-speex+ogg).
(invoke "ctest" "-E"
"(usermetadatawritertest|embeddedimagedatatest|taglibextractortest)")))))))
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("pkg-config" ,pkg-config)))
+ (native-inputs (list extra-cmake-modules pkg-config))
(inputs
(list attr
;; TODO: EPub http://sourceforge.net/projects/ebook-tools
--
2.37.0
From 426e9a5b873ab4bde5426372c57e1ea91a344137 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 1 Aug 2022 14:40:25 +0200
Subject: [PATCH v3 54/86] gnu: grantleetheme: Update to 22.04.3.

* gnu/packages/kde.scm (grantleetheme): Update to 22.04.3.

Toggle diff (23 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 03343e2774..1587f313ec 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -123,14 +123,14 @@ (define-public baloo-widgets
(define-public grantleetheme
(package
(name "grantleetheme")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/grantleetheme-" version ".tar.xz"))
(sha256
- (base32 "1w83slbkj2y1wk78srq2k95ybs66sb4mbaa0zm7fl9pkwhqxbnb7"))))
+ (base32 "10c6s1g3vp5sdhpiciz1j6rsryld7hcc6lvmxdlsvms2bbcmnj7l"))))
(build-system qt-build-system)
(arguments `(#:tests? #f)) ; unexpected error in the test suite.
(native-inputs
--
2.37.0
From 29dafd402674e8978d235e451b880f13565c29fb Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 28 Sep 2021 15:25:49 +1000
Subject: [PATCH v3 50/86] gnu: Add kdsoap.

* gnu/packages/qt.scm (kdsoap): New variable.

Toggle diff (41 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 2f17ab91bd..e55a07bbe5 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3162,3 +3162,34 @@ (define-public libdbusmenu-qt
protocol. The DBusMenu protocol makes it possible for applications to export
and import their menus over DBus.")
(license license:lgpl2.1+)))
+
+(define-public kdsoap
+ (package
+ (name "kdsoap")
+ (version "2.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/KDAB/KDSoap/releases/download/"
+ "kdsoap-" version "/kdsoap-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1vh4rzb09kks1ilay1y60q7gf64gwzdwsca60hmx1xx69w8672fi"))))
+ (build-system qt-build-system)
+ (inputs `(("qtbase" ,qtbase-5)))
+ (arguments
+ '(#:configure-flags '("-DKDSoap_TESTS=true")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "ctest" "-E" ;; These tests try connect to the internet.
+ "(kdsoap-webcalls|kdsoap-webcalls_wsdl|kdsoap-test_calc)"))
+ #t)))))
+ (home-page "https://www.kdab.com/development-resources/qt-tools/kd-soap/")
+ (synopsis "Qt SOAP component")
+ (description "KD SOAP is a tool for creating client applications for web
+services using the XML based SOAP protocol and without the need for a dedicated
+web server.")
+ (license (list license:gpl2 license:gpl3))))
--
2.37.0
From e32a630d3a5dbdfea4bf8b424b0a571e6b48e4f3 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 5 Mar 2022 11:46:54 +1100
Subject: [PATCH v3 73/86] ! gnu: Add plasma-desktop.

* gnu/packages/kde-plasma.scm (plasma-desktop): New variable.

Toggle diff (133 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index ac1dae4764..7fe55ecbf5 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -714,3 +714,114 @@ (define-public plasma-workspace
activities effectively, without being distracting.")
(license (list license:bsd-3 license:gpl2+ license:gpl3 license:lgpl2.1+
license:lgpl3))))
+
+(define-public plasma-desktop
+ (package
+ (name "plasma-desktop")
+ (version "5.24.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1lwizprs6nk6nibydwkwmpi9c7c50lvg2k188pb6ddz2sb7pwgjq"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules
+ kdoctools
+ pkg-config
+ qtsvg
+ qttools))
+ (inputs
+ (list ;kplasma
+ ;kplasmaquick
+ ;packagekit-qt
+
+ kdelibs4support
+ ;kaccounts
+ plasma-workspace
+
+ appstream-qt
+ baloo
+ breeze
+ breeze-icons
+ fontconfig
+ iso-codes
+ kactivities
+ kactivities-stats
+ karchive
+ kcmutils
+ kcoreaddons
+ kcrash
+ kdbusaddons
+ kdeclarative
+ kded
+ kdesu
+ kglobalaccel
+ kguiaddons
+ kholidays
+ ki18n
+ kiconthemes
+ kidletime
+ kinit
+ kio
+ kirigami
+ kitemmodels
+ knewstuff
+ knotifications
+ knotifyconfig
+ kpackage
+ kpeople
+ kqtquickcharts ;; XXX: not found?
+ krunner
+ kscreenlocker
+ ktexteditor
+ ktextwidgets
+ kunitconversion
+ kuserfeedback
+ kwallet
+ kwayland
+ kwin
+ layer-shell-qt
+ libkscreen
+ libksysguard
+ libqalculate gmp mpfr
+ libsm
+ libxft
+ libxkbcommon
+ libxrender
+ libxtst
+ networkmanager-qt
+ phonon
+ pipewire-0.3
+ plasma-wayland-protocols
+ prison
+ qtbase-5
+ qtdeclarative
+ qtwayland
+ qtx11extras
+ wayland
+ wayland-protocols
+ xcb-util
+ xcb-util-image))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" (getcwd))
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (setenv "XDG_CACHE_HOME" (getcwd))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ ;; Disable failing tests for now.
+ (invoke "ctest"))
+ #t)))))
+ (home-page "https://kde.org/plasma-desktop/")
+ (synopsis "")
+ (description "")
+ (license (list license:bsd-3 license:gpl2+ license:gpl3 license:lgpl2.1+
+license:lgpl3))))
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 29a3722f1b..a3e1318e21 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -53,6 +53,7 @@ (define-module (gnu services desktop)
#:use-module (gnu packages admin)
#:use-module (gnu packages cups)
#:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages kde-plasma)
#:use-module (gnu packages gnome)
#:use-module (gnu packages xfce)
#:use-module (gnu packages avahi)
--
2.37.0
From 4f2b4b6b8e6967a923c2e4968d88633c22a04e21 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 11:38:50 +0100
Subject: [PATCH v3 83/86] gnu: Add maliit-keyboard.

* gnu/pacakges/kde-frameworks.scm (maliit-keyboard): New variable.

Toggle diff (78 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index ca608776c3..faa47c6783 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -53,6 +53,8 @@ (define-module (gnu packages kde-frameworks)
#:use-module (gnu packages databases)
#:use-module (gnu packages documentation)
#:use-module (gnu packages docbook)
+ #:use-module (gnu packages documentation)
+ #:use-module (gnu packages fcitx)
#:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
@@ -65,9 +67,11 @@ (define-module (gnu packages kde-frameworks)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages image)
+ #:use-module (gnu packages ibus)
#:use-module (gnu packages iso-codes)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages kde-plasma)
+ #:use-module (gnu packages language)
#:use-module (gnu packages libcanberra)
#:use-module (gnu packages libreoffice)
#:use-module (gnu packages linux)
@@ -1206,6 +1210,50 @@ (define-public maliit-framework
method framework.")
(license license:lgpl2.1)))
+(define-public maliit-keyboard
+ (package
+ (name "maliit-keyboard")
+ (version "2.3.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/maliit/keyboard")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0g89lckl4wzwamc89hs8871fbiyrsjwzk5b6ic4vhc4d1clyqzaw"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f
+ #:phases (modify-phases %standard-phases
+ (add-after 'install 'install-gschema
+ (lambda* (#:key source outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (schemas (string-append out
+ "/share/glib-2.0/schemas")))
+ ;; TODO: No GSettings schemas
+ (install-file (string-append source
+ "/data/schemas/org.maliit.keyboard.maliit.gschema.xml")
+ schemas)))))))
+ (native-inputs (list extra-cmake-modules gsettings-desktop-schemas pkg-config gettext-minimal
+ `(,glib "bin")))
+ (inputs (list hunspell
+ glib
+ libchewing
+ libpinyin
+ maliit-framework
+ presage
+ qtbase-5
+ qtdeclarative
+ qtmultimedia
+ qtquickcontrols2))
+ (home-page "https://github.com/maliit/keyboard")
+ (synopsis "Maliit Keyboard")
+ (description "This package provides virtual keyboard for Wayland and X11
+display servers. It supports many different languages and emoji.")
+ (license license:gpl3+)))
+
(define-public modemmanager-qt
(package
(name "modemmanager-qt")
--
2.37.0
From 2ceed8efc23e67464c33fac499e6c8b66e64c58e Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 12:21:56 +0100
Subject: [PATCH v3 84/86] gnu: Add plasma-mobile-sounds.

* gnu/packages/kde-plasma.scm (plasma-mobile-sounds): New variable.

Toggle diff (33 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index c073e3deba..a61d7e0dd6 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -702,6 +702,26 @@ (define-public plasma-phone-components
and customizable platform for mobile devices.")
(license (list license:gpl3+ license:lgpl2.1+))))
+(define-public plasma-mobile-sounds
+ (package
+ (name "plasma-mobile-sounds")
+ (version "0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/plasma-mobile-sounds/"
+ version "/plasma-mobile-sounds-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1br6kzicrr45vgg0ciqczxlcid21n5lfjm6zc06rw86ys7fx7bpi"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config))
+ (home-page "https://plasma-mobile.org/")
+ (synopsis "Sounds for Plasma Mobile devices")
+ (description "")
+ ;; TODO: Multiple
+ (license (list license:gpl3+ license:lgpl2.1+))))
+
(define-public plasma-workspace
(package
(name "plasma-workspace")
--
2.37.0
From a1f2781f9a23ef56cfb9ae80a8cd5b533f439c8a Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 12:24:36 +0100
Subject: [PATCH v3 79/86] gnu: modem-manager: Update to 1.18.6.

* gnu/packages/freedesktop.scm (modem-manager) Update to 1.18.6. Disable tests
due failing tests.

Toggle diff (30 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 9747a1da82..677ec52c04 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1527,7 +1527,7 @@ (define-public libqmi
(define-public modem-manager
(package
(name "modem-manager")
- (version "1.12.10")
+ (version "1.18.6")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1535,10 +1535,12 @@ (define-public modem-manager
"ModemManager-" version ".tar.xz"))
(sha256
(base32
- "1apq9camys2gaw6y6ic1ld20cncfwpmxnzvh4j5zkbbjpf5hbcxj"))))
+ "02j7d8a6vb4df41vbaz93sx0rh4m43376j8xbyf2617m3jrh9y6l"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags
+ ; multiple tests fail
+ '(#:tests? #f
+ #:configure-flags
`(,(string-append "--with-udev-base-dir=" %output "/lib/udev"))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums
--
2.37.0
From 1f70168cbe95522cb84b0ddee9ce70b89f7e9c6e Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Thu, 21 Jul 2022 10:24:50 +0200
Subject: [PATCH v3 28/86] gnu: labplot: Remove input labels.

* gnu/packages/kde-pim.scm (labplot): Remove input labels.

Toggle diff (27 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 3e4fbe8e0b..45da96a9c0 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -798,14 +798,12 @@ (define-public labplot
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; This test fails, I don't know why.
- (invoke "ctest" "-E" "parsertest"))
- #t)))))
- (native-inputs
- `(("bison" ,bison)
- ("extra-cmake-modules" ,extra-cmake-modules)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
- ("qttools" ,qttools)))
+ (invoke "ctest" "-E" "parsertest")))))))
+ (native-inputs (list bison
+ extra-cmake-modules
+ pkg-config
+ python-wrapper
+ qttools))
(inputs
(list breeze ;for dark themes
breeze-icons ;for icons
--
2.37.0
From 18dcd7e76c50c5d27a01be12a7b0d47dd0e99a25 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Thu, 3 Feb 2022 19:00:31 +1100
Subject: [PATCH v3 29/86] gnu: Remove libraw-0.18.

* gnu/packages/photo.scm (libraw-0.18): Delete unused old version.

Toggle diff (24 lines)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index eda9eadca2..d2c246b983 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -204,17 +204,6 @@ (define-public libraw
;; both two licensing modes for your changes/additions."
(license (list license:lgpl2.1 license:cddl1.0))))
-(define-public libraw-0.18
- (package (inherit libraw)
- (name "libraw")
- (version "0.18.12")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://www.libraw.org/data/LibRaw-"
- version ".tar.gz"))
- (sha256
- (base32
- "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap"))))))
(define-public libexif
(package
--
2.37.0
From 66e4f3eaf12546aca6a17754a16daa40fd1f5081 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Mon, 21 Feb 2022 21:03:44 +1100
Subject: [PATCH v3 51/86] !!DELETE gnu: Add wayland-protocols 1.26.

* gnu/packages/freedesktop.scm (wayland-protocols-next): New variable.

Toggle diff (28 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 4d06235771..925b1fb5f4 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1051,6 +1051,21 @@ (define-public wayland-protocols
. "https://wayland.freedesktop.org/releases.html")))
(license license:expat)))
+;;; This is just a temporary package that should be deleted
+(define-public wayland-protocols-next
+ (package
+ (inherit wayland-protocols)
+ (name "wayland-protocols")
+ (version "1.26")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://wayland.freedesktop.org/releases/"
+ "wayland-protocols-" version ".tar.xz"))
+ (sha256
+ (base32
+ "04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5"))))))
+
(define-public waylandpp
(package
(name "waylandpp")
--
2.37.0
From e0430e7c9b0643ef0ee8a3ee4942dde0b2c73010 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 12:20:11 +0200
Subject: [PATCH v3 42/86] gnu: kmplayer: Update home-page.

* gnu/packages/kde-multimedia.scm (kmplayer): Update home-page.

Toggle diff (15 lines)
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index d1d0121a82..3ac9c65d87 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -650,7 +650,7 @@ (define-public kmplayer
"-DCMAKE_CXX_FLAGS=-I"
#$(this-package-input "qtx11extras")
"/include/qt5"))))
- (home-page "https://kde.org/applications/multimedia/org.kde.kmplayer")
+ (home-page "https://apps.kde.org/kmplayer/")
(synopsis "Media player using mplayer/phonon as backend")
(description "Kmplayer can play all the audio/video supported by
mplayer/phonon from a local file or URL and be embedded in Konqueror and
--
2.37.0
From 0ec2929864ba5f97e035b047828a4b0adda2e31c Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 14:13:22 +0200
Subject: [PATCH v3 47/86] gnu: kajongg: Add bash-minimal to inputs.

* gnu/packages/kde-games.scm (kajongg): [inputs]: Add bash-minimal.

Toggle diff (24 lines)
diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm
index ae1273d28f..d9e00851cc 100644
--- a/gnu/packages/kde-games.scm
+++ b/gnu/packages/kde-games.scm
@@ -27,6 +27,7 @@ (define-module (gnu packages kde-games)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system qt)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages gl)
#:use-module ((gnu packages gnome) #:select (shared-mime-info))
@@ -314,7 +315,8 @@ (define-public kajongg
;("perl" ,perl)
kdoctools))
(inputs
- (list kconfig
+ (list bash-minimal
+ kconfig
kconfigwidgets
kcoreaddons
ki18n
--
2.37.0
From 601a684ae959247035d9ce4d8542e5d78bb99653 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 2 Aug 2022 06:56:24 +0200
Subject: [PATCH v3 58/86] gnu: KDE Internet: Update to 22.04.3.

* gnu/packages/kde-internet.scm (kget, konversation, kopete, krdc, ktorrent,
libktorrent): Update to 22.04.3.

(kconversation): [inputs]: Add qtmultimedia.

Toggle diff (116 lines)
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index ee6fdf10af..97c8c000b9 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -117,14 +117,14 @@ (define-public choqok
(define-public kget
(package
(name "kget")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kget-" version ".tar.xz"))
(sha256
- (base32 "1w249gvzz47ac7n1mnxxf20d9l7jmbh18m5dijy55ck61s4zcq4l"))))
+ (base32 "0rqznsyphnq0zi65wvrl9mwqm9268wgihkr104i87pp5kfiah5yp"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools pkg-config))
@@ -183,14 +183,14 @@ (define-public kget
(define-public konversation
(package
(name "konversation")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/konversation-" version ".tar.xz"))
(sha256
- (base32 "05dxzkpadz29b5fm6pf225xqq0gaz9w50paz9341kzz4k3rnzq80"))))
+ (base32 "08b4vnm66hbbnvkkh1p0a82pd2aj4zy5a8indfv3fzczsfpx6gp0"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -220,6 +220,7 @@ (define-public konversation
phonon
qtbase-5
qca
+ qtmultimedia
solid
sonnet))
(home-page "https://apps.kde.org/konversation/")
@@ -254,14 +255,14 @@ (define-public konversation
(define-public kopete
(package
(name "kopete")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kopete-" version ".tar.xz"))
(sha256
- (base32 "1v519sw2lzlap6xci3j55k8c48755sc9p3mgvj566b6jjq64xi5k"))))
+ (base32 "0fc9m2xgsjmsypqllqb3cp1y2m28dqh48r1qg2xgkfyqa70dnvp9"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools pkg-config))
@@ -331,14 +332,14 @@ (define-public kopete
(define-public krdc
(package
(name "krdc")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/krdc-" version ".tar.xz"))
(sha256
- (base32 "09np9clvmdll7v2p9aswnlhz4cgsnly82za7k3k9fs66h5c8q20j"))))
+ (base32 "0bs8q3na924lnmra5608jwnn0dqczvh0f72nn43673ib3m1mddlr"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -376,14 +377,14 @@ (define-public krdc
(define-public ktorrent
(package
(name "ktorrent")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/ktorrent-" version ".tar.xz"))
(sha256
- (base32 "021x6qcbk4kdh5ay5mqmf92129s42j2rhrs0q350b0wcnpad55zd"))))
+ (base32 "1h95hf4ki2xi2c9bzdg18p6d1757gzqknf6gn1ls6lwqy6p0pr4h"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -431,14 +432,14 @@ (define-public ktorrent
(define-public libktorrent
(package
(name "libktorrent")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/" name "-" version ".tar.xz"))
(sha256
- (base32 "0i976al9bsc3gbplqbxkxr03sdhxv3yzjlfkdaghga8fkihzkkl0"))))
+ (base32 "098ac7b5wa7v6svqv4rx1w44j18pr22qgr236fj94r2kpl2nq79q"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules))
--
2.37.0
From 26b39751c235928c5857bc586f04a01e84fb7515 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:40:42 +0200
Subject: [PATCH v3 11/86] gnu: kwindowsystem: Remove input labels.

* gnu/packages/kde-frameworks.scm (kwindowsystem): Remove input labels.

Toggle diff (23 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 4e71d6db23..6c57261231 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1127,11 +1127,11 @@ (define-public kwindowsystem
qttools
xorg-server-for-tests)) ; for the tests
(inputs
- `(("libxrender" ,libxrender)
- ("qtbase" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)
- ("xcb-utils-keysyms" ,xcb-util-keysyms)
- ("xcb-util-wm" ,xcb-util-wm)))
+ (list libxrender
+ qtbase-5
+ qtx11extras
+ xcb-util-keysyms
+ xcb-util-wm))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.37.0
From 99bc8dd4ece8965d979b671e0ae87818a04a266f Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 5 Mar 2022 11:46:47 +1100
Subject: [PATCH v3 71/86] ! gnu: Add libaccounts-qt.

* gnu/packages/qt.scm (libaccounts-qt): New variable.

Toggle diff (50 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a83d3f0d03..929677a020 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3249,3 +3249,43 @@ (define-public libaccounts-glib
handles the authentication process of an account and securely stores the
credentials and service-specific settings.")
(license license:lgpl2.1+)))
+
+(define-public libaccounts-qt
+ (package
+ (name "libaccounts-qt")
+ (version "1.16")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/accounts-sso/libaccounts-qt")
+ (commit (string-append "VERSION_" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1vmpjvysm0ld8dqnx8msa15hlhrkny02cqycsh4k2azrnijg0xjz"))))
+ (build-system gnu-build-system)
+ (native-inputs (list doxygen pkg-config qtbase-5 strace qttools))
+ (inputs (list glib
+ libaccounts-glib))
+ (arguments
+ (list
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;(delete 'configure)
+ (replace 'configure
+ (lambda _ (invoke "qmake")))
+ ;; (replace 'build
+ ;; (lambda _
+ ;; (with-directory-excursion "Accounts"
+ ;; (invoke "strace" "qmake" "-o" "Makefile" "Accounts.pro")
+ ;; (system "make" "-f" "Makefile"))
+ ;; ;; (invoke ;"strace"
+ ;; ;; "make")
+ ;; ))
+ )))
+ (home-page "https://accounts-sso.gitlab.io/")
+ (synopsis "Qt5 bindings for libaccounts-glib")
+ (description (package-description libaccounts-glib))
+ ; * SignOnQt5 (required version >= 8.55), D-Bus service which performs user authentication on behalf of its clients, <https://gitlab.com/accounts-sso/signond>
+ (license license:lgpl2.1+)))
--
2.37.0
From 14952d86be88e80e8d808b613eb83520f2cdf49b Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 16:45:56 +0200
Subject: [PATCH v3 66/86] gnu: appstream: Move itstool to native-inputs.

* gnu/packages/freedesktop.scm (appstream): Move itstool to native-inputs.

Toggle diff (20 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 4b81a1f5c0..6427a2b95e 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -175,11 +175,12 @@ (define-public appstream
gobject-introspection
gperf
gtk-doc/stable
+ itstool
pkg-config
python-wrapper
libxslt))
(inputs
- (list curl itstool libsoup-minimal-2 libstemmer libxmlb libxml2 libyaml lmdb))
+ (list curl libsoup-minimal-2 libstemmer libxmlb libxml2 libyaml lmdb))
(propagated-inputs
(list glib))
(synopsis "Tools and libraries to work with AppStream metadata")
--
2.37.0
From df8a468330e52a734b9f50ad8b47ff7b564f466b Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 5 Mar 2022 11:47:21 +1100
Subject: [PATCH v3 74/86] . service


Toggle diff (60 lines)
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index a3e1318e21..6f13b00347 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -157,6 +157,11 @@ (define-module (gnu services desktop)
polkit-wheel-service
+ plasma-desktop-configuration
+ plasma-desktop-configuration?
+ plasma-desktop-service
+ plasma-desktop-service-type
+
gnome-keyring-configuration
gnome-keyring-configuration?
gnome-keyring-service-type
@@ -1431,6 +1436,29 @@ (define-deprecated (xfce-desktop-service #:key (config
(service xfce-desktop-service-type config))
+
+
+;;;
+;;; KDE Plasma desktop service.
+;;;
+
+(define-record-type* <plasma-desktop-configuration> plasma-desktop-configuration
+ make-plasma-desktop-configuration
+ plasma-desktop-configuration?
+ (plasma plasma-package
+ (default plasma-workspace))) ;; do we need a union package?
+
+(define plasma-desktop-service-type
+ (service-type
+ (name 'plasma-desktop)
+ (extensions
+ (list ;; (service-extension polkit-service-type
+ ;; plasma-polkit-settings)
+ (service-extension profile-service-type
+ (compose list plasma-workspace))))
+ (default-value (plasma-desktop-configuration))
+ (description "Run Plasma desktop environment.")))
+
+
;;;
;;; Lxqt desktop service.
;;;
diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl
index 7055a8f92d..f343a7395a 100644
--- a/gnu/system/examples/desktop.tmpl
+++ b/gnu/system/examples/desktop.tmpl
@@ -76,6 +76,7 @@
;; NetworkManager, and more.
(services (if (target-x86-64?)
(append (list (service gnome-desktop-service-type)
+ (service plasma-desktop-service-type)
(service xfce-desktop-service-type)
(set-xorg-configuration
(xorg-configuration
--
2.37.0
From c6d24b87bd2658ef894a356877423a318346507d Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sun, 3 Oct 2021 13:42:31 +1100
Subject: [PATCH v3 63/86] gnu: Add kwayland-server.

* gnu/packages/kde-plasma.scm (kwayland-server): New variable.

Toggle diff (59 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index e190d6c50d..74147c7a50 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -336,3 +336,52 @@ (define-public libksysguard
manage running processes. It obtains this information by interacting
with a ksysguardd daemon, which may also run on a remote system.")
(license license:gpl3+)))
+
+(define-public kwayland-server
+ (package
+ (name "kwayland-server")
+ (version "5.24.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1279nqhy1qyz84dkn23rvzak8bg71hbrp09jlhv9mkjdb3bhnyfi"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules pkg-config))
+ (inputs
+ (list plasma-wayland-protocols
+ qtbase-5
+ qtwayland
+ kwayland
+ wayland
+ wayland-protocols-next))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-install-path
+ (lambda _
+ ;; Fixes errors including nonexistant /include/KF5
+ (substitute* "src/server/CMakeLists.txt"
+ (("KF5_INSTALL") "KDE_INSTALL"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" (getcwd))
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (invoke "ctest" "-E" ;; Test fails inconsistently.
+ "kwayland-testDragAndDrop"))
+ #t)))))
+ (home-page "https://api.kde.org/kwayland-server/html/index.html")
+ (synopsis "KDE wayland server component")
+ (description "KWayland is a Qt-style API to interact with the wayland-client and
+wayland-server API.")
+ (license (list license:lgpl2.1
+ license:lgpl2.1+
+ license:lgpl3
+ license:expat
+ license:bsd-3))))
--
2.37.0
From 680081b62415f628523e1095b9a5076b41347874 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sun, 6 Feb 2022 18:32:30 +1100
Subject: [PATCH v3 48/86] gnu: khelpcenter: Fix program.

* gnu/packages/kde-systemtools.scm (khelpcenter): Wrap XDG_DATA_DIRS to
point to khtml where it can find the html4.css file, otherwise
khelpcenter fails to launch.

Toggle diff (25 lines)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index 90260c2630..c9b29ec907 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -160,7 +160,17 @@ (define-public khelpcenter
qtbase-5
xapian))
(arguments
- `(#:tests? #f)) ;; 1/1 test fails
+ `(#:tests? #f ;; 1/1 test fails
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-executable
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ ;; Since qt-wrap selectors do not wrap for /share/kf5
+ ;; directories, we need this so khelpcenter can find html4.css.
+ (wrap-program (string-append out "/bin/khelpcenter")
+ `("XDG_DATA_DIRS" suffix
+ (,(string-append (assoc-ref inputs "khtml") "/share"))))))))))
(home-page "https://apps.kde.org/khelpcenter/")
(synopsis "KDE documentation viewer")
(description "KHelpCenter uses meta data files which describe the
--
2.37.0
From ab39084eb372540b7001d547e704b4ca683f2361 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 30 Jan 2022 10:56:07 +0100
Subject: [PATCH v3 76/86] gnu: Add plasma-phone-components.

* gnu/packages/kde-plasma.scm (plasma-phone-components): New variable.

Toggle diff (70 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 7fe55ecbf5..c5c3eb5955 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -43,6 +43,7 @@ (define-module (gnu packages kde-plasma)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages linux)
#:use-module (gnu packages maths)
+ #:use-module (gnu packages messaging)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages pkg-config)
@@ -583,6 +584,55 @@ (define-public kwin
license:lgpl2.1
license:lgpl3))))
+(define-public plasma-phone-components
+ (package
+ (name "plasma-phone-components")
+ (version "5.23.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/"
+ version "/plasma-phone-components-" version
+ ".tar.xz"))
+ (sha256
+ (base32
+ "0ml5pyi90nlmx5550sf3x9263f8mypj4jmdskzabzhnz44ck8vy9"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules pkg-config qttools))
+ (inputs (list qtbase-5
+ qtdeclarative
+ kactivities
+ kauth
+ kbookmarks
+ kwin
+ kcodecs
+ kcompletion
+ kconfig
+ kconfigwidgets
+ kcoreaddons
+ kdbusaddons
+ kdeclarative
+ ki18n
+ kio
+ kitemviews
+ kjobwidgets
+ knotifications
+ kpackage
+ kpeople
+ kservice
+ kwayland
+ kwidgetsaddons
+ kwindowsystem
+ kxmlgui
+ libphonenumber
+ modemmanager-qt
+ plasma-framework
+ solid))
+ (home-page "https://plasma-mobile.org/")
+ (synopsis "Modules providing phone functionality for Plasma")
+ (description "This package provides user-friendly, privacy-enabling
+and customizable platform for mobile devices.")
+ (license (list license:gpl3+ license:lgpl2.1+))))
+
(define-public plasma-workspace
(package
(name "plasma-workspace")
--
2.37.0
From 3774d0fa9860e15bed5594bf9cce7af488040a51 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Thu, 21 Jul 2022 10:22:52 +0200
Subject: [PATCH v3 27/86] gnu: KDE: Remove trailing booleans.

* gnu/packages/kde.scm (akregator, kdevelop)[arguments]: Remove trailing booleans.

Toggle diff (26 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 6ac614e422..3e4fbe8e0b 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -171,8 +171,7 @@ (define-public akregator
(assoc-ref inputs "qtwebengine")
"/lib/qt5/libexec/QtWebEngineProcess")))
(wrap-program bin
- `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
- #t))))))
+ `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))))))))
(native-inputs
(list extra-cmake-modules kdoctools))
(inputs
@@ -379,8 +378,7 @@ (define-public kdevelop
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "cmake/modules/FindClang.cmake"
(("^\\s*PATHS \"\\$\\{CLANG_LIBRARY_DIRS\\}\"" line)
- (string-append line " " (assoc-ref inputs "clang") "/lib")))
- #t)))))
+ (string-append line " " (assoc-ref inputs "clang") "/lib"))))))))
(home-page "https://kdevelop.org")
(synopsis "IDE for C, C++, Python, Javascript and PHP")
(description "The KDevelop IDE provides semantic syntax highlighting, as
--
2.37.0
From 41ac79aaf217444e481b866137851646329eac32 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 12:22:39 +0100
Subject: [PATCH v3 77/86] gnu: libmbim: Update to 1.26.4.

* gnu/packages/freedesktop.scm (libmbim): Update to 1.26.4.

Toggle diff (24 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index b69a078d35..1dd72700ff 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1467,7 +1467,7 @@ (define-public accountsservice
(define-public libmbim
(package
(name "libmbim")
- (version "1.20.2")
+ (version "1.26.4")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1475,7 +1475,7 @@ (define-public libmbim
"libmbim-" version ".tar.xz"))
(sha256
(base32
- "16q550sy84izi5ic3sbbhjnnka2fwhj8vvdrirpn9xspbsgbc3sm"))))
+ "1ncaarl4lgc7i52rwz50yq701wk2rr478cjybxbifsjqqk2cx27n"))))
(build-system gnu-build-system)
(native-inputs
(list `(,glib "bin") ; for glib-mkenums
--
2.37.0
From 4a81e053972481c54ea195b00aa0de396f27831a Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 25 Mar 2022 11:36:00 +0100
Subject: [PATCH v3 80/86] ! gnu: Add plasma-mobile.

* gnu/packages/kde-plasma.scm (plasma-mobile): New variable.

Toggle diff (61 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index c5c3eb5955..7ac323f501 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -30,6 +30,7 @@ (define-module (gnu packages kde-plasma)
#:use-module (guix build-system cmake)
#:use-module (guix build-system qt)
#:use-module (gnu packages admin)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
@@ -584,6 +585,46 @@ (define-public kwin
license:lgpl2.1
license:lgpl3))))
+(define-public plasma-mobile
+ (package
+ (name "plasma-mobile")
+ (version "5.24.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.kde.org/stable/plasma/"
+ version "/plasma-mobile-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1bwmy7xvd8wmh0snqqjh9jjgawib8ks2g30w48sqxwhplhf3da58"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-script
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (wrap-program (string-append #$output
+ "/bin/kwinwrapper")
+ `("PATH" ":" prefix
+ (,(string-append #$plasma-framework
+ "/bin")))))))))
+ (native-inputs (list extra-cmake-modules pkg-config qttools))
+ (inputs (list bash-minimal
+ kdeclarative
+ ki18n
+ kio
+ knotifications
+ kwayland
+ kwin
+ modemmanager-qt
+ networkmanager-qt
+ plasma-framework
+ qtbase-5))
+ (home-page "https://plasma-mobile.org/")
+ (synopsis
+ "General UI components for Plasma Phone including shell, containment and applets")
+ (description "This package provides user-friendly, privacy-enabling and
+customizable platform for mobile devices.")
+ (license (list license:gpl3+ license:lgpl2.1+))))
+
(define-public plasma-phone-components
(package
(name "plasma-phone-components")
--
2.37.0
M
M
Maxim Cournoyer wrote on 14 Aug 2022 05:01
(name . phodina)(address . phodina@protonmail.com)
87fshzbka1.fsf@gmail.com
Hi!

phodina <phodina@protonmail.com> writes:

Toggle quote (2 lines)
> Here's update to the latest released version of KDE. I submit all the patches as I rebased the updates.

Woow! That's an impressive stack, kudos!

Toggle quote (2 lines)
> @Maxim thanks for the work on updating the packages from Qt5 to Qt6.

You're welcome!

Toggle quote (2 lines)
> Do you know who would be the best reviewer for these patches?

Perhaps Hartmut Goebel? I think they had been involved in attempts of
packaging KDE in the past. I've added them in CC in case they'd like to
get involved, but no obligations, of course.

Thanks,

Maxim
P
P
phodina wrote on 14 Aug 2022 11:51
Re: [bug#50862] [PATCHESv4] KDE updates
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
8gfoSCA1cKmHB6yzch6NGGLotIQSzbzlDNZitvYOf3tuiFq021pw4XY389xBFasUh82vGaJcpd1VQnK_tjRXZ-V6eVKn01gPP5j2b5MTQvs=@protonmail.com
Hi Maxim,

here are new patches :-D as they reflect your changes in the master Qt5 -> Qt6.


Toggle quote (6 lines)
> > Here's update to the latest released version of KDE. I submit all the patches as I rebased the updates.
>
>
> Woow! That's an impressive stack, kudos!
>

Thanks. Big kudos to Brendan Tildesley as he started this enormous effort!

Toggle quote (12 lines)
> > @Maxim thanks for the work on updating the packages from Qt5 to Qt6.
>
>
> You're welcome!
>
> > Do you know who would be the best reviewer for these patches?
>
>
> Perhaps Hartmut Goebel? I think they had been involved in attempts of
> packaging KDE in the past. I've added them in CC in case they'd like to
> get involved, but no obligations, of course.

Thanks. To ease up the effort the patches submitted here are only the stable ones.

There is one commit 688434fb9ad79e82d5e85ce9b36e9b064628879c (!!DELETE gnu: Add wayland-protocols 1.26.) - result in massive rebuild and is important in other projects as well. So either add it or delete if it's already in master.

By stable patches I mean just updates of the packages and some linting.

There is problem when adding package `libaccounts-qt` as it does not build.

Tried to look into the issue and the pkg-config can see the `libaccount-glib` package but the inner qmake in Accounts does not for some reason.

No other distributions (Arch, Debian, Gentoo) do any modifications and Nixos does not package it.

So unfortunately this means no Plasma desktop yet :-(

I'll keep the rest of the patches in my github branch. [1]

There's open issue for this error but not sure the maintainers will help. [2]


----
Petr
From 537e3c943a5173611d336986a632dcc1f90a88b6 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Wed, 2 Feb 2022 13:54:26 +1100
Subject: [PATCH v4 13/73] gnu: phonon: Update home page.

* gnu/packages/kde-frameworks.scm (phonon): Update home page.

Toggle diff (15 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index c58d317292..b1931ceae4 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -206,7 +206,7 @@ (define-public phonon
(substitute* "cmake_install.cmake"
((regex all dest)
(string-append dest (assoc-ref outputs "out"))))))))))
- (home-page "https://phonon.kde.org")
+ (home-page "https://community.kde.org/Phonon")
(synopsis "KDE's multimedia library")
(description "KDE's multimedia library.")
(license license:lgpl2.1+)))
--
2.37.0
From 72b3cec6c830cbf83b8d4dcf885e0fc3ca78997a Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 14 Sep 2021 21:18:06 +1000
Subject: [PATCH v4 01/73] gnu: Add plasma-wayland-protocols.

* gnu/packages/kde-frameworks.scm (plasma-wayland-protocols): New variable.

Toggle diff (37 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 391db94f3a..23cd6555ac 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1036,6 +1036,30 @@ (define-public ksyntaxhighlighting
(properties `((upstream-name . "syntax-highlighting")))
(license license:lgpl2.1+)))
+(define-public plasma-wayland-protocols
+ (package
+ (name "plasma-wayland-protocols")
+ (version "1.6.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/" name "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "07zhf2dzacj4xlhackpzaxqnp0d1ldkqlx0f313pw1pgd74zlkxp"))))
+ (build-system cmake-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (arguments `(#:tests? #f)) ;; No tests
+ (home-page "https://community.kde.org/Frameworks")
+ (synopsis "KDE Plasma Wayland Protocols")
+ (description "Contains XML files describing non-standard wayland
+protocols used in KDE Plasma.")
+ (license (list license:bsd-3
+ license:lgpl2.1
+ license:lgpl2.1+
+ license:lgpl3
+ license:expat))))
+
(define-public kwayland
(package
(name "kwayland")
--
2.37.0
From c569b7de23f9704960def0b3feb15fd70b1d3601 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:43:43 +0200
Subject: [PATCH v4 12/73] gnu: ki18n: Remove input labels.

* gnu/packages/kde-frameworks.scm (ki18n): Remove input labels.

Toggle diff (16 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 9bbdf035ce..c58d317292 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -774,8 +774,7 @@ (define-public ki18n
"0xsp77iaxf72i0ri3pb6x5rrdz3cv8rxcaqcrynisvsmx7l35005"))))
(build-system cmake-build-system)
(propagated-inputs
- `(("gettext" ,gettext-minimal)
- ("python" ,python)))
+ (list gettext-minimal python))
(native-inputs
(list extra-cmake-modules))
(inputs
--
2.37.0
From 2e5caefbe0cbc67bdb2b5720ab2bb1604b0a1c4a Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Wed, 2 Feb 2022 13:55:44 +1100
Subject: [PATCH v4 15/73] gnu: kgraphviewer: Fix home page.

* gnu/packages/kde-frameworks.scm (kgraphviewer): Fix home page.

Toggle diff (15 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index c8e3b55a8a..8d0fc1ba9e 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -702,7 +702,7 @@ (define-public kgraphviewer
qtsvg-5))
(native-inputs
(list pkg-config extra-cmake-modules kdoctools))
- (home-page "https://apps.kde.org/en/kgraphviewer")
+ (home-page "https://apps.kde.org/kgraphviewer/")
(synopsis "Graphviz dot graph viewer for KDE")
(description "KGraphViewer is a Graphviz DOT graph file viewer, aimed to
replace the other outdated Graphviz tools.")
--
2.37.0
From 51cd59772eedff222d84d4b2ef6335a5e1118b1e Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:39:17 +0200
Subject: [PATCH v4 10/73] gnu: solid: Remove input labels.

* gnu/packages/kde-frameworks.scm (solid): Remove input labels.

Toggle diff (17 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index b7fc58d2ba..70c185a9ef 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1377,9 +1377,7 @@ (define-public solid
(native-inputs
(list bison dbus extra-cmake-modules flex qttools-5))
(inputs
- `(("qtbase" ,qtbase-5)
- ("qtdeclarative-5" ,qtdeclarative-5)
- ("udev" ,eudev)))
+ (list qtbase-5 qtdeclarative-5 eudev))
;; TODO: Add runtime-only dependency MediaPlayerInfo
(home-page "https://community.kde.org/Frameworks")
(synopsis "Desktop hardware abstraction")
--
2.37.0
From f4bd2085b3c05e9313f25b5984c196c71f8a4273 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 1 Feb 2022 18:14:24 +1100
Subject: [PATCH v4 02/73] gnu: libdbusmenu-qt: Move to (gnu packages qt).

* gnu/packages/lxqt.scm: Remove libdbusmenu-qt.
* gnu/packages/qt.scm: Re-add libdbusmenu-qt.

Toggle diff (99 lines)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index eab9a24d1d..d8fbd27cbf 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2019, 2020 Reza Alizadeh Majd <r.majd@pantherx.org>
;;; Copyright © 2020 Fakhri Sajadi <f.sajadi@pantherx.org>
;;; Copyright © 2020 André Batista <nandre@riseup.net>
-;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -68,36 +68,6 @@ (define-module (gnu packages lxqt)
;; Third party libraries
-(define-public libdbusmenu-qt
- (package
- (name "libdbusmenu-qt")
- (version "0.9.3+16.04.20160218-0ubuntu1")
- (source
- (origin
- (method git-fetch)
- ;; Download from github rather than launchpad because launchpad trunk
- ;; tarball hash is not deterministic.
- (uri (git-reference
- (url "https://github.com/unity8-team/libdbusmenu-qt")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0b7ii1cvmpcyl79gqal9c3va9m55h055s4hx7fpxkhhqs9463ggg"))))
- (build-system cmake-build-system)
- (arguments
- ;; XXX: Tests require a dbus session and some icons.
- '(#:tests? #f))
- (native-inputs
- (list doxygen))
- (inputs
- (list qtbase-5))
- (home-page "https://launchpad.net/libdbusmenu-qt")
- (synopsis "Qt implementation of the DBusMenu spec")
- (description "This library provides a Qt implementation of the DBusMenu
-protocol. The DBusMenu protocol makes it possible for applications to export
-and import their menus over DBus.")
- (license license:lgpl2.1+)))
-
(define-public libstatgrab
(package
(name "libstatgrab")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8814f7cfd8..5a126106bb 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -20,7 +20,7 @@
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com>
@@ -4060,3 +4060,33 @@ (define-public soqt
also compatible with SGI and TGS Open Inventor, and the API is based on the API
of the InventorXt GUI component toolkit.")
(license license:bsd-3))))
+
+(define-public libdbusmenu-qt
+ (package
+ (name "libdbusmenu-qt")
+ (version "0.9.3+16.04.20160218-0ubuntu1")
+ (source
+ (origin
+ (method git-fetch)
+ ;; Download from github rather than launchpad because launchpad trunk
+ ;; tarball hash is not deterministic.
+ (uri (git-reference
+ (url "https://github.com/unity8-team/libdbusmenu-qt")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0b7ii1cvmpcyl79gqal9c3va9m55h055s4hx7fpxkhhqs9463ggg"))))
+ (build-system cmake-build-system)
+ (arguments
+ ;; XXX: Tests require a dbus session and some icons.
+ '(#:tests? #f))
+ (native-inputs
+ (list doxygen))
+ (inputs
+ (list qtbase-5))
+ (home-page "https://launchpad.net/libdbusmenu-qt")
+ (synopsis "Qt implementation of the DBusMenu spec")
+ (description "This library provides a Qt implementation of the DBusMenu
+protocol. The DBusMenu protocol makes it possible for applications to export
+and import their menus over DBus.")
+ (license license:lgpl2.1+)))
--
2.37.0
From 9ba1ff1ed3bbf16e6a046637525019e381538ff3 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:14:35 +0200
Subject: [PATCH v4 06/73] gnu: kde-frameworkintegration: Remove input labels.

* gnu/packages/kde-frameworks.scm (kde-frameworkintegration): Remove input
labels.

Toggle diff (38 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 1dd5d6ad94..fb7b09835b 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3420,19 +3420,18 @@ (define-public kde-frameworkintegration
(native-inputs
(list extra-cmake-modules pkg-config))
;; TODO: Optional packages not yet in Guix: packagekitqt5, AppStreamQt
- (inputs
- `(("kconfig" ,kconfig)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("ki18n" ,ki18n)
- ("kiconthemes" ,kiconthemes)
- ("kitemviews" ,kitemviews)
- ("knewstuff" ,knewstuff)
- ("knotificantions" ,knotifications)
- ("kpackage" ,kpackage)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("qtbase" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)))
+ (inputs (list kconfig
+ kconfigwidgets
+ kcoreaddons
+ ki18n
+ kiconthemes
+ kitemviews
+ knewstuff
+ knotifications
+ kpackage
+ kwidgetsaddons
+ qtbase-5
+ qtx11extras))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.37.0
From ec6108eb92675c1dd8fe2bcce3c60d7671c49963 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 5 Mar 2022 11:46:10 +1100
Subject: [PATCH v4 69/73] gnu: kmessagelib: Remove qtwebkit as an input.

* gnu/packages/kde-pim.scm (kmessagelib): qtwebkit is unmaintained so it
should be removed where possible.

Toggle diff (14 lines)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 1ba7e4fc8b..fc3e7069f1 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -1273,7 +1273,6 @@ (define-public kmessagelib
qtdeclarative-5
qtwebchannel-5
qtwebengine-5
- qtwebkit
sonnet))
(arguments
`(#:tests? #f ;TODO many test fail for quite different reasons
--
2.37.0
From 137e01b7f014ffba41f32b07f3f2ee9a1e946a04 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Wed, 2 Feb 2022 13:55:13 +1100
Subject: [PATCH v4 14/73] gnu: phonon-backend-gstreamer: Update home page.

* gnu/packages/kde-frameworks.scm (phonon-backend-gstreamer): Update home page.

Toggle diff (15 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index b1931ceae4..c8e3b55a8a 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -238,7 +238,7 @@ (define-public phonon-backend-gstreamer
(arguments
`(#:configure-flags
'( "-DPHONON_BUILD_PHONON4QT5=ON")))
- (home-page "https://phonon.kde.org")
+ (home-page "https://community.kde.org/Phonon")
(synopsis "Phonon backend which uses GStreamer")
(description "Phonon makes use of backend libraries to provide sound.
Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
--
2.37.0
From 8888ecb03d50437337716f680378196d190763d3 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:18:27 +0200
Subject: [PATCH v4 07/73] gnu: plasma-framework: Remove input labels.

* gnu/packages/kde-frameworks.scm (plasma-framework): Remove input
labels.

Toggle diff (80 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index fb7b09835b..ce727d9ead 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3284,40 +3284,39 @@ (define-public plasma-framework
(list kpackage kservice))
(native-inputs
(list extra-cmake-modules kdoctools pkg-config))
- (inputs
- `(("kactivities" ,kactivities)
- ("karchive" ,karchive)
- ("kauth" ,kauth)
- ("kbookmarks" ,kbookmarks)
- ("kcodecs" ,kcodecs)
- ("kcompletion" ,kcompletion)
- ("kconfig" ,kconfig)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcoreaddons" ,kcoreaddons)
- ("kdbusaddons" ,kdbusaddons)
- ("kdeclarative" ,kdeclarative)
- ("kglobalaccel" ,kglobalaccel)
- ("kguiaddons" ,kguiaddons)
- ("kiconthemes" ,kiconthemes)
- ("kirigami" ,kirigami)
- ("kitemviews" ,kitemviews)
- ("kio" ,kio)
- ("ki18n" ,ki18n)
- ("kjobwidgets" ,kjobwidgets)
- ("knotifications" ,knotifications)
- ("kwayland" ,kwayland)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("kwindowsystem" ,kwindowsystem)
- ("kxmlgui" ,kxmlgui)
- ;; XXX: "undefined reference to `glGetString'" errors occur without libglvnd,
- ("libglvnd" ,libglvnd)
- ("phonon" ,phonon)
- ("qtbase" ,qtbase-5)
- ("qtdeclarative-5" ,qtdeclarative-5)
- ("qtquickcontrols2-5" ,qtquickcontrols2-5)
- ("qtsvg-5" ,qtsvg-5)
- ("qtx11extras" ,qtx11extras)
- ("solid" ,solid)))
+ (inputs (list kactivities
+ karchive
+ kauth
+ kbookmarks
+ kcodecs
+ kcompletion
+ kconfig
+ kconfigwidgets
+ kcoreaddons
+ kdbusaddons
+ kdeclarative
+ kglobalaccel
+ kguiaddons
+ kiconthemes
+ kirigami
+ kitemviews
+ kio
+ ki18n
+ kjobwidgets
+ knotifications
+ kwayland
+ kwidgetsaddons
+ kwindowsystem
+ kxmlgui
+ ;; XXX: "undefined reference to `glGetString'" errors occur without libglvnd,
+ libglvnd
+ phonon
+ qtbase-5
+ qtdeclarative-5
+ qtquickcontrols2-5
+ qtsvg-5
+ qtx11extras
+ solid))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.37.0
From 8b0ed5b14eb85318dafeca764f536df984601fd8 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:34:36 +0200
Subject: [PATCH v4 08/73] gnu: kio: Remove input labels.

* gnu/packages/kde-frameworks.scm (kio): Remove input labels.
[inputs]: Remove kdoctools.

Toggle diff (61 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index ce727d9ead..cdae329ee4 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2631,31 +2631,29 @@ (define-public kio
solid))
(native-inputs
(list extra-cmake-modules dbus kdoctools qttools-5))
- (inputs
- `(;; TODO: LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars>
- ("krb5" ,mit-krb5)
- ("karchive" ,karchive)
- ("kauth" ,kauth)
- ("kcodecs" ,kcodecs)
- ("kconfigwidgets" ,kconfigwidgets)
- ("kcrash" ,kcrash)
- ("kdbusaddons" ,kdbusaddons)
- ("kdoctools" ,kdoctools)
- ("kguiaddons" ,kguiaddons)
- ("kiconthemes" ,kiconthemes)
- ("ki18n" ,ki18n)
- ("knotifications" ,knotifications)
- ("ktextwidgets" ,ktextwidgets)
- ("kwallet" ,kwallet)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("libxml2" ,libxml2)
- ("libxslt" ,libxslt)
- ("qtbase" ,qtbase-5)
- ("qtscript" ,qtscript)
- ("qtx11extras" ,qtx11extras)
- ("sonnet" ,sonnet)
- ("util-linux:lib" ,util-linux "lib") ; libmount
- ("zlib" ,zlib)))
+ (inputs (list ;; TODO: LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars>
+ mit-krb5
+ karchive
+ kauth
+ kcodecs
+ kconfigwidgets
+ kcrash
+ kdbusaddons
+ kguiaddons
+ kiconthemes
+ ki18n
+ knotifications
+ ktextwidgets
+ kwallet
+ kwidgetsaddons
+ libxml2
+ libxslt
+ qtbase-5
+ qtscript
+ qtx11extras
+ sonnet
+ `(,util-linux "lib") ; libmount
+ zlib))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.37.0
From b4275d5cfaf41759403cf97d178b2d6c26b84c46 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Thu, 14 Oct 2021 18:11:57 +1100
Subject: [PATCH v4 16/73] gnu: Add layer-shell-qt.

* gnu/packages/kde-plasma.scm (layer-shell-qt): New variable.

Toggle diff (55 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index da6912affe..39716187fd 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +38,7 @@ (define-module (gnu packages kde-plasma)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages qt)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (gnu packages web))
@@ -157,6 +159,32 @@ (define-public ksshaskpass
call it if it is not associated to a terminal.")
(license license:gpl2+)))
+(define-public layer-shell-qt
+ (package
+ (name "layer-shell-qt")
+ (version "5.24.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/plasma/" version
+ "/layer-shell-qt-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1aq089pws39w9ncsiqzgg3qvfg5hc5a74pzra0smdpy5ipfsb6a4"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules pkg-config))
+ (inputs
+ (list libxkbcommon
+ qtbase-5
+ qtdeclarative-5
+ qtwayland
+ wayland
+ wayland-protocols))
+ (home-page "https://invent.kde.org/plasma/layer-shell-qt")
+ (synopsis "Qt component for the Wayland ql-layer-shell protocol")
+ (description "Qt component for the Wayland ql-layer-shell protocol.")
+ (license license:gpl2+)))
+
(define-public kscreenlocker
(package
(name "kscreenlocker")
--
2.37.0
From 23f0f4aab0a70fbe8f1eb2b2b2a706c99e615a97 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:40:42 +0200
Subject: [PATCH v4 11/73] gnu: kwindowsystem: Remove input labels.

* gnu/packages/kde-frameworks.scm (kwindowsystem): Remove input labels.

Toggle diff (23 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 70c185a9ef..9bbdf035ce 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1128,11 +1128,11 @@ (define-public kwindowsystem
qttools-5
xorg-server-for-tests)) ; for the tests
(inputs
- `(("libxrender" ,libxrender)
- ("qtbase" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)
- ("xcb-utils-keysyms" ,xcb-util-keysyms)
- ("xcb-util-wm" ,xcb-util-wm)))
+ (list libxrender
+ qtbase-5
+ qtx11extras
+ xcb-util-keysyms
+ xcb-util-wm))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.37.0
From 112719c861cc9022d9a712c2ff14030b742a0cad Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 25 Jul 2022 11:36:58 +0200
Subject: [PATCH v4 09/73] gnu: kfilemetadata: Remove input labels.

* gnu/packages/kde-frameworks.scm (kfilemetadata): Remove input labels.

Toggle diff (19 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index cdae329ee4..b7fc58d2ba 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1712,10 +1712,8 @@ (define-public kfilemetadata
;; FIXME: Test can't find audio/x-speex mimeinfo
;; (but it can find audio/x-speex+ogg).
(invoke "ctest" "-E"
- "(usermetadatawritertest|embeddedimagedatatest|taglibextractortest)")))))))
- (native-inputs
- `(("extra-cmake-modules" ,extra-cmake-modules)
- ("pkg-config" ,pkg-config)))
+ "(usermetadatawritertest|embeddedimagedatatest|taglibextractortest)")))))))
+ (native-inputs (list extra-cmake-modules pkg-config))
(inputs
(list attr
;; TODO: EPub http://sourceforge.net/projects/ebook-tools
--
2.37.0
From 15dcc3c22f6e880c2465da61ae884473a5c19ef8 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 1 Feb 2022 18:22:59 +1100
Subject: [PATCH v4 03/73] gnu: kdav: Move to (gnu packages kde-frameworks).

* gnu/packages/kde-pim.scm
* gnu/packages/kde-frameworks.scm
(kdav): Move to (gnu packages kde-frameworks). It's considered a
framework component now.

Toggle diff (77 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 23cd6555ac..03ba9e0fd7 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021 Alexandros Theodotou <alex@zrythm.org>
+;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3808,3 +3809,27 @@ (define-public kross
;; under a variety of licenses.
(license (list license:lgpl2.0+ license:lgpl2.1+
license:lgpl2.0 license:gpl3+))))
+
+(define-public kdav
+ (package
+ (name "kdav")
+ (version "20.04.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/kdav-" version ".tar.xz"))
+ (sha256
+ (base32 "0445gl4xm0h39igkxgb6vmq5iaa04wkgrgbs7nfd0zwngk8xaidn"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules))
+ (inputs
+ (list kcoreaddons ki18n kio qtbase-5 qtxmlpatterns))
+ (home-page "https://invent.kde.org/frameworks/kdav")
+ (synopsis "DAV protocol implementation with KJobs")
+ (description "This is a DAV protocol implementation with KJobs. Calendars
+and todos are supported, using either GroupDAV or CalDAV, and contacts are
+supported using GroupDAV or CardDAV.")
+ (license ;; GPL for programs, LGPL for libraries
+ (list license:gpl2+ license:lgpl2.0+))))
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index f5b0c008ce..d895a74fd2 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -606,30 +606,6 @@ (define-public kcalutils
functions for accessing calendar data using the kcalcore API.")
(license license:lgpl2.0+)))
-(define-public kdav
- (package
- (name "kdav")
- (version "20.04.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/kdav-" version ".tar.xz"))
- (sha256
- (base32 "0445gl4xm0h39igkxgb6vmq5iaa04wkgrgbs7nfd0zwngk8xaidn"))))
- (build-system qt-build-system)
- (native-inputs
- (list extra-cmake-modules))
- (inputs
- (list kcoreaddons ki18n kio qtbase-5 qtxmlpatterns))
- (home-page "https://invent.kde.org/frameworks/kdav")
- (synopsis "DAV protocol implementation with KJobs")
- (description "This is a DAV protocol implementation with KJobs. Calendars
-and todos are supported, using either GroupDAV or CalDAV, and contacts are
-supported using GroupDAV or CardDAV.")
- (license ;; GPL for programs, LGPL for libraries
- (list license:gpl2+ license:lgpl2.0+))))
-
(define-public kdepim-apps-libs
(package
(name "kdepim-apps-libs")
--
2.37.0
From 9c8320512183838e832dfdc7d2297d061d2d334e Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 12 Aug 2022 19:45:54 +0200
Subject: [PATCH v4 54/73] gnu: kcontacts: Disable failing test.


Toggle diff (15 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 13a7bfb4b8..eb34de9bff 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1592,7 +1592,7 @@ (define-public kcontacts
;;Expected (result) :
;;"Jim Knopf\nLummerlandstr. 1\n12345 Lummerstadt\n\nGERMANIA"
(invoke "ctest" "-E"
- "(kcontacts-addresstest|kcontacts-emailtest|kcontacts-phonenumbertest|kcontacts-secrecytest|kcontacts-geotest|kcontacts-keytest|kcontacts-testroundtrip|kcontacts-impptest|kcontacts-birthdaytest|kcontacts-addresseetest)")))))))
+ "(kcontacts-addresstest|kcontacts-emailtest|kcontacts-phonenumbertest|kcontacts-soundtest|kcontacts-secrecytest|kcontacts-geotest|kcontacts-keytest|kcontacts-testroundtrip|kcontacts-impptest|kcontacts-birthdaytest|kcontacts-addresseetest)")))))))
(home-page "https://community.kde.org/Frameworks")
(synopsis "API for contacts/address book data following the vCard standard")
(description "This library provides a vCard data model, vCard
--
2.37.0
From e71b1e0a7b074c93c1255a9fbd2288a5ffbafe3d Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 14 Aug 2022 01:56:33 +0200
Subject: [PATCH v4 70/73] gnu: Add kirigami-addons.

* gnu/packages/kde-frameworks.scm (kirigami-addons): New variable.

Toggle diff (38 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index eb34de9bff..41c4347d60 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -858,6 +858,31 @@ (define-public kirigami
of applications that follow the Kirigami Human Interface Guidelines.")
(license license:lgpl2.1+)))
+(define-public kirigami-addons
+ (package
+ (name "kirigami-addons")
+ (version "0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://invent.kde.org/libraries/kirigami-addons/-/archive/v" version
+ "/kirigami-addons-v" version ".tar.gz"))
+ (sha256
+ (base32
+ "1zr8dpc7bzw6g3y0jaxsr2lqlxqwlcphchpk8iah6g1f3n9fq73r"))))
+ (build-system qt-build-system)
+ (arguments
+ (list #:tests? #f)) ;; TODO: failing test
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list kirigami ki18n qtdeclarative-5 qtquickcontrols2-5))
+ (home-page "https://invent.kde.org/libraries/kirigami-addons")
+ (synopsis "Add-ons for the Kirigami framework")
+ (description "This package provides Kirigami components usable by both touch
+and desktop experiences.")
+ (license (list license:expat license:gpl2+ license:gpl3 license:lgpl2.1+
+ license:lgpl3))))
+
(define-public kitemmodels
(package
(name "kitemmodels")
--
2.37.0
From 44b95da04c7f30c69acea07a6e8e93ed75bfc177 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 11:11:57 +0200
Subject: [PATCH v4 33/73] gnu: ark: Add bash-minimal to inputs.

* gnu/packages/kde-utils.scm (ark): [inputs]: Add bash-minimal.

Toggle diff (32 lines)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index cc0f2b8bfd..bd1af5c417 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -26,6 +27,7 @@ (define-module (gnu packages kde-utils)
#:use-module (guix packages)
#:use-module (gnu packages)
#:use-module (gnu packages backup)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages gnome)
@@ -80,7 +82,8 @@ (define-public ark
(native-inputs
(list extra-cmake-modules pkg-config kdoctools xorg-server))
(inputs
- (list breeze-icons
+ (list bash-minimal
+ breeze-icons
karchive
kconfig
kcrash
--
2.37.0
From 316e7328199ba46c07c09d042ccb2b5b0dbfdec7 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 28 Sep 2021 15:25:49 +1000
Subject: [PATCH v4 50/73] gnu: Add kdsoap.

* gnu/packages/qt.scm (kdsoap): New variable.

Toggle diff (41 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5a126106bb..29e25fec78 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4090,3 +4090,34 @@ (define-public libdbusmenu-qt
protocol. The DBusMenu protocol makes it possible for applications to export
and import their menus over DBus.")
(license license:lgpl2.1+)))
+
+(define-public kdsoap
+ (package
+ (name "kdsoap")
+ (version "2.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/KDAB/KDSoap/releases/download/"
+ "kdsoap-" version "/kdsoap-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1vh4rzb09kks1ilay1y60q7gf64gwzdwsca60hmx1xx69w8672fi"))))
+ (build-system qt-build-system)
+ (inputs `(("qtbase" ,qtbase-5)))
+ (arguments
+ '(#:configure-flags '("-DKDSoap_TESTS=true")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "ctest" "-E" ;; These tests try connect to the internet.
+ "(kdsoap-webcalls|kdsoap-webcalls_wsdl|kdsoap-test_calc)"))
+ #t)))))
+ (home-page "https://www.kdab.com/development-resources/qt-tools/kd-soap/")
+ (synopsis "Qt SOAP component")
+ (description "KD SOAP is a tool for creating client applications for web
+services using the XML based SOAP protocol and without the need for a dedicated
+web server.")
+ (license (list license:gpl2 license:gpl3))))
--
2.37.0
From 2703810714249d3dbd00926a7ffac834c0774a13 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 1 Aug 2022 14:40:25 +0200
Subject: [PATCH v4 55/73] gnu: grantleetheme: Update to 22.04.3.

* gnu/packages/kde.scm (grantleetheme): Update to 22.04.3.

Toggle diff (23 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 09c8412dd9..b4ab2ce20d 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -123,14 +123,14 @@ (define-public baloo-widgets
(define-public grantleetheme
(package
(name "grantleetheme")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/grantleetheme-" version ".tar.xz"))
(sha256
- (base32 "1w83slbkj2y1wk78srq2k95ybs66sb4mbaa0zm7fl9pkwhqxbnb7"))))
+ (base32 "10c6s1g3vp5sdhpiciz1j6rsryld7hcc6lvmxdlsvms2bbcmnj7l"))))
(build-system qt-build-system)
(arguments `(#:tests? #f)) ; unexpected error in the test suite.
(native-inputs
--
2.37.0
From b11c2921d7e94ab975d072e46eb9d5cffc41c562 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 1 Aug 2022 14:36:53 +0200
Subject: [PATCH v4 57/73] gnu: Remove kalarmcal.

* gnu/packages/kde-pim.scm: Remove kalarmcal.

Toggle diff (54 lines)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 5d62ee1fc0..1ba7e4fc8b 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -462,47 +462,6 @@ (define-public kaddressbook
CalDAV server.")
(license (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
-(define-public kalarmcal
- (package
- (name "kalarmcal")
- (version "21.12.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/kalarmcal-" version ".tar.xz"))
- (sha256
- (base32 "160pmr702b68hys9l02azvrv6pagy1r2whw0zp3jlf6863p9fkqr"))))
- (build-system qt-build-system)
- (native-inputs
- (list extra-cmake-modules))
- (inputs
- (list akonadi
- boost
- kcalendarcore
- kcalutils
- kcompletion
- kconfig
- kconfigwidgets
- kcoreaddons
- kdbusaddons
- kholidays
- ki18n
- kidentitymanagement
- kio
- kitemmodels
- kpimtextedit
- ktextwidgets
- kxmlgui
- qtbase-5))
- (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 access to and handling of kalarm
-calendar data.")
- (license license:lgpl2.0+)))
-
(define-public kblog
(package
(name "kblog")
--
2.37.0
From 4c72aa8a47b4f899ec60fb01d99da7d054449c98 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 8 Feb 2022 17:36:22 +1100
Subject: [PATCH v4 68/73] gnu: appstream-qt: Add package variant.

* gnu/packages/freedesktop.scm (appstream-qt): Add a build of appstream
with Qt support.

Toggle diff (27 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 81e0abd473..dceca066d7 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -198,6 +198,20 @@ (define-public appstream
;; there are also some (irrelevant) wtfpl2 examples
(license (list license:gpl2+ license:lgpl2.1+))))
+(define-public appstream-qt
+ (package/inherit appstream
+ (name "appstream-qt")
+ (native-inputs
+ (cons (list "qttools" qttools)
+ (package-native-inputs appstream)))
+ (inputs
+ (cons (list "qtbase" qtbase-5)
+ (package-inputs appstream)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments appstream)
+ ((#:configure-flags flags)
+ '(list "-Dqt=true"))))))
+
(define-public farstream
(package
(name "farstream")
--
2.37.0
From ee5af0a5557106e0f601c9d9355e96383201e9c7 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 14 Aug 2022 01:57:34 +0200
Subject: [PATCH v4 71/73] gnu: Add kpublictransport.

* gnu/packages/kde-utils.scm (kpublictransport): New variable.

Toggle diff (44 lines)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index b2295d184a..7cb9f08d01 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -374,6 +374,37 @@ (define-public krusader
great on your desktop.")
(license license:gpl2+)))
+(define-public kpublictransport
+ (package
+ (name "kpublictransport")
+ (version "22.04.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://download.kde.org/stable/release-service/" version
+ "/src/kpublictransport-" version ".tar.xz"))
+ (sha256
+ (base32
+ "05s8mpqn74vz1daim3qdyfg8n7b7n8f18hzcybiim4zxcy2k71rz"))))
+ (build-system qt-build-system)
+ (arguments
+ (list #:phases
+ '(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "ctest" "-E"
+ "(mergeutiltest|departuretest|journeytest|networkconfigtest|
+ locationhistorymodeltest|navitiaparsertest|otpparsertest|ivvassparsertest|cachetest|locationhistorymodeltest)")))))))
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list zlib qtdeclarative-5))
+ (home-page "https://api.kde.org/kdepim/kpublictransport/html/index.html")
+ (synopsis "Library for accessing realtime public transport data")
+ (description "This pakckage provides library for accessing realtime public
+transport data and for performing public transport journey queries.")
+ (license (list license:expat license:bsd-3 license:gpl2+))))
+
(define-public kxstitch
(package
(name "kxstitch")
--
2.37.0
From 22cf6dd1bb1b2cbc70a290d0bce96106effcc5e5 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 14:13:22 +0200
Subject: [PATCH v4 47/73] gnu: kajongg: Add bash-minimal to inputs.

* gnu/packages/kde-games.scm (kajongg): [inputs]: Add bash-minimal.

Toggle diff (24 lines)
diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm
index a423df3b06..7e24aad470 100644
--- a/gnu/packages/kde-games.scm
+++ b/gnu/packages/kde-games.scm
@@ -27,6 +27,7 @@ (define-module (gnu packages kde-games)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system qt)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages gl)
#:use-module ((gnu packages gnome) #:select (shared-mime-info))
@@ -314,7 +315,8 @@ (define-public kajongg
;("perl" ,perl)
kdoctools))
(inputs
- (list kconfig
+ (list bash-minimal
+ kconfig
kconfigwidgets
kcoreaddons
ki18n
--
2.37.0
From beb1cf215f8b7e87500315df0e865bdd3297ab2b Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 9 Aug 2022 23:50:05 +0200
Subject: [PATCH v4 73/73] gnu: Add ktrip.

* gnu/packages/kde-utils.scm (ktrip): New variable.

Toggle diff (80 lines)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 7cb9f08d01..7d3f5f236b 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -32,6 +32,7 @@ (define-module (gnu packages kde-utils)
#:use-module (gnu packages compression)
#:use-module (gnu packages gnome)
#:use-module (gnu packages imagemagick)
+ #:use-module (gnu packages license) ; ktrip
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks)
@@ -250,7 +251,7 @@ (define-public kmousetool
(define-public kmouth
(package
- (name "kmouth")
+ (name "klmouth")
(version "22.04.3")
(source
(origin
@@ -382,8 +383,8 @@ (define-public kpublictransport
(origin
(method url-fetch)
(uri (string-append
- "https://download.kde.org/stable/release-service/" version
- "/src/kpublictransport-" version ".tar.xz"))
+ "https://download.kde.org/stable/release-service/" version
+ "/src/kpublictransport-" version ".tar.xz"))
(sha256
(base32
"05s8mpqn74vz1daim3qdyfg8n7b7n8f18hzcybiim4zxcy2k71rz"))))
@@ -395,9 +396,9 @@ (define-public kpublictransport
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "ctest" "-E"
- "(mergeutiltest|departuretest|journeytest|networkconfigtest|
- locationhistorymodeltest|navitiaparsertest|otpparsertest|ivvassparsertest|cachetest|locationhistorymodeltest)")))))))
- (native-inputs (list extra-cmake-modules))
+ "(mergeutiltest|departuretest|journeytest|networkconfigtest|
+ locationhistorymodeltest|navitiaparsertest|otpparsertest|ivvassparsertest|cachetest|locationhistorymodeltest)")))))))
+ (native-inputs (list extra-cmake-modules))
(inputs (list zlib qtdeclarative-5))
(home-page "https://api.kde.org/kdepim/kpublictransport/html/index.html")
(synopsis "Library for accessing realtime public transport data")
@@ -405,6 +406,32 @@ (define-public kpublictransport
transport data and for performing public transport journey queries.")
(license (list license:expat license:bsd-3 license:gpl2+))))
+(define-public ktrip
+ (package
+ (name "ktrip")
+ (version "22.04")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://invent.kde.org/utilities/ktrip/-/archive/v" version "/ktrip-v"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1vhllccrbvpman31pr13bxv75ry6zswnfxf0ln0ybxssp29l9xyh"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules reuse))
+ (inputs (list kcoreaddons ki18n kirigami kirigami-addons kitemmodels kconfig
+ kpublictransport qtbase-5 qtdeclarative-5 qtgraphicaleffects
+ qtquickcontrols2-5 kqqc2-desktop-style zlib))
+ (home-page "https://apps.kde.org/ktrip/")
+ (synopsis "Helps you navigate in public transport")
+ (description "This package allows you to find journeys between specified
+locations, departures for a specific station and shows real-time delay and
+disruption information.")
+ (license (list license:bsd-2 license:bsd-3 license:gpl2 license:gpl3
+ license:lgpl2.0))))
+
(define-public kxstitch
(package
(name "kxstitch")
--
2.37.0
From 44ceb9d74a9317f22065985d889d6aeb8dc753cc Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Thu, 21 Jul 2022 10:22:52 +0200
Subject: [PATCH v4 27/73] gnu: KDE: Remove trailing booleans.

* gnu/packages/kde.scm (akregator, kdevelop)[arguments]: Remove trailing booleans.

Toggle diff (26 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 680544107e..e5a35e8ccc 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -171,8 +171,7 @@ (define-public akregator
(assoc-ref inputs "qtwebengine-5")
"/lib/qt5/libexec/QtWebEngineProcess")))
(wrap-program bin
- `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
- #t))))))
+ `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))))))))
(native-inputs
(list extra-cmake-modules kdoctools))
(inputs
@@ -378,8 +377,7 @@ (define-public kdevelop
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "cmake/modules/FindClang.cmake"
(("^\\s*PATHS \"\\$\\{CLANG_LIBRARY_DIRS\\}\"" line)
- (string-append line " " (assoc-ref inputs "clang") "/lib")))
- #t)))))
+ (string-append line " " (assoc-ref inputs "clang") "/lib"))))))))
(home-page "https://kdevelop.org")
(synopsis "IDE for C, C++, Python, Javascript and PHP")
(description "The KDevelop IDE provides semantic syntax highlighting, as
--
2.37.0
From 9198c04022e1db080bc87079dba559a3c4383e43 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sun, 6 Feb 2022 16:25:08 +1100
Subject: [PATCH v4 43/73] gnu: ktouch: Update to 21.12.2.

* gnu/packages/education.scm (ktouch): Update to 21.12.2.

Toggle diff (23 lines)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index c5666fb02e..fa6da30f23 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -643,14 +643,14 @@ (define-public klavaro
(define-public ktouch
(package
(name "ktouch")
- (version "20.12.1")
+ (version "21.12.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/ktouch-" version ".tar.xz"))
(sha256
- (base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib"))))
+ (base32 "1rq2n8395sb17rqd295axv2pbwzhqs8ikjqx5ryn4lv1713alabl"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools pkg-config))
--
2.37.0
From c82f76806b60f6dd8f66365254fd13d817ed0bca Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 14 Aug 2022 01:58:15 +0200
Subject: [PATCH v4 72/73] gnu: Add kqqc2-desktop-style.

* gnu/packages/kde-frameworks.scm (kqqc2-desktop-style): New variable.

Toggle diff (35 lines)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 41c4347d60..da4c706206 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -883,6 +883,28 @@ (define-public kirigami-addons
(license (list license:expat license:gpl2+ license:gpl3 license:lgpl2.1+
license:lgpl3))))
+(define-public kqqc2-desktop-style
+ (package
+ (name "kqqc2-desktop-style")
+ (version "5.90.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://invent.kde.org/frameworks/qqc2-desktop-style/-/archive/v" version "/qqc2-desktop-style-v"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1m19bv1cz54w2vfh39pj3sn18dg5ffkm6gmn1iqq6zx6xzp51zjq"))))
+ (build-system qt-build-system)
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list kconfig kirigami qtdeclarative-5 qtquickcontrols2-5))
+ (home-page "https://invent.kde.org/frameworks/qqc2-desktop-style")
+ (synopsis "Qt Quick Controls 2: Desktop Style")
+ (description "This package provides QtQuickControls 2 style that uses
+QWidget's QStyle for painting.")
+ (license (list license:gpl2 license:gpl3 license:lgpl2.0 license:lgpl3))))
+
(define-public kitemmodels
(package
(name "kitemmodels")
--
2.37.0
From 1a67d6443271bfa2b5dff65addf059c666d13a21 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 12:20:11 +0200
Subject: [PATCH v4 42/73] gnu: kmplayer: Update home-page.

* gnu/packages/kde-multimedia.scm (kmplayer): Update home-page.

Toggle diff (15 lines)
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 34d30ca440..24435d875f 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -650,7 +650,7 @@ (define-public kmplayer
"-DCMAKE_CXX_FLAGS=-I"
#$(this-package-input "qtx11extras")
"/include/qt5"))))
- (home-page "https://kde.org/applications/multimedia/org.kde.kmplayer")
+ (home-page "https://apps.kde.org/kmplayer/")
(synopsis "Media player using mplayer/phonon as backend")
(description "Kmplayer can play all the audio/video supported by
mplayer/phonon from a local file or URL and be embedded in Konqueror and
--
2.37.0
From 1a43585913108c0ff425d38637161c71c6f3ebb1 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sun, 3 Oct 2021 13:42:31 +1100
Subject: [PATCH v4 64/73] gnu: Add kwayland-server.

* gnu/packages/kde-plasma.scm (kwayland-server): New variable.

Toggle diff (59 lines)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index bff03dab50..99e098fcfb 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -336,3 +336,52 @@ (define-public libksysguard
manage running processes. It obtains this information by interacting
with a ksysguardd daemon, which may also run on a remote system.")
(license license:gpl3+)))
+
+(define-public kwayland-server
+ (package
+ (name "kwayland-server")
+ (version "5.24.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1279nqhy1qyz84dkn23rvzak8bg71hbrp09jlhv9mkjdb3bhnyfi"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules pkg-config))
+ (inputs
+ (list plasma-wayland-protocols
+ qtbase-5
+ qtwayland
+ kwayland
+ wayland
+ wayland-protocols-next))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-install-path
+ (lambda _
+ ;; Fixes errors including nonexistant /include/KF5
+ (substitute* "src/server/CMakeLists.txt"
+ (("KF5_INSTALL") "KDE_INSTALL"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" (getcwd))
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (invoke "ctest" "-E" ;; Test fails inconsistently.
+ "kwayland-testDragAndDrop"))
+ #t)))))
+ (home-page "https://api.kde.org/kwayland-server/html/index.html")
+ (synopsis "KDE wayland server component")
+ (description "KWayland is a Qt-style API to interact with the wayland-client and
+wayland-server API.")
+ (license (list license:lgpl2.1
+ license:lgpl2.1+
+ license:lgpl3
+ license:expat
+ license:bsd-3))))
--
2.37.0
From fcc41be4648daf9ed7dea3c4eef3042d4e29cd02 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 11:16:10 +0200
Subject: [PATCH v4 35/73] gnu: KDE Utils: Remove trailing booleans.

* gnu/packages/kde-utils.scm (kate, okteta): [arguments]: Remove trailing booleans.

Toggle diff (26 lines)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 1a50a96b7c..01471236a5 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -159,8 +159,7 @@ (define-public kate
(lambda _
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache")
- #t)))))
+ (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache"))))))
(home-page "https://kate-editor.org/")
(synopsis "Multi-document, multi-view text editor")
(description "Kate is a powerful text editor that can open multiple files
@@ -440,8 +439,7 @@ (define-public okteta
(lambda _
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")
- (setenv "HOME" "/tmp/dummy-home")
- #t)))))
+ (setenv "HOME" "/tmp/dummy-home"))))))
(home-page "https://apps.kde.org/okteta/")
(synopsis "Hexadecimal editor for binary files")
(description "Okteta is a simple editor for the raw data of files. This
--
2.37.0
From 593dd2df50a90a43e018e8dd43c429c9f729b0ec Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 16:45:56 +0200
Subject: [PATCH v4 67/73] gnu: appstream: Move itstool to native-inputs.

* gnu/packages/freedesktop.scm (appstream): Move itstool to native-inputs.

Toggle diff (20 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 684ddc14ec..81e0abd473 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -176,11 +176,12 @@ (define-public appstream
gobject-introspection
gperf
gtk-doc/stable
+ itstool
pkg-config
python-wrapper
libxslt))
(inputs
- (list curl itstool libsoup-minimal-2 libstemmer libxmlb libxml2 libyaml lmdb))
+ (list curl libsoup-minimal-2 libstemmer libxmlb libxml2 libyaml lmdb))
(propagated-inputs
(list glib))
(synopsis "Tools and libraries to work with AppStream metadata")
--
2.37.0
From 688434fb9ad79e82d5e85ce9b36e9b064628879c Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Mon, 21 Feb 2022 21:03:44 +1100
Subject: [PATCH v4 51/73] !!DELETE gnu: Add wayland-protocols 1.26.

* gnu/packages/freedesktop.scm (wayland-protocols-next): New variable.

Toggle diff (28 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 037a247243..901b02f986 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1087,6 +1087,21 @@ (define-public wayland-protocols
. "https://wayland.freedesktop.org/releases.html")))
(license license:expat)))
+;;; This is just a temporary package that should be deleted
+(define-public wayland-protocols-next
+ (package
+ (inherit wayland-protocols)
+ (name "wayland-protocols")
+ (version "1.26")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://wayland.freedesktop.org/releases/"
+ "wayland-protocols-" version ".tar.xz"))
+ (sha256
+ (base32
+ "04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5"))))))
+
(define-public waylandpp
(package
(name "waylandpp")
--
2.37.0
From ae2b52692b6a4a22ddea42629c311dfcb0d79eee Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 11:33:21 +0200
Subject: [PATCH v4 37/73] gnu: KDE Systemtools: Update home-page links.

* gnu/packages/kde-systemtools.scm (dolphin, khelpcenter, krfb, ksystemlog,
yakuake): Update home-page.

Toggle diff (59 lines)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index 3a6e911d9b..b79f72a4ed 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -79,7 +80,7 @@ (define-public dolphin
solid))
(arguments
`(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen
- (home-page "https://kde.org/applications/system/org.kde.dolphin")
+ (home-page "https://apps.kde.org/dolphin/")
(synopsis "File manager for KDE")
(description "Dolphin is a file manager for KDE focusing on usability.
The main features of Dolphin are:
@@ -160,7 +161,7 @@ (define-public khelpcenter
xapian))
(arguments
`(#:tests? #f)) ;; 1/1 test fails
- (home-page "https://kde.org/applications/system/org.kde.Help")
+ (home-page "https://apps.kde.org/khelpcenter/")
(synopsis "KDE documentation viewer")
(description "KHelpCenter uses meta data files which describe the
documentation available in the system. Each document is represented by a meta
@@ -267,7 +268,7 @@ (define-public krfb
wayland
xcb-util-image
zlib))
- (home-page "https://kde.org/applications/internet/org.kde.krfb")
+ (home-page "https://apps.kde.org/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
@@ -310,7 +311,7 @@ (define-public ksystemlog
kxmlgui
oxygen-icons ;; default icon set
qtbase-5))
- (home-page "https://kde.org/applications/system/org.kde.ksystemlog")
+ (home-page "https://apps.kde.org/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
@@ -356,7 +357,7 @@ (define-public yakuake
qtbase-5
qtsvg-5
qtx11extras))
- (home-page "https://www.kde.org/applications/system/yakuake/")
+ (home-page "https://apps.kde.org/yakuake/")
(synopsis "Quad-style terminal emulator for KDE")
(description "Yakuake is a drop-down terminal emulator based on KDE Konsole
technology. Features include:
--
2.37.0
From 87a5b38a281ce8d55b681e83cb6f84b2d99a73d2 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 10:25:42 +0200
Subject: [PATCH v4 25/73] gnu: kdenlive, marble-qt: Add kdoctools.

* gnu/packages/kde.scm (kdenlive)[native-inputs]: Add kdoctools.
(marble-qt): Move kdoctools from inputs to native-inputs.

Toggle diff (30 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 85ba8e2f01..5ae1e8f5ce 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -258,7 +258,7 @@ (define-public kdenlive
`("MLT_PREFIX" ":" =
(,#$(this-package-input "mlt"))))))))))
(native-inputs
- (list extra-cmake-modules pkg-config qttools-5))
+ (list extra-cmake-modules kdoctools pkg-config qttools-5))
(inputs
(list bash-minimal
breeze ; make dark them available easily
@@ -1008,13 +1008,12 @@ (define-public marble-qt
"-DBUILD_TOUCH=YES"
"-DBUILD_MARBLE_TESTS=FALSE")))
(native-inputs
- (list extra-cmake-modules qttools-5))
+ (list extra-cmake-modules kdoctools qttools-5))
;; One optional dependency missing: libwlocate.
(inputs
(list gpsd
kcoreaddons
kcrash
- kdoctools
ki18n
kio
knewstuff
--
2.37.0
From 9bd783e6de15bb46c50de9d2a2329de778bc3184 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Thu, 21 Jul 2022 10:24:50 +0200
Subject: [PATCH v4 28/73] gnu: labplot: Remove input labels.

* gnu/packages/kde-pim.scm (labplot): Remove input labels.

Toggle diff (27 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index e5a35e8ccc..0d0dcded09 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -797,14 +797,12 @@ (define-public labplot
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; This test fails, I don't know why.
- (invoke "ctest" "-E" "parsertest"))
- #t)))))
- (native-inputs
- `(("bison" ,bison)
- ("extra-cmake-modules" ,extra-cmake-modules)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
- ("qttools-5" ,qttools-5)))
+ (invoke "ctest" "-E" "parsertest")))))))
+ (native-inputs (list bison
+ extra-cmake-modules
+ pkg-config
+ python-wrapper
+ qttools-5))
(inputs
(list breeze ;for dark themes
breeze-icons ;for icons
--
2.37.0
From 57e51cb6805540f572d7b91f5071817a98160ada Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 2 Aug 2022 06:56:24 +0200
Subject: [PATCH v4 59/73] gnu: KDE Internet: Update to 22.04.3.

* gnu/packages/kde-internet.scm (kget, konversation, kopete, krdc, ktorrent,
libktorrent): Update to 22.04.3.

(kconversation): [inputs]: Add qtmultimedia-5.

Toggle diff (116 lines)
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index dc5fab8a7b..36c60b9fca 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -117,14 +117,14 @@ (define-public choqok
(define-public kget
(package
(name "kget")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kget-" version ".tar.xz"))
(sha256
- (base32 "1w249gvzz47ac7n1mnxxf20d9l7jmbh18m5dijy55ck61s4zcq4l"))))
+ (base32 "0rqznsyphnq0zi65wvrl9mwqm9268wgihkr104i87pp5kfiah5yp"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools pkg-config))
@@ -183,14 +183,14 @@ (define-public kget
(define-public konversation
(package
(name "konversation")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/konversation-" version ".tar.xz"))
(sha256
- (base32 "05dxzkpadz29b5fm6pf225xqq0gaz9w50paz9341kzz4k3rnzq80"))))
+ (base32 "08b4vnm66hbbnvkkh1p0a82pd2aj4zy5a8indfv3fzczsfpx6gp0"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -220,6 +220,7 @@ (define-public konversation
phonon
qtbase-5
qca
+ qtmultimedia-5
solid
sonnet))
(home-page "https://apps.kde.org/konversation/")
@@ -254,14 +255,14 @@ (define-public konversation
(define-public kopete
(package
(name "kopete")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kopete-" version ".tar.xz"))
(sha256
- (base32 "1v519sw2lzlap6xci3j55k8c48755sc9p3mgvj566b6jjq64xi5k"))))
+ (base32 "0fc9m2xgsjmsypqllqb3cp1y2m28dqh48r1qg2xgkfyqa70dnvp9"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools pkg-config))
@@ -331,14 +332,14 @@ (define-public kopete
(define-public krdc
(package
(name "krdc")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/krdc-" version ".tar.xz"))
(sha256
- (base32 "09np9clvmdll7v2p9aswnlhz4cgsnly82za7k3k9fs66h5c8q20j"))))
+ (base32 "0bs8q3na924lnmra5608jwnn0dqczvh0f72nn43673ib3m1mddlr"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -376,14 +377,14 @@ (define-public krdc
(define-public ktorrent
(package
(name "ktorrent")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/ktorrent-" version ".tar.xz"))
(sha256
- (base32 "021x6qcbk4kdh5ay5mqmf92129s42j2rhrs0q350b0wcnpad55zd"))))
+ (base32 "1h95hf4ki2xi2c9bzdg18p6d1757gzqknf6gn1ls6lwqy6p0pr4h"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -431,14 +432,14 @@ (define-public ktorrent
(define-public libktorrent
(package
(name "libktorrent")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/"
version "/src/" name "-" version ".tar.xz"))
(sha256
- (base32 "0i976al9bsc3gbplqbxkxr03sdhxv3yzjlfkdaghga8fkihzkkl0"))))
+ (base32 "098ac7b5wa7v6svqv4rx1w44j18pr22qgr236fj94r2kpl2nq79q"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules))
--
2.37.0
From 2428dbdb45dce6547bd0f530654499bee4cbb176 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 10:47:21 +0200
Subject: [PATCH v4 31/73] gnu: KDE Internet: Update home-page links.

* gnu/packages/kde-internet.scm (konversation, kopete, krdc, ktorrent): Update
home-page.

Toggle diff (59 lines)
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index 1dfae0fefb..26f025ebc4 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -172,7 +173,7 @@ (define-public kget
(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
+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.")
@@ -221,7 +222,7 @@ (define-public konversation
qca
solid
sonnet))
- (home-page "https://kde.org/applications/internet/org.kde.konversations")
+ (home-page "https://apps.kde.org/konversation/")
(synopsis "Graphical Internet Relay Chat (IRC) client for KDE")
(description "Konversation is a graphical Internet Relay Chat client (IRC)
with KDE support.
@@ -311,7 +312,7 @@ (define-public kopete
;; TODO: Xmms
zlib))
;; TODO: enable video support
- (home-page "https://kde.org/applications/internet/org.kde.kopete")
+ (home-page "https://apps.kde.org/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
@@ -362,7 +363,7 @@ (define-public krdc
qtbase-5))
(arguments ;; FIXEME: libvnc can't be found for some reason.
(list #:configure-flags #~(list "-DWITH_VNC=NO")))
- (home-page "https://kde.org/applications/internet/org.kde.krdc")
+ (home-page "https://apps.kde.org/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
@@ -419,7 +420,7 @@ (define-public ktorrent
solid
syndication
taglib))
- (home-page "https://kde.org/applications/internet/org.kde.ktorrent")
+ (home-page "https://apps.kde.org/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
--
2.37.0
From 0286dafe44e7e0a2f59efa54fbcdf7071bfe99a6 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Thu, 14 Oct 2021 18:25:20 +1100
Subject: [PATCH v4 18/73] gnu: libgravatar: Move to (gnu packages kde-pim).

Remove uneeded (gnu packages kde-internet) import.
* gnu/packages/kde-internet.scm: Move libgravatar ...
* gnu/packages/kde-pim.scm ...here

Toggle diff (104 lines)
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index 35d41887c2..25a177965a 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -415,38 +415,6 @@ (define-public ktorrent
a full-featured client for BitTorrent.")
(license license:gpl2+)))
-(define-public libgravatar
- (package
- (name "libgravatar")
- (version "20.04.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://kde/stable/release-service/" version
- "/src/libgravatar-" version ".tar.xz"))
- (sha256
- (base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2"))))
- (build-system qt-build-system)
- (native-inputs
- (list extra-cmake-modules))
- (inputs
- (list kconfig
- ki18n
- kio
- kpimcommon
- ktextwidgets
- kwidgetsaddons
- qtbase-5))
- (arguments
- `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
- (home-page "https://invent.kde.org/pim/libgravatar")
- (synopsis "Online avatar lookup library")
- (description "This library retrieves 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")
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index d895a74fd2..9d7a0bf202 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,7 +35,6 @@ (define-module (gnu packages kde-pim)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks)
- #:use-module (gnu packages kde-internet)
#:use-module (gnu packages openldap)
#:use-module (gnu packages qt)
#:use-module (gnu packages search)
@@ -1641,6 +1641,38 @@ (define-public kpimcommon
(license ;; GPL for programs, LGPL for libraries
(list license:gpl2+ license:lgpl2.0+))))
+(define-public libgravatar
+ (package
+ (name "libgravatar")
+ (version "20.04.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kde/stable/release-service/" version
+ "/src/libgravatar-" version ".tar.xz"))
+ (sha256
+ (base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2"))))
+ (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-5)))
+ (arguments
+ `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
+ (home-page "https://invent.kde.org/pim/libgravatar")
+ (synopsis "Online avatar lookup library")
+ (description "This library retrieves 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 kpimtextedit
(package
(name "kpimtextedit")
--
2.37.0
From b725d0784990173ccf5b310dce01a7c71a591e98 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sun, 6 Feb 2022 18:32:30 +1100
Subject: [PATCH v4 48/73] gnu: khelpcenter: Fix program.

* gnu/packages/kde-systemtools.scm (khelpcenter): Wrap XDG_DATA_DIRS to
point to khtml where it can find the html4.css file, otherwise
khelpcenter fails to launch.

Toggle diff (25 lines)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index b79f72a4ed..809a9ddb7a 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -160,7 +160,17 @@ (define-public khelpcenter
qtbase-5
xapian))
(arguments
- `(#:tests? #f)) ;; 1/1 test fails
+ `(#:tests? #f ;; 1/1 test fails
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-executable
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ ;; Since qt-wrap selectors do not wrap for /share/kf5
+ ;; directories, we need this so khelpcenter can find html4.css.
+ (wrap-program (string-append out "/bin/khelpcenter")
+ `("XDG_DATA_DIRS" suffix
+ (,(string-append (assoc-ref inputs "khtml") "/share"))))))))))
(home-page "https://apps.kde.org/khelpcenter/")
(synopsis "KDE documentation viewer")
(description "KHelpCenter uses meta data files which describe the
--
2.37.0
From 1942283b9ac46e8548384de300f600e691dbe8a1 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Thu, 3 Feb 2022 19:00:31 +1100
Subject: [PATCH v4 29/73] gnu: Remove libraw-0.18.

* gnu/packages/photo.scm (libraw-0.18): Delete unused old version.

Toggle diff (24 lines)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 19c171a9bb..378f60793f 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -204,17 +204,6 @@ (define-public libraw
;; both two licensing modes for your changes/additions."
(license (list license:lgpl2.1 license:cddl1.0))))
-(define-public libraw-0.18
- (package (inherit libraw)
- (name "libraw")
- (version "0.18.12")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://www.libraw.org/data/LibRaw-"
- version ".tar.gz"))
- (sha256
- (base32
- "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap"))))))
(define-public libexif
(package
--
2.37.0
From c4597bc7a70f15b8db9801aecdbd156272a2724f Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 2 Aug 2022 07:33:40 +0200
Subject: [PATCH v4 60/73] gnu: KDE Utils: Update to 22.04.3.

* gnu/packages/kde-utils.scm (ark, kate, kmag, kmousetool, kmouth, okteta,
sweeper): Update to 22.04.3.

Toggle diff (125 lines)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index a383aabc96..b2295d184a 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -43,14 +43,14 @@ (define-module (gnu packages kde-utils)
(define-public ark
(package
(name "ark")
- (version "21.12.3")
+ (version "22.04.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/ark-" version ".tar.xz"))
(sha256
(base32
- "1p30bgnb3aw0f2jnaksz7jfqqcz45b2x3bjrri0w5w580204a5s8"))
+ "1wjy90qkkzafwcw8d4v9cyhmc3sgfipc1085hq2ghqhvrgdyzs00"))
;; The libarchive package in Guix does not support
;; xar; disable related tests.
(patches (search-patches "ark-skip-xar-test.patch"))))
@@ -117,14 +117,14 @@ (define-public ark
(define-public kate
(package
(name "kate")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kate-" version ".tar.xz"))
(sha256
- (base32 "1pp0k00kvih0xkkv1q1gha4na2bwqc7dhyyrla7c2vvln8gi99dg"))))
+ (base32 "0dnlr1cld6lqanqv98bss66w2bi2y78vqb8jx26addn2r1w4ygkf"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -183,14 +183,14 @@ (define-public kate
(define-public kmag
(package
(name "kmag")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kmag-" version ".tar.xz"))
(sha256
- (base32 "067x65gmip89rdgii2nwnxn7zi96cf7vfbhqzg0499pd2d69p3sl"))))
+ (base32 "08jwv2wnb67vjgz5pv1nn6rwl9ldj8dfd74l6va9vz4x5pk7d859"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -213,14 +213,14 @@ (define-public kmag
(define-public kmousetool
(package
(name "kmousetool")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kmousetool-" version ".tar.xz"))
(sha256
- (base32 "013qr1md3gbin7hcahnv14y9i2cg35r433s2w81fvgcakd38qvkj"))))
+ (base32 "13pvdhhf3fdkaiyjp0ijqm5qdffabyw7qq2051l1nqv6i7w6lgwx"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -251,14 +251,14 @@ (define-public kmousetool
(define-public kmouth
(package
(name "kmouth")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/kmouth-" version ".tar.xz"))
(sha256
- (base32 "0xvkp2pm2szbgzdsfmwrykma8npmlwmx2pb1iakbx3x1wyyjsbim"))))
+ (base32 "0lzaw7qqvpqzfz4nb2lk8l06c4yxacfg5982yk33g5q0j7r19bpy"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
@@ -400,14 +400,14 @@ (define-public kxstitch
(define-public okteta
(package
(name "okteta")
- (version "0.26.7")
+ (version "0.26.9")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/okteta/" version
"/src/okteta-" version ".tar.xz"))
(sha256
- (base32 "1qrhsnglvkiq480c0b6hgcpahab7l8wbfpcsgra5zkynj1bba8zi"))))
+ (base32 "1yszs3w78dqdr5d8djf6gp4abzc5lcms859imqcq50wl9r6lr18n"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools qttools-5 shared-mime-info))
@@ -571,14 +571,14 @@ (define-public smb4k
(define-public sweeper
(package
(name "sweeper")
- (version "21.12.3")
+ (version "22.04.3")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/release-service/" version
"/src/sweeper-" version ".tar.xz"))
(sha256
- (base32 "1l4ag2nhy0da9z4nlf7fmjrim7pmwpm3m4v4y50jlpdv73f63246"))))
+ (base32 "0kda4a5d9a11am2y6f91bx8v3nb8mw9qh671nskvgkx46x1pww21"))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules kdoctools))
--
2.37.0
From 64ee211114c734812908d5912b6b186b6a2250c6 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 10:27:37 +0200
Subject: [PATCH v4 26/73] gnu: KDE: Update home-page links.

* gnu/packages/kde.scm (massif-visualizer, libkdegames, okular, poxml,
zeroconf-ioslave): Update home-page link.

Toggle diff (59 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 5ae1e8f5ce..680544107e 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2021 la snesne <lasnesne@lagunposprasihopre.org>
;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -573,7 +574,7 @@ (define-public massif-visualizer
qtbase-5
qtsvg-5
qtxmlpatterns))
- (home-page "https://apps.kde.org/en/massif-visualizer")
+ (home-page "https://apps.kde.org/massif-visualizer/")
(synopsis "Visualize massif data generated by Valgrind")
(description
"Massif Visualizer is a tool that visualizes massif data.
@@ -980,7 +981,7 @@ (define-public libkdegames
qtbase-5
qtdeclarative-5
qtsvg-5))
- (home-page "https://games.kde.org/")
+ (home-page "https://apps.kde.org/categories/games/")
(synopsis "Runtime library for kdegames")
(description "Runtime library for kdegames")
(license (list license:gpl2+ license:fdl1.2+))))
@@ -1099,7 +1100,7 @@ (define-public okular
threadweaver
kcrash
kjs))
- (home-page "https://kde.org/applications/graphics/okular/")
+ (home-page "https://apps.kde.org/okular/")
(synopsis "Document viewer")
(description
"Okular is a document viewer developed for KDE. It can display files in
@@ -1123,7 +1124,7 @@ (define-public poxml
(list extra-cmake-modules kdoctools))
(inputs
(list gettext-minimal qtbase-5))
- (home-page "https://kde.org/applications/development")
+ (home-page "https://apps.kde.org/development/")
(synopsis "Tools for translating DocBook XML files with Gettext")
(description "This is a collection of tools that facilitate translating
DocBook XML files using Gettext message files (PO files). Also included are
@@ -1191,7 +1192,7 @@ (define-public zeroconf-ioslave
(list extra-cmake-modules))
(inputs
(list kdbusaddons kdnssd ki18n kio qtbase-5))
- (home-page "https://kde.org/applications/internet/org.kde.zeroconf_ioslave")
+ (home-page "https://apps.kde.org/kio_zeroconf/")
(synopsis "DNS-SD Service Discovery Monitor")
(description "Adds an entry to Dolphin's Network page to show local
services such as printers which advertise themselves with DNSSD (called Avahi
--
2.37.0
From 11819713f91566f8c94144c5f9bf635535869ea4 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 26 Jul 2022 12:15:41 +0200
Subject: [PATCH v4 40/73] gnu: KDE Multimedia: Add bash-minimal and kdoctools.

* gnu/packages/kde-multimedia.scm (juk, kmix): Move kdoctools from inputs to
native-inputs.

(dragon, k3b): [inputs]: Add bash-minimal.

Toggle diff (49 lines)
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 360db312ed..b9463b1ec8 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -108,7 +108,8 @@ (define-public dragon
(native-inputs
(list extra-cmake-modules kdoctools))
(inputs
- (list kconfig
+ (list bash-minimal
+ kconfig
kconfigwidgets
kcoreaddons
kcrash
@@ -262,14 +263,13 @@ (define-public juk
(base32 "1ipzx031996h83f9w3fzbx5vf5nnskq9kf71a6aypqckk65vcqcs"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules))
+ (list extra-cmake-modules kdoctools))
(inputs
(list kcoreaddons
kcompletion
kconfig
kcrash
kdbusaddons
- kdoctools
kglobalaccel
ki18n
kiconthemes
@@ -572,7 +572,7 @@ (define-public kmix
(base32 "1zk2xljis1pv3m4vs5zr6wza6iv5y6wmh1csx3rn8ylfkrpk7h8k"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules pkg-config))
+ (list extra-cmake-modules kdoctools pkg-config))
(inputs
(list alsa-lib
glib
@@ -582,7 +582,6 @@ (define-public kmix
kconfigwidgets
kcrash
kdbusaddons
- kdoctools
kglobalaccel
ki18n
kiconthemes
--
2.37.0
From 781b75d28f9cf503cdc2966fc60c70e927a1692a Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Thu, 21 Jul 2022 08:26:59 +0200
Subject: [PATCH v4 19/73] gnu: libgravatar: Remove input labels.

* gnu/packages/kde-pim.scm (libgravatar): Remove input labels.

Toggle diff (31 lines)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 9d7a0bf202..fa4565fcf8 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -1653,16 +1653,14 @@ (define-public libgravatar
(sha256
(base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2"))))
(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-5)))
+ (native-inputs (list extra-cmake-modules))
+ (inputs (list kconfig
+ ki18n
+ kio
+ kpimcommon
+ ktextwidgets
+ kwidgetsaddons
+ qtbase-5))
(arguments
`(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
(home-page "https://invent.kde.org/pim/libgravatar")
--
2.37.0
M
M
Marek Pa?nikowski wrote on 20 Aug 2022 16:13
[PATCHES] KDE updates.
(name . 50862@debbugs.gnu.org)(address . 50862@debbugs.gnu.org)
k6FuVlOM6JVBfBe3cg_lUo6kfkQbokNZ5CxUni15UBIDGSqDCurZxtqLSJgj9NbBLROMJDYjHRm31Bqt-fycF432HyngX2om4l-BgQpTKYU=@protonmail.com
Is there a configuration combination, which would allow me to start the Plasma Desktop from SDDM? I have all the packages installed, but the (plasma-desktop-service-type) itself fails to build. I have the SDDM service, configured to use wayland, and "plasma-desktop" and "plasma-workspace" packages installed.
M
M
Marek Pa?nikowski wrote on 21 Aug 2022 16:49
(name . 50862@debbugs.gnu.org)(address . 50862@debbugs.gnu.org)
_9ob3ge_2yhZgyW8iB9y-tAhCCQKEK9B6jc7pXGkMw89K9e8R5zTKoutuCquz_9-S90QV9TZPcMCkHxoM2K3BkKcF0VWuZH0o4KfVBs8RjU=@protonmail.com
I found that the Guix Git on Savannah has a stale `wip-kde-plasma` branch. Are there any plans to reactivate it?
P
P
phodina wrote on 22 Aug 2022 15:19
Re: [bug#50862] Launching the KDE Plasma session
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
HVj8CIzxPrbqIjzfTVXOzv1FJlhKhJWertHuhPBdQZQqkbuYUOifIWkkqJ_PYBApJCJ7p_0HPSquFuHFNVZ2E6WwuKw1mELIMsnkTeJlolQ=@protonmail.com
Hi Marek,

Toggle quote (2 lines)
> I found that the Guix Git on Savannah has a stale `wip-kde-plasma` branch. Are there any plans to reactivate it?

the most recent commits can be found on my Github account in branch upstream-kde[1].

Toggle quote (2 lines)
> Is there a configuration combination, which would allow me to start the Plasma Desktop from SDDM? I have all the packages installed, but the (plasma-desktop-service-type) itself fails to build. I have the SDDM service, configured to use wayland, and "plasma-desktop" and "plasma-workspace" packages installed.

The package libaccounts-qt now builds and I'm able to build VM wth KDE Plasma.

However, when I log in to the Plasma session I saw only black screen so my assumption is it will need meta package like gnome or xfce.

The wayland session did not start but I was testing this in VM running under X11. So I'll use dedicated machine for that.

So my plan is to fix the 2 remaining issues this week and sumbit the patches here (currently about 100).

FIY I cleaned my git of all the stalled branches with KDE packages. This should be the one for upstream as most of the stuff should be solid there.


----
Petr
P
P
phodina wrote on 27 Aug 2022 23:14
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
Cz1tdB8gW2_3mrL484hO0umwOiYgC81aCR-jzLp0uRoSyM23xmOb4O7iPXC0nz_FIFu5j4Und9-UQ1OkojgY1cmQYmAbbJkzRLY6nV1Kv30=@protonmail.com
Hi,

small update. I'm able to launch the X11 KDE Plasma session.

However, I get just black screen with bottom bar without any widgets.

It's possible to launch apps in the kwin like alacritty, dolphin, konsole but some packages through lots of QML errors and don't run.

Wayland session does not run - SDDM attempts to run it switching to black screen and then back to SDDM.

I've patched the binaries in plasma-workspace package and packaged more stuff.

Does anybody know how to make Plasma usable? My guess is it will need some config files and patches.

Also this patch set is getting little bit long. The best approach would be to upstream the KDE updates without the new Plasma packages. They can come in the next round. What do you think?


----
Petr
Attachment: kde-guix-bare.png
B
B
Brendan Tildesley wrote on 29 Aug 2022 07:54
Re: [bug#50862] [PATCHESv4] KDE updates
42a0e805-096e-6eeb-6a56-73a5bcccb5c5@brendan.scot
You added the kpurpose package in your upstream-kde branch, but this
already exists as "purpose", so is a duplicate.

Perhaps you could rename it if you think it should be called that, and
set upstream-name to purpose


Great that you got libacounts-qt working, that was annoying me so much i
stopped working on the update.

You're doing great work. Not sure whether or not I will feel like
working on this again or not.
M
M
Marek Pa?nikowski wrote on 31 Aug 2022 18:36
[PATCHES] KDE updates.
(name . 50862@debbugs.gnu.org)(address . 50862@debbugs.gnu.org)
LjiLNOTn8LgLdgslVv6Mx7fB2T6BZbCLXhvxLNqwU4NvnNlenucLnCKY8l3kTn0bWZJBfjp4DtZdeP8nuJTiE-ebJFsGg897YBToEAnPA-I=@protonmail.com
Hello.

Thank you Phodina for your continuing work on KDE. Today I was able to login into the Plasma X11 session. I saw the black screen and an empty panel with a red square X on its left side. In order to get there I had to comment out a definition of `ktouch` and some test manipulation in `kio`.

I am starting to wonder, if I should garbage collect my Guix store and rebuild everything from scratch. Does the build of `(plasma-desktop-service-type)` succeed without any changes to package code?

PS: Despite having written to this discussion multiple times, I am still not getting any responses in my inbox. I am not able to find any documentation on how to "subscribe" to a particular Debbugs issue. Can I ask for a hint?
M
M
Marius Bakke wrote on 31 Aug 2022 23:02
87a67kcejj.fsf@gnu.org
guix-patches--- via <guix-patches@gnu.org> skriver:


Toggle quote (2 lines)
> PS: Despite having written to this discussion multiple times, I am still not getting any responses in my inbox. I am not able to find any documentation on how to "subscribe" to a particular Debbugs issue. Can I ask for a hint?

AFAIK that is not currently possible. There is a bug about it here:


... just to rub it in, I suppose ...

Meanwhile, a kind reminder for everyone to use "reply all" when
interacting with debbugs (and mailing lists in general). :-)
-----BEGIN PGP SIGNATURE-----

iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYw/MYA8cbWFyaXVzQGdu
dS5vcmcACgkQ6HGLpZEUEHfUSgEA71L72cLVE/cNeaqnpTEkm4sUVGdTUPgQVWO3
o9DPUSQBAMbrV6JpfzqDmbMjjMpjS8JpO5p6PQGprlnVJTr3yS8A
=9yEW
-----END PGP SIGNATURE-----

M
M
Marius Bakke wrote on 31 Aug 2022 23:10
Re: [bug#50862] [PATCHESv4] KDE updates
877d2oce5e.fsf@gnu.org
phodina via Guix-patches via <guix-patches@gnu.org> skriver:

Toggle quote (11 lines)
>> > Do you know who would be the best reviewer for these patches?
>>
>>
>> Perhaps Hartmut Goebel? I think they had been involved in attempts of
>> packaging KDE in the past. I've added them in CC in case they'd like to
>> get involved, but no obligations, of course.
>
> Thanks. To ease up the effort the patches submitted here are only the stable ones.
>
> There is one commit 688434fb9ad79e82d5e85ce9b36e9b064628879c (!!DELETE gnu: Add wayland-protocols 1.26.) - result in massive rebuild and is important in other projects as well. So either add it or delete if it's already in master.

This is excellent work, thanks a lot Brendan and Petr!

I have tested these patches and they seem to work fine; and just in time
because the KDE update is required on the 'staging' branch.

I'm currently reading through the patches and expect to merge today or
tomorrow. :-)
-----BEGIN PGP SIGNATURE-----

iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYw/OXQ8cbWFyaXVzQGdu
dS5vcmcACgkQ6HGLpZEUEHcpkAEAuS4j4D02H6R7kIkGHL78QoCb0IYil/qvxu6X
HIQDQ9EA/iBhdoYoJtxrnt43iIW3nF7tDTWxmte7In7oJ0ZOoTYD
=nucp
-----END PGP SIGNATURE-----

P
P
phodina wrote on 1 Sep 2022 10:03
H3qb1s_CT9h9oqVSbM4hwRVg0DKfsX-BfhYkdcUu_W836BufF48nZFDwD5pOLnqdPqUK2IskMrsPxn948wY6MahrS62whQ89y6psVG0gS_8=@protonmail.com
Hi Marius,

that's good news.

Have you been able to run full Plasma session?

I expect there are some missing descriptions of the packages in the newest commits.

Also I enabled more optional packages than might be necessary in some cases. This applies more to plasma-workspace and plasma-desktop. Maybe we can create minimal and full version of these packages. What do you think?

Maybe we can split the gnu/system/examples/desktop.tmpl file into multiple based on the environment. Instead of adding additional one?

But that's just my view as developer who had to rebuild the packages multiple times and also due to update of wayland-protocols it triggered rebuilds of the other DEs. Onced merged and built it will be fast if the user enables substitutes. Only downside is the disk space.

One last thing. I tried to remove the failing tests and rerun them. However, due to multiple updates over time it might be good to do it again or with the next update of the packages (release of KDE) :-)

----
Petr

Sent from ProtonMail mobile

-------- Original Message --------
On Aug 31, 2022, 11:10 PM, Marius Bakke wrote:

Toggle quote (1 lines)
> phodina via Guix-patches via skriver: >> > Do you know who would be the best reviewer for these patches? >> >> >> Perhaps Hartmut Goebel? I think they had been involved in attempts of >> packaging KDE in the past. I've added them in CC in case they'd like to >> get involved, but no obligations, of course. > > Thanks. To ease up the effort the patches submitted here are only the stable ones. > > There is one commit 688434fb9ad79e82d5e85ce9b36e9b064628879c (!!DELETE gnu: Add wayland-protocols 1.26.) - result in massive rebuild and is important in other projects as well. So either add it or delete if it's already in master. This is excellent work, thanks a lot Brendan and Petr! I have tested these patches and they seem to work fine; and just in time because the KDE update is required on the 'staging' branch. I'm currently reading through the patches and expect to merge today or tomorrow. :-)
Attachment: file
M
M
Marius Bakke wrote on 1 Sep 2022 16:23
87wnanb2cq.fsf@gnu.org
phodina <phodina@protonmail.com> skriver:

Toggle quote (6 lines)
> Hi Marius,
>
> that's good news.
>
> Have you been able to run full Plasma session?

I'm only adding the 'stable' patches that you posted in this thread.

A first batch has been pushed to 'master'; the remainder will go to
'staging' after a little more review, because they cause a lot of
rebuilds. :-)

You can find them in 060e65ebda26be9c28c3..4f7f4e82e1f63f49216ee.

Note: I ended up rewriting the 'appstream' patch to use the latest
version, enable tests, etc; and took "ownership" on it (but added you
and Brendan as co-authors).

Toggle quote (2 lines)
> I expect there are some missing descriptions of the packages in the newest commits.

Right, the latest package additions need a little more work. I'll focus
mainly on the KDE updates.

Toggle quote (2 lines)
> Also I enabled more optional packages than might be necessary in some cases. This applies more to plasma-workspace and plasma-desktop. Maybe we can create minimal and full version of these packages. What do you think?

I don't really have an opinion. It's good if you can rebase the
kde-updates branch on top of staging once I've pushed the remaining
patches and submit a new issue for the KDE desktop.

Toggle quote (2 lines)
> Maybe we can split the gnu/system/examples/desktop.tmpl file into multiple based on the environment. Instead of adding additional one?

I think a separate kde-desktop example would be good, but no strong
opinion. Perhaps it's enough to document it in the manual, plus have a
working option in the installer.

Toggle quote (2 lines)
> But that's just my view as developer who had to rebuild the packages multiple times and also due to update of wayland-protocols it triggered rebuilds of the other DEs. Onced merged and built it will be fast if the user enables substitutes. Only downside is the disk space.

I'm keeping the wayland-protocols update separate for now, we'll update
it properly on 'core-updates' (to be started "soon").

Toggle quote (2 lines)
> One last thing. I tried to remove the failing tests and rerun them. However, due to multiple updates over time it might be good to do it again or with the next update of the packages (release of KDE) :-)

Sounds good!

I'll update this thread once the remaining patches have been reviewed
and pushed.

Thanks again! :-)
-----BEGIN PGP SIGNATURE-----

iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYxDAVg8cbWFyaXVzQGdu
dS5vcmcACgkQ6HGLpZEUEHeDNgEA4G1SfMgrKw3+qqKl8Kt/K7c6aROT0z/WN5Rp
fAzEAU8A/jxTjC1X6Gp7XvBPMQIjKXR+JpJ7psCXYWw2qT2XVSMH
=eDr8
-----END PGP SIGNATURE-----

M
M
Marius Bakke wrote on 1 Sep 2022 17:36
87r10vayyi.fsf@gnu.org
Marius Bakke <marius@gnu.org> skriver:

Toggle quote (3 lines)
> I'll update this thread once the remaining patches have been reviewed
> and pushed.

... and it's in! Commits c4ce54055a75c951f..a38889b14d74e31c.

All patches up to and including 'kwayland-server' have been pushed.

I made the following changes:

* switched to git-fetch for kmplayer, and added a comment about why
using a snapshot.
* Added a comment about kwayland-server licenses (and removed those
which seemingly did not apply)

Why git-fetch? Because the autogenerated tarballs from git hosting
sites are "unstable", they tend to get regenerated with different
timestamps or similar eventually.

For the remaining packages, please add a comments about failing tests,
and for packages that carry multiple licenses, leave a comment about
which licenses apply to which files (if feasible; something like "the
source includes many third-party files with various licenses" is also
OK).

By multiple licenses, I mean those that have more than the KDE default
'LGPL2.1 only OR LGPL3.0 only'.

Thanks again for this gargantuan work, really looking forward to see the
KDE desktop in Guix. :-)

Closing this issue, please open a new one for the final touch!

--
Marius
-----BEGIN PGP SIGNATURE-----

iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYxDRhQ8cbWFyaXVzQGdu
dS5vcmcACgkQ6HGLpZEUEHf2BwD/aPgAq88zOJCQQig4Cgw/jmrepCK2KjVpbHMl
2vx5fzoA/Rh1+CBt+9A6Td5pbXjZj529FCG85/vh3OpRKyQoRGsA
=41U4
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 50862@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 50862
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch