Your message dated Sun, 16 Feb 2020 17:05:31 +0000
with message-id <[email protected]>
and subject line Bug#947884: fixed in wine 5.0-2
has caused the Debian Bug report #947884,
regarding wine: fails to build with glibc 2.30 from experimental
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
947884: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=947884
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: wine-development
Version: 4.21-2
Severity: serious
control: affects -1 src:wine
Hello, I took some time to have a look on wine FTBFS, and I think I crafted
some patches that are pending upstream review
https://bugs.winehq.org/show_bug.cgi?id=48398
+wine-development (4.21-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload (Closes: #-1)
+ * Fix new-gcc errors on arm64.
+ * Do not check anymore for sysctl header file
+
+ -- Gianfranco Costamagna <[email protected]> Tue, 31 Dec 2019
17:27:10 +0100
the sysctl hack is needed for the new glibc
The very same patches are applying cleanly to wine too.
thanks
Gianfranco
diff -Nru wine-5.0~rc1/debian/patches/anysize-array.patch
wine-5.0~rc1/debian/patches/anysize-array.patch
--- wine-5.0~rc1/debian/patches/anysize-array.patch 1970-01-01
01:00:00.000000000 +0100
+++ wine-5.0~rc1/debian/patches/anysize-array.patch 2019-12-31
18:29:19.000000000 +0100
@@ -0,0 +1,32 @@
+Description:
+clang -c -o file.o file.c -I. -I../../include -I../../include/msvcrt
-D__WINESRC__ -D_REENTRANT -fPIC -fno-builtin -fshort-wchar -Wall -pipe
-fcf-protection=none -fno-stack-protector -fno-strict-aliasing
-Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers
-Wno-pragma-pack -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings
-Wpointer-arith -gdwarf-2 -gstrict-dwarf -Werror -Wdate-time -g -O2
-fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat
-Werror=format-security -Wno-shift-overflow -Wno-unused-function
-Wno-deprecated-declarations -Wno-enum-conversion -Wno-absolute-value
+file.c:1057:49: error: array index 1 is past the end of the array (which
contains 1 element) [-Werror,-Warray-bounds]
+ dir_info->FileName[0] == '.' && dir_info->FileName[1] == '.')
continue;
+ ^ ~
+../../include/winternl.h:551:5: note: array 'FileName' declared here
+ WCHAR FileName[ANYSIZE_ARRAY];
+Author: Gianfranco Costamagna <[email protected]>
+Last-Update: 2019-12-31
+
+--- wine-development-4.21.orig/include/winnt.h
++++ wine-development-4.21/include/winnt.h
+@@ -4115,7 +4115,7 @@ typedef struct tagMESSAGE_RESOURCE_DATA
+ * First a constant for the following typedefs.
+ */
+
+-#define ANYSIZE_ARRAY 1
++#define ANYSIZE_ARRAY 2
+
+ /* FIXME: Orphan. What does it point to? */
+ typedef PVOID PACCESS_TOKEN;
+--- wine-development-4.21.orig/tools/winapi/winapi_test
++++ wine-development-4.21/tools/winapi/winapi_test
+@@ -140,7 +140,7 @@ my $progress_max = scalar(@files);
+ my %type_name2type;
+
+ my %defines = (
+- "ANYSIZE_ARRAY" => 1,
++ "ANYSIZE_ARRAY" => 2,
+ "CCHDEVICENAME" => 32,
+ "CCHILDREN_TITLEBAR+1" => 6,
+ "ELF_VENDOR_SIZE" => 4,
diff -Nru wine-5.0~rc1/debian/patches/fix-bad-comparison.patch
wine-5.0~rc1/debian/patches/fix-bad-comparison.patch
--- wine-5.0~rc1/debian/patches/fix-bad-comparison.patch 1970-01-01
01:00:00.000000000 +0100
+++ wine-5.0~rc1/debian/patches/fix-bad-comparison.patch 2019-12-31
18:29:19.000000000 +0100
@@ -0,0 +1,36 @@
+Description:
+../../tools/winegcc/winegcc -o d3dcompiler_47.dll.so --wine-objdir ../.. -fPIC
-fasynchronous-unwind-tables -shared d3dcompiler_47.spec -mno-cygwin
asmparser.o blob.o bytecodewriter.o compiler.o main.o preproc.o reflection.o
utils.o asmshader.tab.o hlsl.tab.o ppy.tab.o asmshader.yy.o hlsl.yy.o ppl.yy.o
version.res ../../dlls/dxguid/libdxguid.a ../../dlls/uuid/libuuid.a
-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now
-Wl,-rpath,/usr/lib/aarch64-linux-gnu/wine
+../d3dx9_36/effect.c:1472:12: error: result of comparison of unsigned enum
expression < 0 is always false
[-Werror,-Wtautological-unsigned-enum-zero-compare]
+ if (op < 0 || op > SCT_PSINT)
+ ~~ ^ ~
+1 error generated.
+
+Author: Gianfranco Costamagna <[email protected]>
+
+Forwarded: pending
+Last-Update: 2019-12-31
+
+--- wine-5.0~rc1.orig/dlls/d3dx9_36/effect.c
++++ wine-5.0~rc1/dlls/d3dx9_36/effect.c
+@@ -1469,7 +1469,7 @@ static HRESULT d3dx_set_shader_const_sta
+ D3DXVECTOR4 value;
+ HRESULT ret;
+
+- if (op < 0 || op > SCT_PSINT)
++ if (op > SCT_PSINT)
+ {
+ FIXME("Unknown op %u.\n", op);
+ return D3DERR_INVALIDCALL;
+--- wine-5.0~rc1.orig/dlls/gdiplus/graphics.c
++++ wine-5.0~rc1/dlls/gdiplus/graphics.c
+@@ -6836,8 +6836,8 @@ GpStatus WINGDIPAPI GdipTransformPoints(
+ GpCoordinateSpace src_space, GpPointF
*points, INT count)
+ {
+ if(!graphics || !points || count <= 0 ||
+- dst_space < 0 || dst_space > CoordinateSpaceDevice ||
+- src_space < 0 || src_space > CoordinateSpaceDevice)
++ dst_space > CoordinateSpaceDevice ||
++ src_space > CoordinateSpaceDevice)
+ return InvalidParameter;
+
+ if(graphics->busy)
diff -Nru wine-5.0~rc1/debian/patches/for-loop.patch
wine-5.0~rc1/debian/patches/for-loop.patch
--- wine-5.0~rc1/debian/patches/for-loop.patch 1970-01-01 01:00:00.000000000
+0100
+++ wine-5.0~rc1/debian/patches/for-loop.patch 2019-12-31 18:29:19.000000000
+0100
@@ -0,0 +1,26 @@
+Description: a for loop from n down to >=0 can't be assigned to an unsigned int
+
+clang -c -o variant.o variant.c -I. -I../../include -I../../include/msvcrt
-D__WINESRC__ -D_OLEAUT32_ -D_REENTRANT -fPIC -fno-builtin -fshort-wchar -Wall
-pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body
-Wignored-qualifiers -Wno-pragma-pack -Wstrict-prototypes -Wtype-limits -Wvla
-Wwrite-strings -Wpointer-arith -gdwarf-2 -gstrict-dwarf -Werror -Wdate-time -g
-O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat
-Werror=format-security -Wno-shift-overflow -Wno-unused-function
-Wno-deprecated-declarations -Wno-enum-conversion -Wno-absolute-value
+signal_arm64.c:1606:48: error: result of comparison of unsigned expression >=
0 is always true [-Werror,-Wtautological-unsigned-zero-compare]
+ for (i = func->u.s.RegF / 2 - 1; i >= 0; i--)
+ ~ ^ ~
+signal_arm64.c:1634:44: error: result of comparison of unsigned expression >=
0 is always true [-Werror,-Wtautological-unsigned-zero-compare]
+ for (i = func->u.s.RegI / 2 - 1; i >= 0; i--)
+ ~ ^ ~
+2 errors generated.
+make[2]: *** [Makefile:331: signal_arm64.o] Error 1
+
+Author: Gianfranco Costamagna <[email protected]>
+--- wine-development-4.21.orig/dlls/ntdll/signal_arm64.c
++++ wine-development-4.21/dlls/ntdll/signal_arm64.c
+@@ -1519,7 +1519,8 @@ static void process_unwind_codes( BYTE *
+ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc,
RUNTIME_FUNCTION *func,
+ CONTEXT *context,
KNONVOLATILE_CONTEXT_POINTERS *ptrs )
+ {
+- unsigned int i, len, offset, skip = 0;
++ int i;
++ unsigned int len, offset, skip = 0;
+ unsigned int int_size = func->u.s.RegI * 8, fp_size = func->u.s.RegF * 8,
regsave, local_size;
+
+ TRACE( "function %lx-%lx: len=%#x flag=%x regF=%u regI=%u H=%u CR=%u
frame=%x\n",
+
diff -Nru wine-5.0~rc1/debian/patches/no-sysctl.patch
wine-5.0~rc1/debian/patches/no-sysctl.patch
--- wine-5.0~rc1/debian/patches/no-sysctl.patch 1970-01-01 01:00:00.000000000
+0100
+++ wine-5.0~rc1/debian/patches/no-sysctl.patch 2019-12-31 17:25:19.000000000
+0100
@@ -0,0 +1,16 @@
+Description: Do not look for sysctl, to avoid gcc warnings with Werror=cpp on
newer glibc
+
+Author: Gianfranco Costamagna <[email protected]>
+Last-Update: 2019-12-31
+
+--- wine-5.0~rc1.orig/configure.ac
++++ wine-5.0~rc1/configure.ac
+@@ -553,7 +553,7 @@ AC_HEADER_STAT()
+
+ dnl **** Checks for headers that depend on other ones ****
+
+-AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/sysctl.h sys/user.h
sys/vfs.h],,,
++AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,,
+ [#include <sys/types.h>
+ #ifdef HAVE_SYS_PARAM_H
+ # include <sys/param.h>
diff -Nru wine-5.0~rc1/debian/patches/series wine-5.0~rc1/debian/patches/series
--- wine-5.0~rc1/debian/patches/series 2019-12-18 05:29:54.000000000 +0100
+++ wine-5.0~rc1/debian/patches/series 2019-12-31 18:29:19.000000000 +0100
@@ -38,3 +38,7 @@
warnings/argument-promotion.patch
warnings/discarded-qualifiers.patch
warnings/uninitialized-variables.patch
+no-sysctl.patch
+fix-bad-comparison.patch
+anysize-array.patch
+for-loop.patch
--- End Message ---
--- Begin Message ---
Source: wine
Source-Version: 5.0-2
Done: Michael Gilbert <[email protected]>
We believe that the bug you reported is fixed in the latest version of
wine, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Michael Gilbert <[email protected]> (supplier of updated wine package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 16 Feb 2020 07:45:30 +0000
Source: wine
Architecture: source
Version: 5.0-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Wine Party <[email protected]>
Changed-By: Michael Gilbert <[email protected]>
Closes: 947884
Changes:
wine (5.0-2) unstable; urgency=medium
.
* Support building with gcc 10.
* Add support for glibc 2.30 (closes: #947884).
- Thanks to Gianfranco Costamagna.
Checksums-Sha1:
0a16bbbcc8834736e4459570429adc6819c6c632 4609 wine_5.0-2.dsc
052529bbfabb33af0a2e8002dbbcf602bc6068a5 213848 wine_5.0-2.debian.tar.xz
53150b2156194bf59834368950aaf75918b03901 19402 wine_5.0-2_source.buildinfo
Checksums-Sha256:
a3d80d0e77431954aee85af16c4af096726d7d8c4f7346a82630e9420296d822 4609
wine_5.0-2.dsc
63b5c0ad86068944268cec7c637372bae04d2101d895488e5ad0e03ee357d2d2 213848
wine_5.0-2.debian.tar.xz
f4e4491847e03f602796beef0b894ce527edb0d3d2271c0cdba41dfcf6f24bbc 19402
wine_5.0-2_source.buildinfo
Files:
78b8ae14719f237eb266112e952ea956 4609 otherosfs optional wine_5.0-2.dsc
2edf2bf5f7fdc79f88736abe9b30a105 213848 otherosfs optional
wine_5.0-2.debian.tar.xz
6299ede0b4df23cc1d13bade3d40fcc7 19402 otherosfs optional
wine_5.0-2_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQQzBAEBCgAdFiEEIwTlZiOEpzUxIyp4mD40ZYkUaygFAl5JcqcACgkQmD40ZYkU
ayhMDR//ej5ry02b2IiH63djogNewGmGmVfGhnmuhElSVCgP8KEHfk7BJvcjvY9Y
bEBI2hInFGOfMV7V5502Ni5FLa29NSZyzG9vCe6V3tWbgjwovJxAj252iYtudAQf
QmUjF4SCeO46bvHrlUlVI6K0KWSADXvgZ9eNu2Z7BcWH2V18a6jQja+UH4dcdTCV
zi+C184Lftssu2v5lb369Fud1Nr55s5pfiydWw3lc+5T6nEV6md+qjs7ijLCryyD
lBAtkh1oi6Du+cEyacm8HHu8e0lbg3XJfJWdGlFbc02CawfDMmwtJj/RwJjS8JdW
0ozp6bw6tw76mFwanXUujesaW5gIGORAlCkfbxqQN8eLPnVpVknqrHjX6buzxXud
NZvvB0WLUk0ngAeh3rG5oQHZA7wDuiklv2+tdo/sViL6b3c4gfP1Qp5mj5ClZMyq
FTASAyLOXqYBa+wgSk9donamfAx+ardH+zKiXbThqcQLvnlyrvM4Vuwyc5hNRZa3
P2B+pa+fMTFar5OZbLQuh6Gdht+9tFv67UqoXo7kHojy7jLqvsFAYU2ktJwfx0Kg
QRYiLVw3yauyzDJNM06STac2OPo+ygUZpbkBD4WcAJRDYbHyFsAoXlSKzhIU5+g9
Q3wpX/2hge7BHYNPAJdzEUo5KpK7Xe6/3ZhBnvgaRTbV6WY9i3E89Z11F5ky010u
anfaqDdQ8iwFp2f9/y5o0BvJeGjXloXqfZlX40qmPPtdb+KfLq+esnK1RqvetOGs
4yDeT/iIFYpe876lLH/NTXOi0dYQIThpCsbgT3kJLQqgG6BETBORApE5B1ACTcMV
OKlhW0o0E7hWfU0ty2UJEkBeEt3x76LruT9zSw4yANE9rmeA+bPn09DdLoMLjjLa
dGrACrD5n13wU+Ws2p3BH7OtU7DiluoaN6opqtBsym3DWocLIiJPafHgXmpH8pCm
dV2V8rSK+iYEUh+8jl8yxGx9wL62UKY9esAv5mYhlu7jy4GkRKxrkzbWmLUNyifQ
sk+OgDnthNrxposn2QElHm+fApe3okf8e32KvuqJDx/bpSggebHOaVVSicWUBOqo
okv1+0Jlltk/TVw+IQO5PMwkT2ukMd1/yZy+psZiaOUfg7GRr31XtuSkRcQw/6jV
u/SJGjnnyQAMsMROzi1U8+ntrxETGBcpUT6awlwrel+1y2mXJ7Jp57IjSTuoLyRT
l8nLyYVSnqvBpZ+c/5LI3ZnBbHhjmz9J2jFdWVHz2I8CJGL400eQlfR5XMdpdPiz
NG3XpmR3TAlVuSwfUNSRNBtFi3GAJiC779XvOQGZHfH9XMnCRfkknVo9o17nIErN
ZPPiUR8dueOiujSI4wHagdtqWsbGqA==
=KloO
-----END PGP SIGNATURE-----
--- End Message ---
