Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Sat, 09 Oct 2021 10:05:59 UTC Commit: b15aa208fa7308ba6f269d409503283280c7fde6 https://github.com/geany/geany/commit/b15aa208fa7308ba6f269d409503283280c7fd...

Log Message: ----------- Windows: Replace GTK2 by (upcoming) GTK4 in bundle script

Modified Paths: -------------- scripts/gtk-bundle-from-msys2.sh

Modified: scripts/gtk-bundle-from-msys2.sh 16 lines changed, 10 insertions(+), 6 deletions(-) =================================================================== @@ -21,11 +21,8 @@ EXE_WRAPPER_32="mingw-w64-i686-wine" EXE_WRAPPER_64="mingw-w64-x86_64-wine"

package_urls="" -gtk3_dependency_pkgs=" -libepoxy -hicolor-icon-theme -adwaita-icon-theme -" +gtk3_dependency_pkgs="" +gtk4_dependency_pkgs=""

packages=" gcc-libs @@ -46,6 +43,7 @@ gettext glib2 graphite2 jasper +libepoxy libjpeg-turbo libtiff libwinpthread-git @@ -60,6 +58,8 @@ pango cairo pixman gdk-pixbuf2 +hicolor-icon-theme +adwaita-icon-theme "

handle_command_line_options() { @@ -74,20 +74,24 @@ handle_command_line_options() { "-3") gtkv="3" ;; + "-4") + gtkv="4" + ;; "-n") run_pi="" ;; "-x") cross="yes" ;; "-h"|"--help") - echo "gtk-bundle-from-msys2.sh [-c] [-h] [-n] [-z] [-3] [CACHEDIR]" + echo "gtk-bundle-from-msys2.sh [-c] [-h] [-n] [-z] [-3 | -4] [CACHEDIR]" echo " -c Use pacman cache. Otherwise pacman will download" echo " archive files" echo " -h Show this help screen" echo " -n Do not run post install scripts of the packages" echo " -z Create a zip afterwards" echo " -3 Prefer gtk3" + echo " -4 Prefer gtk4" echo " -x Set when the script is executed in a cross-compilation context (e.g. to use wine)" echo "CACHEDIR Directory where to look for cached packages (default: /var/cache/pacman/pkg)" exit 1

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).