diff --git a/sources b/sources index 76aaa06..f923618 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-7.3.0-src.tar.xz) = effee6d7c6dfa9f0c6c1bca868dba258094cbb85ad2ffb100e5c94365c9eba6c542825f37f1f8a50f8296b971a13fe068838e358a33307518556466a69d89c78 +SHA512 (wine-mono-10.4.1-src.tar.xz) = e2d227f003932a6dd3115492ee91ccf0682181e317d66d498edfa27302ee164bf1f308a66c1323fc246b9a759500454922312eb0529baf9e7584a78ede5ca60a diff --git a/wine-mono-build-static.patch b/wine-mono-build-static.patch deleted file mode 100644 index ebbc941..0000000 --- a/wine-mono-build-static.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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,7 @@ - # 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) 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 mono_feature_disable_cleanup=yes -+ 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 mono_feature_disable_cleanup=yes - sed -e 's/-lgcc_s//' -i $$(BUILDDIR)/mono-$(1)/libtool - - $$(BUILDDIR)/mono-$(1)/.built: $$(BUILDDIR)/mono-$(1)/Makefile $$(MONO_MONO_SRCS) $$(MINGW_DEPS) -@@ -51,7 +51,7 @@ - $(RM_F) $$(@D)/CMakeCache.txt - mkdir -p $$(@D) - # wincrypt.h interferes with boringssl definitions, so we prevent its inclusion -- 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 +105,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 - - $(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 deleted file mode 100644 index 4d65ab1..0000000 --- a/wine-mono-crlf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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}" - --IMAGECABWINPATH=`${WINE} winepath -w "${CABFILENAME}"` -+IMAGECABWINPATH=`${WINE} winepath -w "${CABFILENAME}" | dos2unix` - - CONTENTDIR="${TABLEDIR}/cab_contents" - rm -rf "${CONTENTDIR}" diff --git a/wine-mono.spec b/wine-mono.spec index a6dfd46..d9bddbc 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,27 +3,21 @@ %{?mingw_package_header} Name: wine-mono -Version: 7.3.0 -Release: 1%{?dist} +Version: 10.4.1 +Release: 3%{?dist} Summary: Mono library required for Wine -License: GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1 +License: GPL-2.0-or-later AND LGPL-2.1-only AND MIT AND BSD-4-Clause-UC AND MS-PL AND MPL-1.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 - -# https://bugs.winehq.org/show_bug.cgi?id=48937 -# fixed in wine 5.7 -Patch1: wine-mono-crlf.patch -# Probably a GCC 12 thing -Patch2: wine-mono-7.3.0-iconv.patch +Patch0: wine-mono-7.3.0-iconv.patch # see git://github.com/madewokherd/wine-mono BuildArch: noarch -ExcludeArch: %{power64} s390x s390 +# wine-mono is not ported to any other architecture and can only be built on a x86 host +ExcludeArch: aarch64 %{power64} s390x s390 # 64 BuildRequires: mingw64-filesystem >= 95 @@ -55,7 +49,7 @@ BuildRequires: libgdiplus BuildRequires: wine-core BuildRequires: /usr/bin/python BuildRequires: python3-setuptools -BuildRequires: /usr/bin/pathfix.py +BuildRequires: python3-devel # https://bugs.winehq.org/show_bug.cgi?id=48937 # fixed in wine 5.7 @@ -63,7 +57,7 @@ BuildRequires: dos2unix Requires: wine-filesystem -# Bundles FAudio, libtheorafile, libmojoshader, SDL2, SDL2_image +# Bundles FAudio, SDL3 %description Windows Mono library required for Wine. @@ -73,20 +67,19 @@ Windows Mono library required for Wine. %{?mingw_debug_package} %prep -%setup -q -%patch0 -p1 -b.static -%patch1 -p1 -b.crlf -%patch2 -p1 -b.iconv +%autosetup -p1 # Fix all Python shebangs -pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . +%py3_shebang_fix . 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/* +rm -rf llvm-mingw-*-ucrt-ubuntu-*-x86_64/ 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 + +# workaround coreutils 9.2 behavior change to "cp -n" option (RHBZ#2208129) +# https://github.com/madewokherd/wine-mono/issues/164 +sed -i 's~cp -n $(IMAGEDIR)/lib/mono/4.8-api/\*.dll $(IMAGEDIR)/lib/mono/4.5/~cp -n $(IMAGEDIR)/lib/mono/4.8-api/\*.dll $(IMAGEDIR)/lib/mono/4.5/ || true~' mono.make %build export BTLS_CFLAGS="-fPIC" @@ -95,6 +88,8 @@ export CPPFLAGS_FOR_BTLS="-fPIC" 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 +# Enable DWARF debug symbols +echo "PREFER_DWARF_SYMBOLS=1" >> user-config.make %make_build image %install @@ -102,29 +97,83 @@ mkdir -p %{buildroot}%{_datadir}/wine/mono/wine-mono-%{version}/ cp -rp image/* \ %{buildroot}%{_datadir}/wine/mono/wine-mono-%{version}/ -# prep licenses -cp mono/LICENSE mono-LICENSE -cp mono/COPYING.LIB mono-COPYING.LIB -cp mono/mcs/COPYING mono-mcs-COPYING - -pushd mono/mcs - -for l in `ls LICENSE*`; do -echo $l -cp $l ../../mono-mcs-$l -done - -popd - -cp mono-basic/README mono-basic-README -cp mono-basic/LICENSE mono-basic-LICENSE - %files -%license COPYING mono-LICENSE mono-COPYING.LIB mono-basic-LICENSE mono-mcs* -%doc README mono-basic-README +%license mono/LICENSE +%doc README.md %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 10.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 10.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Jan 14 2026 Michael Cronenworth - 10.4.1-1 +- version upgrade + +* Sun Nov 02 2025 Michael Cronenworth - 10.3.0-1 +- version upgrade + +* Fri Aug 29 2025 Michael Cronenworth - 10.2.0-1 +- version upgrade + +* Fri Jul 25 2025 Fedora Release Engineering - 10.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jun 30 2025 Björn Esser - 10.1.0-1 +- version upgrade +- Fix FTBFS by forcing DWARF debuginfo +- Fix removal of pre-build toolchain + +* Sun Apr 06 2025 Michael Cronenworth - 10.0.0-1 +- version upgrade + +* Sun Jan 19 2025 Fedora Release Engineering - 9.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Jan 06 2025 Michael Cronenworth - 9.4.0-2 +- Fix using system DLLs (RHBZ#2183853) + +* Wed Dec 04 2024 Zephyr Lykos - 9.4.0-1 +- new version + +* Sat Sep 21 2024 Zephyr Lykos - 9.3.0-1 +- new version + +* Tue Aug 13 2024 Michael Cronenworth - 9.2.0-1 +- version upgrade + +* Sat Jul 20 2024 Fedora Release Engineering - 9.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Mar 28 2024 Michael Cronenworth - 9.0.0-1 +- version upgrade + +* Sat Jan 27 2024 Fedora Release Engineering - 8.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Dec 9 2023 Florian Weimer - 8.1.0-2 +- Fix C compatibility issue in the configure script + +* Mon Oct 30 2023 Michael Cronenworth - 8.1.0-1 +- version upgrade + +* Sat Jul 22 2023 Fedora Release Engineering - 8.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 19 2023 Michael Cronenworth - 8.0.0-1 +- version upgrade + +* Sat Jan 21 2023 Fedora Release Engineering - 7.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Oct 31 2022 Michael Cronenworth - 7.4.0-1 +- version upgrade + +* Sat Jul 23 2022 Fedora Release Engineering - 7.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 06 2022 Michael Cronenworth - 7.3.0-1 - version upgrade