Fix libwebkit deployment #37

probonopd · 2022-10-10T17:10:39Z

@TheAssassin I am not the author of this but I thought maybe you'd like this to be upstreamed.
Please see tauri-apps/tauri#2940 for details.

add missing tls backend. overwrite gio modules dir

Fix gtk path

TheAssassin

Thanks. Will consider merging, but it'll take some work to fix. There's a few hacks in there that won't work upstream (e.g., forcing GTK versions).

FabianLars · 2022-10-10T21:00:00Z

Heyy author here👋 tldr: can't recommend merging ✌️

This was really "tailored" for tauri's use-case and even for us it's not working great yet.

The only no-brainer in my eyes (which i meant to upstream but forgot) is the GTK_PATH change which fixes error messages along the lines of Gtk-Message: Failed to load module X, see the PR for a little more info about this change: tauri-apps#2

Then some changes where for fedora support (and arch etc) and i'm not sure if that's something interesting for upstream when you can't bundle redistributable appimages with linuxdeploy on arch/fedora (because of glibc and whatever) 🤷 So i didn't consider upstreaming these changes, especially since they weren't explicitly tested much (tho there were no complaints either)

The libwebkit specific changes at the bottom where only tested with webkit 4.0 / gtk3 and may not work with 4.1 or 5.0 / gtk4. Also i'm not sure how good of an idea it is to bundle (all) webkit files for all gtk apps?

The gio stuff is still broken, simple as that. The most prominent issue was something about certificates which renders webkitgtk unable to load https pages.

FabianLars · 2022-10-10T21:06:37Z

Oh and i forgot the most important issue here, this PR alone is not enough to make webkit work in appimages, it is missing the essential part of 2940 - the additional webkit files WebKitNetworkProcess WebKitWebProcess and libwebkit2gtkinjectedbundle.so - this was what 2940 was all about.

TheTumultuousUnicornOfDarkness

It adds regressions, and you are not using functions like get_pkgconf_variable() and copy_tree().
Please improve this.

TheTumultuousUnicornOfDarkness · 2022-10-11T08:39:12Z

linuxdeploy-plugin-gtk.sh

@@ -86,7 +86,8 @@ search_tool() {
    done
 }

-DEPLOY_GTK_VERSION="${DEPLOY_GTK_VERSION:-0}" # When not set by user, this variable use the integer '0' as a sentinel value
+#DEPLOY_GTK_VERSION="${DEPLOY_GTK_VERSION:-0}" # When not set by user, this variable use the integer '0' as a sentinel value
+DEPLOY_GTK_VERSION=3 # Force GTK3 for tauri apps


Why did you hardcoded DEPLOY_GTK_VERSION? You can set DEPLOY_GTK_VERSION=3 as an environment variable.

TheTumultuousUnicornOfDarkness · 2022-10-11T08:49:00Z

linuxdeploy-plugin-gtk.sh

@@ -119,6 +120,8 @@ if [ "$APPDIR" == "" ]; then
 fi

 mkdir -p "$APPDIR"
+# make lib64 writable again.
+chmod +w "$APPDIR"/usr/lib64 || true


I do not get it. As this point, $APPDIR is an empty directory, without usr inside.
Also, I am not a big fan of hardcoded /usr/lib64: it will not work on 32-bit distros. Furthermore, Debian-based distros use multiarch so there is no /usr/lib64.

TheTumultuousUnicornOfDarkness · 2022-10-11T08:58:36Z

linuxdeploy-plugin-gtk.sh

@@ -203,15 +206,15 @@ case "$DEPLOY_GTK_VERSION" in
        echo "Installing GTK 3.0 modules"
        gtk3_exec_prefix="$(get_pkgconf_variable "exec_prefix" "gtk+-3.0")"
        gtk3_libdir="$(get_pkgconf_variable "libdir" "gtk+-3.0")/gtk-3.0"
-        gtk3_path="$gtk3_libdir/modules"


If I understand, the issue is /modules should not be at the end of gtk3_path. In that case, why didn't you just remove /modules at the end to fix the issue?

TheTumultuousUnicornOfDarkness · 2022-10-11T09:01:50Z

linuxdeploy-plugin-gtk.sh

@@ -305,3 +308,19 @@ for directory in "${PATCH_ARRAY[@]}"; do
        ln $verbose -s "${file/\/usr\/lib\//}" "$APPDIR/usr/lib"
    done < <(find "$directory" -name '*.so' -print0)
 done
+
+# set write permission on lib64 again to make it deletable.
+chmod +w "$APPDIR"/usr/lib64 || true


/usr/lib64 is 755 on systems. I think the issue is how you create this directory before calling linuxdeploy.

TheTumultuousUnicornOfDarkness · 2022-10-11T09:05:46Z

linuxdeploy-plugin-gtk.sh

+chmod +w "$APPDIR"/usr/lib64 || true
+
+# We have to copy the files first to not get permission errors when we assign gio_extras_dir
+find /usr/lib* -name libgiognutls.so -exec mkdir -p "$APPDIR"/"$(dirname '{}')" \; -exec cp --parents '{}' "$APPDIR/" \; || true


It looks like you are trying to perform a copy_tree, isn't it?

TheTumultuousUnicornOfDarkness · 2022-10-11T09:11:27Z

linuxdeploy-plugin-gtk.sh

+# related files that we seemingly don't need:
+# libgiolibproxy.so - libgiognomeproxy.so - glib-pacrunner
+
+gio_extras_dir=$(find "$APPDIR"/usr/lib* -name libgiognutls.so -exec dirname '{}' \; 2>/dev/null)


It is not safe, it can returns multiples directories, like:

/usr/lib/gio/modules /usr/lib32/gio/modules

Use "$(get_pkgconf_variable "giomoduledir" "gio-2.0") instead.

TheTumultuousUnicornOfDarkness · 2022-10-11T09:14:56Z

linuxdeploy-plugin-gtk.sh

+EOF
+
+#binary patch absolute paths in libwebkit files
+find "$APPDIR"/usr/lib* -name 'libwebkit*' -exec sed -i -e "s|/usr|././|g" '{}' \;


From where libwebkit pops up? I do not see any copy of this library before.

FabianLars · 2022-10-11T09:49:31Z

[...] Please improve this.

As i said, our branch and most of these changes are not upstreamable. And especially since our bundler directly downloads the live version of our fork i will not make many changes to it.

TheAssassin · 2022-12-26T19:28:40Z

Closing this PR for now, since as @FabianLars pointed out this has never meant to go upstream. If we find useful changes, I'm sure @FabianLars won't mind their inclusion. I also want to restate that PRs are very welcome.

FabianLars added 17 commits November 22, 2021 23:26

try to fix webkit

4000d02

where are we lol

f516e40

remove lib64 from search_tool again

6d84bf3

fix permission errors on fedora

ae6f542

ignore chmod error (if dir doesnt exist)

147323e

actually ignore chmod error without crashing the script

9c37485

add missing tls backend. overwrite gio modules dir

01ae4f2

Merge pull request #1 from tauri-apps/fix-tls

2975baf

add missing tls backend. overwrite gio modules dir

Merge branch 'master' of github.com:linuxdeploy/linuxdeploy-plugin-gtk

1f3269b

always use gtk3. disable env var.

66c99f6

fix lint warnings

f0cbf63

Merge branch 'linuxdeploy:master' into master

7ebaa48

Merge branch 'linuxdeploy:master' into master

1b87f10

fix GTK_PATH env var

f8cb22b

add absolute paths to GTK_PATH

c273eb7

Merge pull request #2 from tauri-apps/fix-gtk-path

3f3a18d

Fix gtk path

Merge branch 'linuxdeploy:master' into master

c017fa2

TheAssassin requested a review from TheTumultuousUnicornOfDarkness October 10, 2022 17:11

TheAssassin requested changes Oct 10, 2022

View reviewed changes

TheTumultuousUnicornOfDarkness suggested changes Oct 11, 2022

View reviewed changes

TheTumultuousUnicornOfDarkness mentioned this pull request Oct 11, 2022

Fix GTK_PATH #38

Merged

TheAssassin closed this Dec 26, 2022

freakboy3742 mentioned this pull request Jan 3, 2023

Error running Linux AppImage containing Webkit beeware/briefcase#1029

Closed

freakboy3742 mentioned this pull request Mar 12, 2023

Can't deploy any app that uses Webkit2 #42

Open

TheAssassin mentioned this pull request Oct 3, 2024

Linux AppImage -> FLATPAK notes in 2.8.1-rc1 prusa3d/PrusaSlicer#13376

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix libwebkit deployment #37

Fix libwebkit deployment #37

Uh oh!

probonopd commented Oct 10, 2022 •

edited

Loading

Uh oh!

TheAssassin left a comment

Uh oh!

FabianLars commented Oct 10, 2022

Uh oh!

FabianLars commented Oct 10, 2022

Uh oh!

TheTumultuousUnicornOfDarkness left a comment

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Uh oh!

FabianLars commented Oct 11, 2022

Uh oh!

TheAssassin commented Dec 26, 2022

Uh oh!

Uh oh!

Fix libwebkit deployment #37

Fix libwebkit deployment #37

Uh oh!

Conversation

probonopd commented Oct 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TheAssassin left a comment

Choose a reason for hiding this comment

Uh oh!

FabianLars commented Oct 10, 2022

Uh oh!

FabianLars commented Oct 10, 2022

Uh oh!

TheTumultuousUnicornOfDarkness left a comment

Choose a reason for hiding this comment

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Choose a reason for hiding this comment

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Choose a reason for hiding this comment

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Choose a reason for hiding this comment

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Choose a reason for hiding this comment

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Choose a reason for hiding this comment

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Choose a reason for hiding this comment

Uh oh!

TheTumultuousUnicornOfDarkness Oct 11, 2022

Choose a reason for hiding this comment

Uh oh!

FabianLars commented Oct 11, 2022

Uh oh!

TheAssassin commented Dec 26, 2022

Uh oh!

Uh oh!

probonopd commented Oct 10, 2022 •

edited

Loading