Skip to content

kdevelop: 5.0.4 -> 5.1.1 #26404

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

Merged
merged 1 commit into from
Jun 9, 2017
Merged

kdevelop: 5.0.4 -> 5.1.1 #26404

merged 1 commit into from
Jun 9, 2017

Conversation

ambrop72
Copy link
Contributor

@ambrop72 ambrop72 commented Jun 5, 2017

Including also a patch for bug https://bugs.kde.org/show_bug.cgi?id=379433
which is a quite annoying regression from 5.0.4. The patch is the same as
the change committed upstream.

Please merge back to release-17.03 as well.

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 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.

Sorry, something went wrong.

@grahamc
Copy link
Member

grahamc commented Jun 5, 2017

Instead of copying the patch in to this repo, can you use fetchpatch on https://cgit.kde.org/kdevplatform.git/patch/?id=da4c0fdfcf21dc2a8f48a2b1402213a32effd47a?

Including also a patch for bug https://bugs.kde.org/show_bug.cgi?id=379433
which is a quite annoying regression from 5.0.4. The patch is the same as
the change committed upstream.
@ambrop72
Copy link
Contributor Author

ambrop72 commented Jun 6, 2017

@grahamc done

@joachifm joachifm merged commit 7badb92 into NixOS:master Jun 9, 2017
@ambrop72
Copy link
Contributor Author

Can you merge to 17.03?

@joachifm
Copy link
Contributor

Done

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.

None yet

3 participants