From bf37ce3a06a9364a80543a35066de3714fd46b41 Mon Sep 17 00:00:00 2001 From: Xorg Date: Tue, 11 Oct 2022 12:54:36 +0200 Subject: [PATCH] Fix GTK_PATH This environment variable must not contains '/modules' at the end. Example: https://fr.mathworks.com/help/matlab/matlab_env/remove-canberra-gtk-module-and-pk-gtk-module-messages.html Related to tauri-apps/linuxdeploy-plugin-gtk#2 --- linuxdeploy-plugin-gtk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linuxdeploy-plugin-gtk.sh b/linuxdeploy-plugin-gtk.sh index 6683642..6d89d4d 100755 --- a/linuxdeploy-plugin-gtk.sh +++ b/linuxdeploy-plugin-gtk.sh @@ -210,7 +210,7 @@ case "$DEPLOY_GTK_VERSION" in echo "Installing GTK 3.0 modules" gtk3_exec_prefix="$(get_pkgconf_variable "exec_prefix" "gtk+-3.0" "/usr")" gtk3_libdir="$(get_pkgconf_variable "libdir" "gtk+-3.0" "/usr/lib/x86_64-linux-gnu")/gtk-3.0" - gtk3_path="$gtk3_libdir/modules" + gtk3_path="$gtk3_libdir" gtk3_immodulesdir="$gtk3_libdir/$(get_pkgconf_variable "gtk_binary_version" "gtk+-3.0" "3.0.0")/immodules" gtk3_printbackendsdir="$gtk3_libdir/$(get_pkgconf_variable "gtk_binary_version" "gtk+-3.0" "3.0.0")/printbackends" gtk3_immodules_cache_file="$(dirname "$gtk3_immodulesdir")/immodules.cache" @@ -237,7 +237,7 @@ EOF echo "Installing GTK 4.0 modules" gtk4_exec_prefix="$(get_pkgconf_variable "exec_prefix" "gtk4" "/usr")" gtk4_libdir="$(get_pkgconf_variable "libdir" "gtk4")/gtk-4.0" - gtk4_path="$gtk4_libdir/modules" + gtk4_path="$gtk4_libdir" copy_tree "$gtk4_libdir" "$APPDIR/" cat >> "$HOOKFILE" <