Add upstream patch to fix builds without network access

f38
Michael Cronenworth 6 years ago
parent 69aaf8ddcb
commit 4484cf7db6

@ -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

@ -12,6 +12,9 @@ Source0: http://dl.winehq.org/wine/wine-mono/%{version}/wine-mono-%{versi
Patch0: wine-mono-build-msifilename.patch Patch0: wine-mono-build-msifilename.patch
# to statically link in winpthreads # to statically link in winpthreads
Patch1: wine-mono-build-static.patch 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 # see git://github.com/madewokherd/wine-mono
@ -46,6 +49,7 @@ BuildRequires: zip
BuildRequires: wine-core BuildRequires: wine-core
BuildRequires: wine-devel BuildRequires: wine-devel
BuildRequires: mono-core BuildRequires: mono-core
BuildRequires: /usr/bin/python
BuildRequires: /usr/bin/pathfix.py BuildRequires: /usr/bin/pathfix.py
Requires: wine-filesystem Requires: wine-filesystem
@ -57,13 +61,14 @@ Windows Mono library required for Wine.
%setup -q %setup -q
%patch0 -p1 -b.msifilename %patch0 -p1 -b.msifilename
%patch1 -p1 -b.static %patch1 -p1 -b.static
%patch2 -p1 -b.monolite
# Fix all Python shebangs # Fix all Python shebangs
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
sed -i 's/GENMDESC_PRG=python/GENMDESC_PRG=python3/' mono/mono/mini/Makefile.am.in sed -i 's/GENMDESC_PRG=python/GENMDESC_PRG=python3/' mono/mono/mini/Makefile.am.in
%build %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 %install
mkdir -p %{buildroot}%{_datadir}/wine/mono mkdir -p %{buildroot}%{_datadir}/wine/mono

Loading…
Cancel
Save