From d343b2e02dc6efa72ff900859ae1f3382ee0d28c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:26:51 +0000 Subject: [PATCH 01/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wine-mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wine-mono.spec b/wine-mono.spec index a6dfd46..580175c 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -4,7 +4,7 @@ Name: wine-mono Version: 7.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mono library required for Wine License: GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1 @@ -125,6 +125,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From 5ce0310a6e8ce485418f18f6a35b4a099bcecfe2 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Mon, 31 Oct 2022 21:37:22 -0500 Subject: [PATCH 02/29] Update to 7.4.0 --- sources | 2 +- wine-mono.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 76aaa06..7753f76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-7.3.0-src.tar.xz) = effee6d7c6dfa9f0c6c1bca868dba258094cbb85ad2ffb100e5c94365c9eba6c542825f37f1f8a50f8296b971a13fe068838e358a33307518556466a69d89c78 +SHA512 (wine-mono-7.4.0-src.tar.xz) = 8f8cfd9f84e3979cbb7bcc1b90f7bfef8bae10128da2e0f3ebc982992c832e29dae81b8dd2c401eac9832f22b565aba851643f2bba8688e57c0e90f283e8a70e diff --git a/wine-mono.spec b/wine-mono.spec index 580175c..16ea337 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,8 +3,8 @@ %{?mingw_package_header} Name: wine-mono -Version: 7.3.0 -Release: 2%{?dist} +Version: 7.4.0 +Release: 1%{?dist} Summary: Mono library required for Wine License: GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1 @@ -125,6 +125,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From 237649e0d3f58a99133bfd713a4efa86dcb2180d Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 1 Nov 2022 07:21:11 +0100 Subject: [PATCH 03/29] Switch from pathfix.py to %py3_shebang_fix For more info see https://fedoraproject.org/wiki/Changes/Python3.12#pathfix.py_tool_will_be_removed --- wine-mono.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wine-mono.spec b/wine-mono.spec index 580175c..e72456a 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -55,7 +55,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 @@ -79,7 +79,7 @@ Windows Mono library required for Wine. %patch2 -p1 -b.iconv # 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 From c62f458eb1ff216b05416f29dc234cc25aa5624b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:51:02 +0000 Subject: [PATCH 04/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wine-mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wine-mono.spec b/wine-mono.spec index 2448367..a504e6d 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -4,7 +4,7 @@ Name: wine-mono Version: 7.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mono library required for Wine License: GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1 @@ -125,6 +125,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From 349bce080fd86409b1af137b5842e4ce1b25dd58 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Mon, 19 Jun 2023 23:04:52 -0500 Subject: [PATCH 05/29] Update to 8.0.0 --- sources | 2 +- wine-mono.spec | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/sources b/sources index 7753f76..7cbaa2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-7.4.0-src.tar.xz) = 8f8cfd9f84e3979cbb7bcc1b90f7bfef8bae10128da2e0f3ebc982992c832e29dae81b8dd2c401eac9832f22b565aba851643f2bba8688e57c0e90f283e8a70e +SHA512 (wine-mono-8.0.0-src.tar.xz) = 6db05a13bd72679143f10113a5f53b6650f42b9d5af5af932d901751d3c7ddbf2f0ac3e7ffa3c848fc5b2972c085ccd0855ad3849c9aa74ebee9335d4ca7f3c8 diff --git a/wine-mono.spec b/wine-mono.spec index a504e6d..33980af 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,22 +3,15 @@ %{?mingw_package_header} Name: wine-mono -Version: 7.4.0 -Release: 2%{?dist} +Version: 8.0.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 - -# 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 @@ -74,20 +67,22 @@ Windows Mono library required for Wine. %prep %setup -q -%patch0 -p1 -b.static -%patch1 -p1 -b.crlf -%patch2 -p1 -b.iconv +%patch -P 0 -p1 -b.iconv # Fix all Python shebangs %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-20210423-ucrt-ubuntu-18.04-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" export CPPFLAGS_FOR_BTLS="-fPIC" @@ -125,6 +120,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From 3b725cc4b00427875cceaccee7d5bf05acf0c5ff Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Mon, 19 Jun 2023 23:05:42 -0500 Subject: [PATCH 06/29] Remove obsolete patches --- wine-mono-build-static.patch | 29 ----------------------------- wine-mono-crlf.patch | 11 ----------- 2 files changed, 40 deletions(-) delete mode 100644 wine-mono-build-static.patch delete mode 100644 wine-mono-crlf.patch 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}" From fd7833f92ff07dfa9cbbf8733edc39d7cb45165e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:14:11 +0000 Subject: [PATCH 07/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wine-mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wine-mono.spec b/wine-mono.spec index 33980af..f90230c 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -4,7 +4,7 @@ Name: wine-mono Version: 8.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mono library required for Wine License: GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1 @@ -120,6 +120,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From ccd3189dc30857d9bfa913b253bc1f14c2e1de23 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Mon, 30 Oct 2023 11:39:38 -0500 Subject: [PATCH 08/29] Update to 8.1.0 --- sources | 2 +- wine-mono.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 7cbaa2d..db45d41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-8.0.0-src.tar.xz) = 6db05a13bd72679143f10113a5f53b6650f42b9d5af5af932d901751d3c7ddbf2f0ac3e7ffa3c848fc5b2972c085ccd0855ad3849c9aa74ebee9335d4ca7f3c8 +SHA512 (wine-mono-8.1.0-src.tar.xz) = 90620b1d9a8af6b6077e96f0cf0b1829c6c4da3df1775c1455583c9121bb0be1fd79849461976ae561354eec8cb25d007f443c9278b34099046e837f45a3f3e0 diff --git a/wine-mono.spec b/wine-mono.spec index f90230c..3c49cce 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,11 +3,11 @@ %{?mingw_package_header} Name: wine-mono -Version: 8.0.0 -Release: 2%{?dist} +Version: 8.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 +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 @@ -120,6 +120,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From 474ef6aeffa4e49da779b4a8fe43a700c999b35f Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sat, 9 Dec 2023 11:09:20 +0100 Subject: [PATCH 09/29] Fix C compatibility issue in the configure script Related to: --- wine-mono-configure-c99.patch | 43 +++++++++++++++++++++++++++++++++++ wine-mono.spec | 7 +++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 wine-mono-configure-c99.patch diff --git a/wine-mono-configure-c99.patch b/wine-mono-configure-c99.patch new file mode 100644 index 0000000..36f7d7e --- /dev/null +++ b/wine-mono-configure-c99.patch @@ -0,0 +1,43 @@ +The thread start routine must return void *, and int and void * +are distinct types. Compilers increasingly issue errors instead +of warnings for such type errors, and this causes the configure +probe to fail unconditionally, even if the system supports +__thread variables. + +Submitted upstream: + +diff --git a/mono/configure.ac b/mono/configure.ac +index bbbd1622d9728859..5a3a5770c8a3cdb6 100644 +--- a/mono/configure.ac ++++ b/mono/configure.ac +@@ -2833,14 +2833,16 @@ if test x$host_win32 = xno; then + __thread int i; + static int res1, res2; + +- void thread_main (void *arg) ++ void *thread_main (void *parg) + { ++ int arg = *(int *)parg; + i = arg; + sleep (1); + if (arg == 1) + res1 = (i == arg); + else + res2 = (i == arg); ++ return NULL; + } + + int main () { +@@ -2848,8 +2850,10 @@ if test x$host_win32 = xno; then + + i = 5; + +- pthread_create (&t1, NULL, thread_main, 1); +- pthread_create (&t2, NULL, thread_main, 2); ++ int one = 1; ++ pthread_create (&t1, NULL, thread_main, &one); ++ int two = 2; ++ pthread_create (&t2, NULL, thread_main, &two); + + pthread_join (t1, NULL); + pthread_join (t2, NULL); diff --git a/wine-mono.spec b/wine-mono.spec index 3c49cce..2bde717 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -4,7 +4,7 @@ Name: wine-mono Version: 8.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mono library required for Wine 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 @@ -12,6 +12,7 @@ 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 Patch0: wine-mono-7.3.0-iconv.patch +Patch1: wine-mono-configure-c99.patch # see git://github.com/madewokherd/wine-mono @@ -68,6 +69,7 @@ Windows Mono library required for Wine. %prep %setup -q %patch -P 0 -p1 -b.iconv +%patch -P 1 -p1 -b.c99 # Fix all Python shebangs %py3_shebang_fix . @@ -120,6 +122,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From dc73f0c429ffcdee2bdaa2e531c53fadae650e9c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:51:02 +0000 Subject: [PATCH 10/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- wine-mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wine-mono.spec b/wine-mono.spec index 2bde717..60d5fd0 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -4,7 +4,7 @@ Name: wine-mono Version: 8.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Mono library required for Wine 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 @@ -122,6 +122,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From c0cf6f065d031a00c29bf08e1867a6f89dd99008 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Thu, 28 Mar 2024 12:17:10 -0500 Subject: [PATCH 11/29] Update to 9.0.0 # Conflicts: # wine-mono.spec --- sources | 2 +- wine-mono.spec | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sources b/sources index db45d41..97e44a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-8.1.0-src.tar.xz) = 90620b1d9a8af6b6077e96f0cf0b1829c6c4da3df1775c1455583c9121bb0be1fd79849461976ae561354eec8cb25d007f443c9278b34099046e837f45a3f3e0 +SHA512 (wine-mono-9.0.0-src.tar.xz) = 0ae26252d9ba61b6817dc193873a5da830d39b45179fd00f2fda2718957a9123667cd64b28d752535c93f2bcc9d0952085e28c3691b6747de1dd18a2b54f3102 diff --git a/wine-mono.spec b/wine-mono.spec index 60d5fd0..6c1af64 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,8 +3,8 @@ %{?mingw_package_header} Name: wine-mono -Version: 8.1.0 -Release: 3%{?dist} +Version: 9.0.0 +Release: 1%{?dist} Summary: Mono library required for Wine 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 @@ -78,8 +78,6 @@ sed -i 's/GENMDESC_PRG=python/GENMDESC_PRG=python3/' mono/mono/mini/Makefile.am. # remove shipped compiler rm -rf llvm-mingw-20210423-ucrt-ubuntu-18.04-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 @@ -122,6 +120,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From c7d141b0585dbbc2aaa1bbdc07eb4978fe685011 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:22:32 +0000 Subject: [PATCH 12/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wine-mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wine-mono.spec b/wine-mono.spec index 6c1af64..e5cf638 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -4,7 +4,7 @@ Name: wine-mono Version: 9.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mono library required for Wine 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 @@ -120,6 +120,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From 87358a08d6352bad928bc042f56ef9f19935e87b Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Tue, 13 Aug 2024 22:50:15 -0500 Subject: [PATCH 13/29] Update to 9.2.0 --- sources | 2 +- wine-mono.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 97e44a2..7fd20b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-9.0.0-src.tar.xz) = 0ae26252d9ba61b6817dc193873a5da830d39b45179fd00f2fda2718957a9123667cd64b28d752535c93f2bcc9d0952085e28c3691b6747de1dd18a2b54f3102 +SHA512 (wine-mono-9.2.0-src.tar.xz) = ec6027afb9e0b4b1f732d8a0d1b30a0535d7be0c0a0136f2479155a62418b43ed142ec04d188717225fd9128f8fa38e92b06888415015d8a4e00a57aa96fcf3a diff --git a/wine-mono.spec b/wine-mono.spec index e5cf638..6719f19 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,8 +3,8 @@ %{?mingw_package_header} Name: wine-mono -Version: 9.0.0 -Release: 2%{?dist} +Version: 9.2.0 +Release: 1%{?dist} Summary: Mono library required for Wine 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 @@ -120,6 +120,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From cbe196ad4970403d1a3d37e06f93a609cbb0a07a Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Sun, 22 Sep 2024 13:15:43 +0800 Subject: [PATCH 14/29] Update to 9.3.0 --- sources | 2 +- wine-mono.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7fd20b8..1d13ccc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-9.2.0-src.tar.xz) = ec6027afb9e0b4b1f732d8a0d1b30a0535d7be0c0a0136f2479155a62418b43ed142ec04d188717225fd9128f8fa38e92b06888415015d8a4e00a57aa96fcf3a +SHA512 (wine-mono-9.3.0-src.tar.xz) = 558b0f45149dbc58991f56eb275e2151dab25f6f40a3a5338246ee8e83972f0126656b890bad6c44865833c1898df2062b007ac602e0c27d42c77a3f47bc243f diff --git a/wine-mono.spec b/wine-mono.spec index 6719f19..abf5194 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,7 +3,7 @@ %{?mingw_package_header} Name: wine-mono -Version: 9.2.0 +Version: 9.3.0 Release: 1%{?dist} Summary: Mono library required for Wine @@ -120,6 +120,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* Sat Sep 21 2024 Zephyr Lykos - 9.3.0-1 +- new version + * Tue Aug 13 2024 Michael Cronenworth - 9.2.0-1 - version upgrade From 8fa49189799ec51b7932a0695e1f0c574ed587d9 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Thu, 5 Dec 2024 06:11:54 +0800 Subject: [PATCH 15/29] Update to 9.4.0 --- sources | 2 +- wine-mono.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 1d13ccc..cfa89e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-9.3.0-src.tar.xz) = 558b0f45149dbc58991f56eb275e2151dab25f6f40a3a5338246ee8e83972f0126656b890bad6c44865833c1898df2062b007ac602e0c27d42c77a3f47bc243f +SHA512 (wine-mono-9.4.0-src.tar.xz) = ae45d6dae42d2e42470f5ada01779376d43baf13b4a7a92fe6ec4608173f530ec36190e6ffc0335b99e3e5ade1b9a5581d4b94cf165cb03f608f3ecc450039d1 diff --git a/wine-mono.spec b/wine-mono.spec index abf5194..6c64867 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,7 +3,7 @@ %{?mingw_package_header} Name: wine-mono -Version: 9.3.0 +Version: 9.4.0 Release: 1%{?dist} Summary: Mono library required for Wine @@ -120,6 +120,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* Wed Dec 04 2024 Zephyr Lykos - 9.4.0-1 +- new version + * Sat Sep 21 2024 Zephyr Lykos - 9.3.0-1 - new version From 5889531558d0987f673aafd8fbe0faef18395e1c Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Mon, 6 Jan 2025 20:36:40 -0600 Subject: [PATCH 16/29] Fix using system DLLs (RHBZ#2183853) --- wine-mono-builtins.patch | 58 ++++++++++++++++++++++++++++++++++++++++ wine-mono.spec | 12 +++++---- 2 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 wine-mono-builtins.patch diff --git a/wine-mono-builtins.patch b/wine-mono-builtins.patch new file mode 100644 index 0000000..9eed362 --- /dev/null +++ b/wine-mono-builtins.patch @@ -0,0 +1,58 @@ +From f2d4798eabe3a888f8b8bbfd27c152a396b38aaa Mon Sep 17 00:00:00 2001 +From: Zephyr Lykos +Date: Sun, 5 Jan 2025 00:36:14 +0800 +Subject: [PATCH] build: mark all PE files as wine builtins + +This allows libmono to load extra libraries (notably win-iconv) from +system_dllpath. + +For example, Fedora's wine-mono is built against a shared win-iconv +installed in system_dllpath, but wine will not search there unless it's +explicitly instructed to do so since wine commit bfbccf1a (ntdll: Prevent +loading Wine system dependencies in place of identically named application +DLLs.). + +https://gitlab.winehq.org/wine/wine/-/merge_requests/7077 +Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54573 +--- + GNUmakefile | 6 +++--- + tools/mark-wine-builtin.sh | 3 +++ + 2 files changed, 6 insertions(+), 3 deletions(-) + create mode 100755 tools/mark-wine-builtin.sh + +diff --git a/GNUmakefile b/GNUmakefile +index e3419fdb..28809e58 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -101,16 +101,16 @@ define MINGW_TEMPLATE = + + ifeq (1,$(ENABLE_DEBUG_SYMBOLS)) + ifeq (1,$(PREFER_DWARF_SYMBOLS)) +-INSTALL_PE_$(1)=do_install () { $$(MINGW_ENV) $$(MINGW_$(1))-objcopy --only-keep-debug "$$$$1" "$$$$(printf %s "$$$$2"|sed -e 's/\....$$$$/.dbg/')"; $$(MINGW_ENV) $$(MINGW_$(1))-objcopy --strip-all "$$$$1" "$$$$2"; $$(MINGW_ENV) $$(MINGW_$(1))-objcopy --add-gnu-debuglink="$$$$(printf %s "$$$$2"|sed -e 's/\....$$$$/.dbg/')" "$$$$2"; }; do_install ++INSTALL_PE_$(1)=do_install () { $$(MINGW_ENV) $$(MINGW_$(1))-objcopy --only-keep-debug "$$$$1" "$$$$(printf %s "$$$$2"|sed -e 's/\....$$$$/.dbg/')"; $$(MINGW_ENV) $$(MINGW_$(1))-objcopy --strip-all "$$$$1" "$$$$2"; $$(MINGW_ENV) $$(MINGW_$(1))-objcopy --add-gnu-debuglink="$$$$(printf %s "$$$$2"|sed -e 's/\....$$$$/.dbg/')" "$$$$2"; tools/mark-wine-builtin.sh "$$$$2"; }; do_install + PDB_CFLAGS_$(1)=-gdwarf-4 -g + PDB_LDFLAGS_$(1)= + else +-INSTALL_PE_$(1)=do_install () { cp "$$$$(printf %s "$$$$1"|sed -e 's/\....$$$$/.pdb/')" "$$$$(printf %s "$$$$2"|sed -e 's/\....$$$$/.pdb/')"; cp "$$$$1" "$$$$2"; $$(MINGW_ENV) $$(MINGW_$(1))-strip "$$$$2"; }; do_install ++INSTALL_PE_$(1)=do_install () { cp "$$$$(printf %s "$$$$1"|sed -e 's/\....$$$$/.pdb/')" "$$$$(printf %s "$$$$2"|sed -e 's/\....$$$$/.pdb/')"; cp "$$$$1" "$$$$2"; $$(MINGW_ENV) $$(MINGW_$(1))-strip "$$$$2"; tools/mark-wine-builtin.sh "$$$$2"; }; do_install + PDB_CFLAGS_$(1)=-gcodeview -g + PDB_LDFLAGS_$(1)=-Wl,-pdb= + endif + else +-INSTALL_PE_$(1)=do_install () { cp "$$$$1" "$$$$2"; $$(MINGW_ENV) $$(MINGW_$(1))-strip "$$$$2"; }; do_install ++INSTALL_PE_$(1)=do_install () { cp "$$$$1" "$$$$2"; $$(MINGW_ENV) $$(MINGW_$(1))-strip "$$$$2"; tools/mark-wine-builtin.sh "$$$$2"; }; do_install + endif + + # installinf.exe +diff --git a/tools/mark-wine-builtin.sh b/tools/mark-wine-builtin.sh +new file mode 100755 +index 00000000..5846221b +--- /dev/null ++++ b/tools/mark-wine-builtin.sh +@@ -0,0 +1,3 @@ ++#!/bin/sh ++ ++printf 'Wine builtin DLL\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0' | dd if=/dev/stdin of="$1" bs=1 seek=64 count=32 conv=notrunc +-- +GitLab + diff --git a/wine-mono.spec b/wine-mono.spec index 6c64867..36f9cad 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -4,7 +4,7 @@ Name: wine-mono Version: 9.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mono library required for Wine 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 @@ -12,7 +12,8 @@ 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 Patch0: wine-mono-7.3.0-iconv.patch -Patch1: wine-mono-configure-c99.patch +Patch1: wine-mono-configure-c99.patch +Patch2: wine-mono-builtins.patch # see git://github.com/madewokherd/wine-mono @@ -67,9 +68,7 @@ Windows Mono library required for Wine. %{?mingw_debug_package} %prep -%setup -q -%patch -P 0 -p1 -b.iconv -%patch -P 1 -p1 -b.c99 +%autosetup -q # Fix all Python shebangs %py3_shebang_fix . @@ -120,6 +119,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From 7cdc625d891fd88ee35a6ac6fb0547d25d8f4a46 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Mon, 6 Jan 2025 20:56:16 -0600 Subject: [PATCH 17/29] Fix autosetup macro usage --- wine-mono.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wine-mono.spec b/wine-mono.spec index 36f9cad..f74215d 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -68,7 +68,7 @@ Windows Mono library required for Wine. %{?mingw_debug_package} %prep -%autosetup -q +%autosetup # Fix all Python shebangs %py3_shebang_fix . From a83cfb5ca988eef61fc76a09333ede18cd0ee12d Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Mon, 6 Jan 2025 21:12:15 -0600 Subject: [PATCH 18/29] We'll fix autosetup eventually --- wine-mono.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wine-mono.spec b/wine-mono.spec index f74215d..50b9597 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -13,6 +13,7 @@ URL: http://wiki.winehq.org/Mono Source0: https://dl.winehq.org/wine/wine-mono/%{version}/wine-mono-%{version}-src.tar.xz Patch0: wine-mono-7.3.0-iconv.patch Patch1: wine-mono-configure-c99.patch +# https://gitlab.winehq.org/mono/wine-mono/-/merge_requests/22 Patch2: wine-mono-builtins.patch # see git://github.com/madewokherd/wine-mono @@ -68,7 +69,7 @@ Windows Mono library required for Wine. %{?mingw_debug_package} %prep -%autosetup +%autosetup -p1 # Fix all Python shebangs %py3_shebang_fix . From 32b764e2409800fe7b8fb527284b854baca68c8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:03:15 +0000 Subject: [PATCH 19/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wine-mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wine-mono.spec b/wine-mono.spec index 50b9597..647bd59 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -4,7 +4,7 @@ Name: wine-mono Version: 9.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Mono library required for Wine 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 @@ -120,6 +120,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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) From beddc2668b17a533b2adae07be89a0a29375df47 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Tue, 21 Jan 2025 12:58:16 -0600 Subject: [PATCH 20/29] Add arm to ExcludeArch and include comment detailing why --- wine-mono.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wine-mono.spec b/wine-mono.spec index 647bd59..65ed3f1 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -19,7 +19,8 @@ Patch2: wine-mono-builtins.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 From b9c671490b95d884e45d89e0b70d44d5d33e7b20 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Sun, 6 Apr 2025 15:06:31 -0500 Subject: [PATCH 21/29] Update to 10.0.0 --- sources | 2 +- wine-mono-builtins.patch | 58 ---------------------------------------- wine-mono.spec | 9 ++++--- 3 files changed, 6 insertions(+), 63 deletions(-) delete mode 100644 wine-mono-builtins.patch diff --git a/sources b/sources index cfa89e9..6fb032a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-9.4.0-src.tar.xz) = ae45d6dae42d2e42470f5ada01779376d43baf13b4a7a92fe6ec4608173f530ec36190e6ffc0335b99e3e5ade1b9a5581d4b94cf165cb03f608f3ecc450039d1 +SHA512 (wine-mono-10.0.0-src.tar.xz) = 9998e3425da2dd85b44842050600b5087973ace965bd497f5aefe3c8af1f34adaa0ed43d6afc8b038aa7880fda274b8c76065bddffa8179e3f4956211bf20775 diff --git a/wine-mono-builtins.patch b/wine-mono-builtins.patch deleted file mode 100644 index 9eed362..0000000 --- a/wine-mono-builtins.patch +++ /dev/null @@ -1,58 +0,0 @@ -From f2d4798eabe3a888f8b8bbfd27c152a396b38aaa Mon Sep 17 00:00:00 2001 -From: Zephyr Lykos -Date: Sun, 5 Jan 2025 00:36:14 +0800 -Subject: [PATCH] build: mark all PE files as wine builtins - -This allows libmono to load extra libraries (notably win-iconv) from -system_dllpath. - -For example, Fedora's wine-mono is built against a shared win-iconv -installed in system_dllpath, but wine will not search there unless it's -explicitly instructed to do so since wine commit bfbccf1a (ntdll: Prevent -loading Wine system dependencies in place of identically named application -DLLs.). - -https://gitlab.winehq.org/wine/wine/-/merge_requests/7077 -Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54573 ---- - GNUmakefile | 6 +++--- - tools/mark-wine-builtin.sh | 3 +++ - 2 files changed, 6 insertions(+), 3 deletions(-) - create mode 100755 tools/mark-wine-builtin.sh - -diff --git a/GNUmakefile b/GNUmakefile -index e3419fdb..28809e58 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -101,16 +101,16 @@ define MINGW_TEMPLATE = - - ifeq (1,$(ENABLE_DEBUG_SYMBOLS)) - ifeq (1,$(PREFER_DWARF_SYMBOLS)) --INSTALL_PE_$(1)=do_install () { $$(MINGW_ENV) $$(MINGW_$(1))-objcopy --only-keep-debug "$$$$1" "$$$$(printf %s "$$$$2"|sed -e 's/\....$$$$/.dbg/')"; $$(MINGW_ENV) $$(MINGW_$(1))-objcopy --strip-all "$$$$1" "$$$$2"; $$(MINGW_ENV) $$(MINGW_$(1))-objcopy --add-gnu-debuglink="$$$$(printf %s "$$$$2"|sed -e 's/\....$$$$/.dbg/')" "$$$$2"; }; do_install -+INSTALL_PE_$(1)=do_install () { $$(MINGW_ENV) $$(MINGW_$(1))-objcopy --only-keep-debug "$$$$1" "$$$$(printf %s "$$$$2"|sed -e 's/\....$$$$/.dbg/')"; $$(MINGW_ENV) $$(MINGW_$(1))-objcopy --strip-all "$$$$1" "$$$$2"; $$(MINGW_ENV) $$(MINGW_$(1))-objcopy --add-gnu-debuglink="$$$$(printf %s "$$$$2"|sed -e 's/\....$$$$/.dbg/')" "$$$$2"; tools/mark-wine-builtin.sh "$$$$2"; }; do_install - PDB_CFLAGS_$(1)=-gdwarf-4 -g - PDB_LDFLAGS_$(1)= - else --INSTALL_PE_$(1)=do_install () { cp "$$$$(printf %s "$$$$1"|sed -e 's/\....$$$$/.pdb/')" "$$$$(printf %s "$$$$2"|sed -e 's/\....$$$$/.pdb/')"; cp "$$$$1" "$$$$2"; $$(MINGW_ENV) $$(MINGW_$(1))-strip "$$$$2"; }; do_install -+INSTALL_PE_$(1)=do_install () { cp "$$$$(printf %s "$$$$1"|sed -e 's/\....$$$$/.pdb/')" "$$$$(printf %s "$$$$2"|sed -e 's/\....$$$$/.pdb/')"; cp "$$$$1" "$$$$2"; $$(MINGW_ENV) $$(MINGW_$(1))-strip "$$$$2"; tools/mark-wine-builtin.sh "$$$$2"; }; do_install - PDB_CFLAGS_$(1)=-gcodeview -g - PDB_LDFLAGS_$(1)=-Wl,-pdb= - endif - else --INSTALL_PE_$(1)=do_install () { cp "$$$$1" "$$$$2"; $$(MINGW_ENV) $$(MINGW_$(1))-strip "$$$$2"; }; do_install -+INSTALL_PE_$(1)=do_install () { cp "$$$$1" "$$$$2"; $$(MINGW_ENV) $$(MINGW_$(1))-strip "$$$$2"; tools/mark-wine-builtin.sh "$$$$2"; }; do_install - endif - - # installinf.exe -diff --git a/tools/mark-wine-builtin.sh b/tools/mark-wine-builtin.sh -new file mode 100755 -index 00000000..5846221b ---- /dev/null -+++ b/tools/mark-wine-builtin.sh -@@ -0,0 +1,3 @@ -+#!/bin/sh -+ -+printf 'Wine builtin DLL\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0' | dd if=/dev/stdin of="$1" bs=1 seek=64 count=32 conv=notrunc --- -GitLab - diff --git a/wine-mono.spec b/wine-mono.spec index 65ed3f1..b2b696f 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,8 +3,8 @@ %{?mingw_package_header} Name: wine-mono -Version: 9.4.0 -Release: 3%{?dist} +Version: 10.0.0 +Release: 1%{?dist} Summary: Mono library required for Wine 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 @@ -13,8 +13,6 @@ URL: http://wiki.winehq.org/Mono Source0: https://dl.winehq.org/wine/wine-mono/%{version}/wine-mono-%{version}-src.tar.xz Patch0: wine-mono-7.3.0-iconv.patch Patch1: wine-mono-configure-c99.patch -# https://gitlab.winehq.org/mono/wine-mono/-/merge_requests/22 -Patch2: wine-mono-builtins.patch # see git://github.com/madewokherd/wine-mono @@ -121,6 +119,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From 7e70348af634907d5dbdd7746b794618f9aed0f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 12 Jul 2025 10:44:34 +0200 Subject: [PATCH 22/29] Update to 10.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix FTBFS by forcing DWARF debuginfo Fix removal of pre-build toolchain Signed-off-by: Björn Esser --- sources | 2 +- wine-mono.spec | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 6fb032a..4e5c53f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-10.0.0-src.tar.xz) = 9998e3425da2dd85b44842050600b5087973ace965bd497f5aefe3c8af1f34adaa0ed43d6afc8b038aa7880fda274b8c76065bddffa8179e3f4956211bf20775 +SHA512 (wine-mono-10.1.0-src.tar.xz) = 8607dc3a92ca3162b9c18411559cbc5a5eb5a29a8b23c2df207bfc748ceb9abaa0c8ee695298453d360937fce3e5364f13e66691b2d0d818500db4cf893cb532 diff --git a/wine-mono.spec b/wine-mono.spec index b2b696f..e990fd6 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,7 +3,7 @@ %{?mingw_package_header} Name: wine-mono -Version: 10.0.0 +Version: 10.1.0 Release: 1%{?dist} Summary: Mono library required for Wine @@ -75,7 +75,7 @@ Windows Mono library required for Wine. sed -i 's/GENMDESC_PRG=python/GENMDESC_PRG=python3/' mono/mono/mini/Makefile.am.in # remove shipped compiler -rm -rf llvm-mingw-20210423-ucrt-ubuntu-18.04-x86_64/* +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 # workaround coreutils 9.2 behavior change to "cp -n" option (RHBZ#2208129) @@ -89,6 +89,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 @@ -119,6 +121,11 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From abdff4a0d6c0b3c33bea04c0914a485f920348fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:26:22 +0000 Subject: [PATCH 23/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wine-mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wine-mono.spec b/wine-mono.spec index e990fd6..e9d48d0 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -4,7 +4,7 @@ Name: wine-mono Version: 10.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mono library required for Wine 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 @@ -121,6 +121,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From 8bdcfd3e2f20e3b3ab07e0d21ca6065fd6cbf506 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Fri, 29 Aug 2025 20:53:35 -0500 Subject: [PATCH 24/29] Update to 10.2.0 --- sources | 2 +- wine-mono.spec | 28 +++++++--------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/sources b/sources index 4e5c53f..82a8ebb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-10.1.0-src.tar.xz) = 8607dc3a92ca3162b9c18411559cbc5a5eb5a29a8b23c2df207bfc748ceb9abaa0c8ee695298453d360937fce3e5364f13e66691b2d0d818500db4cf893cb532 +SHA512 (wine-mono-10.2.0-src.tar.xz) = ba98126789e386d9e9c1f513f4ccadc59c2f92b2c9644cef7eb04ebd07d801a8572cbc4df47e757fedfc962222695ee6e4ebff0a3b9b6c05f40fde3870d18a67 diff --git a/wine-mono.spec b/wine-mono.spec index e9d48d0..f6f5ad2 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,8 +3,8 @@ %{?mingw_package_header} Name: wine-mono -Version: 10.1.0 -Release: 2%{?dist} +Version: 10.2.0 +Release: 1%{?dist} Summary: Mono library required for Wine 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 @@ -98,29 +98,15 @@ 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 %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From 8ee3aa013c5ece8c4ef5584f7e214ae510415a0c Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Sun, 2 Nov 2025 19:39:37 -0600 Subject: [PATCH 25/29] Update to 10.3.0 --- sources | 2 +- wine-mono.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 82a8ebb..d98908a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-10.2.0-src.tar.xz) = ba98126789e386d9e9c1f513f4ccadc59c2f92b2c9644cef7eb04ebd07d801a8572cbc4df47e757fedfc962222695ee6e4ebff0a3b9b6c05f40fde3870d18a67 +SHA512 (wine-mono-10.3.0-src.tar.xz) = 42ed5d1feb1aa8e4ada7b86e801fe972937ad7eea54a6bee4b9b85806cd5c199ae1cb775de0269b7be541a4fd435eeb1d14b11766a4c71d35ac0774b71eb5017 diff --git a/wine-mono.spec b/wine-mono.spec index f6f5ad2..4095d2a 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,7 +3,7 @@ %{?mingw_package_header} Name: wine-mono -Version: 10.2.0 +Version: 10.3.0 Release: 1%{?dist} Summary: Mono library required for Wine @@ -100,10 +100,13 @@ cp -rp image/* \ %files %license mono/LICENSE -%doc README +%doc README.md %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* Sun Nov 02 2025 Michael Cronenworth - 10.3.0-1 +- version upgrade + * Fri Aug 29 2025 Michael Cronenworth - 10.2.0-1 - version upgrade From 884fdcd42495ffbc110ca6de0b34a145864592d5 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Wed, 14 Jan 2026 22:22:29 -0600 Subject: [PATCH 26/29] bundles notes --- wine-mono.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wine-mono.spec b/wine-mono.spec index 4095d2a..01d5bc2 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -4,7 +4,7 @@ Name: wine-mono Version: 10.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mono library required for Wine 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 @@ -58,7 +58,7 @@ BuildRequires: dos2unix Requires: wine-filesystem -# Bundles FAudio, libtheorafile, libmojoshader, SDL2, SDL2_image +# Bundles FAudio, SDL3 %description Windows Mono library required for Wine. From 86e58671ce3a95e58d8e3eacda7a18aa2eb5ae23 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Wed, 14 Jan 2026 23:01:17 -0600 Subject: [PATCH 27/29] Update to 10.4.1 --- sources | 2 +- wine-mono-configure-c99.patch | 43 ----------------------------------- wine-mono.spec | 8 ++++--- 3 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 wine-mono-configure-c99.patch diff --git a/sources b/sources index d98908a..f923618 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wine-mono-10.3.0-src.tar.xz) = 42ed5d1feb1aa8e4ada7b86e801fe972937ad7eea54a6bee4b9b85806cd5c199ae1cb775de0269b7be541a4fd435eeb1d14b11766a4c71d35ac0774b71eb5017 +SHA512 (wine-mono-10.4.1-src.tar.xz) = e2d227f003932a6dd3115492ee91ccf0682181e317d66d498edfa27302ee164bf1f308a66c1323fc246b9a759500454922312eb0529baf9e7584a78ede5ca60a diff --git a/wine-mono-configure-c99.patch b/wine-mono-configure-c99.patch deleted file mode 100644 index 36f7d7e..0000000 --- a/wine-mono-configure-c99.patch +++ /dev/null @@ -1,43 +0,0 @@ -The thread start routine must return void *, and int and void * -are distinct types. Compilers increasingly issue errors instead -of warnings for such type errors, and this causes the configure -probe to fail unconditionally, even if the system supports -__thread variables. - -Submitted upstream: - -diff --git a/mono/configure.ac b/mono/configure.ac -index bbbd1622d9728859..5a3a5770c8a3cdb6 100644 ---- a/mono/configure.ac -+++ b/mono/configure.ac -@@ -2833,14 +2833,16 @@ if test x$host_win32 = xno; then - __thread int i; - static int res1, res2; - -- void thread_main (void *arg) -+ void *thread_main (void *parg) - { -+ int arg = *(int *)parg; - i = arg; - sleep (1); - if (arg == 1) - res1 = (i == arg); - else - res2 = (i == arg); -+ return NULL; - } - - int main () { -@@ -2848,8 +2850,10 @@ if test x$host_win32 = xno; then - - i = 5; - -- pthread_create (&t1, NULL, thread_main, 1); -- pthread_create (&t2, NULL, thread_main, 2); -+ int one = 1; -+ pthread_create (&t1, NULL, thread_main, &one); -+ int two = 2; -+ pthread_create (&t2, NULL, thread_main, &two); - - pthread_join (t1, NULL); - pthread_join (t2, NULL); diff --git a/wine-mono.spec b/wine-mono.spec index 01d5bc2..b4dabe9 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -3,8 +3,8 @@ %{?mingw_package_header} Name: wine-mono -Version: 10.3.0 -Release: 2%{?dist} +Version: 10.4.1 +Release: 1%{?dist} Summary: Mono library required for Wine 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 @@ -12,7 +12,6 @@ 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 Patch0: wine-mono-7.3.0-iconv.patch -Patch1: wine-mono-configure-c99.patch # see git://github.com/madewokherd/wine-mono @@ -104,6 +103,9 @@ cp -rp image/* \ %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* Wed Jan 14 2026 Michael Cronenworth - 10.4.1-1 +- version upgrade + * Sun Nov 02 2025 Michael Cronenworth - 10.3.0-1 - version upgrade From 86bc9b703c5aa4a04a1d2515cc4cce0de1c08aeb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:15:29 +0000 Subject: [PATCH 28/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- wine-mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wine-mono.spec b/wine-mono.spec index b4dabe9..02ec5fb 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -4,7 +4,7 @@ Name: wine-mono Version: 10.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mono library required for Wine 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 @@ -103,6 +103,9 @@ cp -rp image/* \ %{_datadir}/wine/mono/wine-mono-%{version}/ %changelog +* 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 From 0db498bb901143bbd2dd217d2242d3822af834dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:49:46 +0000 Subject: [PATCH 29/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- wine-mono.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wine-mono.spec b/wine-mono.spec index 02ec5fb..d9bddbc 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -4,7 +4,7 @@ Name: wine-mono Version: 10.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Mono library required for Wine 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 @@ -103,6 +103,9 @@ cp -rp image/* \ %{_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