From 3dd1f4d15de2238b292a59ac4763711b9a74f2b0 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Sun, 23 Jun 2019 14:03:21 -0500
Subject: [PATCH] Update to 4.9.0

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

diff --git a/.gitignore b/.gitignore
index 0d62973..9bdca3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/wine-mono-4.8.3.tar.gz
+/wine-mono-4.9.0.tar.gz
diff --git a/sources b/sources
index ab5bd8f..f646a51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wine-mono-4.8.3.tar.gz) = 85d579a22308b6d47b597940b6af968f5c113008349f316068514a456a0761fd69cda72e76ed33835bf0d078e7f48df32af2c04cf2a5c519c7abbb4812ab8879
+SHA512 (wine-mono-4.9.0.tar.gz) = eb8ed323365dba8ecebbc82ed5c0a98af2a403e736a221997d924d361f78bc696e955cb37cad207911f333c6fce42b8e9d6f95f401f62c0400561144d8bb2cb3
diff --git a/wine-mono-build-static.patch b/wine-mono-build-static.patch
index d458507..2af01d0 100644
--- a/wine-mono-build-static.patch
+++ b/wine-mono-build-static.patch
@@ -1,26 +1,19 @@
---- wine-mono-4.8.1/build-winemono.sh.orig	2015-04-20 10:34:32.150114394 -0500
-+++ wine-mono-4.8.1/build-winemono.sh	2015-04-20 10:33:13.699274928 -0500
-@@ -73,6 +73,7 @@
-     cd "$BUILDDIR/build-cross-$ARCH"
-     if test 1 != $REBUILD || test ! -e Makefile; then
-         CPPFLAGS="-gdwarf-2 -gstrict-dwarf" "$SRCDIR"/mono/configure --prefix="$BUILDDIR/build-cross-$ARCH-install" --build=$BUILD --target=$MINGW --host=$MINGW --with-tls=none --disable-mcs-build --enable-win32-dllmain=yes --with-libgc-threads=win32 PKG_CONFIG=false mono_cv_clang=no || exit 1
-+        sed -e 's+compiler_flags="-specs=/usr/lib/rpm/redhat/redhat-hardened-ld"+compiler_flags="-static"+' -i libtool
-         sed -e 's/-lgcc_s//' -i libtool
-     fi
-     WINEPREFIX=/dev/null make $MAKEOPTS || exit 1
-@@ -162,6 +163,7 @@
-     cd "$BUILDDIR/build-cross-cli"
-     if test 1 != $REBUILD || test ! -e Makefile; then
-         "$SRCDIR"/mono/configure --prefix="$BUILDDIR/build-cross-cli-install" --with-mcs-docs=no --disable-system-aot || exit 1
-+        sed -e 's+compiler_flags="-specs=/usr/lib/rpm/redhat/redhat-hardened-ld"+compiler_flags="-static"+' -i libtool
-     fi
+--- wine-mono-4.9.0/Makefile.orig	2015-04-20 10:34:32.150114394 -0500
++++ wine-mono-4.9.0/Makefile	2015-04-20 10:33:13.699274928 -0500
+@@ -106,6 +106,7 @@
+ $$(BUILDDIR)/mono-$(1)/Makefile: $$(SRCDIR)/mono/configure $$(BUILDDIR)/.dir
+ 	mkdir -p $$(@D)
+ 	cd $$(BUILDDIR)/mono-$(1); 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
++	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
  
- 	# put a System.Native library somewhere monolite can find it during the build
-@@ -232,6 +234,7 @@
-     # build mono-basic
-     cd "$SRCDIR/mono-basic"
-     ./configure --prefix="$BUILDDIR/build-cross-cli-win32-install" || exit 1
-+    sed -e 's+compiler_flags="-specs=/usr/lib/rpm/redhat/redhat-hardened-ld"+compiler_flags="-static"+' -i libtool
-     make $MAKEOPTS || exit 1
-     make install || exit 1
+ $$(BUILDDIR)/mono-$(1)/.built: $$(BUILDDIR)/mono-$(1)/Makefile $$(MONO_MONO_SRCS)
+@@ -260,6 +261,7 @@
+ $(BUILDDIR)/mono-unix/Makefile: $(SRCDIR)/mono/configure $(BUILDDIR)/.dir
+ 	mkdir -p $(@D)
+ 	cd $(@D) && $(SRCDIR_ABS)/mono/configure --prefix="$(BUILDDIR_ABS)/mono-unix-install" --with-mcs-docs=no --disable-system-aot
++	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.spec b/wine-mono.spec
index b469511..99b1551 100644
--- a/wine-mono.spec
+++ b/wine-mono.spec
@@ -2,7 +2,7 @@
 %{?mingw_package_header}
 
 Name:           wine-mono
-Version:        4.8.3
+Version:        4.9.0
 Release:        1%{?dist}
 Summary:        Mono library required for Wine
 
@@ -47,6 +47,8 @@ BuildRequires:  /usr/bin/pathfix.py
 
 Requires: wine-filesystem
 
+# Bundles FAudio, libtheorafile, libmojoshader, SDL2, SDL2_image
+
 %description
 Windows Mono library required for Wine.
 
@@ -62,7 +64,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
 sed -i 's/GENMDESC_PRG=python/GENMDESC_PRG=python3/' mono/mono/mini/Makefile.am.in
 
 %build
-MAKEOPTS=%{_smp_mflags} ./build-winemono.sh -i
+make %{_smp_mflags} image
 
 %install
 mkdir -p %{buildroot}%{_datadir}/wine/mono/wine-mono-%{version}/
@@ -92,6 +94,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE
 %{_datadir}/wine/mono/wine-mono-%{version}/
 
 %changelog
+* Sun Jun 23 2019 Michael Cronenworth <mike@cchtml.com> - 4.9.0-1
+- version upgrade
+
 * Sun Apr 28 2019 Michael Cronenworth <mike@cchtml.com> - 4.8.3-1
 - version upgrade