From 27b18f1a15af709d67d21243c115ef19d14c2c05 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Mon, 4 Oct 2021 14:36:33 -0500
Subject: [PATCH] Update to 6.4.0

---
 .gitignore                   |  2 +-
 sources                      |  2 +-
 wine-mono-build-static.patch | 11 +++++------
 wine-mono.spec               |  5 ++++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 917b657..e3ffc10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/wine-mono-6.3.0-src.tar.xz
+/wine-mono-6.4.0-src.tar.xz
diff --git a/sources b/sources
index 4d9b784..e7e1aba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wine-mono-6.3.0-src.tar.xz) = c9f99e2a96573cce2c46740cef4a6683f75503035e2c026f1ba712ba055bb098b18a539d96c24a369c86fc9817c0a6a241fb9d83e7ae655dd019166adfd6a69b
+SHA512 (wine-mono-6.4.0-src.tar.xz) = 1f49a4a01e55c047408097d9e47d9b8f56f296b08e24e8e8cd47ebabc8af142c2041e63afdb41c5e826f0a46610eca56f8295b6c86cdf97cef9cd8a2c42b79df
diff --git a/wine-mono-build-static.patch b/wine-mono-build-static.patch
index f34c622..ebbc941 100644
--- a/wine-mono-build-static.patch
+++ b/wine-mono-build-static.patch
@@ -1,16 +1,15 @@
 --- 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 @@
+@@ -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
-+	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
+-	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 +52,7 @@
+@@ -51,7 +51,7 @@
  	$(RM_F) $$(@D)/CMakeCache.txt
  	mkdir -p $$(@D)
  	# wincrypt.h interferes with boringssl definitions, so we prevent its inclusion
@@ -19,7 +18,7 @@
  
  $$(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,7 @@
+@@ -105,7 +105,7 @@
  # mono native/classlib build
  $(BUILDDIR)/mono-unix/Makefile: $(SRCDIR)/mono/configure $(SRCDIR)/mono.make $(BUILDDIR)/.dir
  	mkdir -p $(@D)
diff --git a/wine-mono.spec b/wine-mono.spec
index cbfb9d3..5566d88 100644
--- a/wine-mono.spec
+++ b/wine-mono.spec
@@ -2,7 +2,7 @@
 %{?mingw_package_header}
 
 Name:           wine-mono
-Version:        6.3.0
+Version:        6.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
+* Mon Oct 04 2021 Michael Cronenworth <mike@cchtml.com> - 6.4.0-1
+- version upgrade
+
 * Mon Aug 30 2021 Michael Cronenworth <mike@cchtml.com> - 6.3.0-1
 - version upgrade