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.

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

kde_applications: 18.12.03 -> 19.04.1; kdeFrameworks: 5.56 -> 5.58; plasma-5: 5.15.3 -> 5.15.5 #60035

Merged
merged 16 commits into from May 23, 2019

Conversation

nyanloutre
Copy link
Member

@nyanloutre nyanloutre commented Apr 22, 2019

Motivation for this change

Some work will need to be done to make some application work.

Fixed apps:

  • akonadi
  • kdegraphics-thumbnailers
  • kdenlive
  • kdepim-runtime
  • kio-extras
  • kcalc
  • kmail

kdenlive is trying to download https://github.com/rttrorg/rttr during build

kdepim-runtime error:

[ 31%] Building CXX object resources/facebook/CMakeFiles/facebookresourcelib.dir/listjob.cpp.o
In file included from /build/kdepim-runtime-19.04.0/resources/facebook/listjob.cpp:18:0:
/build/kdepim-runtime-19.04.0/resources/facebook/listjob.h:23:10: fatal error: AkonadiCore/Item: No such file or directory
 #include <AkonadiCore/Item>
          ^~~~~~~~~~~~~~~~~~

the plasma5 test is passing and every dependencies are cached on https://nyanloutre.cachix.org

any help is welcome

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • 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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@dtzWill
Copy link
Member

dtzWill commented Apr 22, 2019

a59ab5a
(as well as similar fixes to what you have above)
was what I ended up with, at least or the applications I use/build. Sorry, was working to upstream things today 😇.

@nyanloutre
Copy link
Member Author

@dtzWill thanks I added the patch that I missed

@worldofpeace
Copy link
Contributor

kdenlive is trying to download https://github.com/rttrorg/rttr during build

That's what it does when it can't find it

I don't think it's packaged so we'll need to add it.

@worldofpeace
Copy link
Contributor

Fixed that in the push. Hope you don't mind.

@nyanloutre
Copy link
Member Author

@worldofpeace ok no problem, I was looking at it too but didn't find how to enable the unit tests

@nyanloutre nyanloutre marked this pull request as ready for review April 22, 2019 21:31
@nyanloutre
Copy link
Member Author

and as with the previous versions of kdenlive on NixOS there is missing codecs for rendering (only lossless is available)

@worldofpeace
Copy link
Contributor

and as with the previous versions of kdenlive on NixOS there is missing codecs for rendering (only lossless is available)

Which codecs?

At runtime I also saw warnings for missing

  • frei0r-plugins
  • ffmpeg (probably runtime optional)
  • ffplay
  • ffprobe

@nyanloutre
Copy link
Member Author

nyanloutre commented Apr 22, 2019

It's similar to this issue : https://forums.linuxmint.com/viewtopic.php?t=276908
I can get rid of the warning message if ffmpeg is in the path but the issue remain

@bkchr
Copy link
Contributor

bkchr commented Apr 23, 2019

The package qtnetworkauth does not exist? Did you just missed to commit the module?

@nyanloutre
Copy link
Member Author

I added qtnetworkauth but kdepim-runtime is still not compiling (see the PR description)

@dtzWill
Copy link
Member

dtzWill commented Apr 23, 2019 via email

@nyanloutre
Copy link
Member Author

Is there still something blocking the merge ?

@worldofpeace
Copy link
Contributor

Sorry, I just haven't had a chance to test things @nyanloutre.

Have you runtime tested the applications?

@FRidh FRidh mentioned this pull request May 4, 2019
9 tasks
@vandenoever
Copy link
Contributor

#60889 is a similar patch. It has working kmail. You can cherry pick from there.

Notably, it disable facebook from resources/CMakeLists.txt in kdepim-runtime by patching it out which is cleaner than using sed.

It fixes two compilation errors in kmail by this patch

diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt
index 48ed076..9c56896 100644
--- a/agents/archivemailagent/CMakeLists.txt
+++ b/agents/archivemailagent/CMakeLists.txt
@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui )
 add_library(archivemailagent STATIC ${libarchivemailagent_SRCS})
 target_link_libraries(archivemailagent
     KF5::MailCommon
+    KF5::Libkdepim
     KF5::I18n
     KF5::Notifications
     KF5::IconThemes
diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt
index a56b730..83604cf 100644
--- a/agents/followupreminderagent/CMakeLists.txt
+++ b/agents/followupreminderagent/CMakeLists.txt
@@ -23,6 +23,7 @@ target_link_libraries(followupreminderagent
     KF5::AkonadiMime
     KF5::AkonadiAgentBase
     KF5::DBusAddons
+    KF5::FollowupReminder
     KF5::XmlGui
     KF5::KIOWidgets
     KF5::Notifications

@nyanloutre nyanloutre force-pushed the kdeapps_update branch 2 times, most recently from a0ad774 to f0c0989 Compare May 5, 2019 16:25
@ofborg ofborg bot requested a review from FRidh May 5, 2019 16:44
@nyanloutre
Copy link
Member Author

@vandenoever I cherry picked your commits, thanks

@nyanloutre nyanloutre force-pushed the kdeapps_update branch 2 times, most recently from 38f7fde to f8c5097 Compare May 6, 2019 17:48
@nyanloutre
Copy link
Member Author

@dtzWill in the kdepim-runtime package was qca-qt5 mandatory for runtime ? (because it's building fine without it)

@nyanloutre
Copy link
Member Author

nixosTests.plasma5 ran successfully for me

@vandenoever
Copy link
Contributor

I would like to abuse this thread a bit. KDE has a yearly conference. It's a great way to let people know how great KDE software works on NixOS and praise the KDE devs in person. If someone feels like presenting a talk along the lines of 'KDE/Plasma on NixOS', I'm sure it would be very much appreciated.

https://akademy.kde.org/2019/cfp

I try to go every year and it never disappoints.

@acowley
Copy link
Contributor

acowley commented May 19, 2019

I've also built this and done a quick video edit and render with kdenlive. 👍

@nyanloutre
Copy link
Member Author

@acowley is lossy encoding (x264 for example) working in kdenlive now ?

@acowley
Copy link
Contributor

acowley commented May 19, 2019

It worked out of the box for me (x264 is what I used), but I can’t say why it worked (eg maybe I had ffmpeg available).

@worldofpeace
Copy link
Contributor

Just squashed the fixup commit.

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I'm inclined to integrate this fairly soon if there isn't any issues raised.

@worldofpeace
Copy link
Contributor

Result of nix-review

Failures that are new and should be fixed

@nyanloutre
Copy link
Member Author

nyanloutre commented May 23, 2019

For Krita, it may be this issue: #35359
https://bugs.kde.org/show_bug.cgi?id=407591

@vcunat
Copy link
Member

vcunat commented May 23, 2019

Yes, I'm fairly certain, i.e. it's unrelated to this PR.

@worldofpeace
Copy link
Contributor

Ok krita build failure is transient, I guess this should be good now.

@worldofpeace worldofpeace merged commit 53afb54 into NixOS:master May 23, 2019
@worldofpeace
Copy link
Contributor

Thanks to those involved 🎆

@nyanloutre nyanloutre deleted the kdeapps_update branch May 23, 2019 19:08
@vandenoever
Copy link
Contributor

Awesome!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants