[gimp] Installer: rearrange install order of files, should make installing slightly faster

[Jehan <jehanp src gnome org>]

commit ff4dd2ce254dde229c0cf7be99dc5a7c65c4fc5b
Author: Jernej Simončič <jernej|s-gitstuff eternallybored org>
Date:   Tue Mar 24 20:59:35 2020 +0100

    Installer: rearrange install order of files, should make installing slightly faster
    
    (cherry picked from commit a8fb741246513daf311938a56d5161f696254aae)

 build/windows/installer/gimp3264.iss | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/build/windows/installer/gimp3264.iss b/build/windows/installer/gimp3264.iss
index 5e28feba3b..24bd642106 100755
--- a/build/windows/installer/gimp3264.iss
+++ b/build/windows/installer/gimp3264.iss
@@ -279,22 +279,15 @@ Source: "{#DEPS_DIR32}\etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Compone
 ;ghostscript TODO: detect version automatically
 Source: "{#DEPS_DIR32}\share\ghostscript\9.50\lib\*.*"; DestDir: "{app}\share\ghostscript\9.50\lib"; 
Components: gs and (gimp32 or gimp64); Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
 
-;32-on-64bit
-#include "32on64.isi"
-;prefer 32bit twain plugin over 64bit because 64bit twain drivers are rare
-Source: "{#GIMP_DIR32}\lib\gimp\2.0\plug-ins\twain\twain.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins\twain"; 
Components: gimp32on64; Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
-Source: "{#GIMP_DIR64}\lib\gimp\2.0\plug-ins\twain\twain.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins\twain"; 
Components: (not gimp32on64) and gimp64; Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
-;special case due to MS-Windows engine
-Source: "{#DEPS_DIR32}\etc\gtk-2.0\*"; DestDir: "{app}\32\etc\gtk-2.0"; Excludes: gtkrc; Components: 
gimp32on64; Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
-Source: "{#DEPS_DIR32}\etc\gtk-2.0\gtkrc"; DestDir: "{app}\32\etc\gtk-2.0"; Components: gimp32on64 and 
deps64\wimp; Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
-;compat libraries
-Source: "{#DEPS_DIR}\compat\*.dll"; DestDir: "{app}\32\"; Components: gimp32on64\compat; Flags: 
recursesubdirs restartreplace uninsrestartdelete ignoreversion
-
 #ifdef PYTHON
 ;*.py files are the same on 32 and 64-bit
 Source: "{#GIMP_DIR32}\lib\gimp\2.0\plug-ins\*.py"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; Components: py; 
Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
 #endif
 
+;64bit
+#define PLATFORM 64
+#include "files.isi"
+
 ;32bit
 #define PLATFORM 32
 #include "files.isi"
@@ -302,9 +295,16 @@ Source: "{#GIMP_DIR32}\lib\gimp\2.0\plug-ins\*.py"; DestDir: "{app}\lib\gimp\2.0
 Source: "{#GIMP_DIR32}\lib\gimp\2.0\plug-ins\twain.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; Components: 
gimp32; Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
 Source: "{#DEPS_DIR}\compat\*.dll"; DestDir: "{app}"; Components: deps32\compat; Flags: recursesubdirs 
restartreplace uninsrestartdelete ignoreversion
 
-;64bit
-#define PLATFORM 64
-#include "files.isi"
+;32-on-64bit
+#include "32on64.isi"
+;prefer 32bit twain plugin over 64bit because 64bit twain drivers are rare
+Source: "{#GIMP_DIR32}\lib\gimp\2.0\plug-ins\twain\twain.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins\twain"; 
Components: gimp32on64; Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
+Source: "{#GIMP_DIR64}\lib\gimp\2.0\plug-ins\twain\twain.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins\twain"; 
Components: (not gimp32on64) and gimp64; Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
+;special case due to MS-Windows engine
+Source: "{#DEPS_DIR32}\etc\gtk-2.0\*"; DestDir: "{app}\32\etc\gtk-2.0"; Excludes: gtkrc; Components: 
gimp32on64; Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
+Source: "{#DEPS_DIR32}\etc\gtk-2.0\gtkrc"; DestDir: "{app}\32\etc\gtk-2.0"; Components: gimp32on64 and 
deps64\wimp; Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
+;compat libraries
+Source: "{#DEPS_DIR}\compat\*.dll"; DestDir: "{app}\32\"; Components: gimp32on64\compat; Flags: 
recursesubdirs restartreplace uninsrestartdelete ignoreversion
 
 ;upgrade zlib1.dll in System32 if it's present there to avoid breaking plugins
 ;sharedfile flag will ensure that the upgraded file is left behind on uninstall to avoid breaking other 
programs that use the file