Accepting request 709687 from Emulators

- Add wine49-include-Avoid-compound-literals-for-WCHAR-strings.patch
  backport from mainline.
- Use gcc9. (forwarded request 709680 from marxin)

OBS-URL: https://build.opensuse.org/request/show/709687
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=280

_service

@@ -3,7 +3,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="url">https://github.com/wine-staging/wine-staging.git</param>
-    <param name="revision">refs/tags/v4.9</param>
+    <param name="revision">refs/tags/v4.10</param>
     <param name="match-tag">v*.*</param>
     <param name="scm">git</param>
   </service>

wine-4.10.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5add8161d8b73a413b011285951bed28602ebb0b5b257f35d40bc782ea1c2d10
+size 22109948

wine-4.10.tar.xz.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlz+pMAACgkQzvrI6q8X
+UZ2Mng/+Jc1OOAFy1F5bx0jL7kTpLKk6N7ZNaMxiLRyAdQerWMb9SwBCChqCQSYJ
+TpS8qhbImsp45Rbs9n7DK+9Edwyp6/xzLLH/kZU3tXrM6zlw/CFeFrYd6ZMofutx
+v3alQFSb8lADc++leAE8YqxeFYNz7VDCjXKGSriyz8IyGEd2bh+egRJZWIecwRc0
+4EF2dqtQH2N/dqNYOqYgfBFmweyCBkSnwiueDuW5YTy8dph6pKYVt4tTOugzC8rI
+DYFLMCir+bGG9mCSZgUKsXAVzUzIPY14chwpCCzrwt+msF83SMQyRhJX/3Hff5VM
+UcR/LJBiR8KBtj0ilR3wkSwUqjfN7B/h4Wnn2/mTunFpFoOKFzzX3c+6PTEDN1Fq
+eKuLP+BFH5g4oWSRKpXHqCEovEq2Ez0gQHglRVv6peTBh3V5fRlVEfuQ8Tik1mmJ
+J0mR9v0e/kKX3BMpbHEEYBVv1ccfUEu6KiQmrW8OsKi46GXwIYT2VrHE0UkfheYs
+u19ixgLBPc3ZQDtQSA2f2s4NjGQ1oqYcAUZ37UId1iVQ+evmFZyYZPdP++Du9KOl
+hAiqcdddruARRYf/YVRPY6rX79Kgto1XQQcqRnv8xB0dB1+7qWcgrDuVPIxxKITD
+GyEMEsYtj/Xd3KqJJ6OedKAPkujAK/BuMfKofIcJYGj8A60a1gI=
+=Rrc4
+-----END PGP SIGNATURE-----

wine-4.9.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:91848e22fff3cb17db7fe7d727d714d21c5d4229dd460b5d1506753021fc799b
-size 22077528

wine-4.9.tar.xz.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlzoWA8ACgkQzvrI6q8X
-UZ0Ugg//a5cdjVltAPcGjCgDZKPdw2omh5SUGh9VDIckL3eTmfAcLH25VZVZDqsG
-NuZLJDUGE6nw+NxM19SsmpAHOXhmmDuMWBLm/3dSXtY843Xr90yFj0Wsew8AUp0W
-fbEL0EadMOnEJ6mFSHTu2Y8GnEFOcvlio+ti6DrIsmktHToJQLCktQ1fEoJTyZAJ
-HGTf82n/ArxN3MNZaK31UQa3cYiC7kudmauOGQONcsV6SqlB+wrqExtztf6Sebp1
-uKHixgVPbefvGEbYqB6HwMVZzIVKAWXzdAe9qLKyYJmn7aMyWXMl3+T9Jwy91Nqn
-wk5XFV2BmPDnfCU4FLTdSkDrZbo6pU3ceqOePzTixFv5ppI+JVwA2JW4CdDTTDCJ
-7aVVfeI1RjPqtMsShO/VC/nMganZDjrag8SOamd0ZrfsTIOUqP+GrJzNAEvbI8Xg
-CGWjzwjlZqkXHcYnoLplOlC0Hz+yLynRE8aYgQXkfwe4IVyZ0GnPDRsENXiKuWfR
-VK9spAR08GWGyUYr8djLykbZm9e5NqdKDoBLOwTT/5Up2ZZkfTjrq4hBZtWx1xdw
-LH1EuelN4opBQqJOi8jME/ofSQDWf+LDxe8b2tiAFT0IBFJzBhMcOKWd2JkFc5ot
-LQkXzt23BuRaqaFJsbfiwpWjWO/AnYwcyP6F/tBwXGv3STTT46s=
-=Cc2J
------END PGP SIGNATURE-----

wine-staging-4.10.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a12c0890e94703e5dbdd8eaef9e10988fc597edfb886605f492baf98fe18641
+size 7455840

wine-staging-4.9.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3cab2e1f288f9529994b812d22bf9670245576ff31d0b6d3918ed8caf23cba4
-size 7455500

wine.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+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>
+
+- updated to 4.10 development release
+  - Many DLLs are built as PE files by default.
+  - More support for installing Plug and Play drivers.
+  - Clock synchronization in Media Foundation.
+  - Volume adjustment in audio drivers.
+  - Various bug fixes.
+- updated staging to 4.10
+
 -------------------------------------------------------------------
 Mon Jun  3 10:44:25 UTC 2019 - Adrian Schröter <adrian@suse.de>
 

wine.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # 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/
 #
 
 
@@ -29,8 +29,8 @@
 %endif
 
 # needs to be on top due to usage of %version macro below
-%define realver 4.9
-Version:        4.9
+%define realver 4.10
+Version:        4.10
 Release:        0
 
 %if "%{flavor}" != ""
@@ -131,6 +131,7 @@ Source7:        baselibs.conf
 # SUSE specific patches
 # - currently none, but add them here
 #Patch0:         susepatches.patch
+Patch0:         wine49-include-Avoid-compound-literals-for-WCHAR-strings.patch
 Recommends:     wine-gecko >= 2.47
 # not packaged in distro...
 Recommends:     wine-mono
@@ -147,7 +148,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{ix86} x86_64 ppc %arm aarch64
 %if %{staging}
 # upstream patch target version
-%define staging_version 4.9
+%define staging_version 4.10
 Source100:      wine-staging-%{staging_version}.tar.xz
 BuildRequires:  gtk3-devel
 BuildRequires:  libOSMesa-devel
@@ -205,7 +206,7 @@ libraries.
 
 %prep
 %setup -q -n wine-%{realver}
-#%%patch0 -p1
+%patch0 -p1
 #
 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//'`
 %endif
 
-if rpm -q gcc|grep gcc-9 ; then
-	export CC=gcc-8
-fi
 %ifarch aarch64
 # ARM64 now requires clang
 # https://source.winehq.org/git/wine.git/commit/8fb8cc03c3edb599dd98f369e14a08f899cbff95