atk: Updated to version 2.20.0

hexchat · Jun 11, 2016 · c2de426c6a539f15c40efc429cd74dcf4f871f06 · c2de426
1 parent ec47d7b
commit c2de426c6a539f15c40efc429cd74dcf4f871f06
Unified Split

Showing with 9 additions and 126 deletions.

+1 −1 README.md

+1 −1 atk/build/win32/vs14/atk-build-defines.props

+0 −112 atk/build/win32/vs14/atk-install.vcxproj

+2 −2 atk/build/win32/vs14/atk-version-paths.props

+4 −9 atk/mod.md

+1 −1 build.ps1
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ These are the libraries in the bundle:
 | Library                | Version        | Source
 | ---------------------- | -------------- | ------
-  
-| ATK                    | 2.18.0         | [Source](https://dl.hexchat.net/gtk-win32/src/atk-2.18.0.tar.xz)
+  
+| ATK                    | 2.20.0         | [Source](https://dl.hexchat.net/gtk-win32/src/atk-2.20.0.tar.xz)
 | Cairo                  | 1.14.6         | [Source](https://dl.hexchat.net/gtk-win32/src/cairo-1.14.6.tar.xz)
 | Enchant                | 1.6.0          | [Source](https://dl.hexchat.net/gtk-win32/src/enchant-1.6.0.tar.gz)
 | Fontconfig             | 2.8.0          | [Source](https://dl.hexchat.net/gtk-win32/src/fontconfig-2.8.0.tar.gz)

diff --git a/atk/build/win32/vs14/atk-build-defines.props b/atk/build/win32/vs14/atk-build-defines.props
@@ -13,7 +13,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-  
-      <AdditionalIncludeDirectories>..\..\..;..\..\..\atk;$(GLibEtcInstallRoot)\include;$(GLibEtcInstallRoot)\include\glib-2.0;$(GLibEtcInstallRoot)\lib\glib-2.0\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+  
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\atk;$(GLibEtcInstallRoot)\include\glib-2.0;$(GLibEtcInstallRoot)\lib\glib-2.0\include;$(GLibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>

diff --git a/atk/build/win32/vs14/atk-install.vcxproj b/atk/build/win32/vs14/atk-install.vcxproj
diff --git a/atk/build/win32/vs14/atk-version-paths.props b/atk/build/win32/vs14/atk-version-paths.props
@@ -2,8 +2,8 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="UserMacros">
    <ApiVersion>1.0</ApiVersion>
-  
-    <VSVer>12</VSVer>
-  
-    <GLibEtcInstallRoot>$(SolutionDir)\..\..\..\..\..\..\gtk\$(Platform)</GLibEtcInstallRoot>
+  
+    <VSVer>14</VSVer>
+  
+    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\..\..\gtk\$(Platform)</GlibEtcInstallRoot>
    <CopyDir>..\..\..\..\atk-rel</CopyDir>
    <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
    <AtkLibtoolCompatibleDllPrefix>lib</AtkLibtoolCompatibleDllPrefix>

diff --git a/atk/mod.md b/atk/mod.md
@@ -1,16 +1,11 @@
-  
-* Download [ATK 2.18.0](http://ftp.gnome.org/pub/gnome/sources/atk/2.18/atk-2.18.0.tar.xz)
+  
+* Download [ATK 2.20.0](http://ftp.gnome.org/pub/gnome/sources/atk/2.20/atk-2.20.0.tar.xz)
 * In `build\win32\vs14\atk-build-defines.props`, replace:
 	* `intl.lib` with `libintl.lib`
 * In `build\win32\vs14\atk-version-paths.props`, replace:
-  
-	* `<GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>` with
-  
-`<GLibEtcInstallRoot>$(SolutionDir)\..\..\..\..\..\..\gtk\$(Platform)</GLibEtcInstallRoot>`
-  
-	* `<CopyDir>$(GLibEtcInstallRoot)</CopyDir>` with
-  
-`<CopyDir>..\..\..\..\atk-rel</CopyDir>`
-  
-	* `<AtkSeparateVSDllSuffix>-1-vs$(VSVer)</AtkSeparateVSDllSuffix>` with
-  
-`<AtkSeparateVSDllSuffix>-1.0</AtkSeparateVSDllSuffix>`
+  
+	* `<GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>` with `<GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\..\..\gtk\$(Platform)</GlibEtcInstallRoot>`
+  
+	* `<CopyDir>$(GLibEtcInstallRoot)</CopyDir>` with `<CopyDir>..\..\..\..\atk-rel</CopyDir>`
+  
+	* `<AtkSeparateVSDllSuffix>-1-vs$(VSVer)</AtkSeparateVSDllSuffix>` with `<AtkSeparateVSDllSuffix>-1.0</AtkSeparateVSDllSuffix>`
 * In `build\win32\vs14\atk.vcxproj`:
 	* Add `<Import Project="..\..\..\..\stack.props" />`
 	* Remove all `<Optimization>` lines
-  
-* In `build\win32\vs14\atk-install.vcxproj`:
-  
-	* Replace `AtkEtcInstallRoot` with `GLibEtcInstallRoot`
 * Copy `build\detectenv-msvc.mak` from a newer project like gobject-introspection (Until VS2015 added)
diff --git a/build.ps1 b/build.ps1
@@ -148,7 +148,7 @@ param (
 $items = @{
 	'atk' = @{
-  
-		'ArchiveUrl' = 'http://dl.hexchat.net/gtk-win32/src/atk-2.18.0.tar.xz'
+  
+		'ArchiveUrl' = 'https://dl.hexchat.net/gtk-win32/src/atk-2.20.0.tar.xz'
 		'Dependencies' = @('glib', 'gobject-introspection')
 	};