qtwebkit: fix path for libgdk-x11-2.0, it's in gtk2 apparently #60420
Conversation
| @@ -20,7 +20,7 @@ index 2fe69d1..b658e4a 100644 | |||
| // The code below has the same effect as this one: | |||
| // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); | |||
| - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); | |||
| + QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); | |||
| + QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); | |||
There was a problem hiding this comment.
You should remove
|
The same issue seems to have been there from the time Qt 5 was added, https://github.com/NixOS/nixpkgs/pull/1082/files#diff-985f9487cb048c1700c2b1383412c7f6R21 It was probably taken from Qt 4. Most likely, whoever did the Qt packaging is not very familiar with GLib ecosystem and confused Maybe even better would be removing the NSplugin support from qtwebkit, allowing us to drop the |
|
On Mon, 29 Apr 2019 10:07:34 -0700, Jan Tojnar ***@***.***> wrote:
The same issue seems to have been there from the time Qt 5 was added,
https://github.com/NixOS/nixpkgs/pull/1082/files#diff-985f9487cb048c1700c2b1383412c7f6R21
It was probably taken from Qt 4. Most likely, whoever did the Qt packaging is not very familiar with GLib ecosystem and confused `gdk` (which has always been part of `gtk`) with `gdk-pixbuf`.
Maybe even better would be removing the NSplugin support from qtwebkit, allowing us to drop the `gtk2` dependency. And we should do the same in webkitgtk – we [disabled it by default](cfcb022#diff-4f8047132dd1d49e3f9d07b835f7b163) a while ago.
Sounds good to me!
I started putting together this change,
but am unsure which bits you meant to have disabled.
If you have an somewhat clear idea of how this'd look,
(and assuming it's not any trouble!)
could you make a commit implementing this
and we can discuss/test from there?
Thanks! No worries if you don't have time :)
…
--
You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub:
#60420 (comment) part: text/html
|
I meant removing all the bits conditional on For QtWebkit, I would assume it has a similar flag for not building plug-in support.
Not at the moment. But there is no hurry. |
Motivation for this change
This seems like it would cause breakage as-is, but was looking
for libgdk-x11-2.0 for something else and noticed that it apparently
is not from
gdk_pixbufbut fromgtk2?Not sure if this changed for some reason, but seems strange
to bake into the library a path to a file that doesn't exist o:).
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)