Accepting request 709680 from home:marxin:branches:Emulators

- Add wine49-include-Avoid-compound-literals-for-WCHAR-strings.patch
  backport from mainline.
- Use gcc9.

OBS-URL: https://build.opensuse.org/request/show/709680
OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=631
This commit is contained in:
Marcus Meissner 2019-06-13 08:26:15 +00:00 committed by Git OBS Bridge
parent caa3ff8d8b
commit 4e38a9c60c
3 changed files with 2410 additions and 5 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jun 13 07:49:12 UTC 2019 - Martin Liška <mliska@suse.cz>
- Add wine49-include-Avoid-compound-literals-for-WCHAR-strings.patch
backport from mainline.
- Use gcc9.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 11 05:56:26 UTC 2019 - Marcus Meissner <meissner@suse.com> Tue Jun 11 05:56:26 UTC 2019 - Marcus Meissner <meissner@suse.com>

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -131,6 +131,7 @@ Source7: baselibs.conf
# SUSE specific patches # SUSE specific patches
# - currently none, but add them here # - currently none, but add them here
#Patch0: susepatches.patch #Patch0: susepatches.patch
Patch0: wine49-include-Avoid-compound-literals-for-WCHAR-strings.patch
Recommends: wine-gecko >= 2.47 Recommends: wine-gecko >= 2.47
# not packaged in distro... # not packaged in distro...
Recommends: wine-mono Recommends: wine-mono
@ -205,7 +206,7 @@ libraries.
%prep %prep
%setup -q -n wine-%{realver} %setup -q -n wine-%{realver}
#%%patch0 -p1 %patch0 -p1
# #
cp %{S:3} . cp %{S:3} .
# #
@ -233,9 +234,6 @@ export WIDL_TIME_OVERRIDE="0" # for reproducible builds.
export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fomit-frame-pointer//'` export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fomit-frame-pointer//'`
%endif %endif
if rpm -q gcc|grep gcc-9 ; then
export CC=gcc-8
fi
%ifarch aarch64 %ifarch aarch64
# ARM64 now requires clang # ARM64 now requires clang
# https://source.winehq.org/git/wine.git/commit/8fb8cc03c3edb599dd98f369e14a08f899cbff95 # https://source.winehq.org/git/wine.git/commit/8fb8cc03c3edb599dd98f369e14a08f899cbff95

File diff suppressed because it is too large Load Diff