https://bugs.winehq.org/show_bug.cgi?id=51932
Bug ID: 51932 Summary: wine-stable 6.0.2 build fails in Ubuntu 21.10 Product: Wine Version: 6.0.2 Hardware: x86-64 OS: Linux Status: NEW Severity: normal Priority: P2 Component: wldap32 Assignee: wine-bugs@winehq.org Reporter: dimesio@earthlink.net Distribution: ---
Created attachment 70898 --> https://bugs.winehq.org/attachment.cgi?id=70898 OBS build log from 64 bit Ubuntu 21.10
All the other builds were fine, but it failed in Ubuntu 21.10:
[ 962s] In file included from dlls/wldap32/add.c:33: [ 962s] dlls/wldap32/winldap_private.h:323:13: error: conflicting types for 'ldap_connect'; have 'ULONG(WLDAP32_LDAP *, LDAP_TIMEVAL *)' {aka 'unsigned int(struct wldap32 *, struct l_timeval *)'} [ 962s] 323 | ULONG CDECL ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*); [ 962s] | ^~~~~~~~~~~~ [ 962s] In file included from dlls/wldap32/add.c:26: [ 962s] /usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' with type 'int(LDAP *)' {aka 'int(struct ldap *)'} [ 962s] 1555 | ldap_connect( LDAP *ld ); [ 962s] | ^~~~~~~~~~~~ [ 962s] make[1]: *** [Makefile:126215: dlls/wldap32/add.o] Error 1 [ 962s] make[1]: *** Waiting for unfinished jobs.... [ 964s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 964s] dh_auto_build: error: make -j3 returned exit code 2 [ 964s] make: *** [debian/rules:13: build] Error 25 [ 964s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
Attaching the OBS build log from the 64 bit package; the 32 bit one also failed.
https://bugs.winehq.org/show_bug.cgi?id=51932
Rosanne DiMesio dimesio@earthlink.net changed:
What |Removed |Added ---------------------------------------------------------------------------- CC| |mstefani@winehq.org
https://bugs.winehq.org/show_bug.cgi?id=51932
--- Comment #1 from Hans Leidekker hans@meelstraat.net --- Does the patch from bug 51129 help?
https://bugs.winehq.org/show_bug.cgi?id=51932
--- Comment #2 from Rosanne DiMesio dimesio@earthlink.net --- (In reply to Hans Leidekker from comment #1)
Does the patch from bug 51129 help?
Yes, that fixes it.
https://bugs.winehq.org/show_bug.cgi?id=51932
--- Comment #3 from Hans Leidekker hans@meelstraat.net --- (In reply to Rosanne DiMesio from comment #2)
(In reply to Hans Leidekker from comment #1)
Does the patch from bug 51129 help?
Yes, that fixes it.
I had tagged that bug for 6.0.x but apparently it didn't make it in. You may want to consider including this patch in the source package instead. Note that this patch is not needed in current Wine because the name conflict no longer exists after the PE conversion.
https://bugs.winehq.org/show_bug.cgi?id=51932
--- Comment #4 from Michael Stefaniuc mstefani@winehq.org --- I have a script that checks for bugs that have the 6.0.x and are missing from my tree. But I look only at RESOLVED / CLOSED bugs for that. Even my saved bugzilla search does that as unresolved bugs are not that interesting for me especially as we have the Wine-Bug tag now in the commits.
Hans, can you please attach a full patch including author information and your sign-off? I'll include that into Stable then. Thanks!
https://bugs.winehq.org/show_bug.cgi?id=51932
--- Comment #5 from Hans Leidekker hans@meelstraat.net --- Created attachment 70901 --> https://bugs.winehq.org/attachment.cgi?id=70901 patch
Here you go.
https://bugs.winehq.org/show_bug.cgi?id=51932
Robert Walker bob.mt.wya@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- CC| |bob.mt.wya@gmail.com
https://bugs.winehq.org/show_bug.cgi?id=51932
Michael Stefaniuc mstefani@winehq.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |6.0.x
--- Comment #6 from Michael Stefaniuc mstefani@winehq.org --- Thanks, added: https://github.com/mstefani/wine-stable/commit/7f1d6a8ee2c72409f4f840df23401...
Not marking the bug as Fixed yet as the normal Devel release process would Close it prematurely.
https://bugs.winehq.org/show_bug.cgi?id=51932
Michael Stefaniuc mstefani@winehq.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Fixed by SHA1| |7f1d6a8ee2c72409f4f840df234 | |01c9702adee5e Status|ASSIGNED |RESOLVED Resolution|--- |FIXED
--- Comment #7 from Michael Stefaniuc mstefani@winehq.org --- Fixed with 7f1d6a8ee2c72409f4f840df23401c9702adee5e
https://bugs.winehq.org/show_bug.cgi?id=51932
Michael Stefaniuc mstefani@winehq.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |CLOSED Target Milestone|6.0.x |---
--- Comment #8 from Michael Stefaniuc mstefani@winehq.org --- Closing bugs fixed in 6.0.3.