From 4a681695022d59b8fbe908749cb6eb7e7a8795b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Thu, 2 Jan 2025 17:43:31 +0100 Subject: [PATCH 1/2] Windows: Add ".exe" suffix to post install commands Newer Wine versions require the extension. Relates to https://github.com/geany/geany/pull/4088 and https://github.com/geany/infrastructure/pull/12. --- build/gtk-bundle-from-msys2.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/gtk-bundle-from-msys2.sh b/build/gtk-bundle-from-msys2.sh index 7dc8fc1f9..5121dcbc0 100644 --- a/build/gtk-bundle-from-msys2.sh +++ b/build/gtk-bundle-from-msys2.sh @@ -206,11 +206,11 @@ delayed_post_install() { # ca-certificates DEST=etc/pki/ca-trust/extracted # OpenSSL PEM bundle that includes trust flags - ${EXE_WRAPPER_64} bin/p11-kit extract --format=openssl-bundle --filter=certificates --overwrite $DEST/openssl/ca-bundle.trust.crt - ${EXE_WRAPPER_64} bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose server-auth $DEST/pem/tls-ca-bundle.pem - ${EXE_WRAPPER_64} bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose email $DEST/pem/email-ca-bundle.pem - ${EXE_WRAPPER_64} bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose code-signing $DEST/pem/objsign-ca-bundle.pem - ${EXE_WRAPPER_64} bin/p11-kit extract --format=java-cacerts --filter=ca-anchors --overwrite --purpose server-auth $DEST/java/cacerts + ${EXE_WRAPPER_64} bin/p11-kit.exe extract --format=openssl-bundle --filter=certificates --overwrite $DEST/openssl/ca-bundle.trust.crt + ${EXE_WRAPPER_64} bin/p11-kit.exe extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose server-auth $DEST/pem/tls-ca-bundle.pem + ${EXE_WRAPPER_64} bin/p11-kit.exe extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose email $DEST/pem/email-ca-bundle.pem + ${EXE_WRAPPER_64} bin/p11-kit.exe extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose code-signing $DEST/pem/objsign-ca-bundle.pem + ${EXE_WRAPPER_64} bin/p11-kit.exe extract --format=java-cacerts --filter=ca-anchors --overwrite --purpose server-auth $DEST/java/cacerts mkdir -p ssl/certs cp -f $DEST/pem/tls-ca-bundle.pem ssl/certs/ca-bundle.crt cp -f $DEST/pem/tls-ca-bundle.pem ssl/cert.pem From 2ed42e11646ab6efc45ee5d72132513b0811a355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Thu, 2 Jan 2025 17:51:34 +0100 Subject: [PATCH 2/2] Windows: Remove "zstd" dependency from GTK bundle "zstd" is already bundled by Geany itself. --- build/gtk-bundle-from-msys2.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build/gtk-bundle-from-msys2.sh b/build/gtk-bundle-from-msys2.sh index 5121dcbc0..f3de0a67c 100644 --- a/build/gtk-bundle-from-msys2.sh +++ b/build/gtk-bundle-from-msys2.sh @@ -55,7 +55,6 @@ p11-kit readline sqlite3 termcap -zstd " gtk3_dependency_pkgs="