This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

pango: Updated to version 1.40.2

  • Loading branch information...
TingPing authored and Arnavion committed Sep 7, 2016
1 parent db78498 commit 4f8573b0ce4cf3466fe5518d1fd9b439e317a9b4
View
@@ -40,7 +40,7 @@ These are the libraries in the bundle:
| libxml2 | 2.9.4 | [Source](https://dl.hexchat.net/gtk-win32/src/libxml2-2.9.4.tar.gz)
| luajit | 2.0.4 | [Source](https://dl.hexchat.net/gtk-win32/src/luajit-2.0.4.tar.gz)
| OpenSSL | 1.0.2h | [Source](https://dl.hexchat.net/gtk-win32/src/openssl-1.0.2h.tar.gz)
| Pango | 1.40.1 | [Source](https://dl.hexchat.net/gtk-win32/src/pango-1.40.1.tar.xz)
| Pango | 1.40.2 | [Source](https://dl.hexchat.net/gtk-win32/src/pango-1.40.2.tar.xz)
| Pixman | 0.34.0 | [Source](https://dl.hexchat.net/gtk-win32/src/pixman-0.34.0.tar.gz)
| win-iconv | 0.0.8 | [Source](https://dl.hexchat.net/gtk-win32/src/win-iconv-0.0.8.tar.gz)
| zlib | 1.2.8 | [Source](https://dl.hexchat.net/gtk-win32/src/zlib-1.2.8.tar.xz)
View
@@ -233,7 +233,7 @@ $items = @{
};
'pango' = @{
'ArchiveUrl' = 'https://dl.hexchat.net/gtk-win32/src/pango-1.40.1.tar.xz'
'ArchiveUrl' = 'https://dl.hexchat.net/gtk-win32/src/pango-1.40.2.tar.xz'
'Dependencies' = @('cairo', 'harfbuzz', 'gobject-introspection')
};
@@ -949,6 +949,7 @@ $items['pango'].BuildScript = {
Remove-Item -Recurse $packageDestination -ErrorAction Ignore
Exec $patch -p1 -i pango-synthesize-fonts-properly.patch
Exec $patch -p1 -i pangocairo-fix-missing-export.patch
Fix-C4819 .\pango\break.c
Fix-C4819 .\pango\pango-language-sample-table.h
@@ -968,11 +969,11 @@ $items['pango'].BuildScript = {
Package $packageDestination
$packageDestination = "$PWD-gir-rel"
Push-Location .\build
Push-Location .\build\win32
$originalEnvironment = Swap-Environment $vcvarsEnvironment
Exec nmake -f .\pango-introspection-msvc.mak CFG=release PYTHON2=..\..\..\..\python-2.7\$platform\python.exe BASEDIR=..\..\..\..\gtk\$platform
Exec nmake -f .\pango-introspection-msvc.mak CFG=release PYTHON=..\..\..\..\..\python-2.7\$platform\python.exe PREFIX=..\..\..\..\..\gtk\$platform
[void] (Swap-Environment $originalEnvironment)
@@ -7,9 +7,10 @@
<PangoBinaryVersion>1.8.0</PangoBinaryVersion>
<PangoDummyPrefix>/dummy</PangoDummyPrefix>
<PangoDefines>G_LOG_DOMAIN="Pango";PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;SYSCONFDIR="$(PangoDummyPrefix)/etc";LIBDIR="$(PangoDummyPrefix)/lib"</PangoDefines>
<NoFCDef>PANGO_VISUALC_NO_FC</NoFCDef>
<CairoFTDefines>HAVE_CAIRO_FREETYPE=1</CairoFTDefines>
<PangoFT2Incs>..;$(GlibEtcInstallRoot)\include\harfbuzz</PangoFT2Incs>
<PangoFT2Libs>fontconfig.lib;freetype.lib;harfbuzz.lib</PangoFT2Libs>
<PangoCairoIncs>$(GlibEtcInstallRoot)\include\cairo</PangoCairoIncs>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>pangobuilddefinesprops</_PropertySheetDisplayName>
@@ -40,14 +41,17 @@
<BuildMacro Include="PangoDefines">
<Value>$(PangoDefines)</Value>
</BuildMacro>
<BuildMacro Include="NoFCDef">
<Value>$(NoFCDef)</Value>
<BuildMacro Include="CairoFTDefines">
<Value>$(CairoFTDefines)</Value>
</BuildMacro>
<BuildMacro Include="PangoFT2Incs">
<Value>$(PangoFT2Incs)</Value>
</BuildMacro>
<BuildMacro Include="PangoFT2Libs">
<Value>$(PangoFT2Libs)</Value>
</BuildMacro>
<BuildMacro Include="PangoCairoIncs">
<Value>$(PangoCairoIncs)</Value>
</BuildMacro>
</ItemGroup>
</Project>
</Project>
@@ -2,15 +2,20 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<VSVer>14</VSVer>
<PangoMajorVersion>1</PangoMajorVersion>
<PangoMinorVersion>40</PangoMinorVersion>
<PangoMicroVersion>2</PangoMicroVersion>
<ApiVersion>1.0</ApiVersion>
<GlibEtcInstallRoot>$(SolutionDir)..\..\..\..\..\..\gtk\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(SolutionDir)..\..\..\..\pango-rel</CopyDir>
<ApiVersion>1.0</ApiVersion>
<PangoLibtoolCompatibleDllPrefix>lib</PangoLibtoolCompatibleDllPrefix>
<PangoLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</PangoLibtoolCompatibleDllSuffix>
<PangoSeparateVSDllPrefix />
<PangoSeparateVSDllSuffix>-1.0</PangoSeparateVSDllSuffix>
<PangoDllPrefix>$(PangoSeparateVSDllPrefix)</PangoDllPrefix>
<PangoDllSuffix>$(PangoSeparateVSDllSuffix)</PangoDllSuffix>
<PythonPath>..\..\..\..\..\..\python-2.7\$(Platform)</PythonPath>
<PythonPathX64>$(PythonPath)</PythonPathX64>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>pangoversionpathsprops</_PropertySheetDisplayName>
@@ -19,18 +24,24 @@
<BuildMacro Include="VSVer">
<Value>$(VSVer)</Value>
</BuildMacro>
<BuildMacro Include="GlibEtcInstallRoot">
<Value>$(GlibEtcInstallRoot)</Value>
<BuildMacro Include="PangoMajorVersion">
<Value>$(PangoMajorVersion)</Value>
</BuildMacro>
<BuildMacro Include="GlibEtcInstallRootFromBuildWin32">
<Value>$(GlibEtcInstallRootFromBuildWin32)</Value>
<BuildMacro Include="PangoMinorVersion">
<Value>$(PangoMinorVersion)</Value>
</BuildMacro>
<BuildMacro Include="CopyDir">
<Value>$(CopyDir)</Value>
<BuildMacro Include="PangoMicroVersion">
<Value>$(PangoMicroVersion)</Value>
</BuildMacro>
<BuildMacro Include="ApiVersion">
<Value>$(ApiVersion)</Value>
</BuildMacro>
<BuildMacro Include="GlibEtcInstallRoot">
<Value>$(GlibEtcInstallRoot)</Value>
</BuildMacro>
<BuildMacro Include="CopyDir">
<Value>$(CopyDir)</Value>
</BuildMacro>
<BuildMacro Include="PangoLibtoolCompatibleDllPrefix">
<Value>$(PangoLibtoolCompatibleDllPrefix)</Value>
</BuildMacro>
@@ -49,5 +60,11 @@
<BuildMacro Include="PangoDllSuffix">
<Value>$(PangoDllSuffix)</Value>
</BuildMacro>
<BuildMacro Include="PythonPath">
<Value>$(PythonPath)</Value>
</BuildMacro>
<BuildMacro Include="PythonPathX64">
<Value>$(PythonPathX64)</Value>
</BuildMacro>
</ItemGroup>
</Project>
</Project>
@@ -86,7 +86,6 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>..\..\..\pango\pango.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -105,7 +104,6 @@
<Link>
<OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<ModuleDefinitionFile>..\..\..\pango\pango.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -126,7 +124,6 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>..\..\..\pango\pango.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -144,7 +141,6 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>..\..\..\pango\pango.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -162,33 +158,33 @@
<ClCompile Include="..\..\..\pango\mini-fribidi\fribidi.c" />
<ClCompile Include="..\..\..\pango\mini-fribidi\fribidi_char_type.c" />
<ClCompile Include="..\..\..\pango\mini-fribidi\fribidi_types.c" />
<ClCompile Include="..\..\..\pango\break.c" />
<ClCompile Include="..\..\..\pango\ellipsize.c" />
<ClCompile Include="..\..\..\pango\fonts.c" />
<ClCompile Include="..\..\..\pango\glyphstring.c" />
<ClCompile Include="..\..\..\pango\modules.c" />
<ClCompile Include="..\..\..\pango\pango-attributes.c" />
<ClCompile Include="..\..\..\pango\pango-bidi-type.c" />
<ClCompile Include="..\..\..\pango\pango-color.c" />
<ClCompile Include="..\..\..\pango\pango-context.c" />
<ClCompile Include="..\..\..\pango\pango-coverage.c" />
<ClCompile Include="..\..\..\pango\pango-engine.c" />
<ClCompile Include="..\..\..\pango\pango-fontmap.c" />
<ClCompile Include="..\..\..\pango\pango-fontset.c" />
<ClCompile Include="..\..\..\pango\pango-glyph-item.c" />
<ClCompile Include="..\..\..\pango\pango-gravity.c" />
<ClCompile Include="..\..\..\pango\pango-item.c" />
<ClCompile Include="..\..\..\pango\pango-language.c" />
<ClCompile Include="..\..\..\pango\pango-layout.c" />
<ClCompile Include="..\..\..\pango\pango-markup.c" />
<ClCompile Include="..\..\..\pango\pango-matrix.c" />
<ClCompile Include="..\..\..\pango\pango-renderer.c" />
<ClCompile Include="..\..\..\pango\pango-script.c" />
<ClCompile Include="..\..\..\pango\pango-tabs.c" />
<ClCompile Include="..\..\..\pango\pango-utils.c" />
<ClCompile Include="..\..\..\pango\reorder-items.c" />
<ClCompile Include="..\..\..\pango\shape.c" />
<ClCompile Include="..\..\..\pango\pango-enum-types.c" />
<ClCompile Include="..\..\..\pango\break.c" />
<ClCompile Include="..\..\..\pango\ellipsize.c" />
<ClCompile Include="..\..\..\pango\fonts.c" />
<ClCompile Include="..\..\..\pango\glyphstring.c" />
<ClCompile Include="..\..\..\pango\modules.c" />
<ClCompile Include="..\..\..\pango\pango-attributes.c" />
<ClCompile Include="..\..\..\pango\pango-bidi-type.c" />
<ClCompile Include="..\..\..\pango\pango-color.c" />
<ClCompile Include="..\..\..\pango\pango-context.c" />
<ClCompile Include="..\..\..\pango\pango-coverage.c" />
<ClCompile Include="..\..\..\pango\pango-engine.c" />
<ClCompile Include="..\..\..\pango\pango-fontmap.c" />
<ClCompile Include="..\..\..\pango\pango-fontset.c" />
<ClCompile Include="..\..\..\pango\pango-glyph-item.c" />
<ClCompile Include="..\..\..\pango\pango-gravity.c" />
<ClCompile Include="..\..\..\pango\pango-item.c" />
<ClCompile Include="..\..\..\pango\pango-language.c" />
<ClCompile Include="..\..\..\pango\pango-layout.c" />
<ClCompile Include="..\..\..\pango\pango-markup.c" />
<ClCompile Include="..\..\..\pango\pango-matrix.c" />
<ClCompile Include="..\..\..\pango\pango-renderer.c" />
<ClCompile Include="..\..\..\pango\pango-script.c" />
<ClCompile Include="..\..\..\pango\pango-tabs.c" />
<ClCompile Include="..\..\..\pango\pango-utils.c" />
<ClCompile Include="..\..\..\pango\reorder-items.c" />
<ClCompile Include="..\..\..\pango\shape.c" />
<ClCompile Include="..\..\..\pango\pango-enum-types.c" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\config.h.win32">
Oops, something went wrong.

0 comments on commit 4f8573b

Please sign in to comment.