rpms/mono
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drop patch for libgdiplus reference, it has been fixed upstream

Browse Source
This commit is contained in:
Timotheus Pokorra 2016-08-24 20:57:48 +02:00
parent 786f705158
commit b942246049
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mono-4.0.0-libgdiplusconfig.patch
View File

@ -1,13 +0,0 @@
--- a/data/config.in 2016-01-02 18:56:31.246981603 +0100
+++ b/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>

15
mono.spec
View File

@ -16,7 +16,7 @@
Name: mono
Version: 4.6.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Cross-platform, Open Source, .NET development framework
Group: Development/Languages
@ -29,11 +29,10 @@ Source0: http://download.mono-project.com/sources/mono/mono-%{version}.15
# You should not regenerate this unless you have a really, really, really good reason.
Source1: mono.snk
Patch0: mono-4.0.0-ignore-reference-assemblies.patch
Patch1: mono-4.0.0-libgdiplusconfig.patch
Patch2: mono-4.2.1-ppc.patch
Patch3: mono-4.3.2-find-provides.patch
Patch4: mono-4.2-fix-winforms-trayicon.patch
Patch5: mono-4.6.0-patch_arm_fast_tls.patch
Patch1: mono-4.2.1-ppc.patch
Patch2: mono-4.3.2-find-provides.patch
Patch3: mono-4.2-fix-winforms-trayicon.patch
Patch4: mono-4.6.0-patch_arm_fast_tls.patch
BuildRequires: bison
BuildRequires: gcc-c++
@ -274,7 +273,6 @@ Development file for monodoc
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
# Add undeclared Arg
sed -i "61a #define ARG_MAX _POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
@ -771,6 +769,9 @@ rm -f %{buildroot}%{_libdir}/pkgconfig/cecil.pc
%{_libdir}/pkgconfig/monodoc.pc
%changelog
* Wed Aug 24 2016 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 4.6.0-2
- drop patch for libgdiplus reference, it has been fixed upstream
* Tue Aug 23 2016 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 4.6.0-1
- update to 4.6.0.150 Cycle 8 Beta Preview 1
- use Mono.Cecil from the tarball to build Mono, but do not make it public for other packages