[PATCH v2 0/1] MR3222: localspl: Add workaround for old versions of cups.h
Recent versions of cups.h have HTTP_STATUS_CONTINUE as enum, so defining it doesn't hurt -- v2: localspl: Add workaround for old versions of cups.h https://gitlab.winehq.org/wine/wine/-/merge_requests/3222
From: Fabian Maurer <dark.shadow4(a)web.de> Recent versions of cups.h have HTTP_STATUS_CONTINUE as enum, so defining it doesn't hurt Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54166 --- dlls/localspl/cups.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/localspl/cups.c b/dlls/localspl/cups.c index cf96f1739fe..b5c26cc2626 100644 --- a/dlls/localspl/cups.c +++ b/dlls/localspl/cups.c @@ -44,6 +44,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(localspl); +/* cups.h before version 1.7.0 doesn't have HTTP_STATUS_CONTINUE */ +#define HTTP_STATUS_CONTINUE 100 + #ifdef SONAME_LIBCUPS static void *libcups_handle; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3222
On Sun Jul 2 21:05:22 2023 +0000, Fabian Maurer wrote:
changed this line in [version 2 of the diff](/wine/wine/-/merge_requests/3222/diffs?diff_id=55104&start_sha=d6c708f8103d468299ca20b8457c4c4a7729121d#0390b585fe53e267135a4d7509954a15be1fa7d6_47_47) Sure, updated
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3222#note_37564
[CUPS 1.7.0](https://www.cups.org/blog/2013-10-24-cups-1.7.0.html) was released in October 2013. Is it worth maintaining extra code in Wine to work around such an old version? If someone has CUPS 1.6 and really wants to compile the latest Wine, they could always compile with `CFLAGS='-DHTTP_STATUS_CONTINUE=100'` or simply `--without-cups`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3222#note_37565
On Sun Jul 2 21:57:03 2023 +0000, Alex Henrie wrote:
[CUPS 1.7.0](https://www.cups.org/blog/2013-10-24-cups-1.7.0.html) was released in October 2013. Is it worth maintaining extra code in Wine to work around such an old version? If someone has CUPS 1.6 and really wants to compile the latest Wine, they could always compile with `CFLAGS='-DHTTP_STATUS_CONTINUE=100'` or simply `--without-cups`. Well, CentOS 7 from the bug report comes with cups 1.6.3. I personally don't see the harm including a define to work around this issue, but I don't know where the cutoff should be. I mean, gcc 4.3 is also ancient and fixes are still accepted.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3222#note_37566
On Sun Jul 2 21:57:03 2023 +0000, Fabian Maurer wrote:
Well, CentOS 7 from the bug report comes with cups 1.6.3. I personally don't see the harm including a define to work around this issue, but I don't know where the cutoff should be. I mean, gcc 4.3 is also ancient and fixes are still accepted. I guess the fact that CentOS is a widely used distribution and version 7 is still supported by the vendor ([through June of next year](https://wiki.centos.org/About/Product)) is a decent reason to support it in Wine. (Although as I mentioned, I personally think there are better ways to get the latest Wine on CentOS 7. Another good option in my opinion is to run Wine in Docker.)
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3222#note_37567
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3222
participants (4)
-
Alex Henrie (＠alexhenrie) -
Fabian Maurer
-
Fabian Maurer (＠DarkShadow44)
-
Huw Davies (＠huw)