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

Kdepim 17.08 #28418

Merged
merged 6 commits into from
Aug 27, 2017
Merged

Kdepim 17.08 #28418

merged 6 commits into from
Aug 27, 2017

Conversation

vandenoever
Copy link
Contributor

@vandenoever vandenoever commented Aug 19, 2017

Motivation for this change

Compile fixes for the KDEPIM packages.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • 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.

@mention-bot
Copy link

@vandenoever, thanks for your PR! By analyzing the history of the files in this pull request, we identified @adisbladis, @ttuegel and @phunehehe to be potential reviewers.

@vandenoever
Copy link
Contributor Author

KMail 17.08 works fine in this branch. I think I tried all PIM applications (akregator, kaddressbook, kontact, kleopatra). Hope this can finally land.

@vandenoever
Copy link
Contributor Author

Rebased on #28366 after #27224 landed in master.

@vandenoever
Copy link
Contributor Author

@ttuegel These are some more patches needed to get kdepim to work on kdeapplications 17.08.

@@ -44,17 +44,6 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp
loader->setTheme(dirName);

if (!sEngine) {
@@ -102,9 +105,7 @@ QString ThemePrivate::errorTemplate(cons
Copy link
Member

Choose a reason for hiding this comment

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

Why is this patch changing?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The purpose of this part is unclear to me. The patch as it was was reverting an improvement, namely the check for a null pointer.

@@ -1,2 +1 @@
grantleetheme_check_null.patch
Copy link
Member

Choose a reason for hiding this comment

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

Why is this patch removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it was applied upstream

29770046

@@ -15,7 +15,7 @@ mkDerivation {
maintainers = with maintainers; [ sander phreedom ];
platforms = platforms.linux;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper shared_mime_info ];
Copy link
Member

Choose a reason for hiding this comment

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

Why is shared_mime_info removed from nativeBuildInputs but retained in the arguments to the package (above)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's still present in propagatedBuildInputs

Copy link
Contributor Author

@vandenoever vandenoever left a comment

Choose a reason for hiding this comment

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

Hope things are clear now.

@@ -1,2 +1 @@
grantleetheme_check_null.patch
Copy link
Contributor Author

Choose a reason for hiding this comment

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

it was applied upstream

29770046

@@ -15,7 +15,7 @@ mkDerivation {
maintainers = with maintainers; [ sander phreedom ];
platforms = platforms.linux;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper shared_mime_info ];
Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's still present in propagatedBuildInputs

@@ -44,17 +44,6 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp
loader->setTheme(dirName);

if (!sEngine) {
@@ -102,9 +105,7 @@ QString ThemePrivate::errorTemplate(cons
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The purpose of this part is unclear to me. The patch as it was was reverting an improvement, namely the check for a null pointer.

@ttuegel ttuegel merged commit 469555a into NixOS:master Aug 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants