The package rpms/wine.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/wine.git/commit/?id=e9fd18efa1f753f7... https://src.fedoraproject.org/cgit/rpms/wine.git/commit/?id=4c071d0d0ad2f48b....
Change: +%ifarch aarch64 +%ifarch aarch64
Thanks.
Full change: ============
commit 4c071d0d0ad2f48b9848268383205ecab883747b Author: Michael Cronenworth mike@cchtml.com Date: Sat May 12 12:35:28 2018 -0500
Try exporting CC for ARM64
diff --git a/wine.spec b/wine.spec index c0c41c1..bf6c1b7 100644 --- a/wine.spec +++ b/wine.spec @@ -699,6 +699,12 @@ sed -i -e 's!^loader server: libs/port libs/wine tools.*!& include!' Makefile.in # http://bugs.winehq.org/show_bug.cgi?id=25073 export CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//'` -Wno-error"
+%ifarch aarch64 +# ARM64 now requires clang +# https://source.winehq.org/git/wine.git/commit/8fb8cc03c3edb599dd98f369e14a08... +export CC="/usr/bin/clang" +%endif + %configure \ --sysconfdir=%{_sysconfdir}/wine \ --x-includes=%{_includedir} --x-libraries=%{_libdir} \
commit 20bc4ba006fdb0b914f7e7effdb04f7495e1859b Author: Michael Cronenworth mike@cchtml.com Date: Sat May 12 12:19:45 2018 -0500
Try not installing gcc on ARM64
diff --git a/wine.spec b/wine.spec index c3f0185..c0c41c1 100644 --- a/wine.spec +++ b/wine.spec @@ -83,9 +83,10 @@ ExclusiveArch: %{ix86} %{arm}
BuildRequires: bison BuildRequires: flex -BuildRequires: gcc %ifarch aarch64 BuildRequires: clang >= 5.0 +%else +BuildRequires: gcc %endif BuildRequires: autoconf BuildRequires: desktop-file-utils
commit e9fd18efa1f753f731d202f51e54639bbea7352d Author: Michael Cronenworth mike@cchtml.com Date: Sat May 12 12:09:08 2018 -0500
Wine 3.8 now requires Clang on ARM64
https://source.winehq.org/git/wine.git/commit/8fb8cc03c3edb599dd98f369e14a08...
diff --git a/wine.spec b/wine.spec index 8231222..c3f0185 100644 --- a/wine.spec +++ b/wine.spec @@ -84,6 +84,9 @@ ExclusiveArch: %{ix86} %{arm} BuildRequires: bison BuildRequires: flex BuildRequires: gcc +%ifarch aarch64 +BuildRequires: clang >= 5.0 +%endif BuildRequires: autoconf BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel
commit 8abf3809077f3fe50b253202efe16054ea44749f Author: Michael Cronenworth mike@cchtml.com Date: Sat May 12 11:11:55 2018 -0500
Update to 3.8
diff --git a/.gitignore b/.gitignore index beff821..6e7b3d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/wine-3.6.tar.xz -/wine-3.6.tar.xz.sign -/wine-staging-3.6.tar.gz +/wine-3.8.tar.xz +/wine-3.8.tar.xz.sign +/wine-staging-3.8.tar.gz diff --git a/sources b/sources index 87f5673..0c28232 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wine-3.6.tar.xz) = 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22 -SHA512 (wine-3.6.tar.xz.sign) = 0e3cc6ca6630e94581a09a466eea58148e8ab65fd98b5350aeb7bb3e949c524ce806b760522795047572399fa21f4e12deb15613007cc86da812ec36ce959647 -SHA512 (wine-staging-3.6.tar.gz) = 839731fa3dba91cefd9e0f036b4d688c4786fe8cb19143819457fb9e45a6c14ef3a70630b585abdd424a00036312114034a2529700012ea1863527e45fbfac2a +SHA512 (wine-3.8.tar.xz) = 387c6bff3eafac7e92030d11c02b3461b4ead059d2aad7f6d903e176f304d2ac0a426132fcd452507868f0d22bb360a30734edf3e73dfd514037458f08406e98 +SHA512 (wine-3.8.tar.xz.sign) = 169462c3c4d77ce7f843a3936c3f622350056b13b72672c1132f944f40908f16b2d4597f018d455f8766d2ca790d80e18529b7e11666509b2f871dc8df55dc01 +SHA512 (wine-staging-3.8.tar.gz) = 46ba27b0b9fe5f86d1647f12050715b796604c91487cad6847dce5250ffcfdf8ccf44dcff79c88048221cbf58af92ed72523c09f3591e2c5306bba24ff9d154c diff --git a/wine.spec b/wine.spec index 77dea46..8231222 100644 --- a/wine.spec +++ b/wine.spec @@ -21,7 +21,7 @@ %endif
Name: wine -Version: 3.6 +Version: 3.8 Release: 1%{?dist} Summary: A compatibility layer for windows applications
@@ -681,12 +681,7 @@ This package adds the opencl driver for wine. # setup and apply wine-staging patches gzip -dc %{SOURCE900} | tar -xf - --strip-components=1
-# disable some patches for now, breaks ARMv7 -# https://bugs.winehq.org/show_bug.cgi?id=44099 -patches/patchinstall.sh DESTDIR="`pwd`" --all \ - -W shell32-ACE_Viewer \ - -W fsutil-Stub_Program \ - -W advapi32-Token_Integrity_Level +patches/patchinstall.sh DESTDIR="`pwd`" --all
# fix parallelized build sed -i -e 's!^loader server: libs/port libs/wine tools.*!& include!' Makefile.in @@ -1058,13 +1053,14 @@ fi %doc documentation/README.* %if 0%{?compholio} %{_bindir}/msidb -#{_libdir}/wine/runas.exe.so +%{_libdir}/wine/runas.exe.so %endif %{_bindir}/winedump %{_libdir}/wine/explorer.exe.so %{_libdir}/wine/cabarc.exe.so %{_libdir}/wine/control.exe.so %{_libdir}/wine/cmd.exe.so +%{_libdir}/wine/dxdiag.exe.so %{_libdir}/wine/notepad.exe.so %{_libdir}/wine/plugplay.exe.so %{_libdir}/wine/progman.exe.so @@ -1074,11 +1070,11 @@ fi %{_libdir}/wine/winemine.exe.so %{_libdir}/wine/winemsibuilder.exe.so %{_libdir}/wine/winepath.exe.so +%{_libdir}/wine/winmgmt.exe.so %{_libdir}/wine/winver.exe.so %{_libdir}/wine/wordpad.exe.so %{_libdir}/wine/write.exe.so %{_libdir}/wine/wusa.exe.so -%{_libdir}/wine/dxdiag.exe.so
%ifarch %{ix86} %{arm} %{_bindir}/wine32 @@ -1388,6 +1384,7 @@ fi %{_libdir}/wine/atl90.dll.so %{_libdir}/wine/atl100.dll.so %{_libdir}/wine/atl110.dll.so +%{_libdir}/wine/atmlib.dll.so %{_libdir}/wine/authz.dll.so %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so @@ -1606,6 +1603,7 @@ fi %{_libdir}/wine/mmdevapi.dll.so %{_libdir}/wine/mofcomp.exe.so %{_libdir}/wine/mountmgr.sys.so +%{_libdir}/wine/mp3dmod.dll.so %{_libdir}/wine/mpr.dll.so %{_libdir}/wine/mprapi.dll.so %{_libdir}/wine/msacm32.dll.so @@ -2196,6 +2194,9 @@ fi %endif
%changelog +* Sat May 12 2018 Michael Cronenworth mike@cchtml.com 3.8-1 +- version update + * Sat Apr 14 2018 Michael Cronenworth mike@cchtml.com 3.6-1 - version update - enable wine-staging
arch-excludes@lists.fedoraproject.org