From 4484cf7db69f7810111669961d91caddcf9f4396 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Mon, 4 Mar 2019 15:00:02 -0600 Subject: [PATCH] Add upstream patch to fix builds without network access --- wine-mono-monolite.patch | 19 +++++++++++++++++++ wine-mono.spec | 7 ++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 wine-mono-monolite.patch diff --git a/wine-mono-monolite.patch b/wine-mono-monolite.patch new file mode 100644 index 0000000..199dca3 --- /dev/null +++ b/wine-mono-monolite.patch @@ -0,0 +1,19 @@ +diff --git a/build-winemono.sh b/build-winemono.sh +index bee0dbf..7f0b062 100755 +--- a/build-winemono.sh ++++ b/build-winemono.sh +@@ -120,6 +120,14 @@ + "$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 ++ ++ # put a System.Native library somewhere monolite can find it during the build ++ cd "$BUILDDIR/build-cross-cli/mono/native" ++ make $MAKEOPTS || exit 1 ++ mkdir "$BUILDDIR/build-cross-cli/mono/lib/" ++ cp .libs/libmono-native.so "$BUILDDIR/build-cross-cli/mono/lib/libSystem.Native.so" || exit 1 ++ ++ cd "$BUILDDIR/build-cross-cli" + if test 1 = $USE_MONOLITE; then + make get-monolite-latest || exit 1 + elif test -e $SRCDIR/monolite/mcs.exe; then diff --git a/wine-mono.spec b/wine-mono.spec index 678fd77..d04f695 100644 --- a/wine-mono.spec +++ b/wine-mono.spec @@ -12,6 +12,9 @@ Source0: http://dl.winehq.org/wine/wine-mono/%{version}/wine-mono-%{versi Patch0: wine-mono-build-msifilename.patch # to statically link in winpthreads Patch1: wine-mono-build-static.patch +# Fix from upstream for built-in monolite +# https://www.winehq.org/pipermail/wine-devel/2019-March/140838.html +Patch2: wine-mono-monolite.patch # see git://github.com/madewokherd/wine-mono @@ -46,6 +49,7 @@ BuildRequires: zip BuildRequires: wine-core BuildRequires: wine-devel BuildRequires: mono-core +BuildRequires: /usr/bin/python BuildRequires: /usr/bin/pathfix.py Requires: wine-filesystem @@ -57,13 +61,14 @@ Windows Mono library required for Wine. %setup -q %patch0 -p1 -b.msifilename %patch1 -p1 -b.static +%patch2 -p1 -b.monolite # Fix all Python shebangs 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} MSIFILENAME=wine-mono-%{version}.msi ./build-winemono.sh.static +MAKEOPTS=%{_smp_mflags} MSIFILENAME=wine-mono-%{version}.msi ./build-winemono.sh %install mkdir -p %{buildroot}%{_datadir}/wine/mono