-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
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
Kdepim 17.08 #28418
Conversation
@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. |
51d76fc
to
b37eafd
Compare
KMail 17.08 works fine in this branch. I think I tried all PIM applications (akregator, kaddressbook, kontact, kleopatra). Hope this can finally land. |
b37eafd
to
a8d7561
Compare
a8d7561
to
cea59ff
Compare
@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 |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 ]; |
There was a problem hiding this comment.
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)?
There was a problem hiding this comment.
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
There was a problem hiding this 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 |
There was a problem hiding this comment.
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 ]; |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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.
Motivation for this change
Compile fixes for the KDEPIM packages.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandbox
innix.conf
on non-NixOS)
nix-shell -p nox --run "nox-review wip"
./result/bin/
)