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

webkitgtk: 2.16.6 -> 2.18.0 #29796

Closed
wants to merge 1 commit into from
Closed

Conversation

bendlas
Copy link
Contributor

@bendlas bendlas commented Sep 26, 2017

Motivation for this change

stable update

Things done

update dependents

just built, will test when I get home

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

@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {

# XXX: WebKit2 missing include path for gst-plugins-base.
# Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0"
Copy link
Contributor

@jtojnar jtojnar Sep 26, 2017

Choose a reason for hiding this comment

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

This should not be necessary, the bug was already fixed, see jtojnar@3b4df8d

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm a bit confused: In your update branch, you leave the build flag in: jtojnar@99796a4

I'll push the workaround for now, since that's what built for me, but I would like to incorporate your cleanup.

Copy link
Contributor

Choose a reason for hiding this comment

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

I am not removing it since it was already removed in aebae6c

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, that should have rang a bell. I was just stupid. I'd even been thinking about this needing to go to staging, yet, it didn't occur to me, to look there.


webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
harfbuzz = harfbuzz-icu;
gst-plugins-base = gst_all_1.gst-plugins-base;
inherit (darwin) libobjc;
};

webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix {
webkitgtk217x = callPackage ../development/libraries/webkitgtk/2.17.nix {
Copy link
Contributor

Choose a reason for hiding this comment

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

2.17 is unstable version of 2.18. As such, it can be removed.

@fpletz fpletz added this to the 17.09 milestone Sep 27, 2017
@fpletz fpletz added 8.has: package (update) 9.needs: port to stable A PR needs a backport to the stable release. labels Sep 27, 2017
remove references to 216x
@bendlas
Copy link
Contributor Author

bendlas commented Oct 28, 2017

Sorry, I just saw that this already went to staging. I reverted the commit to master. Still, staging should be updated to 2.18.2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (update) 9.needs: port to stable A PR needs a backport to the stable release.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants