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

Jump to bottom

kdegraphics-thumbnailers: Add patch for thumbnail.so hang. #85494

Merged
merged 1 commit into from May 11, 2020
Merged

kdegraphics-thumbnailers: Add patch for thumbnail.so hang. #85494

merged 1 commit into from May 11, 2020

Conversation

ambrop72
Copy link
Contributor

Fixes a bug in the KDE PDF thumbnail generator which causes thumbnail.so processes to hang and accumulate as well as a long delay during shutdown/reboot as systemd tries to terminate the processes and eventually gives up. Reproduction is probably easy, have a folder with a PDF and browse it with Dolphin. The patch here is the same as was accepted upstream.

https://bugs.kde.org/show_bug.cgi?id=404652
https://phabricator.kde.org/D26635

This is a pretty annoying bug so I think that a patch is appropriate as is backporting to 19.09. Tested on release-19.09 but it surely works in master because of the same kdegraphics-thumbnailers version.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ambrop72 ambrop72 requested a review from ttuegel as a code owner April 18, 2020 12:24
@worldofpeace
Copy link
Contributor

This is a pretty annoying bug so I think that a patch is appropriate as is backporting to 19.09. Tested on release-19.09 but it surely works in master because of the same kdegraphics-thumbnailers version.

Could we do 20.03 also?

worldofpeace
worldofpeace reviewed Apr 18, 2020
View reviewed changes
pkgs/applications/kde/kdegraphics-thumbnailers.nix Outdated
@@ -9,6 +9,7 @@ mkDerivation {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
patches = [ ./kdegraphics-thumbnailers-fix-hang.patch ];
Copy link
Contributor

Choose a reason for hiding this comment

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

can we get the details of the bug fix linked here as a reference?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added.

@ambrop72
Copy link
Contributor Author

This is a pretty annoying bug so I think that a patch is appropriate as is backporting to 19.09. Tested on release-19.09 but it surely works in master because of the same kdegraphics-thumbnailers version.

Could we do 20.03 also?

Ah I wrote wrong, I'm using this on top of 20.03, in any case I think it should be backported to both.

worldofpeace
worldofpeace approved these changes Apr 18, 2020
View reviewed changes
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.

I'll defer to @ttuegel, but this looks correct.

ttuegel
ttuegel reviewed Apr 24, 2020
View reviewed changes
pkgs/applications/kde/kdegraphics-thumbnailers-fix-hang.patch Outdated
@@ -0,0 +1,31 @@
diff --git a/ps/gscreator.cpp b/ps/gscreator.cpp
Copy link
Member

Choose a reason for hiding this comment

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

Could we fetch this from Phabricator using fetchpatch, instead of including it in the Nixpkgs tree?

@ambrop72
Copy link
Contributor Author

ambrop72 commented May 4, 2020

Changed to fetchpatch.

@ofborg ofborg bot requested a review from ttuegel May 4, 2020 19:45
@aanderse
Copy link
Member

aanderse commented May 6, 2020

I would really appreciate a backport of this too...

@aanderse
Copy link
Member

aanderse commented May 9, 2020

ping @ttuegel
ping @worldofpeace (needs more sparkles 😄)

@ttuegel ttuegel merged commit 863c217 into NixOS:master May 11, 2020
@ajs124
Copy link
Member

ajs124 commented May 12, 2020 •
edited

The patch url 404s and since it's not in the binary cache, that means the build fails.

@ajs124
Copy link
Member

ajs124 commented May 13, 2020

Thanks @adisbladis for fixing this in 5e20609

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel ttuegel approved these changes

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
6.topic: qt/kde 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ambrop72 @worldofpeace @aanderse @ajs124 @ttuegel