win32: Update to build against gvsbuild

5 files changed, 32 insertions, 43 deletions

diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index 6adedf0d..f96c80f3 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -24,10 +24,10 @@
   <Import Project="..\hexchat.props" />

   <ItemGroup>

     <None Include="$(DepsRoot)\bin\cert.pem" />

-    <None Include="$(DepsRoot)\bin\atk-1.0.dll" />

+    <None Include="$(DepsRoot)\bin\atk-1.0-0.dll" />

     <None Include="$(DepsRoot)\bin\cairo.dll" />

     <None Include="$(DepsRoot)\bin\fontconfig.dll" />

-    <None Include="$(DepsRoot)\bin\gdk_pixbuf-2.0.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" />

@@ -37,19 +37,17 @@
     <None Include="$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper-console.exe" />

     <None Include="$(DepsRoot)\bin\gthread-2.0.dll" />

     <None Include="$(DepsRoot)\bin\gtk-win32-2.0.dll" />

-    <None Include="$(DepsRoot)\bin\harfbuzz.dll" />

     <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\ffi-7.dll" />

+    <None Include="$(DepsRoot)\bin\intl.dll" />

     <None Include="$(DepsRoot)\bin\libpng16.dll" />

     <None Include="$(DepsRoot)\bin\libxml2.dll" />

-    <None Include="$(DepsRoot)\bin\pango-1.0.dll" />

-    <None Include="$(DepsRoot)\bin\pangocairo-1.0.dll" />

-    <None Include="$(DepsRoot)\bin\pangoft2-1.0.dll" />

-    <None Include="$(DepsRoot)\bin\pangowin32-1.0.dll" />

-    <None Include="$(DepsRoot)\bin\pixman-1.dll" />

+    <None Include="$(DepsRoot)\bin\pango-1.0-0.dll" />

+    <None Include="$(DepsRoot)\bin\pangocairo-1.0-0.dll" />

+    <None Include="$(DepsRoot)\bin\pangoft2-1.0-0.dll" />

+    <None Include="$(DepsRoot)\bin\pangowin32-1.0-0.dll" />

     <None Include="$(DepsRoot)\bin\ssleay32.dll" />

     <None Include="$(DepsRoot)\bin\zlib1.dll" />

     <None Include="$(WinSparklePath)\WinSparkle.dll" />

@@ -58,7 +56,7 @@
     <None Include="readme.url" />

 

     <None Include="$(DepsRoot)\bin\lua51.dll" />

-    <None Include="$(DepsRoot)\bin\girepository-1.0.dll" />

+    <None Include="$(DepsRoot)\bin\girepository-1.0-1.dll" />

     <LuaLib Include="$(DepsRoot)\lib\lua\**\*.dll" />

     <LuaShare Include="$(DepsRoot)\share\lua\*.lua" />

     <LuaShare Include="$(DepsRoot)\share\lua\**\*.lua" />

@@ -67,6 +65,8 @@
 

     <Engines Include="$(DepsRoot)\lib\gtk-2.0\i686-pc-vs14\engines\**\*" />

 

+    <FontConfig Include="$(DepsRoot)\etc\fonts\*"/>

+

     <Share Include="share\**\*" />

 

     <DepsRootDocs Include="$(DepsRoot)\share\doc\**\*" />

@@ -78,9 +78,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <Target Name="Build">

     <Copy SourceFiles="@(None)" DestinationFolder="$(HexChatRel)" />

+    <Copy SourceFiles="@(FontConfig)" DestinationFolder="$(HexChatRel)\etc\fonts" />

     <Copy SourceFiles="@(Engines)" DestinationFiles="@(Engines->'$(HexChatRel)\lib\gtk-2.0\i686-pc-vs14\engines\%(RecursiveDir)%(Filename)%(Extension)')" />

     <Copy SourceFiles="@(Share)" DestinationFiles="@(Share->'$(HexChatRel)\share\%(RecursiveDir)%(Filename)%(Extension)')" />

-    <Copy SourceFiles="@(DepsRootDocs)" DestinationFiles="@(DepsRootDocs->'$(HexChatRel)\share\doc\%(RecursiveDir)%(Filename)%(Extension)')" />

     <Copy SourceFiles="..\..\COPYING" DestinationFolder="$(HexChatRel)\share\doc\hexchat" />

     <Copy SourceFiles="$(WinSparklePath)\COPYING" DestinationFolder="$(HexChatRel)\share\doc\WinSparkle" />

     <Copy SourceFiles="$(DepsRoot)\lib\enchant\libenchant_myspell.dll" DestinationFolder="$(HexChatRel)\lib\enchant" />

@@ -89,7 +89,9 @@
     <Copy SourceFiles="@(LuaShare)" DestinationFiles="@(LuaShare->'$(HexChatRel)\share\lua\%(RecursiveDir)%(Filename)%(Extension)')" />

     <Copy SourceFiles="@(LuaLib)" DestinationFiles="@(LuaLib->'$(HexChatRel)\lib\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" />

+

+    <Copy SourceFiles="@(DepsRootDocs)" DestinationFiles="@(DepsRootDocs->'$(HexChatRel)\share\doc\%(RecursiveDir)%(Filename)%(Extension)')" />

   </Target>

 </Project>

diff --git a/win32/hexchat.props b/win32/hexchat.props
index 818894fb..831996e5 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -6,7 +6,6 @@
 

 		<YourDepsPath>c:\gtk-build\gtk</YourDepsPath>

 		<YourGendefPath>c:\gtk-build\gendef</YourGendefPath>

-		<YourMsgfmtPath>c:\gtk-build\msgfmt</YourMsgfmtPath>

 		<YourPerlPath>c:\gtk-build\perl-5.20</YourPerlPath>

 		<YourPython2Path>c:\gtk-build\python-2.7</YourPython2Path>

 		<YourPython3Path>c:\gtk-build\python-3.6</YourPython3Path>

@@ -15,11 +14,11 @@
 		<!-- YOU SHOULDN'T TOUCH ANYTHING BELOW -->

 

 		<!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* -->

-		<!-- must be buildable with GSEAL_ENABLE in the future, xtext, setup, and chanview-tabs stand in the way --> 

+		<!-- must be buildable with GSEAL_ENABLE in the future, xtext, setup, and chanview-tabs stand in the way -->

 		<OwnFlags>GTK_DISABLE_DEPRECATED;GDK_PIXBUF_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline</OwnFlags>

-		<DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot>

+		<!-- FIXME: Add ability to use debug builds -->

+		<DepsRoot>$(YourDepsPath)\$(PlatformName)\release</DepsRoot>

 		<GendefPath>$(YourGendefPath)</GendefPath>

-		<MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath>

 		<WinSparklePath>$(YourWinSparklePath)\$(PlatformName)</WinSparklePath>

 		<PerlPath>$(YourPerlPath)\$(PlatformName)</PerlPath>

 		<PerlLib>perl520</PerlLib>

@@ -29,12 +28,12 @@
 		<Python3Path>$(YourPython3Path)\$(PlatformName)</Python3Path>

 		<Python3Lib>python36</Python3Lib>

 		<Python3Output>hcpython3</Python3Output>

-		<LuaInclude>$(DepsRoot)\include\luajit-2.0</LuaInclude>

+		<LuaInclude>$(DepsRoot)\include\luajit-2.1</LuaInclude>

 		<LuaOutput>hclua</LuaOutput>

 		<LuaLib>lua51</LuaLib>

 		<Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>

 		<Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>

-		<DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;libintl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>

+		<DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>

 		<DataDir>$(SolutionDir)..\data\\</DataDir>

 		<HexChatBuild>$(SolutionDir)..\..\hexchat-build</HexChatBuild>

 		<HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>

diff --git a/win32/hexchat.sln b/win32/hexchat.sln
index 1c6367ca..b567203d 100644
--- a/win32/hexchat.sln
+++ b/win32/hexchat.sln
@@ -1,12 +1,9 @@
 

 Microsoft Visual Studio Solution File, Format Version 12.00

 # Visual Studio 14

-VisualStudioVersion = 14.0.25123.0

+VisualStudioVersion = 14.0.25420.1

 MinimumVisualStudioVersion = 10.0.40219.1

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\src\common\common.vcxproj", "{87554B59-006C-4D94-9714-897B27067BA3}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A7D7CE59-2A31-48AE-BED2-A9828E241832} = {A7D7CE59-2A31-48AE-BED2-A9828E241832}

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fe-gtk", "..\src\fe-gtk\fe-gtk.vcxproj", "{E4BDB4C8-2335-415A-ACEE-BA88B19BFE82}"

 	ProjectSection(ProjectDependencies) = postProject

@@ -87,7 +84,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\inst
 		{B10A2C41-344C-43E0-A32D-B9587C198D8B} = {B10A2C41-344C-43E0-A32D-B9587C198D8B}

 		{461DC24A-A410-4171-8C02-CCDBF3702C2A} = {461DC24A-A410-4171-8C02-CCDBF3702C2A}

 		{E93E1255-95D1-4B08-8FDF-B53CC6A21280} = {E93E1255-95D1-4B08-8FDF-B53CC6A21280}

-		{A7D7CE59-2A31-48AE-BED2-A9828E241832} = {A7D7CE59-2A31-48AE-BED2-A9828E241832}

 		{5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} = {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91}

 		{6C0CA980-97C5-427A-BE61-5BCECAFABBDA} = {6C0CA980-97C5-427A-BE61-5BCECAFABBDA}

 		{B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC} = {B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC}

@@ -105,8 +101,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "htm", "..\src\htm\htm.cspro
 		{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make-te", "..\src\common\make-te.vcxproj", "{A7D7CE59-2A31-48AE-BED2-A9828E241832}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl", "..\plugins\perl\perl.vcxproj", "{D90BC3E3-1341-4849-9354-5F40489D39D1}"

 	ProjectSection(ProjectDependencies) = postProject

 		{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}

@@ -194,10 +188,6 @@ Global
 		{DE87FFCA-9606-4116-B747-062D88A56A28}.Release|Win32.Build.0 = Release|x86

 		{DE87FFCA-9606-4116-B747-062D88A56A28}.Release|x64.ActiveCfg = Release|x64

 		{DE87FFCA-9606-4116-B747-062D88A56A28}.Release|x64.Build.0 = Release|x64

-		{A7D7CE59-2A31-48AE-BED2-A9828E241832}.Release|Win32.ActiveCfg = Release|Win32

-		{A7D7CE59-2A31-48AE-BED2-A9828E241832}.Release|Win32.Build.0 = Release|Win32

-		{A7D7CE59-2A31-48AE-BED2-A9828E241832}.Release|x64.ActiveCfg = Release|x64

-		{A7D7CE59-2A31-48AE-BED2-A9828E241832}.Release|x64.Build.0 = Release|x64

 		{D90BC3E3-1341-4849-9354-5F40489D39D1}.Release|Win32.ActiveCfg = Release|Win32

 		{D90BC3E3-1341-4849-9354-5F40489D39D1}.Release|Win32.Build.0 = Release|Win32

 		{D90BC3E3-1341-4849-9354-5F40489D39D1}.Release|x64.ActiveCfg = Release|x64

@@ -238,7 +228,6 @@ Global
 		{C9B735E4-75BC-45AC-A5E3-39A6D076F912} = {0FD996A7-464F-4981-8380-3DCA3A244A13}

 		{5A0F4962-E670-4DA2-9E45-52CC47F26E2F} = {0FD996A7-464F-4981-8380-3DCA3A244A13}

 		{DE87FFCA-9606-4116-B747-062D88A56A28} = {AAACEB12-9475-410E-AF5A-FDFF907E9043}

-		{A7D7CE59-2A31-48AE-BED2-A9828E241832} = {AAACEB12-9475-410E-AF5A-FDFF907E9043}

 		{D90BC3E3-1341-4849-9354-5F40489D39D1} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}

 		{C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}

 		{C53145CC-D021-40C9-B97C-0249AB9A43C9} = {561126F4-FA18-45FC-A2BF-8F858F161D6D}

diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt
index f4177c9f..a9a03dd4 100644
--- a/win32/installer/hexchat.iss.tt
+++ b/win32/installer/hexchat.iss.tt
@@ -116,11 +116,12 @@ Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createal
 Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
 Source: "share\themes\MS-Windows\*"; DestDir: "{app}\share\themes\MS-Windows"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
 Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations
+Source: "etc\fonts\*"; DestDir: "{app}\etc\fonts"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
 
-Source: "atk-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "atk-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "cairo.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "fontconfig.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "gdk_pixbuf-2.0.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
@@ -135,19 +136,17 @@ Source: "gspawn-win32-helper-console.exe"; DestDir: "{app}"; Flags: ignoreversio
 #endif
 Source: "gthread-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gtk-win32-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-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: "ffi-7.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "intl.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
-Source: "pango-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "pangocairo-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "pangoft2-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "pangowin32-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "pixman-1.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "pango-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "pangocairo-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "pangoft2-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "pangowin32-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 
@@ -157,7 +156,7 @@ 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: "girepository-1.0-1.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\lua
 Source: "lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\lua
 Source: "lib\lua\lgi\*.dll"; DestDir: "{app}\lib\lua\lgi"; Flags: ignoreversion; Components: langs\lua
 Source: "lib\girepository-1.0\*.typelib"; DestDir: "{app}\lib\girepository-1.0"; Flags: ignoreversion; Components: langs\lua
diff --git a/win32/nls/nls.vcxproj b/win32/nls/nls.vcxproj
index 58e4baf3..aa60abff 100644
--- a/win32/nls/nls.vcxproj
+++ b/win32/nls/nls.vcxproj
@@ -32,7 +32,7 @@ rmdir /q /s "$(OutDir)\locale"
 mkdir "$(OutDir)\locale"

 for %%A in (*.po) do (

 mkdir "$(OutDir)\locale\%%~nA\LC_MESSAGES"

-"$(MsgfmtPath)\msgfmt" -co "$(OutDir)\locale\%%~nA\LC_MESSAGES\hexchat.mo" %%A

+"$(DepsRoot)\bin\msgfmt.exe" -co "$(OutDir)\locale\%%~nA\LC_MESSAGES\hexchat.mo" %%A

 )</Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>