diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-22 12:36:13 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-08-21 06:51:16 -0500 |
commit | 4b032f12eaf2167694098b2ae312dc508635a889 (patch) | |
tree | 372a75244fccc0757c452ed95092a35e9831a5ed /pkgs/applications/kde | |
parent | 7640cae5b04c88d8b8b97a628a0f10fd7cecffef (diff) | |
download | nixlib-4b032f12eaf2167694098b2ae312dc508635a889.tar nixlib-4b032f12eaf2167694098b2ae312dc508635a889.tar.gz nixlib-4b032f12eaf2167694098b2ae312dc508635a889.tar.bz2 nixlib-4b032f12eaf2167694098b2ae312dc508635a889.tar.lz nixlib-4b032f12eaf2167694098b2ae312dc508635a889.tar.xz nixlib-4b032f12eaf2167694098b2ae312dc508635a889.tar.zst nixlib-4b032f12eaf2167694098b2ae312dc508635a889.zip |
kdepim-apps-libs: init at 17.04.0
Diffstat (limited to 'pkgs/applications/kde')
4 files changed, 85 insertions, 0 deletions
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index c7e43f5820d3..8af037087741 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -83,6 +83,7 @@ let kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive.nix {}; kdepim-runtime = callPackage ./kdepim-runtime.nix {}; + kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix new file mode 100644 index 000000000000..6189e8706db0 --- /dev/null +++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, copyPathsToStore, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets, + kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison, +}: + +mkDerivation { + name = "kdepim-apps-libs"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets + kcontacts ki18n kiconthemes kio libkleo pimcommon prison + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch new file mode 100644 index 000000000000..02c369cc4ee8 --- /dev/null +++ b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch @@ -0,0 +1,62 @@ +Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp +=================================================================== +--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp ++++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp +@@ -50,9 +50,9 @@ public: + mTemplateLoader.clear(); + } + +- void changeGrantleePath(const QString &path) ++ void changeGrantleePath(const QStringList &paths) + { +- mTemplateLoader->setTemplateDirs(QStringList() << path); ++ mTemplateLoader->setTemplateDirs(paths); + mEngine->addTemplateLoader(mTemplateLoader); + + mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html")); +@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee + + void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path) + { +- d->changeGrantleePath(path); ++ d->changeGrantleePath(QStringList(path)); + } + + void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme) + { +- d->changeGrantleePath(theme.absolutePath()); ++ d->changeGrantleePath(theme.absolutePaths()); + } + + inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value) +Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp +=================================================================== +--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp ++++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp +@@ -74,9 +74,9 @@ public: + mTemplateLoader.clear(); + } + +- void changeGrantleePath(const QString &path) ++ void changeGrantleePath(const QStringList &paths) + { +- mTemplateLoader->setTemplateDirs(QStringList() << path); ++ mTemplateLoader->setTemplateDirs(paths); + mEngine->addTemplateLoader(mTemplateLoader); + + mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html")); +@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta + + void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path) + { +- d->changeGrantleePath(path); ++ d->changeGrantleePath(QStringList(path)); + } + + void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme) + { +- d->changeGrantleePath(theme.absolutePath()); ++ d->changeGrantleePath(theme.absolutePaths()); + } + + void GrantleeContactFormatter::setForceDisableQRCode(bool b) diff --git a/pkgs/applications/kde/kdepim-apps-libs/series b/pkgs/applications/kde/kdepim-apps-libs/series new file mode 100644 index 000000000000..1e8a52b55e96 --- /dev/null +++ b/pkgs/applications/kde/kdepim-apps-libs/series @@ -0,0 +1 @@ +kdepim-apps-libs-grantlee-merge-theme-dirs.patch |