From 7659caada1e33e20afc7cc20ec359791c92a7291 Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Wed, 29 Aug 2018 16:10:21 +0000
Subject: [PATCH] win32: Reflect gvsbuild changes

---
 win32/copy/copy.vcxproj        | 12 +++++++-----
 win32/installer/hexchat.iss.tt | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index f96c80f3..c508a7f3 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -26,16 +26,18 @@
     <None Include="$(DepsRoot)\bin\cert.pem" />
     <None Include="$(DepsRoot)\bin\atk-1.0-0.dll" />
     <None Include="$(DepsRoot)\bin\cairo.dll" />
+    <None Include="$(DepsRoot)\bin\freetype.dll" />
+    <None Include="$(DepsRoot)\bin\fribidi-0.dll" />
     <None Include="$(DepsRoot)\bin\fontconfig.dll" />
     <None Include="$(DepsRoot)\bin\gdk_pixbuf-2.0-0.dll" />
     <None Include="$(DepsRoot)\bin\gdk-win32-2.0.dll" />
-    <None Include="$(DepsRoot)\bin\gio-2.0.dll" />
-    <None Include="$(DepsRoot)\bin\glib-2.0.dll" />
-    <None Include="$(DepsRoot)\bin\gmodule-2.0.dll" />
-    <None Include="$(DepsRoot)\bin\gobject-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\gio-2.0-0.dll" />
+    <None Include="$(DepsRoot)\bin\glib-2.0-0.dll" />
+    <None Include="$(DepsRoot)\bin\gmodule-2.0-0.dll" />
+    <None Include="$(DepsRoot)\bin\gobject-2.0-0.dll" />
     <None Include="$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper.exe" />
     <None Include="$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper-console.exe" />
-    <None Include="$(DepsRoot)\bin\gthread-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\gthread-2.0-0.dll" />
     <None Include="$(DepsRoot)\bin\gtk-win32-2.0.dll" />
     <None Include="$(DepsRoot)\bin\iconv.dll" />
     <None Include="$(DepsRoot)\bin\libeay32.dll" />
diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt
index 774c3d65..e242ee96 100644
--- a/win32/installer/hexchat.iss.tt
+++ b/win32/installer/hexchat.iss.tt
@@ -119,13 +119,15 @@ Source: "etc\fonts\*"; DestDir: "{app}\etc\fonts"; Flags: ignoreversion createal
 
 Source: "atk-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "cairo.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "freetype.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "fribidi-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "fontconfig.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gdk_pixbuf-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gdk-win32-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "gio-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "glib-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "gmodule-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "gobject-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "gio-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "glib-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "gmodule-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "gobject-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 #if APPARCH == "x64"
 Source: "gspawn-win64-helper.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gspawn-win64-helper-console.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
@@ -133,7 +135,7 @@ Source: "gspawn-win64-helper-console.exe"; DestDir: "{app}"; Flags: ignoreversio
 Source: "gspawn-win32-helper.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gspawn-win32-helper-console.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 #endif
-Source: "gthread-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "gthread-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gtk-win32-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "iconv.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs