apply patch to fix issues with libgdiplus.so.0 (#1251756)

This commit is contained in:
Timotheus Pokorra 2016-01-02 18:59:37 +01:00
parent 6a33029383
commit bbd841cb36
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,13 @@
--- data/config.in.orig 2016-01-02 18:56:31.246981603 +0100
+++ data/config.in 2016-01-02 18:56:46.510980850 +0100
@@ -29,8 +29,8 @@
<dllentry dll="__Internal" name="MoveMemory" target="mono_win32_compat_MoveMemory"/>
<dllentry dll="__Internal" name="ZeroMemory" target="mono_win32_compat_ZeroMemory"/>
</dllmap>
- <dllmap dll="gdiplus" target="@libgdiplus_install_loc@" os="!windows"/>
- <dllmap dll="gdiplus.dll" target="@libgdiplus_install_loc@" os="!windows"/>
+ <dllmap dll="gdiplus" target="@libgdiplus_install_loc@.0" os="!windows"/>
+ <dllmap dll="gdiplus.dll" target="@libgdiplus_install_loc@.0" os="!windows"/>
<dllmap dll="gdi32" target="@libgdiplus_install_loc@" os="!windows"/>
<dllmap dll="gdi32.dll" target="@libgdiplus_install_loc@" os="!windows"/>
</configuration>

View File

@ -17,7 +17,7 @@
Name: mono
Version: 4.2.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Cross-platform, Open Source, .NET development framework
Group: Development/Languages
@ -31,6 +31,7 @@ Source0: http://download.mono-project.com/sources/mono/mono-%{version}.10
Source1: mono.snk
Patch0: mono-4.0.0-ignore-reference-assemblies.patch
Patch1: mono-4.2.0-tlab_next_addr_offset.patch
Patch2: mono-4.0.0-libgdiplusconfig.patch
BuildRequires: bison
BuildRequires: gcc-c++
@ -268,6 +269,7 @@ Development file for monodoc
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
# Add undeclared Arg
sed -i "61a #define ARG_MAX _POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
@ -734,6 +736,9 @@ rm -f %{buildroot}%{_libdir}/pkgconfig/mono-nunit.pc
%{_libdir}/pkgconfig/monodoc.pc
%changelog
* Sat Jan 02 2016 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 4.2.1-3
- apply patch to fix issues with libgdiplus.so.0 (#1251756)
* Sat Jan 02 2016 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 4.2.1-2
- apply patch to fix build on ARM (#1293727)