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.

Sign up for GitHub

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

webkitgtk[release-17.09]: 2.16.6 -> 2.18.2 #31407

Merged
merged 1 commit into from Nov 10, 2017
Merged

webkitgtk[release-17.09]: 2.16.6 -> 2.18.2 #31407

merged 1 commit into from Nov 10, 2017

Conversation

bendlas
Copy link
Contributor

@bendlas bendlas commented Nov 8, 2017

Motivation for this change

We need to keep stable secure.

Things done

Backported commits touching webkitgtk, including the update to 2.18.2, that I recently pushed to staging: ee0c629

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

cc @fpletz

@bendlas bendlas requested a review from fpletz November 8, 2017 20:04
@fpletz
Copy link
Member

fpletz commented Nov 9, 2017

Please use cherry-pick -x to add a reference to the picked commit.

@fpletz fpletz added this to the 17.09 milestone Nov 9, 2017
@bendlas
Copy link
Contributor Author

bendlas commented Nov 9, 2017

@fpletz done

@vcunat
Copy link
Member

vcunat commented Nov 9, 2017 •
edited

Well, about target branch being staging-17.09. This PR has conflicts wrt. release-17.09. Perhaps we should first merge it to staging-17.09 or something, so we solve conflicts in this PR already. (Otherwise it's not completely clear what we're merging.) Also note that we don't currently have any jobset for staging-17.09, but we can easily create it if 17.09 managers think so. (EDIT: I personally think it's OK now for 17.09 to merge mass rebuilds directly.)

BTW, libproxy still refers directly to webkitgtk216x, creating an evaluation error.

@vcunat
Copy link
Member

vcunat commented Nov 9, 2017

In particular, note that on 17.09 we already have webkitgtk 2.18.1.

@bendlas
webkitgtk: 2.18.1 -> 2.18.2
41e70e2 
(cherry picked from commit ee0c629)
@bendlas bendlas requested a review from FRidh as a code owner November 9, 2017 22:19
@bendlas bendlas changed the base branch from staging-17.09 to release-17.09 November 9, 2017 22:20
@bendlas
Copy link
Contributor Author

bendlas commented Nov 9, 2017

OK, rebased the PR onto release-17.09

@bendlas
Copy link
Contributor Author

bendlas commented Nov 9, 2017

couldn't find any references to webkitgtk216x in it

@vcunat
Copy link
Member

vcunat commented Nov 10, 2017

Yes, that was just on the old base.

@vcunat
Copy link
Member

vcunat commented Nov 10, 2017

Well, some pages don't render for me, but this PR doesn't seem to affect the problem, and it's the same on nixos-unstable. I tried epiphany and midori, e.g. google.com is shown just blank grey. Apparently the content is there, as shown by hovering over (invisible) links.

vcunat
vcunat approved these changes Nov 10, 2017
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.

Can't well test it (see my comment), but the change seems OK.

@bendlas bendlas merged commit 2b0dd71 into NixOS:release-17.09 Nov 10, 2017
@etu etu mentioned this pull request Dec 11, 2017
Open
@bendlas bendlas deleted the staging-17.09 branch October 22, 2023 02:00
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

@fpletz fpletz Awaiting requested review from fpletz

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
1.severity: mass-rebuild 8.has: package (update) 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-darwin: 501+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 0 10.rebuild-linux: 11-100 10.rebuild-linux: 501+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
17.09
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@bendlas @fpletz @vcunat @GrahamcOfBorg