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

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

Merged
merged 1 commit into from May 11, 2020

Conversation

@ambrop72
Copy link
Contributor

ambrop72 commented Apr 18, 2020

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.
@worldofpeace
Copy link
Member

worldofpeace commented Apr 18, 2020

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?

@@ -9,6 +9,7 @@ mkDerivation {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
patches = [ ./kdegraphics-thumbnailers-fix-hang.patch ];

This comment has been minimized.

@worldofpeace

worldofpeace Apr 18, 2020 Member

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

This comment has been minimized.

@ambrop72

ambrop72 Apr 18, 2020 Author Contributor

Added.

@ambrop72 ambrop72 force-pushed the ambrop72:kde-thumbnail-hang branch from 038ab82 to 7bde25e Apr 18, 2020
@ambrop72
Copy link
Contributor Author

ambrop72 commented Apr 18, 2020

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.

@ambrop72 ambrop72 force-pushed the ambrop72:kde-thumbnail-hang branch from 7bde25e to 31c1540 Apr 18, 2020
Copy link
Member

worldofpeace left a comment

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

@@ -0,0 +1,31 @@
diff --git a/ps/gscreator.cpp b/ps/gscreator.cpp

This comment has been minimized.

@ttuegel

ttuegel Apr 24, 2020 Member

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

@ambrop72 ambrop72 force-pushed the ambrop72:kde-thumbnail-hang branch from 31c1540 to 57e6799 May 4, 2020
@ambrop72
Copy link
Contributor Author

ambrop72 commented May 4, 2020

Changed to fetchpatch.

@ofborg ofborg bot requested a review from ttuegel May 4, 2020
@aanderse
Copy link
Contributor

aanderse commented May 6, 2020

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

@aanderse
Copy link
Contributor

aanderse commented May 9, 2020

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

@ttuegel ttuegel merged commit 863c217 into NixOS:master May 11, 2020
14 checks passed
14 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="57e6799"; rev="57e6799d907995242575d94bd37178c59cb3cc9a"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="57e6799"; rev="57e6799d907995242575d94bd37178c59cb3cc9a"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="57e6799"; rev="57e6799d907995242575d94bd37178c59cb3cc9a"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="57e6799"; rev="57e6799d907995242575d94bd37178c59cb3cc9a"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="57e6799"; rev="57e6799d907995242575d94bd37178c59cb3cc9a"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="57e6799"; rev="57e6799d907995242575d94bd37178c59cb3cc9a"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="57e6799"; rev="57e6799d907995242575d94bd37178c59cb3cc9a"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ajs124
Copy link
Member

ajs124 commented May 12, 2020

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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.