wine and wine-development FTBFS with OpenLDAP 2.5

These packages are not covered by git-ubuntu, so I will be posting patches here.

This is the patch for wine.

This is the wine-development patch.

OK, I've posted both patches now.

You will notice that they are basically the same; this is because both projects share the same orig tarball (or at least a very big part of it).

These patches introduce a rename of the "ldap_connect" function (which is now present on OpenLDAP 2.5 as well) to something else in order to prevent the FTBFS. You can find a PPA with both packages built (along with OpenLDAP 2.5) here:

https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4559/+packages

The patches are "backported" from a solution provided by one of the Wine developers. This solution is not upstream and I don't know if it will be adopted or not, because the development version of wine fixed this problem using another approach (which is much harder to backport). Having said that, I talked to the Debian Wine maintainer and he told me he plans to update both wine and wine-development on Debian until the end of the year. Once he does that, we won't need these patches anymore.

Thanks for the patches Sergio. The changes LGTM, the patch was provided by upstream (more like a workaround for the stable release) and they said it'd be safe.

A small thing I'd fix in the changelog of both packages is to align the text better. Instead of:

  * Fix FTBFS with OpenLDAP 2.5. (LP: #1929859)
    - d/p/fixes/fix-ftbfs-openldap-2.5.patch: New patch to rename
    wldap32's 'ldap_connect' to something else so that it doesn't conflict
    with OpenLDAP's function with the same name.

I'd use:

  * Fix FTBFS with OpenLDAP 2.5. (LP: #1929859)
    - d/p/fixes/fix-ftbfs-openldap-2.5.patch: New patch to rename
      wldap32's 'ldap_connect' to something else so that it doesn't conflict
      with OpenLDAP's function with the same name.

And the added patch is missing the Description header (in both packages) which I think it is important.

Apart from that, +1 from me for both packages.

Thanks for the review, Lucas. Indeed, the formatting problem was a mistake on my end, thanks for catching it.

I've now uploaded both packages to -proposed.

This bug was fixed in the package wine-development - 5.17-1ubuntu1

---------------
wine-development (5.17-1ubuntu1) impish; urgency=medium

  * Fix FTBFS with OpenLDAP 2.5. (LP: #1929859)
    - d/p/fixes/fix-ftbfs-openldap-2.5.patch: New patch to rename
      wldap32's 'ldap_connect' to something else so that it doesn't
      conflict with OpenLDAP's function with the same name.

 -- Sergio Durigan Junior <email address hidden> Thu, 27 May 2021 14:33:53 -0400

This bug was fixed in the package wine - 5.0.3-3ubuntu1

---------------
wine (5.0.3-3ubuntu1) impish; urgency=medium

  * Fix FTBFS with OpenLDAP 2.5. (LP: #1929859)
    - d/p/fixes/fix-ftbfs-openldap-2.5.patch: New patch to rename
      wldap32's 'ldap_connect' to something else so that it doesn't
      conflict with OpenLDAP's function with the same name.

 -- Sergio Durigan Junior <email address hidden> Thu, 27 May 2021 14:33:53 -0400