diff --git a/browser_patches/webkit/archive.sh b/browser_patches/webkit/archive.sh index 161aeed18a..eee6d37863 100755 --- a/browser_patches/webkit/archive.sh +++ b/browser_patches/webkit/archive.sh @@ -62,6 +62,9 @@ createZipForLinux() { LD_LIBRARY_PATH="$PWD/WebKitBuild/DependenciesWPE/Root/lib" ldd WebKitBuild/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/[^ ]*' | xargs cp -t $tmpdir LD_LIBRARY_PATH="$PWD/WebKitBuild/DependenciesWPE/Root/lib" ldd WebKitBuild/Release/bin/WPENetworkProcess | grep -o '[^ ]*WebKitBuild/[^ ]*' | xargs cp -t $tmpdir LD_LIBRARY_PATH="$PWD/WebKitBuild/DependenciesWPE/Root/lib" ldd WebKitBuild/Release/bin/WPEWebProcess | grep -o '[^ ]*WebKitBuild/[^ ]*' | xargs cp -t $tmpdir + mkdir -p $tmpdir/gio/modules + cp -t $tmpdir/gio/modules $PWD/WebKitBuild/DependenciesWPE/Root/lib/gio/modules/* + cd $tmpdir ln -s libWPEBackend-fdo-1.0.so.1 libWPEBackend-fdo-1.0.so cd - @@ -70,6 +73,8 @@ createZipForLinux() { cp -t $tmpdir ./WebKitBuild/Release/bin/MiniBrowser ./WebKitBuild/Release/bin/WebKit*Process # copy all relevant shared objects LD_LIBRARY_PATH="$PWD/WebKitBuild/DependenciesGTK/Root/lib" ldd WebKitBuild/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/[^ ]*' | xargs cp -t $tmpdir + mkdir -p $tmpdir/gio/modules + cp -t $tmpdir/gio/modules $PWD/WebKitBuild/DependenciesGTK/Root/lib/gio/modules/* # we failed to nicely build libgdk_pixbuf - expect it in the env rm $tmpdir/libgdk_pixbuf* diff --git a/browser_patches/webkit/pw_run.sh b/browser_patches/webkit/pw_run.sh index 426860ea99..209bc70de8 100755 --- a/browser_patches/webkit/pw_run.sh +++ b/browser_patches/webkit/pw_run.sh @@ -20,27 +20,32 @@ function runLinux() { # if script is run as-is DEPENDENCIES_FOLDER="DependenciesGTK" MINIBROWSER_FOLDER="minibrowser-gtk"; + GIO_DIR="" if [[ "$*" == *--headless* ]]; then DEPENDENCIES_FOLDER="DependenciesWPE"; MINIBROWSER_FOLDER="minibrowser-wpe"; fi if [[ -d $SCRIPT_PATH/$MINIBROWSER_FOLDER ]]; then LD_PATH="$SCRIPT_PATH/$MINIBROWSER_FOLDER" + GIO_DIR="$SCRIPT_PATH/$MINIBROWSER_FOLDER/gio/modules" MINIBROWSER="$SCRIPT_PATH/$MINIBROWSER_FOLDER/MiniBrowser" elif [[ -d $SCRIPT_PATH/checkout/WebKitBuild ]]; then LD_PATH="$SCRIPT_PATH/checkout/WebKitBuild/$DEPENDENCIES_FOLDER/Root/lib:$SCRIPT_PATH/checkout/WebKitBuild/Release/bin" + GIO_DIR="$SCRIPT_PATH/checkout/WebKitBuild/$DEPENDENCIES_FOLDER/Root/lib/gio/modules" MINIBROWSER="$SCRIPT_PATH/checkout/WebKitBuild/Release/bin/MiniBrowser" elif [[ -f $SCRIPT_PATH/MiniBrowser ]]; then LD_PATH="$SCRIPT_PATH" + GIO_DIR="$SCRIPT_PATH/gio/modules" MINIBROWSER="$SCRIPT_PATH/MiniBrowser" elif [[ -d $SCRIPT_PATH/WebKitBuild ]]; then LD_PATH="$SCRIPT_PATH/WebKitBuild/$DEPENDENCIES_FOLDER/Root/lib:$SCRIPT_PATH/WebKitBuild/Release/bin" + GIO_DIR="$SCRIPT_PATH/WebKitBuild/$DEPENDENCIES_FOLDER/Root/lib/gio/modules" MINIBROWSER="$SCRIPT_PATH/WebKitBuild/Release/bin/MiniBrowser" else echo "Cannot find a MiniBrowser.app in neither location" 1>&2 exit 1 fi - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LD_PATH $MINIBROWSER "$@" + GIO_MODULE_DIR=$GIO_DIR LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LD_PATH $MINIBROWSER "$@" } SCRIPT_PATH="$(cd "$(dirname "$0")" ; pwd -P)"