From a8b3c9d0c61c3b0397dd6681f56b8de3f72bdb43 Mon Sep 17 00:00:00 2001 From: "survolog (Andrey Grigorev)" Date: Sun, 1 Sep 2019 00:21:31 +0300 Subject: [PATCH] Update to 4.15 and 4.0.2 --- .abf.yml | 11 ++++---- README.install.urpmi.i586.stable | 2 +- README.install.urpmi.i586.staging | 2 +- README.install.urpmi.x86_64.stable | 4 +-- README.install.urpmi.x86_64.staging | 2 +- README.urpmi.staging => README.urpmi | 0 README.urpmi.stable | 13 --------- wine.spec | 42 +++++++++++++--------------- 8 files changed, 30 insertions(+), 46 deletions(-) rename README.urpmi.staging => README.urpmi (100%) delete mode 100644 README.urpmi.stable diff --git a/.abf.yml b/.abf.yml index 2b5deba..a9ce392 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,9 +1,8 @@ sources: - wine-4.0.1.tar.xz: ae90c3ca008b11120fa962fb30d43f1791c0a916 - wine-4.9.tar.xz: cbf15926fb112c12baa936203c32da0fdcd85e14 - wine-staging-4.9.tar.gz: b547cb759e4274b3e705eda2f53d7f4b3adee82f - wine-nine-standalone-0.4.tar.gz: 68f0dac73205650f839189c676183e5c4dff7cf5 - winetricks-20190310.tar.gz: e48303a7c3153dc679228595ae400a8954445fa4 icons-4.0.tar.xz: 3063b6fcf8d9aeedcb9ecaab9c522bed88a21c0a rosa-wine-desktop-4.4.1.tar.xz: 299d6a589af1e4db705f0e09190a8b388bb74b95 - + wine-4.0.2.tar.xz: af82cb438cc892273bedda5ae6166510fc8fe902 + wine-4.15.tar.xz: 470a8101ff1046d0278f57785d7857a6170ae905 + wine-nine-standalone-0.4.tar.gz: 68f0dac73205650f839189c676183e5c4dff7cf5 + wine-staging-4.15.tar.gz: b7f64bc7e2b9bde8221ac2e030ec3d714a7aab40 + winetricks-20190615.tar.gz: 2ab46b79706c27ceea048d7c769f092d3753c5e2 diff --git a/README.install.urpmi.i586.stable b/README.install.urpmi.i586.stable index d3d7b90..0462566 100644 --- a/README.install.urpmi.i586.stable +++ b/README.install.urpmi.i586.stable @@ -1,4 +1,4 @@ -This is an optional Wine package to run Win32 applications. +This is an optional Wine package for running Win32 applications. === Russian === diff --git a/README.install.urpmi.i586.staging b/README.install.urpmi.i586.staging index ccdbb26..76ab091 100644 --- a/README.install.urpmi.i586.staging +++ b/README.install.urpmi.i586.staging @@ -1,4 +1,4 @@ -This is an optional Wine package with Staging patches to run Win32 applications. +This is an optional Wine package with Staging patches for running Win32 applications. === Russian === diff --git a/README.install.urpmi.x86_64.stable b/README.install.urpmi.x86_64.stable index 96e19d5..c087867 100644 --- a/README.install.urpmi.x86_64.stable +++ b/README.install.urpmi.x86_64.stable @@ -1,5 +1,5 @@ -This is Wine for running Win64 applications. This version can only be used to run -64-bit Windows applications as is. For running 32-bit Windows applications, +This is Wine for running Win64 applications. This version can only be used for +running 64-bit Windows applications as is. For running 32-bit Windows applications, you need to also install the 'wine32-stable' package from the 32-bit repository. === Russian === diff --git a/README.install.urpmi.x86_64.staging b/README.install.urpmi.x86_64.staging index 333f077..bfd2f4c 100644 --- a/README.install.urpmi.x86_64.staging +++ b/README.install.urpmi.x86_64.staging @@ -1,5 +1,5 @@ This is Wine with Staging patches for running Win64 applications. -This version can only be used to run 64-bit Windows applications as is. +This version can only be used for running 64-bit Windows applications as is. For running 32-bit Windows applications, you need to also install the 'wine32' package from the 32-bit repository. diff --git a/README.urpmi.staging b/README.urpmi similarity index 100% rename from README.urpmi.staging rename to README.urpmi diff --git a/README.urpmi.stable b/README.urpmi.stable deleted file mode 100644 index b8300f4..0000000 --- a/README.urpmi.stable +++ /dev/null @@ -1,13 +0,0 @@ -To install or update DXVK (DirectX10/DX11->Vulkan) in Wine -run in a terminal: -winetricks --force dxvk96 -or (latest, untested): -winetricks --force dxvk - -=== Russian === - -Для установки или обновления DXVK (DirectX10/DX11->Vulkan) в Wine -запустите в терминале: -winetricks --force dxvk96 -или (последнее, непроверенное): -winetricks --force dxvk diff --git a/wine.spec b/wine.spec index e83d395..779b036 100644 --- a/wine.spec +++ b/wine.spec @@ -8,14 +8,14 @@ %bcond_without systemd # wine and staging tarballs version -%define stagver 4.9 +%define stagver 4.15 %define stagpver 4.x # wine-stable tarball version -%define stabver 4.0.1 +%define stabver 4.0.2 %define stabpver 4.0 -%define winetricks_ver 20190310 +%define winetricks_ver 20190615 %define winenine_ver 0.4 %if %{with unstable} @@ -69,10 +69,9 @@ Source10: wine.rpmlintrc Source11: rosa-wine-desktop-4.4.1.tar.xz Source12: icons-4.0.tar.xz Source13: wine-stable.rpmlintrc -Source20: README.urpmi.staging +Source20: README.urpmi Source21: README.install.urpmi.x86_64.staging Source22: README.install.urpmi.i586.staging -Source23: README.urpmi.stable Source24: README.install.urpmi.x86_64.stable Source25: README.install.urpmi.i586.stable @@ -96,14 +95,14 @@ Patch3: wine-4.0-fix-openal-opencl-headers-detection.patch Patch4: wine-staging-4.5-mock-urpm-broken-pipe.patch Patch5: wine-nine-standalone-0.3-ru-localization.patch -%if %{with unstable} +#if %%{with unstable} #BuildRequires: faudio-devel -# This is needed to build wine-nine-standalone, which crashes on a stable version +#endif +# This is needed to build wine-nine-standalone %ifarch x86_64 -BuildRequires: wine64-devel +BuildRequires: %{wine64}-devel %else -BuildRequires: wine-devel -%endif +BuildRequires: %{wine}-devel %endif BuildRequires: bison BuildRequires: chrpath @@ -113,6 +112,7 @@ BuildRequires: docbook-utils BuildRequires: flex BuildRequires: fontforge BuildRequires: imagemagick +# This is needed to build nine-standalone BuildRequires: meson BuildRequires: prelink BuildRequires: sgml-tools @@ -223,6 +223,8 @@ native Unix executables. %doc ANNOUNCE AUTHORS README README.install.urpmi README.urpmi %if %{with unstable} %{_bindir}/msidb +%{_datadir}/wine/winebus.inf +%{_datadir}/wine/winehid.inf %endif %{_bindir}/function_grep.pl %{_bindir}/msiexec @@ -454,6 +456,8 @@ from the 32-bit repository to be able to run 32-bit applications. %doc ANNOUNCE AUTHORS README README.install.urpmi README.urpmi %if %{with unstable} %{_bindir}/msidb +%{_datadir}/wine/winebus.inf +%{_datadir}/wine/winehid.inf %endif %{_bindir}/function_grep.pl %{_bindir}/msiexec @@ -621,11 +625,12 @@ systemctl stop systemd-binfmt.service gzip -dc "%{SOURCE4}" | /bin/tar -xf - --strip-components=1 #patch4 -p1 -b .for-mock-urpm-build ./patches/patchinstall.sh DESTDIR="%{_builddir}/wine-%{version}" --all +%endif + # wine-nine-standalone pushd ../wine-nine-standalone-%{winenine_ver} %patch5 -p1 -b .wine-nine-localization popd -%endif sed -i 's,@MDKVERSION@,%{mdvver},' dlls/ntdll/server.c @@ -648,7 +653,7 @@ export ICOTOOL=false autoreconf -vfi # HAL is obsolete, then don't ask for it # our OSS is too old (< 4), also don't ask for it -# some sound cards need in without-pulse +# Some sound cards also can need --without-pulse %configure2_5x \ %ifarch x86_64 --enable-win64 \ @@ -665,7 +670,6 @@ autoreconf -vfi %make # 2. Next, build wine-nine-standalone -%if %{with unstable} pushd ../wine-nine-standalone-%{winenine_ver} export PKG_CONFIG_PATH=%{_libdir}/pkgconfig mkdir -p ./tmp @@ -687,7 +691,6 @@ meson \ ninja -C "./tmp/build" find -L . popd -%endif %install %makeinstall_std LDCONFIG=/bin/true @@ -716,9 +719,6 @@ cp %{SOURCE9} %{buildroot}%{_datadir}/desktop-directories/ mkdir -p %{buildroot}%{_datadir}/applications/ cp rosa-wine-*.desktop %{buildroot}%{_datadir}/applications/ -%if %{with unstable} -rm %{buildroot}%{_datadir}/applications/rosa-wine-ninecfg.desktop -%endif cp -r icons-*/icons %{buildroot}%{_datadir}/ # Categories=Emulator does nothing and is added as a workaround to kde #27700 @@ -740,23 +740,20 @@ chrpath -d %{buildroot}%{_bindir}/{wine64,wineserver,wmc,wrc} %{buildroot}%{_lib chrpath -d %{buildroot}%{_bindir}/{wine,wineserver,wmc,wrc} %{buildroot}%{_libdir}/wine/*.so %endif -# Install wine-nine-standalone stuff. It crash on wine64-stable -%if %{with unstable} +# Install wine-nine-standalone stuff pushd ../wine-nine-standalone-%{winenine_ver} install -m 755 ./tmp/build/ninewinecfg/ninewinecfg.exe.so %{buildroot}/%{_libdir}/wine/ninewinecfg.exe.so install -m 755 ./tmp/build/ninewinecfg/ninewinecfg.exe.fake %{buildroot}/%{_libdir}/wine/fakedlls/ninewinecfg.exe install -m 755 ./tmp/build/d3d9-nine/d3d9-nine.dll.so %{buildroot}/%{_libdir}/wine/d3d9-nine.dll.so install -m 755 ./tmp/build/d3d9-nine/d3d9-nine.dll.fake %{buildroot}/%{_libdir}/wine/fakedlls/d3d9-nine.dll popd -%endif # Some advices to user +cp %{SOURCE20} . %if %{with unstable} -cp %{SOURCE20} README.urpmi cp %{SOURCE21} README.install.urpmi.x86_64 cp %{SOURCE22} README.install.urpmi %else -cp %{SOURCE23} README.urpmi cp %{SOURCE24} README.install.urpmi.x86_64 cp %{SOURCE25} README.install.urpmi %endif @@ -765,3 +762,4 @@ mv -f README.install.urpmi.x86_64 README.install.urpmi %else rm README.install.urpmi.x86_64 %endif +