JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdepim-apps-libs: init at 17.04.0

Browse Source
This commit is contained in:
Thomas Tuegel 2017-05-22 12:36:13 -05:00
parent 7640cae5b0
commit 4b032f12ea
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
4 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/kde/default.nix
View File

@ -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 {};

21
pkgs/applications/kde/kdepim-apps-libs/default.nix Normal file
View File

@ -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" ];
}

62
pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch Normal file
View File

@ -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)

1
pkgs/applications/kde/kdepim-apps-libs/series Normal file
View File

@ -0,0 +1 @@
kdepim-apps-libs-grantlee-merge-theme-dirs.patch