From 2dc5b793b33cece62c66422bf1cdd6c5c8067279 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Tue, 14 Jul 2020 13:43:28 -0500 Subject: [PATCH] Update to 5.1.0 --- .gitignore | 2 +- sources | 2 +- wine-mono-build-static.patch | 20 ++++++++++---------- wine-mono.spec | 14 +++++++++++++- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 9ab96b3..353b90a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wine-mono-5.0.0-src.tar.xz +/wine-mono-5.1.0-src.tar.xz diff --git a/sources b/sources index 01365e6..b9e7b5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-5.0.0-src.tar.xz) = 8668e1f9ed6a04c04d4a8adff3a84c30eb52121369fea871e893cbaffb5221c51d717cf3ff86a53d901a871a58cda4d6eb6b823e70bbfd0952083d3b7127354d +SHA512 (wine-mono-5.1.0-src.tar.xz) = 92bff1fc934f2a74065cc6899a4d3c1f101586f9a3c86c39d787249d3ac3c5485509a7cef65532716413c179c03d3d424d709d63f3d1773859199e5a4683123f diff --git a/wine-mono-build-static.patch b/wine-mono-build-static.patch index e3b8192..0c5ba5e 100644 --- a/wine-mono-build-static.patch +++ b/wine-mono-build-static.patch @@ -1,27 +1,27 @@ ---- wine-mono-5.0.0/GNUmakefile.orig 2015-04-20 10:34:32.150114394 -0500 -+++ wine-mono-5.0.0/GNUmakefile 2015-04-20 10:33:13.699274928 -0500 -@@ -128,7 +128,8 @@ +--- wine-mono-5.0.0/mono.make.orig 2020-06-01 11:47:42.000000000 -0500 ++++ wine-mono-5.0.0/mono.make 2020-06-24 14:47:01.905533172 -0500 +@@ -15,7 +15,8 @@ # libmono dll's - $$(BUILDDIR)/mono-$(1)/Makefile: $$(SRCDIR)/mono/configure $$(BUILDDIR)/.dir + $$(BUILDDIR)/mono-$(1)/Makefile: $$(SRCDIR)/mono/configure $$(SRCDIR)/mono.make $$(BUILDDIR)/.dir $$(MINGW_DEPS) mkdir -p $$(@D) - cd $$(BUILDDIR)/mono-$(1); $$(MINGW_ENV) CPPFLAGS="-gdwarf-2 -gstrict-dwarf" $$(SRCDIR_ABS)/mono/configure --prefix="$$(BUILDDIR_ABS)/build-cross-$(1)-install" --build=$$(shell $$(SRCDIR)/mono/config.guess) --target=$$(MINGW_$(1)) --host=$$(MINGW_$(1)) --with-tls=none --disable-mcs-build --enable-win32-dllmain=yes --with-libgc-threads=win32 PKG_CONFIG=false mono_cv_clang=no --disable-boehm + cd $$(BUILDDIR)/mono-$(1); $$(MINGW_ENV) CPPFLAGS_FOR_BTLS="-fPIC" CPPFLAGS="-gdwarf-2 -gstrict-dwarf -fPIC" $$(SRCDIR_ABS)/mono/configure --prefix="$$(BUILDDIR_ABS)/build-cross-$(1)-install" --build=$$(shell $$(SRCDIR)/mono/config.guess) --target=$$(MINGW_$(1)) --host=$$(MINGW_$(1)) --with-tls=none --disable-mcs-build --enable-win32-dllmain=yes --with-libgc-threads=win32 PKG_CONFIG=false mono_cv_clang=no --disable-boehm + sed -e 's+compiler_flags="-specs=/usr/lib/rpm/redhat/redhat-hardened-ld"+compiler_flags="-static"+' -i $$(BUILDDIR)/mono-$(1)/libtool sed -e 's/-lgcc_s//' -i $$(BUILDDIR)/mono-$(1)/libtool - $$(BUILDDIR)/mono-$(1)/.built: $$(BUILDDIR)/mono-$(1)/Makefile $$(MONO_MONO_SRCS) -@@ -163,7 +164,7 @@ - $$(BUILDDIR)/btls-$(1)/Makefile: $$(SRCDIR)/mono/mono/btls/CMakeLists.txt + $$(BUILDDIR)/mono-$(1)/.built: $$(BUILDDIR)/mono-$(1)/Makefile $$(MONO_MONO_SRCS) $$(MINGW_DEPS) +@@ -51,7 +52,7 @@ + $(RM_F) $$(@D)/CMakeCache.txt mkdir -p $$(@D) # wincrypt.h interferes with boringssl definitions, so we prevent its inclusion - cd $$(@D); $$(MINGW_ENV) cmake -DCMAKE_TOOLCHAIN_FILE="$$(SRCDIR_ABS)/toolchain-$(1).cmake" -DCMAKE_C_COMPILER=$$(MINGW_$(1))-gcc -DCMAKE_C_FLAGS='-D__WINCRYPT_H__ -D_WIN32_WINNT=0x0600 -static-libgcc' -DCMAKE_CXX_COMPILER=$$(MINGW_$(1))-g++ -DOPENSSL_NO_ASM=1 -DBTLS_ROOT="$$(SRCDIR_ABS)/mono/external/boringssl" -DBUILD_SHARED_LIBS=1 $$(SRCDIR_ABS)/mono/mono/btls + cd $$(@D); $$(MINGW_ENV) CPPFLAGS_FOR_BTLS="-fPIC" cmake -DCMAKE_TOOLCHAIN_FILE="$$(SRCDIR_ABS)/toolchain-$(1).cmake" -DCMAKE_C_COMPILER=$$(MINGW_$(1))-gcc -DCMAKE_C_FLAGS='-fPIC -D__WINCRYPT_H__ -D_WIN32_WINNT=0x0600 -static-libgcc' -DCMAKE_CXX_COMPILER=$$(MINGW_$(1))-g++ -DOPENSSL_NO_ASM=1 -DBTLS_ROOT="$$(SRCDIR_ABS)/mono/external/boringssl" -DBUILD_SHARED_LIBS=1 $$(SRCDIR_ABS)/mono/mono/btls - $$(BUILDDIR)/btls-$(1)/.built: $$(BUILDDIR)/btls-$(1)/Makefile $$(MONO_BTLS_SRCS) + $$(BUILDDIR)/btls-$(1)/.built: $$(BUILDDIR)/btls-$(1)/Makefile $$(MONO_BTLS_SRCS) $$(MINGW_DEPS) +WINEPREFIX=/dev/null $$(MINGW_ENV) $$(MAKE) -C $$(BUILDDIR)/btls-$(1) -@@ -415,7 +416,8 @@ +@@ -105,7 +106,8 @@ # mono native/classlib build - $(BUILDDIR)/mono-unix/Makefile: $(SRCDIR)/mono/configure $(BUILDDIR)/.dir + $(BUILDDIR)/mono-unix/Makefile: $(SRCDIR)/mono/configure $(SRCDIR)/mono.make $(BUILDDIR)/.dir mkdir -p $(@D) - cd $(@D) && $(SRCDIR_ABS)/mono/configure --prefix="$(BUILDDIR_ABS)/mono-unix-install" --with-mcs-docs=no --disable-system-aot --without-compiler-server + cd $(@D) && CPPFLAGS_FOR_BTLS="-fPIC" BTLS_CFLAGS="-fPIC" $(SRCDIR_ABS)/mono/configure --prefix="$(BUILDDIR_ABS)/mono-unix-install" --with-mcs-docs=no --disable-system-aot --without-compiler-server diff --git a/wine-mono.spec b/wine-mono.spec index 5443122..4fcafe7 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -2,12 +2,13 @@ %{?mingw_package_header} Name: wine-mono -Version: 5.0.0 +Version: 5.1.0 Release: 1%{?dist} Summary: Mono library required for Wine License: GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1 URL: http://wiki.winehq.org/Mono +# https://github.com/madewokherd/wine-mono Source0: https://dl.winehq.org/wine/wine-mono/%{version}/wine-mono-%{version}-src.tar.xz # to statically link in winpthreads Patch0: wine-mono-build-static.patch @@ -74,9 +75,17 @@ Windows Mono library required for Wine. pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . sed -i 's/GENMDESC_PRG=python/GENMDESC_PRG=python3/' mono/mono/mini/Makefile.am.in +# remove shipped compiler +rm -rf llvm-mingw-20200325-ubuntu-18.04/* +sed -i 's/$CPPFLAGS_FOR_BTLS $btls_cflags/$CPPFLAGS_FOR_BTLS -fPIC $btls_cflags/' mono/configure.ac + %build export BTLS_CFLAGS="-fPIC" export CPPFLAGS_FOR_BTLS="-fPIC" +# Disable LLVM compiler as we do not ship a full, updated MinGW environment. Use GCC instead. +echo "AUTO_LLVM_MINGW=0" > user-config.make +# Disable WpfGfx as it requires LLVM to compile +echo "ENABLE_DOTNET_CORE_WPFGFX=0" >> user-config.make make %{_smp_mflags} image %install @@ -107,6 +116,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* Wed Jun 24 2020 Michael Cronenworth - 5.1.0-1 +- version upgrade + * Sun Apr 26 2020 Michael Cronenworth - 5.0.0-1 - version upgrade