From 5b05271e4cc31399c9d32232114d5ae66522a881 Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Wed, 6 Apr 2016 16:26:00 -0700
Subject: [PATCH] win32: Install lgi with lua plugin

---
 win32/copy/copy.vcxproj        | 13 ++++++++++++-
 win32/installer/hexchat.iss.tt |  9 +++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index d9f38f28..8a0e130f 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -41,6 +41,7 @@
     <None Include="$(DepsRoot)\bin\iconv.dll" />
     <None Include="$(DepsRoot)\bin\libeay32.dll" />
     <None Include="$(DepsRoot)\bin\libenchant.dll" />
+    <None Include="$(DepsRoot)\bin\libffi.dll" />
     <None Include="$(DepsRoot)\bin\libintl.dll" />
     <None Include="$(DepsRoot)\bin\libpng16.dll" />
     <None Include="$(DepsRoot)\bin\libxml2.dll" />
@@ -56,6 +57,14 @@
     <None Include="changelog.url" />
     <None Include="readme.url" />
 
+    <None Include="$(DepsRoot)\bin\lua51.dll" />
+    <None Include="$(DepsRoot)\bin\girepository-1.0.dll" />
+    <None Include="$(DepsRoot)\bin\lgi.dll" />
+    <LuaShare Include="$(DepsRoot)\share\lua\*.lua" />
+    <LuaShare Include="$(DepsRoot)\share\lua\**\*.lua" />
+    <LuaShare Include="$(DepsRoot)\share\lua\**\**\*.lua" />
+    <Typelib Include="$(DepsRoot)\lib\girepository-1.0\*.typelib" />
+
     <Engines Include="$(DepsRoot)\lib\gtk-2.0\i686-pc-vs14\engines\**\*" />
 
     <Share Include="share\**\*" />
@@ -77,7 +86,9 @@
     <Copy SourceFiles="$(DepsRoot)\lib\enchant\libenchant_myspell.dll" DestinationFolder="$(HexChatRel)\lib\enchant" />
     <Copy SourceFiles="@(Locale)" DestinationFiles="@(Locale->'$(HexChatRel)\share\locale\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(MSWindowsTheme)" DestinationFiles="@(MSWindowsTheme->'$(HexChatRel)\share\themes\MS-Windows\%(RecursiveDir)%(Filename)%(Extension)')" />
-
+    <Copy SourceFiles="@(LuaShare)" DestinationFiles="@(LuaShare->'$(HexChatRel)\share\lua\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(Typelib)" DestinationFiles="@(Typelib->'$(HexChatRel)\lib\girepository-1.0\%(Filename)%(Extension)')" />
+	
     <WriteLinesToFile File="$(HexChatRel)portable-mode" Lines="2" Overwrite="true" />
   </Target>
 </Project>
diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt
index 2b3ee59d..79a860cf 100644
--- a/win32/installer/hexchat.iss.tt
+++ b/win32/installer/hexchat.iss.tt
@@ -139,6 +139,7 @@ Source: "harfbuzz.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
 Source: "libenchant.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "libffi.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "libintl.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "libxml2.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
@@ -156,6 +157,14 @@ Source: "lib\enchant\*"; DestDir: "{app}\lib\enchant"; Flags: ignoreversion; Com
 
 Source: "lib\gtk-2.0\i686-pc-vs14\engines\*"; DestDir: "{app}\lib\gtk-2.0\i686-pc-vs14\engines"; Flags: ignoreversion; Components: libs
 
+Source: "girepository-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\lua
+Source: "lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\lua
+Source: "lgi.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\lua
+Source: "lib\girepository-1.0\*.typelib"; DestDir: "{app}\lib\girepository-1.0"; Flags: ignoreversion; Components: langs\lua
+Source: "share\lua\*.lua"; DestDir: "{app}\share\lua"; Flags: ignoreversion; Components: langs\lua
+Source: "share\lua\lgi\*.lua"; DestDir: "{app}\share\lua\lgi"; Flags: ignoreversion; Components: langs\lua
+Source: "share\lua\lgi\override\*.lua"; DestDir: "{app}\share\lua\lgi\override"; Flags: ignoreversion; Components: langs\lua
+
 Source: "plugins\hcchecksum.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\checksum
 Source: "plugins\hcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat
 Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec