treewide: replace kcalcore dependencies with kcalendarcore

gstqt5
nyanloutre 2019-12-11 22:15:00 +01:00 committed by Frederik Rietdijk
parent 3ccb0bef9c
commit 2abd0a559c
15 changed files with 30 additions and 29 deletions

View File

@ -9,7 +9,7 @@
, qtwebengine
, akonadi-contacts
, kcalcore
, kcalendarcore
, kconfigwidgets
, kcoreaddons
, kdoctools
@ -89,7 +89,7 @@ mkDerivation rec {
qtwebengine
akonadi-contacts
kcalcore
kcalendarcore
kconfigwidgets
kcoreaddons
kfilemetadata

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, kcalcore, kcalutils, kcontacts,
akonadi, akonadi-contacts, kcalendarcore, kcalutils, kcontacts,
kidentitymanagement, kio, kmailtransport,
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
akonadi akonadi-contacts kcalcore kcalutils kcontacts kidentitymanagement
akonadi akonadi-contacts kcalendarcore kcalutils kcontacts kidentitymanagement
kio kmailtransport
];
outputs = [ "out" "dev" ];

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, kcalcore, kcmutils, kcontacts, kcoreaddons, kmime,
akonadi, akonadi-mime, kcalendarcore, kcmutils, kcontacts, kcoreaddons, kmime,
krunner, qtbase, xapian
}:
@ -14,7 +14,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcmutils krunner xapian ];
propagatedBuildInputs = [
akonadi akonadi-mime kcalcore kcontacts kcoreaddons kmime qtbase
akonadi akonadi-mime kcalendarcore kcontacts kcoreaddons kmime qtbase
];
outputs = [ "out" "dev" ];
}

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,
akonadi, akonadi-contacts, calendarsupport, kcalendarcore, kcompletion,
kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim,
ktextwidgets, kxmlgui, messagelib, qtbase, akonadi-search, xapian
}:
@ -14,7 +14,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets
akonadi akonadi-contacts calendarsupport kcalendarcore kcompletion kconfigwidgets
kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
messagelib qtbase libkdepim akonadi-search xapian
];

View File

@ -6,7 +6,7 @@
kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio,
knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon,
kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalcore, kcalutils,
kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils,
kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime,
pimcommon, kpimtextedit, kdepim-apps-libs, messagelib,
@ -27,7 +27,7 @@ mkDerivation {
kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio
knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon
kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalcore kcalutils
kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore kcalutils
kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime
pimcommon kpimtextedit kdepim-apps-libs messagelib

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement,
akonadi, kcalendarcore, kdelibs4support, kholidays, kidentitymanagement,
kpimtextedit, kcalutils
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils
akonadi kcalendarcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils
];
outputs = [ "out" "dev" ];
}

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
grantlee, kcalendarcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
kidentitymanagement, kpimtextedit,
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
grantlee kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
grantlee kcalendarcore kconfig kontactinterface kcoreaddons kdelibs4support
kidentitymanagement kpimtextedit
];
outputs = [ "out" "dev" ];

View File

@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, shared-mime-info,
akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass,
kitinerary, kontactinterface
@ -17,7 +17,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
akonadi-import-wizard akonadi-notes calendarsupport eventviews
incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative
incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative
kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
libksieve mailcommon mailimporter messagelib poppler prison kpkpass
kitinerary kontactinterface

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, extra-cmake-modules
, qtbase, qtdeclarative, ki18n, kmime, kpkpass
, poppler, kcontacts, kcalcore
, poppler, kcontacts, kcalendarcore
}:
mkDerivation {
@ -13,7 +13,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
qtbase qtdeclarative ki18n kmime kpkpass poppler
kcontacts kcalcore
kcontacts kcalendarcore
];
outputs = [ "out" "dev" ];
}

View File

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, cyrus_sasl, kcmutils,
ki18n, kio, kmime, kwallet, ksmtp, libkgapi,
kcalcore, kcontacts
kcalendarcore, kcontacts
}:
mkDerivation {
@ -13,7 +13,7 @@ mkDerivation {
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalcore kcontacts ];
buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalendarcore kcontacts ];
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
outputs = [ "out" "dev" ];
}

View File

@ -9,7 +9,7 @@
grantlee, grantleetheme, qtx11extras,
akonadi, akonadi-notes, akonadi-search, kcalutils,
kontactinterface, libkdepim, kmime, pimcommon, kpimtextedit,
kcalcore
kcalendarcore
}:
mkDerivation {
@ -24,6 +24,6 @@ mkDerivation {
akonadi akonadi-notes kcalutils kontactinterface
libkdepim kmime pimcommon kpimtextedit
akonadi-search
kcalcore
kcalendarcore
];
}

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kcalcore, kcalutils, kcontacts, kdelibs4support
kcalendarcore, kcalutils, kcontacts, kdelibs4support
}:
mkDerivation {
@ -12,7 +12,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kcalcore kcalutils kcontacts kdelibs4support
kcalendarcore kcalutils kcontacts kdelibs4support
];
outputs = [ "out" "dev" ];
}

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
qtwebengine, kio, kcalcore, kcontacts,
qtwebengine, kio, kcalendarcore, kcontacts,
cyrus_sasl
}:
@ -12,5 +12,5 @@ mkDerivation {
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ qtwebengine kio kcalcore kcontacts cyrus_sasl ];
buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ];
}

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-notes, kcalcore, kcmutils, kcrash, kdbusaddons,
akonadi, akonadi-notes, kcalendarcore, kcmutils, kcrash, kdbusaddons,
kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications,
knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo,
pimcommon, qttools, karchive, mailcommon, messagelib
@ -15,7 +15,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-notes kcalcore kcmutils kcrash kdbusaddons
akonadi akonadi-notes kcalendarcore kcmutils kcrash kdbusaddons
kidentitymanagement kldap kmailtransport knewstuff knotifications
knotifyconfig kparts kross ktexteditor kwallet libkdepim libkleo pimcommon
qttools karchive mailcommon messagelib

View File

@ -22610,7 +22610,8 @@ in
digikam = libsForQt5.callPackage ../applications/graphics/digikam {
inherit (plasma5) oxygen;
inherit (kdeApplications) akonadi-contacts kcalcore;
inherit (kdeApplications) akonadi-contacts;
inherit (kdeFrameworks) kcalendarcore;
ffmpeg = ffmpeg_4;
opencv3 = opencv3WithoutCuda;
};