From b7a32ee848febf20062286f3cb97e2dbf232f0e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jernej=20Simon=C4=8Di=C4=8D?=
 <jernej|s-gitstuff@eternallybored.org>
Date: Mon, 20 Aug 2018 19:08:56 +0200
Subject: [PATCH] Installer: don't include unnecessary files, some more fixes
 for new plugin paths

---
 build/windows/installer/32on64.list  | 6 ++++--
 build/windows/installer/files.isi    | 2 +-
 build/windows/installer/gimp3264.iss | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build/windows/installer/32on64.list b/build/windows/installer/32on64.list
index 0f2ae0db7c..799e2a4206 100644
--- a/build/windows/installer/32on64.list
+++ b/build/windows/installer/32on64.list
@@ -1,8 +1,10 @@
 #list of 32bit files to install on x64
 !GTK
 etc\fonts\
-lib\gtk-2.0\2.10.0\engines\
-lib\gtk-2.0\modules\
+lib\gtk-2.0\2.10.0\engines\*.dll
+lib\gtk-2.0\2.10.0\immodules\*.dll
+lib\gtk-2.0\2.10.0\loaders\*.dll
+lib\gtk-2.0\modules\*.dll
 lib\gdk-pixbuf-2.0\2.10.0\loaders\*.dll
 lib\gdk-pixbuf-2.0\2.10.0\loaders.cache
 share\themes\
diff --git a/build/windows/installer/files.isi b/build/windows/installer/files.isi
index 3b02005cec..8d1ed60ee0 100644
--- a/build/windows/installer/files.isi
+++ b/build/windows/installer/files.isi
@@ -34,5 +34,5 @@ Source: "{#DEPS_DIR}\{#DDIR}\lib\gio\*.dll"; DestDir: "{app}\lib\gio"; Component
 Source: "{#DEPS_DIR}\{#DDIR}\lib\gtk-2.0\*.dll"; DestDir: "{app}\lib\gtk-2.0"; Components: deps{#PLATFORM}; Flags: recursesubdirs restartreplace ignoreversion uninsrestartdelete
 
 #if PLATFORM==64
-Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\2.0\plug-ins\file-mng.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; Components: gimp{#PLATFORM}; Flags: restartreplace ignoreversion uninsrestartdelete
+Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\2.0\plug-ins\file-mng\file-mng.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins\file-mng"; Components: gimp{#PLATFORM}; Flags: restartreplace ignoreversion uninsrestartdelete
 #endif
diff --git a/build/windows/installer/gimp3264.iss b/build/windows/installer/gimp3264.iss
index ad23311d88..d73ea4c82f 100755
--- a/build/windows/installer/gimp3264.iss
+++ b/build/windows/installer/gimp3264.iss
@@ -539,6 +539,8 @@ Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\palette-sort.py"
 Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\palette-to-gradient.py"
 Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\py-slice.py"
 Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\python-eval.py"
+Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\python-console\pyconsole.py"
+Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\python-console\python-console.py"
 ;DLLs in plug-ins directory (see bug 796225)
 Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\*.dll"
 ;old icons