Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KDE Frameworks: 5.36 -> 5.37 and KDE Applications 17.04.3 -> 17.08.0 #28366

Merged
merged 5 commits into from Aug 22, 2017
Merged

KDE Frameworks: 5.36 -> 5.37 and KDE Applications 17.04.3 -> 17.08.0 #28366

merged 5 commits into from Aug 22, 2017

Conversation

vandenoever
Copy link
Contributor

@vandenoever vandenoever commented Aug 18, 2017 •
edited

Motivation for this change

New version of KDE Applications and KDE frameworks. Only small changes were needed to make it work.

Things done

I've tested konsole, dolphin, konversation, kate, k3b, kdenlive, spectacle, kmix, kcachegrind, filelight by opening them and using them a bit.

  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • [ x] NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@vandenoever vandenoever changed the title Kde applications KDE Frameworks and KDE applications update Aug 18, 2017
@vandenoever vandenoever changed the title KDE Frameworks and KDE applications update KDE Frameworks and KDE Applications update Aug 18, 2017
@vandenoever vandenoever changed the title KDE Frameworks and KDE Applications update KDE Frameworks: 5.36 -> 5.37 and KDE Applications 17.04.3 -> 17.08.0 Aug 18, 2017
@bkchr
Copy link
Contributor

bkchr commented Aug 18, 2017

Hi, your commits do not compile on my system.

Currently I have added the following changes:

diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix
index fa4ad3fcd2..db019db358 100644
--- a/pkgs/desktops/plasma-5/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules,
   kcoreaddons, kdeclarative, ki18n, krunner, kservice, plasma-framework,
-  qtscript, qtdeclarative,
+  qtscript, qtdeclarative
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index 50f53d70a9..0bfad2b5c8 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules, kdoctools,
   gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n,
-  libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative
+  libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem
 }:
 
 mkDerivation {
@@ -10,6 +10,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n
-    libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative
+    libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix
index 352a56d643..826999f2f9 100644
--- a/pkgs/development/libraries/kde-frameworks/krunner.nix
+++ b/pkgs/development/libraries/kde-frameworks/krunner.nix
@@ -11,7 +11,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kconfig kcoreaddons ki18n kio kservice qtdeclarative solid
-    threadweaver kwindowsystem
+    threadweaver
   ];
-  propagatedBuildInputs = [ plasma-framework qtbase ];
+  propagatedBuildInputs = [ plasma-framework qtbase kwindowsystem ];
 }

But khelpcenter still not compiles, but I did not fixed it yet.

@vandenoever vandenoever force-pushed the kde-applications branch 2 times, most recently from 30c57c4 to 33ed84f Compare August 18, 2017 17:28
@vandenoever
Copy link
Contributor Author

@bkchr I've applied your patch and fixed khelpcenter.

I've also tested marble.

@bkchr
Copy link
Contributor

bkchr commented Aug 18, 2017

Nice for fixing it that fast! Are you sure that the patch is needed? Maybe we miss to define something in the right way in nixos?

@vandenoever
Copy link
Contributor Author

On most distros there is just one ../include/KF5 folder. So a missing dependency can be undetected. In this case, I tried adding KF5::KCoreAddons to the target_link_libraries. That should put the KCoreAddons include folder in the include path. But that did not fix the compile problem. So I took the approach of directly adding the directory. It does not feel clean, but I do not know another way to fix it.

@bkchr
Copy link
Contributor

bkchr commented Aug 19, 2017

Okay I looked into khelpcenter again and found a "better" patch. They just missed to add KF5::CoreAddons to khc_xapianindexer. It would be nice if you could replace the patch with mine, I will send this patch also upstream :)

diff --git a/searchhandlers/CMakeLists.txt b/searchhandlers/CMakeLists.txt
index 298a32e..b9e06c6 100644
--- a/searchhandlers/CMakeLists.txt
+++ b/searchhandlers/CMakeLists.txt
@@ -16,7 +16,7 @@ set(khc_xapianindexer_SOURCES
 add_executable(khc_xapianindexer ${khc_xapianindexer_SOURCES})
 kde_target_enable_exceptions(khc_xapianindexer PRIVATE)
 ecm_mark_nongui_executable(khc_xapianindexer)
-target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES})
+target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive KF5::CoreAddons ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES})
 if (${KF5_VERSION} VERSION_GREATER 5.35.0)
     # practically means >=5.36
     target_link_libraries(khc_xapianindexer KF5::DocTools)

@bkchr
Copy link
Contributor

bkchr commented Aug 19, 2017

Committed upstream

@vandenoever
Copy link
Contributor Author

Good improvement. I'll update the patch after my nox-review run is done.

@vandenoever
Copy link
Contributor Author

I fixed lxqt-runner and lxqt-notificationd. i-score does not build, but it not build before either.

@bkchr I've used your khelpcenter patch.

@vandenoever vandenoever mentioned this pull request Aug 19, 2017
Merged
8 tasks
@bkchr
Copy link
Contributor

bkchr commented Aug 20, 2017

Ty :) The patch was also accepted upstream, so it should be shipped in the next bug fix release.

@globin
Copy link
Member

globin commented Aug 20, 2017

cc @ttuegel

@vandenoever
Copy link
Contributor Author

Rebased on master after #27224 landed.

@ttuegel
Copy link
Member

ttuegel commented Aug 21, 2017

This looks good to me, I'm just waiting on the tests to finish here.

@ttuegel ttuegel merged commit 49fb3b9 into NixOS:master Aug 22, 2017
@vandenoever vandenoever deleted the kde-applications branch August 22, 2017 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@vandenoever @bkchr @globin @ttuegel