From 61d6cef341b65356c894d302a640598733dcfc99 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 2 Feb 2022 20:08:23 +1100 Subject: [PATCH v4 21/73] gnu: KDE PIM: Update all packages to 21.12.3. * gnu/packages/kde-pim.scm (KDE PIM): Update to 21.12.3. (akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, akonadi-search, kaddressbook, kalarmcal, kcalendarsupport, kcalutils, kdepim-runtime, keventviews, kgpg, kidentitymanagement, kimap, kincidenceeditor, kldap, kleopatra, kmail, kmailcommon, kmailimporter, kmailtransport, kmbox, kmessagelib, kmime, knotes, kontactinterface, korganizer, kpeoplevcard, kpimcommon, kpimtextedit, ksmtp, ktnef, libgravatar, libkdepim, libkgapi, libkleo, libksieve): Update to 21.12.3. (kblog): Update to 20.04.3. * gnu/packages/patches/akonadi-not-relocatable.patch * gnu/packages/patches/akonadi-paths.patch * gnu/packages/patches/akonadi-timestamps.patch Fix patches to apply to latest code. (akonadi-calendar): [inputs]: Add new dependencies. (akonadi-contacts): [inputs]: Add new dependencies. (akonadi-search): [arguments]: Disable failing tests. (kcalendarsupport): [inputs]: Add new dependency, remove obsolete kdepim-apps-lib. (libksieve): [arguments]: Enable test that works now. * gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch: Fix patch. (kaddressbook): [inputs]: Remove obsolete kdepim-apps-libs. Move kdocstools to native-inputs. (kmessagelib): [inputs]: Remove obsolete kdepim-appslibs, add kguiaddons. [arguments]: Fix findind header file. (kmailimporter): [inputs]: Add new dependencies. (kmailtransport): [inputs]: Add qtkeychain. (knotes): [inputs]: Move kdocstools to native-inputs. (kincidenceeditor): [inputs]: Add new dependencies. Remove obsolete kdepim-apps-libs [arguments]: Disable failing test. (kldap): [inputs]: Add qtkeychain. (kgpg)[arguments]: Disable failing tests. (libkleo): [propagated-inputs]: Propagate gpgme, qgpgme. [arguments]: Disable failing tests. (kdepim-runtime): [inputs]: Add new dependencies grantlee, grantleetheme, kcmutils, kldap, libkdepim, qtkeychain [arguments]: Enable all the tests that pass. We need to use the old hack instead of search-input-directory to workaround a mysterious include error. (kdepim-apps-lib): Remove obsolete package. (kmail): [origin]: Remove patch. Don't think it is needed anymore. [inputs]: Add new dependencies, delete obsolete kdepim-apps-libs and duplicate kmime. [arguments]: Disable failing tests. * gnu/packages/patches/kmail-Fix-missing-link-libraries.patch: Delete file. * gnu/local.mk: Remove reference to patch. (kmailcommon): [inputs]: Add new dependencies. diff --git a/gnu/local.mk b/gnu/local.mk index cb270aae6f..ae42832e2a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1361,7 +1361,6 @@ dist_patch_DATA = \ %D%/packages/patches/kinit-kdeinit-extra_libs.patch \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kismet-unbundle-boost.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/kmplayer-aarch64.patch \ diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index fa4565fcf8..5e4cb82f90 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -44,14 +44,14 @@ (define-module (gnu packages kde-pim) (define-public akonadi (package (name "akonadi") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-" version ".tar.xz")) (sha256 - (base32 "0kkn7lh3akkk9cdi8qdk9kqzs1cgv916mkl440x4ykqd1v8brzqb")) + (base32 "026srxk7da20vfhbj7jh8aip3sylpm61czwblj3wxxps0vbxxs2g")) (patches (search-patches "akonadi-paths.patch" "akonadi-timestamps.patch" @@ -89,9 +89,7 @@ (define-public akonadi (modify-phases (@ (guix build qt-build-system) %standard-phases) (add-before 'configure 'add-definitions (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (mysql (assoc-ref inputs "mysql")) - (pgsql (assoc-ref inputs "postgresql"))) + (let ((out (assoc-ref outputs "out"))) (with-output-to-file "CMakeLists.txt.new" (lambda _ (display @@ -119,14 +117,14 @@ (define-public akonadi (define-public akonadi-calendar (package (name "akonadi-calendar") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-calendar-" version ".tar.xz")) (sha256 - (base32 "1mq76qyd3jcngb2yfanpn7qvklzllza399fxwii0mqppp1vmnb2b")))) + (base32 "0hzy6y9pxa06k0pp5yr84i0sv15qgzjn7nrlmsylm6iy7fspqqbq")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -135,6 +133,8 @@ (define-public akonadi-calendar akonadi-contacts akonadi-mime boost + grantlee + grantleetheme kcalendarcore kcalutils kcodecs @@ -162,21 +162,24 @@ (define-public akonadi-calendar (define-public akonadi-contacts (package (name "akonadi-contacts") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-contacts-" version ".tar.xz")) (sha256 - (base32 "0igggarnl99s5pl73dgrpha4lf7vnr000iy69vcwmqs5lxb7cyli")))) + (base32 "04ixj09s27q8pbmfrb1475bc0h84sb5ikfxzpc4i5b3whx40g9dm")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list akonadi boost + grantlee + grantleetheme kauth + kcmutils kcodecs kcompletion kconfigwidgets @@ -193,6 +196,7 @@ (define-public akonadi-contacts ktextwidgets kwidgetsaddons kxmlgui + libkleo prison kio qtbase-5 @@ -213,14 +217,14 @@ (define-public akonadi-contacts (define-public akonadi-mime (package (name "akonadi-mime") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-mime-" version ".tar.xz")) (sha256 - (base32 "1wd776ia3z22a79biq04y4m83n8xpvfmyg8bcsslr7lmc3avdg8w")))) + (base32 "1bcrbf5z9175p206cvm5s6zq882nb32cf9akdcbnadqiibrpxkxv")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules libxslt ;; xslt for generating interface descriptions @@ -265,14 +269,14 @@ (define-public akonadi-mime (define-public akonadi-notes (package (name "akonadi-notes") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-notes-" version ".tar.xz")) (sha256 - (base32 "04y293kjrmjjcbb7fkjl7hl4vrks4cjjxnvc6ibzyv81rn6cdhh2")))) + (base32 "0xkcw9izgxfzglciig2i4wiz6iflzjg0d6dp1nq6p1kwxwc899sb")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -290,14 +294,14 @@ (define-public akonadi-notes (define-public akonadi-search (package (name "akonadi-search") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-search-" version ".tar.xz")) (sha256 - (base32 "1h5p44y244gzf7ndzw7afrvq9c76ybp8ddvg82p3lzjh02rrvd50")))) + (base32 "1id6zzjxc9zvpz1ryj2zn1yff5ak04r1mlk9cklbj99frzf0wv6p")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules @@ -334,7 +338,8 @@ (define-public akonadi-search (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "dbus-launch" "ctest"))))))) + (invoke "dbus-launch" "ctest" "-E" + "akonadi-sqlite-collectionindexingjobtest"))))))) (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (synopsis "Akonadi search library") (description "This package provides a library used to search in the @@ -345,46 +350,58 @@ (define-public akonadi-search (define-public kincidenceeditor (package (name "kincidenceeditor") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/incidenceeditor-" version ".tar.xz")) (sha256 - (base32 "1xpp5lw60mvpjsjsxmicfa5y2d68wnb9vm4yb1krwkihm852ziny")))) + (base32 "1sbflfggpqhwhg3iw46462z3p83sjhlx6f1fvgz251m020vqq9xa")))) (properties `((upstream-name . "incidenceeditor"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules)) + (list extra-cmake-modules dbus)) (inputs (list akonadi akonadi-calendar akonadi-contacts akonadi-mime boost + grantlee + grantleetheme kcalendarcore kcalendarsupport kcalutils kcodecs kcontacts kdbusaddons - kdepim-apps-libs kdiagram keventviews ki18n kiconthemes kidentitymanagement + kimap kio kitemmodels kldap kmailtransport kmime + kpimcommon kpimtextedit ktextwidgets kwallet libkdepim 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.") @@ -394,17 +411,17 @@ (define-public kincidenceeditor (define-public kaddressbook (package (name "kaddressbook") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kaddressbook-" version ".tar.xz")) (sha256 - (base32 "1vpdhdj87ai2sxjn2jk3mh6bzfr1n3yzydnkgv7nc8v1m2fdawap")))) + (base32 "1hzq0fdy99l1kqw14d582l0s56gvrw86abihib6k4az4c6g3c0md")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules)) + (list extra-cmake-modules kdoctools)) (inputs (list akonadi akonadi-contacts @@ -420,8 +437,6 @@ (define-public kaddressbook kcontacts kcrash kdbusaddons - kdepim-apps-libs - kdoctools ki18n kiconthemes kimap @@ -451,14 +466,14 @@ (define-public kaddressbook (define-public kalarmcal (package (name "kalarmcal") - (version "20.04.1") + (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 "0g0bm4zzzcpl2pqqf609349zagwrgj6a4ibxpgg4zf21aacdq8bi")))) + (base32 "160pmr702b68hys9l02azvrv6pagy1r2whw0zp3jlf6863p9fkqr")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -492,14 +507,14 @@ (define-public kalarmcal (define-public kblog (package (name "kblog") - (version "20.04.1") + (version "20.04.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kblog-" version ".tar.xz")) (sha256 - (base32 "0pi3axs58wsz5vq6vyisz73s24q739zplwrblyvkcm16nll4mvhk")))) + (base32 "1d5r9ivc1xmhkrz780xga87p84h7dnxjl981qap16gy37sxahcjr")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -526,14 +541,14 @@ (define-public kblog (define-public kcalendarsupport (package (name "kcalendarsupport") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/calendarsupport-" version ".tar.xz")) (sha256 - (base32 "1yv3hs7qw481cxw4kzbx5l8vv18bgzm1b0vj3zrlqqxwl5ac6xvy")))) + (base32 "0annni037cp1ga2lj2gkjxlkygnaxna4fs095lbaqp5zljz3g8vp")))) (properties `((upstream-name . "calendarsupport"))) (build-system qt-build-system) (native-inputs @@ -542,12 +557,12 @@ (define-public kcalendarsupport (list akonadi akonadi-calendar akonadi-mime + akonadi-notes boost kcalendarcore kcalutils kcompletion kdbusaddons - kdepim-apps-libs kguiaddons kholidays ki18n @@ -571,14 +586,14 @@ (define-public kcalendarsupport (define-public kcalutils (package (name "kcalutils") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kcalutils-" version ".tar.xz")) (sha256 - (base32 "0v268w8vhgqxq1nwv9b9cy4h7zqgjrv19r44g3zc9w5j76ivix86")))) + (base32 "006sfkjzyid8byl2mmyn1is4nra9wjqh21ksd5g1kv948hf1jdcs")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules libxml2)) ;; xmllint required for tests @@ -606,61 +621,17 @@ (define-public kcalutils functions for accessing calendar data using the kcalcore API.") (license license:lgpl2.0+))) -(define-public kdepim-apps-libs - (package - (name "kdepim-apps-libs") - (version "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 - (list extra-cmake-modules)) - (inputs - (list akonadi - akonadi-contacts - boost - gpgme - grantlee - grantleetheme - kconfig - kconfigwidgets - kcontacts - kcoreaddons - ki18n - kimap - kio - kitemmodels - kmime - kpimcommon - kservice - kwidgetsaddons - libkleo - prison - qgpgme - qtbase-5)) - (home-page "https://invent.kde.org/pim/kdepim-apps-libs") - (synopsis "KDE PIM mail related libraries and data files") - (description "This package provides mail related libraries and data files -for KDE PIM.") - (license ;; GPL for programs, LGPL for libraries - (list license:gpl2+ license:lgpl2.0+)))) - (define-public kdepim-runtime (package (name "kdepim-runtime") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kdepim-runtime-" version ".tar.xz")) (sha256 - (base32 "1in4x4wvgclkni72cfkw9jx35d0qd0jmfwybm3ksx5qx5sbki9gg")))) + (base32 "1ahrnnc9vn0556s4nrsjgc9vbf5rb6yby7fn33p3jjnpgja0mc7m")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules dbus kdoctools libxslt shared-mime-info)) @@ -672,9 +643,12 @@ (define-public kdepim-runtime akonadi-notes boost cyrus-sasl + grantlee + grantleetheme kalarmcal kcalendarcore kcalutils + kcmutils kcodecs kconfig kconfigwidgets @@ -686,6 +660,7 @@ (define-public kdepim-runtime kio kitemmodels kmailtransport + kldap kmbox kmime knotifications @@ -696,11 +671,13 @@ (define-public kdepim-runtime ktextwidgets kwallet kwindowsystem + libkdepim libkgapi ;; TODO: libkolab qca qtbase-5 qtdeclarative-5 + qtkeychain qtnetworkauth-5 qtspeech qtwebchannel-5 @@ -709,8 +686,7 @@ (define-public kdepim-runtime (arguments ;; TODO: 5/45 tests fail for quite different reasons, even with ;; "offscreen" and dbus - `(#:tests? #f - #:phases (modify-phases %standard-phases + `(#:phases (modify-phases %standard-phases (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH (lambda* (#:key inputs #:allow-other-keys) ;; FIXME: is not @@ -718,8 +694,19 @@ (define-public kdepim-runtime ;; this hack. (setenv "CPLUS_INCLUDE_PATH" (string-append - (search-input-directory inputs "include/KF5") - ":" (or (getenv "CPLUS_INCLUDE_PATH") "")))))))) + (assoc-ref inputs "akonadi-mime") "/include/KF5:" + (or (getenv "CPLUS_INCLUDE_PATH") ""))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; FIXME: Atleast some appear to require network. + (invoke "dbus-launch" "ctest" "-E" "\ +(akonadi-sqlite-synctest|akonadi-sqlite-pop3test|storecompacttest\ +|akonadi-sqlite-ewstest|ewsmoveitemrequest_ut|ewsdeleteitemrequest_ut\ +|ewsgetitemrequest_ut|ewsunsubscriberequest_ut|ewssettings_ut\ +|templatemethodstest|akonadi-sqlite-serverbusytest|ewsattachment_ut|\\ +testmovecollectiontask)")) + #t))))) (home-page "https://invent.kde.org/pim/kdepim-runtime") (synopsis "Runtime components for Akonadi KDE") (description "This package contains Akonadi agents written using KDE @@ -734,14 +721,14 @@ (define-public kdepim-runtime (define-public keventviews (package (name "keventviews") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/eventviews-" version ".tar.xz")) (sha256 - (base32 "0si9p95rgp7mgkzhzwyy10zrwzy1kipbhm1y96yjlc9rxi3jrc73")))) + (base32 "01x9ccwspn1dwkmcxcr8p6pazj6w31pxhx0bzlfr6bgpccicp2w2")))) (properties `((upstream-name . "eventviews"))) (build-system qt-build-system) (native-inputs @@ -783,23 +770,34 @@ (define-public keventviews (define-public kgpg (package (name "kgpg") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kgpg-" version ".tar.xz")) (sha256 - (base32 "03d3gsbara7ga2cyrhafkw11qq9cj804h9vpvxl4wd2a9c90snkh")))) + (base32 "1mzq3g4xwg459k0mp9xvg8bhilizadbh4gck1764wq69bxlcyav3")))) (build-system qt-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest" "-E" ;; FIXME: Failing tests. + "(kgpg-import|kgpg-disable)"))))))) (native-inputs (list extra-cmake-modules gnupg ;; TODO: Remove after gpgme uses fixed path + dbus ;; Remove after failing test passes kdoctools)) (inputs (list akonadi akonadi-contacts boost gpgme + grantlee + grantleetheme karchive kcodecs kcontacts @@ -830,14 +828,14 @@ (define-public kgpg (define-public kidentitymanagement (package (name "kidentitymanagement") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kidentitymanagement-" version ".tar.xz")) (sha256 - (base32 "0flp9p9hlr1zfgvsy5i1nq55p7bvnhqxkxbif1lyw0cq6iblxhgr")))) + (base32 "18xwvlmqhih5jmig2mj3a6mc5awlxdv8f81da6cgm123imhrirk4")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -869,14 +867,14 @@ (define-public kidentitymanagement (define-public kimap (package (name "kimap") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kimap-" version ".tar.xz")) (sha256 - (base32 "1x22wfzqp92mn1fy2xl89k9yjfk2vgcva0fd30i9rrqj4aw2rsma")))) + (base32 "11jd9zkvflfh3gqs36fhj8mla3k44xf7zdb0z4nl9sk5nhhgm5px")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -900,24 +898,24 @@ (define-public kimap (define-public kldap (package (name "kldap") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kldap-" version ".tar.xz")) (sha256 - (base32 "0whlp586ycsx0qf0nr81avwscpq62w5js46z7vayy0dxkhrhfayr")))) + (base32 "13llsfhx9lfvhf90a3vmpkyh02fjg5sp4fmrwrqyx9hjrbmy1g0a")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) (inputs - (list ki18n kio kwidgetsaddons qtbase-5)) + (list ki18n kio kwidgetsaddons qtbase-5 qtkeychain)) (propagated-inputs (list cyrus-sasl openldap)) (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") (synopsis "Library for accessing LDAP") - (description " This is a library for accessing LDAP with a convenient Qt + (description "This is a library for accessing LDAP with a convenient Qt style C++ API. LDAP (Lightweight Directory Access Protocol) is an application protocol for querying and modifying directory services running over TCP/IP.") (license license:lgpl2.0+))) @@ -925,14 +923,14 @@ (define-public kldap (define-public kleopatra (package (name "kleopatra") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kleopatra-" version ".tar.xz")) (sha256 - (base32 "1m50nzb2m27fkb8z3k34cv4zi2akr0fx8zn7lk5swhg49sgrip6n")))) + (base32 "10f61m0qrs0qipn94jd32gibyj8pcvprs8j7gmac0mym0b3djjls")))) (build-system qt-build-system) (native-inputs (list dbus extra-cmake-modules gnupg ;; TODO: Remove after gpgme uses fixed path @@ -967,7 +965,7 @@ (define-public kleopatra (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "dbus-launch" "ctest" ".")) + (invoke "dbus-launch" "ctest")) #t))))) (home-page "https://kde.org/applications/utilities/org.kde.kleopatra") (synopsis "Certificate Manager and Unified Crypto GUI") @@ -980,15 +978,14 @@ (define-public kleopatra (define-public kmail (package (name "kmail") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmail-" version ".tar.xz")) (sha256 - (base32 "06qfxzi5pasm6p5ck44sjca96dz8xzd1nndq5lqcyvcxmmnvvz3p")) - (patches (search-patches "kmail-Fix-missing-link-libraries.patch")))) + (base32 "1knh6cf72hidc6jyiw250b708b410fla0c5w83zaavmwv37ah8z0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules dbus kdoctools)) @@ -999,6 +996,8 @@ (define-public kmail akonadi-search boost gpgme + grantlee + grantleetheme kbookmarks kcalendarcore kcalutils @@ -1009,7 +1008,6 @@ (define-public kmail kcontacts kcrash kdbusaddons - kdepim-apps-libs kguiaddons ki18n kiconthemes @@ -1024,7 +1022,6 @@ (define-public kmail kmailtransport kmessagelib kmime - kmime knotifications knotifyconfig kontactinterface @@ -1034,6 +1031,7 @@ (define-public kmail kservice ksyntaxhighlighting ktextwidgets + kuserfeedback ktnef kwallet kwidgetsaddons @@ -1047,6 +1045,7 @@ (define-public kmail qgpgme qtbase-5 qtdeclarative-5 + qtkeychain qtwebchannel-5 qtwebengine-5 sonnet)) @@ -1056,7 +1055,14 @@ (define-public kmail (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "dbus-launch" "ctest" ".")) + (invoke "dbus-launch" "ctest" "-E" ;; FIXME: Many failing tests. + "(akonadi-sqlite-kmcomposerwintest|\ +akonadi-sqlite-tagselectdialogtest|\ +akonadi-sqlite-kmcommandstest|\ +sendlateragent-sendlaterutiltest|\ +sendlateragent-sendlaterconfigtest|\ +followupreminder-followupreminderconfigtest|\ +akonadi-sqlite-unifiedmailboxmanagertest)")) #t))))) (home-page "https://kontact.kde.org/components/kmail.html") (synopsis "Full featured graphical email client") @@ -1073,14 +1079,14 @@ (define-public kmail (define-public kmailcommon (package (name "kmailcommon") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/mailcommon-" version ".tar.xz")) (sha256 - (base32 "0q1k57zx1l7bnzrk1hadjxjn6r4yzz833mgsvaai9sd8qg022x2l")))) + (base32 "1zi8zkhv9g4vsylqzjm2wr9v6b20irfxhf4q467cmpqqrqpcp3af")))) (properties `((upstream-name . "mailcommon"))) (build-system qt-build-system) (native-inputs @@ -1091,6 +1097,8 @@ (define-public kmailcommon akonadi-mime boost gpgme + grantlee + grantleetheme karchive kcodecs kcompletion @@ -1099,6 +1107,7 @@ (define-public kmailcommon kcontacts kdbusaddons kdesignerplugin + kguiaddons ki18n kiconthemes kidentitymanagement @@ -1126,7 +1135,7 @@ (define-public kmailcommon qgpgme qtbase-5)) (arguments - `(#:tests? #f)) ;; TODO: 4/56 tests fail, even with "offscreen" and dbus + `(#:tests? #f)) ;; TODO: 12/62 tests fail (home-page "https://invent.kde.org/pim/mailcommon") (synopsis "KDE email utility library") (description "The mail common library provides utility functions for @@ -1137,32 +1146,38 @@ (define-public kmailcommon (define-public kmailimporter (package (name "kmailimporter") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/mailimporter-" version ".tar.xz")) (sha256 - (base32 "1929pw0shdzi0yvjnqhak680hjjibg8f8hqy3svyxxhiqbhfjm26")))) + (base32 "0lcr9zzdf16f82spr9x33jnzr23sx7xk2zvfpzdki3b5jxvapnsk")))) (properties `((upstream-name . "mailimporter"))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list akonadi + akonadi-contacts akonadi-mime + grantlee + grantleetheme boost karchive kcompletion kconfig kconfigwidgets + kcontacts kcoreaddons kdbusaddons ki18n + kimap kio kitemmodels kmime + kpimcommon kxmlgui libkdepim qtbase-5)) @@ -1176,14 +1191,14 @@ (define-public kmailimporter (define-public kmailtransport (package (name "kmailtransport") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmailtransport-" version ".tar.xz")) (sha256 - (base32 "1swqlgzxzlqffm119sbhszy9lr93m8lzwygr0q4raa660b6yiavm")))) + (base32 "0l3pgs781a6is937i0bkz9ykr40l36rwlrirsr4g8wh0gkc3ifi6")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1205,7 +1220,8 @@ (define-public kmailtransport ktextwidgets kwallet libkgapi - qtbase-5)) + qtbase-5 + qtkeychain)) (arguments `(#:tests? #f)) ;; TODO - 3/3 tests fail, require drkonqi (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") @@ -1217,14 +1233,14 @@ (define-public kmailtransport (define-public kmbox (package (name "kmbox") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmbox-" version ".tar.xz")) (sha256 - (base32 "03cny38v4y1lmcrs6d34hbj9assqgf51rqryf5rdzkiaq79c1krc")))) + (base32 "04cl2khj3a7n81nlmxsg8kgszrl22qm6s2kvbrhz39yfzi31cwqr")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -1239,14 +1255,14 @@ (define-public kmbox (define-public kmessagelib (package (name "kmessagelib") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/messagelib-" version ".tar.xz")) (sha256 - (base32 "03vq4962bhps2j9c9i52majlbkmvg2gmr197igv8xamja1vs8hk1")))) + (base32 "0xrhnkahqirsz37lbvx505ll7bfhr25lbq89yqq81bxbzkbvamsw")))) (properties `((upstream-name . "messagelib"))) (build-system qt-build-system) (native-inputs @@ -1269,7 +1285,7 @@ (define-public kmessagelib kconfigwidgets kcontacts kdbusaddons - kdepim-apps-libs + kguiaddons ki18n kiconthemes kidentitymanagement @@ -1309,12 +1325,11 @@ (define-public kmessagelib (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH (lambda* (#:key inputs #:allow-other-keys) ;; FIXME: One of the compilation steps fail to find - ;; without this hack. + ;; without this hack. (setenv "CPLUS_INCLUDE_PATH" - (string-append - (assoc-ref inputs "libkdepim") - "/include/KF5:" - (or (getenv "CPLUS_INCLUDE_PATH") "")))))))) + (string-append (assoc-ref inputs "qtbase") + "/include/qt5/QtPrintSupport:" + (or (getenv "CPLUS_INCLUDE_PATH") "")))))))) (home-page "https://invent.kde.org/pim/messagelib") (synopsis "KDE PIM messaging libraries") (description "This package provides several libraries for messages, @@ -1326,14 +1341,14 @@ (define-public kmessagelib (define-public kmime (package (name "kmime") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmime-" version ".tar.xz")) (sha256 - (base32 "1dkdxfr1ry10qyql5sp1ai4li11f0ncf9hipg27j59y70mlyrl2r")))) + (base32 "03s7l4lywdvp97h4qjgq06qqcclvnhy83qsrfzv0w2wcl631nnpw")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -1362,17 +1377,17 @@ (define-public kmime (define-public knotes (package (name "knotes") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/knotes-" version ".tar.xz")) (sha256 - (base32 "13h4n7fb5p6g1f5kmw6pblpd76j904psm30s3a5d3kykni57dijx")))) + (base32 "07pj0aqwsy1xi5mx7x0h3zmxfg0n4afgjax9a9ihc553xs6k48d7")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules libxslt)) + (list extra-cmake-modules kdoctools libxslt)) (inputs (list akonadi akonadi-contacts @@ -1392,14 +1407,12 @@ (define-public knotes kcoreaddons kcrash kdnssd - kdoctools kglobalaccel kiconthemes kimap kitemmodels kitemviews kmime - kmime knewstuff knotifications knotifyconfig @@ -1434,14 +1447,14 @@ (define-public knotes (define-public kontactinterface (package (name "kontactinterface") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kontactinterface-" version ".tar.xz")) (sha256 - (base32 "0s1qm1wjkvbb1film94r7g88d8vgh26bm0hm6gpyqv5bazw5qx3j")))) + (base32 "1qwx0q4bbk3d720ij37wbd54g9alw6ispjl1mq19hkk3gs5l1c78")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -1462,14 +1475,14 @@ (define-public kontactinterface (define-public korganizer (package (name "korganizer") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/korganizer-" version ".tar.xz")) (sha256 - (base32 "04lz3ldrr0lpy9zpsg9ja1i9gxzlcjpqcwn3g7l4jjdky4frcr2r")))) + (base32 "072pyzs38dv07mwi4hlfb4rh9jx40dpxac3ywy7kj6nyvbfjmh0r")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules dbus qttools-5 kdoctools)) @@ -1481,6 +1494,8 @@ (define-public korganizer akonadi-notes akonadi-search boost + grantlee + grantleetheme kcalendarcore kcalendarsupport kcalutils @@ -1493,7 +1508,6 @@ (define-public korganizer kcoreaddons kcrash kdbusaddons - kdepim-apps-libs keventviews kholidays kiconthemes @@ -1536,11 +1550,11 @@ (define-public korganizer (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "dbus-launch" "ctest" ".")) + (invoke "dbus-launch" "ctest")) #t))))) (home-page "https://kontact.kde.org/components/korganizer.html") (synopsis "Organizational assistant, providing calendars and other similar -functionality to help you organize your life.") +functionality to help you organize your life") (description "KOrganizer is the calendar and scheduling component of Kontact. It provides management of events and tasks, alarm notification, web export, network transparent handling of data, group scheduling, import and @@ -1585,14 +1599,14 @@ (define-public kpeoplevcard (define-public kpimcommon (package (name "kpimcommon") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/pimcommon-" version ".tar.xz")) (sha256 - (base32 "15lfqv5w4iwyjlvf4idykpkjgppl0ic59r4dw95qkbbjkps0nr7j")))) + (base32 "1k1d100lr277lgwyzn2ssxsx9x2yd9nfd5657r95vmdnkh2qs517")))) (properties `((upstream-name . "pimcommon"))) (build-system qt-build-system) (native-inputs @@ -1602,9 +1616,13 @@ (define-public kpimcommon akonadi akonadi-contacts akonadi-mime + akonadi-search boost grantlee + grantleetheme ;; TODO: ("kaccounts" ,kaccounts) + kcalendarcore + kcmutils kcodecs kconfig kconfigwidgets @@ -1619,10 +1637,10 @@ (define-public kpimcommon kitemmodels kitemviews kjobwidgets + kldap kmime knewstuff kpimtextedit - kservice ktextwidgets kwallet kwidgetsaddons @@ -1644,14 +1662,14 @@ (define-public kpimcommon (define-public libgravatar (package (name "libgravatar") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libgravatar-" version ".tar.xz")) (sha256 - (base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2")))) + (base32 "1bihy3dfagwc7aday40myqjbn555mkzzaaq7c14ywkmhh99dhvh7")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kconfig @@ -1674,14 +1692,14 @@ (define-public libgravatar (define-public kpimtextedit (package (name "kpimtextedit") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kpimtextedit-" version ".tar.xz")) (sha256 - (base32 "0j6d4sv405c3x0ww75qsww94apidsb8aaqf59akhv96zmv0vx5wy")))) + (base32 "19hrqbjcmpi81vmnggrkrv0fcc9inhz5aa5klx0141aylnzfgwsl")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools-5)) @@ -1715,14 +1733,14 @@ (define-public kpimtextedit (define-public ksmtp (package (name "ksmtp") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ksmtp-" version ".tar.xz")) (sha256 - (base32 "1xyaahibm0dc3qdwiak5yqa66szxaxnylvqxi6k21ayvzn2vxbhx")))) + (base32 "0kdy5gsg1sgccvdk1fpf866xl9m8v8z034jpgf6s7n2pr5r5mni2")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -1755,14 +1773,14 @@ (define-public ksmtp (define-public ktnef (package (name "ktnef") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ktnef-" version ".tar.xz")) (sha256 - (base32 "0cn5p32w2kas56yyc15c22kll4hd02lvvxz2n6cz1wda8alspj19")))) + (base32 "1in991n8alkxf40p0wvkr7gdaaz8w4kdw1rsq6sbjil6cs4cr5nl")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -1787,14 +1805,14 @@ (define-public ktnef (define-public libkdepim (package (name "libkdepim") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkdepim-" version ".tar.xz")) (sha256 - (base32 "0bask561laxgkgm3rxfpyxqs6jx1l9xjk058lhycq0pik6vwhdha")))) + (base32 "0g9jx6z5jf9yqn01xc1k038b4ljr9sil7bwvifc64s38qxl9wmww")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools-5)) @@ -1834,14 +1852,14 @@ (define-public libkdepim (define-public libkgapi (package (name "libkgapi") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkgapi-" version ".tar.xz")) (sha256 - (base32 "0nvd5fqrvyb7c3g7rf1lxbbv38q9sqnhd6irgx7awwgw92inxky4")))) + (base32 "1vbk8786mk1irm94bsm97270gnd149nz7w0zqnvwz499f72d21jx")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools-5)) @@ -1869,14 +1887,14 @@ (define-public libkgapi (define-public libkleo (package (name "libkleo") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkleo-" version ".tar.xz")) (sha256 - (base32 "0rijpmqyx4mrr7csik3vkfcra7kfywk6yz548fmq3ha8wa9ax8fv")))) + (base32 "19q128ldi0aspy7vc03r54vrf7wz7l1181x9pbmax8340nbnaz7l")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools qttools-5)) @@ -1895,6 +1913,18 @@ (define-public libkleo kpimtextedit qgpgme qtbase-5)) + (propagated-inputs + `(("gpgme" ,gpgme) + ("qgpgme" ,qgpgme))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; FIXME: These tests fail. + (invoke "ctest" "-E" + "(keyresolvercoretest|newkeyapprovaldialogtest)")) + #t))))) (home-page "https://invent.kde.org/pim/libkleo") (synopsis "KDE PIM cryptographic library") (description "@code{libkleo} is a library for Kleopatra and other parts of @@ -1905,14 +1935,14 @@ (define-public libkleo (define-public libksieve (package (name "libksieve") - (version "20.04.1") + (version "21.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libksieve-" version ".tar.xz")) (sha256 - (base32 "04k2nkwg5vlgbr5wpvsq02wi54ljsy4ka7y3ns5x3d2gb06wp03c")) + (base32 "1li9cc5y6xbn4m4qa21qmsjd4xzshp67mxwh2nvr17mfs8ray7vd")) (patches (search-patches "libksieve-Fix-missing-link-libraries.patch")))) (build-system qt-build-system) (native-inputs @@ -1951,11 +1981,6 @@ (define-public libksieve "src/ksieveui/editor/webengine/autotests/CMakeLists.txt" (("^\\s*(add_test|ecm_mark_as_test)\\W" line) (string-append "# " line))) - ;; FIXME: This test fails due to time zone problems. - (substitute* - "src/ksieveui/autocreatescripts/autotests/CMakeLists.txt" - ((".*sieveeditorgraphicalmodewidgettest\\.cpp.*") - "")) #t))))) (home-page "https://invent.kde.org/pim/libksieve") (synopsis "KDE Sieve library") diff --git a/gnu/packages/patches/akonadi-not-relocatable.patch b/gnu/packages/patches/akonadi-not-relocatable.patch index c3964c5c05..bd4cbee79f 100644 --- a/gnu/packages/patches/akonadi-not-relocatable.patch +++ b/gnu/packages/patches/akonadi-not-relocatable.patch @@ -1,19 +1,18 @@ -From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001 -From: gnidorah -Date: Fri, 22 Dec 2017 17:36:03 +0300 -Subject: [PATCH] Revert "Make Akonadi installation properly relocatable" +From 4b90a0bd4411a66bbe6ecf85ce89a60a58bee969 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 25 Apr 2021 08:01:21 -0500 +Subject: [PATCH 3/3] akonadi revert make relocatable -This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a. --- CMakeLists.txt | 3 --- KF5AkonadiConfig.cmake.in | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) -Index: akonadi-19.08.0/CMakeLists.txt -=================================================================== ---- akonadi-19.08.0.orig/CMakeLists.txt -+++ akonadi-19.08.0/CMakeLists.txt -@@ -306,9 +306,6 @@ configure_package_config_file( +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4e8cc81..63161b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -368,9 +368,6 @@ configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} @@ -21,29 +20,25 @@ Index: akonadi-19.08.0/CMakeLists.txt - AKONADI_INCLUDE_DIR - KF5Akonadi_DATA_DIR ) - + install(FILES -Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in -=================================================================== ---- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in -+++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in -@@ -26,8 +26,8 @@ if(BUILD_TESTING) - find_dependency(Qt5Test "@QT_REQUIRED_VERSION@") - endif() - +diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in +index bcf7320..1574319 100644 +--- a/KF5AkonadiConfig.cmake.in ++++ b/KF5AkonadiConfig.cmake.in +@@ -1,10 +1,10 @@ + @PACKAGE_INIT@ + -set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") -set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") +set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@") +set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@") - - find_dependency(Boost "@Boost_MINIMUM_VERSION@") - -@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako - include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) - + # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed -set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") +set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") - - #################################################################################### - # CMAKE_AUTOMOC + + # set the directories + if(NOT AKONADI_INSTALL_DIR) +-- +2.31.1 diff --git a/gnu/packages/patches/akonadi-paths.patch b/gnu/packages/patches/akonadi-paths.patch index ac08ec5448..bb4a19ede0 100644 --- a/gnu/packages/patches/akonadi-paths.patch +++ b/gnu/packages/patches/akonadi-paths.patch @@ -1,26 +1,26 @@ This is based on the respectve patch from NixPkgs, but with the parts pinning -mysql and postgresql executables removed. The our package definition on why. +mysql and postgresql executables removed. See our package definition on why. diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp --- a/src/akonadicontrol/agentmanager.cpp +++ b/src/akonadicontrol/agentmanager.cpp -@@ -61,7 +61,7 @@ public: - []() { - QCoreApplication::instance()->exit(255); - }); +@@ -47,7 +47,7 @@ public: + connect(this, &Akonadi::ProcessControl::unableToStart, this, []() { + QCoreApplication::instance()->exit(255); + }); - start(QStringLiteral("akonadiserver"), args, RestartOnCrash); -+ start(QLatin1String(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash); ++ start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash); } - + ~StorageProcessControl() override -@@ -84,7 +84,7 @@ public: - []() { - qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!"; - }); +@@ -69,7 +69,7 @@ public: + connect(this, &Akonadi::ProcessControl::unableToStart, this, []() { + qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!"; + }); - start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash); -+ start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash); ++ start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash); } - + ~AgentServerProcessControl() override diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp --- a/src/akonadicontrol/agentprocessinstance.cpp @@ -37,12 +37,12 @@ diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/ag diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp --- a/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp -@@ -209,7 +209,7 @@ bool DbConfigMysql::startInternalServer() +@@ -215,7 +215,7 @@ bool DbConfigMysql::startInternalServer() #endif - + // generate config file - const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf")); + const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); - const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); + const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); if (globalConfig.isEmpty()) { diff --git a/gnu/packages/patches/akonadi-timestamps.patch b/gnu/packages/patches/akonadi-timestamps.patch index e299a6991f..df81fdb2dc 100644 --- a/gnu/packages/patches/akonadi-timestamps.patch +++ b/gnu/packages/patches/akonadi-timestamps.patch @@ -2,12 +2,12 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp =================================================================== --- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp +++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp -@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer( +@@ -260,8 +260,7 @@ bool DbConfigMysql::startInternalServer( bool confUpdate = false; QFile actualFile(actualConfig); // update conf only if either global (or local) is newer than actual -- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) || -- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { +- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) +- || (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { + if (true) { QFile globalFile(globalConfig); QFile localFile(localConfig); diff --git a/gnu/packages/patches/kmail-Fix-missing-link-libraries.patch b/gnu/packages/patches/kmail-Fix-missing-link-libraries.patch deleted file mode 100644 index fc784d63dd..0000000000 --- a/gnu/packages/patches/kmail-Fix-missing-link-libraries.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6b0a3a60870499b20ce9ae2ea07cbc5ee53cbdd2 Mon Sep 17 00:00:00 2001 -From: Hartmut Goebel -Date: Tue, 21 Jan 2020 23:23:38 +0100 -Subject: [PATCH] Fix missing link libraries. - -See - -These are only actually missing if the libraries reside in different -prefixes, as it is the case in Guix or Nix. ---- - agents/archivemailagent/CMakeLists.txt | 1 + - agents/followupreminderagent/CMakeLists.txt | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt -index 95c6249de..d0ddcd475 100644 ---- a/agents/archivemailagent/CMakeLists.txt -+++ b/agents/archivemailagent/CMakeLists.txt -@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui ) - add_library(archivemailagent STATIC ${libarchivemailagent_SRCS}) - target_link_libraries(archivemailagent - KF5::MailCommon -+ KF5::Libkdepim - KF5::I18n - KF5::Notifications - KF5::KIOWidgets -diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt -index 9ae7eaa29..527044807 100644 ---- a/agents/followupreminderagent/CMakeLists.txt -+++ b/agents/followupreminderagent/CMakeLists.txt -@@ -27,6 +27,7 @@ target_link_libraries(followupreminderagent - KF5::AkonadiMime - KF5::AkonadiAgentBase - KF5::DBusAddons -+ KF5::FollowupReminder - KF5::XmlGui - KF5::KIOWidgets - KF5::Notifications --- -2.21.1 - diff --git a/gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch b/gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch index 238c4ec46c..3835c2e313 100644 --- a/gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch +++ b/gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch @@ -1,59 +1,23 @@ -From 732861dda9c466841a09329a0b2c992f2b78c40a Mon Sep 17 00:00:00 2001 -From: Hartmut Goebel -Date: Tue, 21 Jan 2020 23:15:23 +0100 -Subject: [PATCH] Fix missing link libraries. - See -These are only actually missing if the libraries reside in different -prefixes, as it is the case in Guix or Nix. ---- - src/ksieveui/autocreatescripts/tests/CMakeLists.txt | 2 ++ - src/ksieveui/scriptsparsing/autotests/CMakeLists.txt | 2 +- - src/ksieveui/scriptsparsing/tests/CMakeLists.txt | 8 ++++++-- - 3 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/ksieveui/autocreatescripts/tests/CMakeLists.txt b/src/ksieveui/autocreatescripts/tests/CMakeLists.txt -index 8a482b4..c43216c 100644 ---- a/src/ksieveui/autocreatescripts/tests/CMakeLists.txt -+++ b/src/ksieveui/autocreatescripts/tests/CMakeLists.txt -@@ -15,6 +16,7 @@ set(parsingscript_gui_SRCS parsingscript_gui.cpp ../../tests/capability.cpp) - add_executable(parsingscript_gui ${parsingscript_gui_SRCS}) - target_link_libraries(parsingscript_gui - KF5::KIOCore -+ KF5::SyntaxHighlighting - KF5::KSieveUi - KF5::KSieve - KF5::PimCommon -diff --git a/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt b/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt -index e41a74e..31703ef 100644 ---- a/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt -+++ b/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt -@@ -5,7 +5,7 @@ macro(add_sieveeditor_xmlprintingscriptbuilding _source _extrasource) - ecm_add_test(${_test} - TEST_NAME ${_name} - NAME_PREFIX "sieveeditor-xmlprintingscriptbuilding-" -- LINK_LIBRARIES Qt5::Test KF5::I18n KF5::KSieveUi -+ LINK_LIBRARIES Qt5::Test KF5::I18n KF5::KSieveUi KF5::SyntaxHighlighting - ) - endmacro() - add_sieveeditor_xmlprintingscriptbuilding(xmlprintingscriptbuildertest.cpp "" "") -diff --git a/src/ksieveui/scriptsparsing/tests/CMakeLists.txt b/src/ksieveui/scriptsparsing/tests/CMakeLists.txt -index a252039..99a1aaa 100644 ---- a/src/ksieveui/scriptsparsing/tests/CMakeLists.txt -+++ b/src/ksieveui/scriptsparsing/tests/CMakeLists.txt -@@ -9,5 +9,9 @@ set(xmlsieveparsing_SRCS - ) - - add_executable(xmlsieveparsing ${xmlsieveparsing_SRCS} ) --target_link_libraries(xmlsieveparsing KF5::KSieveUi KF5::KSieve KF5::I18n) -- -+target_link_libraries(xmlsieveparsing -+ KF5::KSieveUi -+ KF5::SyntaxHighlighting -+ KF5::KSieve -+ KF5::I18n -+) --- -2.21.1 +diff --git a/src/ksieveui/CMakeLists.txt b/src/ksieveui/CMakeLists.txt +--- a/src/ksieveui/CMakeLists.txt ++++ b/src/ksieveui/CMakeLists.txt +@@ -255,6 +255,7 @@ target_link_libraries(KF5KSieveUi + KF5::KManageSieve + KF5::KSieve + KF5::PimCommon ++ KF5::SyntaxHighlighting + PRIVATE + KF5::Libkdepim + KF5::Archive +@@ -269,7 +270,6 @@ target_link_libraries(KF5KSieveUi + KF5::I18n + KF5::SonnetUi + Qt::PrintSupport +- KF5::SyntaxHighlighting + ) + set_target_properties(KF5KSieveUi PROPERTIES +-- +2.33.0 -- 2.37.0