From 3bde6195f6fd447d9ce9a264b4457c3bb2b3b690 Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Sun, 28 Sep 2025 18:19:18 -0300 Subject: [PATCH] build/windows, gimp-data: Prepare to Inno Setup 6.6.0 --- build/windows/installer/base_gimp3264.iss | 9 ++++++--- gimp-data | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/windows/installer/base_gimp3264.iss b/build/windows/installer/base_gimp3264.iss index 899777a498..6dc734ee78 100644 --- a/build/windows/installer/base_gimp3264.iss +++ b/build/windows/installer/base_gimp3264.iss @@ -140,10 +140,12 @@ ;3 INSTALLER SOURCE +#define ASSETS_DIR BUILD_DIR + "\build\windows\installer" ;3.1.1 Icons and other files -#define ASSETS_DIR BUILD_DIR + "\build\windows\installer" #include ASSETS_DIR + "\splash-dimensions.h" +#define WIZARD_SMALL_IMAGE ASSETS_DIR + "\gimp.scale-100.bmp," + ASSETS_DIR + "\gimp.scale-125.bmp," + ASSETS_DIR + "\gimp.scale-150.bmp," + ASSETS_DIR + "\gimp.scale-175.bmp," + ASSETS_DIR + "\gimp.scale-200.bmp," + ASSETS_DIR + "\gimp.scale-225.bmp," + ASSETS_DIR + "\gimp.scale-250.bmp" +#define WIZARD_IMAGE ASSETS_DIR + "\install-end.scale-100.bmp," + ASSETS_DIR + "\install-end.scale-125.bmp," + ASSETS_DIR + "\install-end.scale-150.bmp," + ASSETS_DIR + "\install-end.scale-175.bmp," + ASSETS_DIR + "\install-end.scale-200.bmp," + ASSETS_DIR + "\install-end.scale-225.bmp," + ASSETS_DIR + "\install-end.scale-250.bmp" ;3.1.2 Installer lang files [Languages] @@ -247,8 +249,9 @@ AlwaysShowDirOnReadyPage=yes WizardStyle=modern WizardSizePercent=100 WizardResizable=no -WizardSmallImageFile={#ASSETS_DIR}\gimp.scale-100.bmp,{#ASSETS_DIR}\gimp.scale-125.bmp,{#ASSETS_DIR}\gimp.scale-150.bmp,{#ASSETS_DIR}\gimp.scale-175.bmp,{#ASSETS_DIR}\gimp.scale-200.bmp,{#ASSETS_DIR}\gimp.scale-225.bmp,{#ASSETS_DIR}\gimp.scale-250.bmp -WizardImageFile={#ASSETS_DIR}\install-end.scale-100.bmp,{#ASSETS_DIR}\install-end.scale-125.bmp,{#ASSETS_DIR}\install-end.scale-150.bmp,{#ASSETS_DIR}\install-end.scale-175.bmp,{#ASSETS_DIR}\install-end.scale-200.bmp,{#ASSETS_DIR}\install-end.scale-225.bmp,{#ASSETS_DIR}\install-end.scale-250.bmp +WizardImageAlphaFormat=defined +WizardSmallImageFile={#WIZARD_SMALL_IMAGE} +WizardImageFile={#WIZARD_IMAGE} WizardImageStretch=yes [LangOptions] DialogFontName=Segoe UI diff --git a/gimp-data b/gimp-data index 9218ec5970..048d766855 160000 --- a/gimp-data +++ b/gimp-data @@ -1 +1 @@ -Subproject commit 9218ec59701770715a2755d8ba9f8c0e588fb4bd +Subproject commit 048d766855353db8189e724cde77814c3dd92a3b