From 6c596b9ca64744c80377503918627ca3a832cdf4 Mon Sep 17 00:00:00 2001 From: Michael Pyne Date: Sat, 19 Apr 2014 23:19:40 -0400 Subject: [PATCH 1/7] kf5: Ignore Windows-related module by default. --- kf5-workspace-build-include | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kf5-workspace-build-include b/kf5-workspace-build-include index 262772e..3305ac9 100644 --- a/kf5-workspace-build-include +++ b/kf5-workspace-build-include @@ -22,6 +22,9 @@ module-set kf5-workspace-modules disable-snapshots true # kde-runtime is temporary (parts of it depend on plasma, so it's here) use-modules kde-runtime workspace plasmate kde-gtk-config + + # Remove if you're somehow using Windows + ignore-modules kwindowsaddons end module-set module-set kf5-network-management From e238c156db3b7b6aa73d110114fa49accb51e493 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 23 Apr 2014 17:43:15 +0200 Subject: [PATCH 2/7] kactivities moved under frameworks now --- kf5-frameworks-build-include | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kf5-frameworks-build-include b/kf5-frameworks-build-include index cce1171..10d2110 100644 --- a/kf5-frameworks-build-include +++ b/kf5-frameworks-build-include @@ -58,9 +58,8 @@ end module module-set extra-frameworks repository kde-projects - # Will move to frameworks/ once the 4.x branch doesn't matter much anymore - # (master branch is used for the Qt5/KF5 version) - use-modules kactivities plasma-framework krunner + # TODO: finish moving plasma-framework to frameworks/ + use-modules plasma-framework krunner end module-set # Example of how to set options for just one module from a module-set... this is From 2c851f4de9ee9a57658965f902913bf714582e80 Mon Sep 17 00:00:00 2001 From: David Faure Date: Fri, 25 Apr 2014 12:14:14 +0200 Subject: [PATCH 3/7] Remove special case for attica, it moved to frameworks --- kf5-frameworks-build-include | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kf5-frameworks-build-include b/kf5-frameworks-build-include index 10d2110..f5f76cf 100644 --- a/kf5-frameworks-build-include +++ b/kf5-frameworks-build-include @@ -26,10 +26,9 @@ module libdbusmenu-qt repository bzr://lp:libdbusmenu-qt end module -# Attica will move to frameworks/ once the 4.x branch doesn't matter much anymore module-set repository kde-projects - use-modules kdesrc-build extra-cmake-modules attica + use-modules kdesrc-build extra-cmake-modules # Optionally: add polkit-qt-1 cmake-options -DCMAKE_BUILD_TYPE:STRING=debug end module-set From c425f5410141fd8da1b01166300d0fc601db1071 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 26 Apr 2014 10:56:07 +0200 Subject: [PATCH 4/7] plasma-framework moved to frameworks --- kf5-frameworks-build-include | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/kf5-frameworks-build-include b/kf5-frameworks-build-include index f5f76cf..c68e19f 100644 --- a/kf5-frameworks-build-include +++ b/kf5-frameworks-build-include @@ -1,5 +1,5 @@ # Module definitions for building KDE Frameworks 5 -# (cmake, KF5's dependencies, kdelibs frameworks, plasma-framework) +# (cmake, KF5's dependencies, KDE Frameworks 5) # Usage: Write your own kdesrc-buildrc with only a "global" section # then include this file, like this: @@ -47,9 +47,8 @@ end module-set module-set frameworks repository kde-projects use-modules frameworks - # KRunner depends on Plasma # KPrintUtils has been merged into kde4support - ignore-modules krunner kprintutils + ignore-modules kprintutils # The CodeBlocks generator allows usage in QtCreator, while still generating Makefiles cmake-options -DBUILD_TESTING=TRUE -DCMAKE_BUILD_TYPE:STRING=debug -G "CodeBlocks - Unix Makefiles" end module @@ -57,10 +56,6 @@ end module module-set extra-frameworks repository kde-projects - # TODO: finish moving plasma-framework to frameworks/ - use-modules plasma-framework krunner -end module-set - # Example of how to set options for just one module from a module-set... this is # useful to have *after* your "include .../kf5-framework-build-include" in your # kdesrc-buildrc if you just want to tweak some settings without adding/removing From 304a4dd1aa3e803a41156d78052fe1fa861be85d Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 26 Apr 2014 12:16:18 +0200 Subject: [PATCH 5/7] whoops, properly clean up here --- kf5-frameworks-build-include | 3 --- 1 file changed, 3 deletions(-) diff --git a/kf5-frameworks-build-include b/kf5-frameworks-build-include index c68e19f..22a515b 100644 --- a/kf5-frameworks-build-include +++ b/kf5-frameworks-build-include @@ -53,9 +53,6 @@ module-set frameworks cmake-options -DBUILD_TESTING=TRUE -DCMAKE_BUILD_TYPE:STRING=debug -G "CodeBlocks - Unix Makefiles" end module -module-set extra-frameworks - repository kde-projects - # Example of how to set options for just one module from a module-set... this is # useful to have *after* your "include .../kf5-framework-build-include" in your # kdesrc-buildrc if you just want to tweak some settings without adding/removing From 4acfa3dd95b651a96b84c12531381ea71048a4d8 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 26 Apr 2014 20:39:03 +0200 Subject: [PATCH 6/7] kde-runtime is empty, remove it. Clean up old line about snapshots. --- kf5-workspace-build-include | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/kf5-workspace-build-include b/kf5-workspace-build-include index 3305ac9..348b1bb 100644 --- a/kf5-workspace-build-include +++ b/kf5-workspace-build-include @@ -18,10 +18,8 @@ module-set kf5-workspace-modules repository kde-projects # Required for branch-group - #until tarballs are created again - disable-snapshots true - # kde-runtime is temporary (parts of it depend on plasma, so it's here) - use-modules kde-runtime workspace plasmate kde-gtk-config + + use-modules workspace plasmate kde-gtk-config # Remove if you're somehow using Windows ignore-modules kwindowsaddons @@ -39,6 +37,7 @@ end module-set module-set kf5-baloo repository kde-projects + # Temporarily here. Not workspace-specific. use-modules baloo kfilemetadata milou branch frameworks end module-set From 169b7492d0d89f0794730707350207a80bc0e3b5 Mon Sep 17 00:00:00 2001 From: Jeremy Whiting Date: Tue, 29 Apr 2014 10:14:37 -0600 Subject: [PATCH 7/7] Add akonadi to frameworks build list --- kf5-frameworks-build-include | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kf5-frameworks-build-include b/kf5-frameworks-build-include index 22a515b..28c20a9 100644 --- a/kf5-frameworks-build-include +++ b/kf5-frameworks-build-include @@ -42,6 +42,11 @@ module-set phonon use-modules phonon/phonon phonon-vlc phonon-gstreamer end module-set +module-set akonadi + repository kde-projects + use-modules akonadi +end module-set + # ============================= KDE Frameworks ======================== module-set frameworks