diff --git a/linuxdeploy-plugin-gtk.sh b/linuxdeploy-plugin-gtk.sh index 2d5a2a2..be654e5 100755 --- a/linuxdeploy-plugin-gtk.sh +++ b/linuxdeploy-plugin-gtk.sh @@ -20,9 +20,9 @@ show_usage() { echo echo "Required variables:" echo " LINUXDEPLOY=\".../linuxdeploy\" path to linuxdeploy (e.g., AppImage); set automatically when plugin is run directly by linuxdeploy" - echo - echo "Optional variables:" - echo " DEPLOY_GTK_VERSION (major version of GTK to deploy, e.g. '2', '3' or '4'; auto-detect by default)" + #echo + #echo "Optional variables:" + #echo " DEPLOY_GTK_VERSION (major version of GTK to deploy, e.g. '2', '3' or '4'; auto-detect by default)" } variable_is_true() { @@ -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 APPDIR= while [ "$1" != "" ]; do @@ -119,6 +120,8 @@ if [ "$APPDIR" == "" ]; then fi mkdir -p "$APPDIR" +# make lib64 writable again. +chmod +w "$APPDIR"/usr/lib64 || true if command -v pkgconf > /dev/null; then PKG_CONFIG="pkgconf" @@ -203,7 +206,7 @@ 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" + #gtk3_path="$gtk3_libdir/modules" export GTK_PATH="\$APPDIR/$gtk3_path" gtk3_immodulesdir="$gtk3_libdir/$(get_pkgconf_variable "gtk_binary_version" "gtk+-3.0")/immodules" gtk3_printbackendsdir="$gtk3_libdir/$(get_pkgconf_variable "gtk_binary_version" "gtk+-3.0")/printbackends" gtk3_immodules_cache_file="$(dirname "$gtk3_immodulesdir")/immodules.cache" @@ -211,7 +214,7 @@ case "$DEPLOY_GTK_VERSION" in copy_tree "$gtk3_libdir" "$APPDIR/" cat >> "$HOOKFILE" </dev/null) +cat >> "$HOOKFILE" <