diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index c686973f9b..f038def043 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1 +1 @@ -1267 +1268 diff --git a/browser_patches/webkit/archive.sh b/browser_patches/webkit/archive.sh index b4dc1d471a..b73251eaf2 100755 --- a/browser_patches/webkit/archive.sh +++ b/browser_patches/webkit/archive.sh @@ -59,9 +59,19 @@ createZipForLinux() { # copy all relevant binaries cp -t $tmpdir ./WebKitBuild/WPE/Release/bin/MiniBrowser ./WebKitBuild/WPE/Release/bin/WPE*Process # copy all relevant shared objects - LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir - LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPENetworkProcess | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir - LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPEWebProcess | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir + # - exclude gstreamer plugins + LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/MiniBrowser \ + | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' \ + | grep -v '/libgst.*so' \ + | xargs cp -t $tmpdir + LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPENetworkProcess \ + | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' \ + | grep -v '/libgst.*so' \ + | xargs cp -t $tmpdir + LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPEWebProcess \ + | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' \ + | grep -v '/libgst.*so' \ + | xargs cp -t $tmpdir # Copy libvpx.so.5 as Ubuntu 20.04 comes with libvpx.so.6 ldd WebKitBuild/WPE/Release/bin/MiniBrowser | grep -o '[^ ]*\/libvpx.so.5[^ ]*' | xargs cp -t $tmpdir # Injected bundle is loaded dynamicly via dlopen => not bt listed by ldd. @@ -76,7 +86,14 @@ createZipForLinux() { # copy all relevant binaries cp -t $tmpdir ./WebKitBuild/GTK/Release/bin/MiniBrowser ./WebKitBuild/GTK/Release/bin/WebKit*Process # copy all relevant shared objects - LD_LIBRARY_PATH="$PWD/WebKitBuild/GTK/DependenciesGTK/Root/lib" ldd WebKitBuild/GTK/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/GTK/[^ ]*' | xargs cp -t $tmpdir + # - exclude gstreamer plugins + # - exclude libdrm + LD_LIBRARY_PATH="$PWD/WebKitBuild/GTK/DependenciesGTK/Root/lib" ldd WebKitBuild/GTK/Release/bin/MiniBrowser \ + | grep -o '[^ ]*WebKitBuild/GTK/[^ ]*' \ + | grep -v '/libgst.*so' \ + | grep -v '/libdrm.so' \ + | xargs cp -t $tmpdir + # Injected bundle is loaded dynamicly via dlopen => not bt listed by ldd. cp -t $tmpdir WebKitBuild/GTK/Release/lib/libwebkit2gtkinjectedbundle.so # Copy libvpx.so.5 as Ubuntu 20.04 comes with libvpx.so.6