From eca1e1bfc60f9e3729abaf7d6c9a40efca7e3556 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Mon, 30 Aug 2021 12:47:22 -0500 Subject: [PATCH] Update to 6.3.0 --- .gitignore | 2 +- sources | 2 +- wine-mono-build-static.patch | 11 +++++------ wine-mono-crlf.patch | 8 ++++---- wine-mono.spec | 9 +++++++-- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 418b7e1..917b657 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wine-mono-6.2.0-src.tar.xz +/wine-mono-6.3.0-src.tar.xz diff --git a/sources b/sources index e2ad727..4d9b784 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-6.2.0-src.tar.xz) = ab01e872b4312e1c1c36d86e781b52e45a1a5792504883e8de95148ba3b855ee4934ac5736e3225a6dde0edb4b83153326d8928785c35159492e4ee5e8981047 +SHA512 (wine-mono-6.3.0-src.tar.xz) = c9f99e2a96573cce2c46740cef4a6683f75503035e2c026f1ba712ba055bb098b18a539d96c24a369c86fc9817c0a6a241fb9d83e7ae655dd019166adfd6a69b diff --git a/wine-mono-build-static.patch b/wine-mono-build-static.patch index 0c5ba5e..f34c622 100644 --- a/wine-mono-build-static.patch +++ b/wine-mono-build-static.patch @@ -4,8 +4,8 @@ # libmono dll's $$(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 +- cd $$(BUILDDIR)/mono-$(1); $$(MINGW_ENV) CFLAGS="$$(PDB_CFLAGS_$(1)) $$$${CFLAGS:--g -O2}" CXXFLAGS="$$(PDB_CFLAGS_$(1)) $$$${CXXFLAGS:--g -O2}" LDFLAGS="$$(PDB_LDFLAGS_$(1))" $$(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" CFLAGS="$$(PDB_CFLAGS_$(1)) $$$${CFLAGS:--g -O2} -fPIC" CXXFLAGS="$$(PDB_CFLAGS_$(1)) $$$${CXXFLAGS:--g -O2} -fPIC" LDFLAGS="$$(PDB_LDFLAGS_$(1))" $$(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 @@ -14,18 +14,17 @@ $(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 +- cd $$(@D); $$(MINGW_ENV) CXXFLAGS="$$(PDB_CFLAGS_$(1))" LDFLAGS="$$(PDB_LDFLAGS_$(1))" 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 $$(PDB_CFLAGS_$(1))' -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" CXXFLAGS="$$(PDB_CFLAGS_$(1))" LDFLAGS="$$(PDB_LDFLAGS_$(1))" 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 $$(PDB_CFLAGS_$(1))' -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) $$(MINGW_DEPS) +WINEPREFIX=/dev/null $$(MINGW_ENV) $$(MAKE) -C $$(BUILDDIR)/btls-$(1) -@@ -105,7 +106,8 @@ +@@ -105,7 +106,7 @@ # mono native/classlib build $(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 -+ sed -e 's+compiler_flags="-specs=/usr/lib/rpm/redhat/redhat-hardened-ld"+compiler_flags="-static"+' -i $(@D)/libtool $(BUILDDIR)/mono-unix/mono/lib/libSystem.Native.so: $(BUILDDIR)/mono-unix/Makefile $(MONO_LIBNATIVE_SRCS) mkdir -p $(@D) diff --git a/wine-mono-crlf.patch b/wine-mono-crlf.patch index 14caf95..4d65ab1 100644 --- a/wine-mono-crlf.patch +++ b/wine-mono-crlf.patch @@ -1,11 +1,11 @@ --- a/tools/build-msi-tables.sh 2020-04-10 11:06:24.000000000 -0500 +++ b/tools/build-msi-tables.sh 2020-04-27 10:03:20.835241179 -0500 @@ -7,7 +7,7 @@ - mkdir -p ${TABLEDIR} - cp ${TABLESRCDIR}/*.idt ${TABLEDIR} + mkdir -p "${TABLEDIR}" + cp "${TABLESRCDIR}"/*.idt "${TABLEDIR}" -IMAGECABWINPATH=`${WINE} winepath -w "${CABFILENAME}"` +IMAGECABWINPATH=`${WINE} winepath -w "${CABFILENAME}" | dos2unix` - cd "${IMAGEDIR}" - + CONTENTDIR="${TABLEDIR}/cab_contents" + rm -rf "${CONTENTDIR}" diff --git a/wine-mono.spec b/wine-mono.spec index 816747a..cbfb9d3 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -2,8 +2,8 @@ %{?mingw_package_header} Name: wine-mono -Version: 6.2.0 -Release: 2%{?dist} +Version: 6.3.0 +Release: 1%{?dist} Summary: Mono library required for Wine License: GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1 @@ -80,6 +80,8 @@ sed -i 's/GENMDESC_PRG=python/GENMDESC_PRG=python3/' mono/mono/mini/Makefile.am. # 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 +sed -i 's/-gcodeview //' GNUmakefile +sed -i 's/-Wl,-pdb=//' GNUmakefile %build export BTLS_CFLAGS="-fPIC" @@ -118,6 +120,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* Mon Aug 30 2021 Michael Cronenworth - 6.3.0-1 +- version upgrade + * Fri Jul 23 2021 Fedora Release Engineering - 6.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild