Skip to content

libsForQt5.qt5.qtimageformats: add dependencies jasper, libmng, and libwebp#255044

Merged
vcunat merged 1 commit intoNixOS:masterfrom
obj-obj:master
Sep 16, 2023
Merged

libsForQt5.qt5.qtimageformats: add dependencies jasper, libmng, and libwebp#255044
vcunat merged 1 commit intoNixOS:masterfrom
obj-obj:master

Conversation

@obj-obj
Copy link
Contributor

@obj-obj obj-obj commented Sep 14, 2023

Description of changes

These dependencies are on both qt6-imageformats (in this repo) and the qt5-imageformats Arch Linux package. I noticed a lack of WEBP support in Spectacle, and this will probably fix it.

I haven't tested on my own machine, because I don't have the time right now to recompile a bunch of packages.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@obj-obj obj-obj requested a review from ttuegel as a code owner September 14, 2023 00:35
@obj-obj obj-obj marked this pull request as draft September 14, 2023 00:35
@github-actions github-actions bot added the 6.topic: qt/kde Object-oriented framework for GUI creation label Sep 14, 2023
@NixOSInfra NixOSInfra added the 12.first-time contribution This PR is the author's first one; please be gentle! label Sep 14, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Sep 14, 2023
@obj-obj obj-obj marked this pull request as ready for review September 14, 2023 02:04
nagy
nagy suggested changes Sep 14, 2023
View reviewed changes
Copy link
Member

@nagy nagy left a comment

Choose a reason for hiding this comment

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

Can you follow the commit message (and PR title) guidelines at https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions ?

@obj-obj
Copy link
Contributor Author

obj-obj commented Sep 14, 2023

Oh, didn't see those, sorry

Will do

@obj-obj obj-obj changed the title fix: add more dependencies to qt5-imageformats libsForQt5.qt5.qtimageformats: add dependencies jasper, libmng, and libwebp Sep 14, 2023
@vcunat
Copy link
Member

vcunat commented Sep 16, 2023

I don't think this will make webp available for you, as before this PR the log says

  WEBP ................................... yes
    Using system libwebp ................. no

@vcunat
Copy link
Member

vcunat commented Sep 16, 2023

However, it would probably help with #254798 right now.

vcunat
vcunat approved these changes Sep 16, 2023
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Log looks good, indicating unvendoring of libwebp (a security fix ATM). This PR is exactly what we do in the qt6 version already, too. I built several reverse dependencies on x86_64 NixOS.

@vcunat vcunat added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Sep 16, 2023
@vcunat vcunat merged commit 72e3962 into NixOS:master Sep 16, 2023
@vcunat
Copy link
Member

vcunat commented Sep 16, 2023

(squashed in order to improve the commit message)

@vcunat vcunat mentioned this pull request Sep 15, 2023
Closed
90 tasks
@obj-obj
Copy link
Contributor Author

obj-obj commented Sep 16, 2023

Log looks good, indicating unvendoring of libwebp (a security fix ATM). This PR is exactly what we do in the qt6 version already, too. I built several reverse dependencies on x86_64 NixOS.

Yeah, I actually copy-pasted this from QT6 lol

@obj-obj
Copy link
Contributor Author

obj-obj commented Sep 16, 2023

Log looks good, indicating unvendoring of libwebp (a security fix ATM). This PR is exactly what we do in the qt6 version already, too. I built several reverse dependencies on x86_64 NixOS.

Aren't reverse dependencies called "dependents"?

@vcunat
Copy link
Member

vcunat commented Sep 16, 2023

Maybe, I don't care about terminology too much here, as long as the meaning is clear. nix-store uses --referrers-closure

@delroth
Copy link
Contributor

delroth commented Sep 18, 2023 •
edited
Loading

Can the libwebp part at least get cherry-picked to 23.05 for CVE-2023-4863 remediation?

EDIT: oops, I missed #255432 - thanks for being ahead of me :p

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

Reviewers

@vcunat vcunat vcunat approved these changes

@ttuegel ttuegel Awaiting requested review from ttuegel

+1 more reviewer

@nagy nagy nagy requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@obj-obj @vcunat @delroth @nagy @NixOSInfra