opencl-fixup.mypatch fails to apply on current Wine mainline

[adolfintel]

When building mainline Wine with TKG, the build fails with the following error:

Applying hotfix wine-tkg-patches/hotfixes/autoconf-opencl-hotfix/opencl-fixup.mypatch
patching file configure.ac
Hunk #1 succeeded at 44 with fuzz 2 (offset -6 lines).
Hunk #2 FAILED at 430.
Hunk #3 succeeded at 481 (offset -34 lines).
Hunk #4 succeeded at 710 with fuzz 2 (offset -46 lines).
1 out of 4 hunks FAILED -- saving rejects to file configure.ac.rej

It was building fine yesterday so Wine must have changed something that broke the hotfix.

[topin89]

Yeah, luckily fix was quite simple.

diff --git a/wine-tkg-git/wine-tkg-patches/hotfixes/autoconf-opencl-hotfix/opencl-fixup.mypatch b/wine-tkg-git/wine-tkg-patches/hotfixes/autoconf-opencl-hotfix/opencl-fixup.mypatch
index 22223141..b995653e 100644
--- a/wine-tkg-git/wine-tkg-patches/hotfixes/autoconf-opencl-hotfix/opencl-fixup.mypatch
+++ b/wine-tkg-git/wine-tkg-patches/hotfixes/autoconf-opencl-hotfix/opencl-fixup.mypatch
@@ -21,14 +21,14 @@ index 2bb09f618c7..9cc74660864 100644
  AC_ARG_WITH(opengl,    AS_HELP_STRING([--without-opengl],[do not use OpenGL]))
  AC_ARG_WITH(osmesa,     AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library]))
  AC_ARG_WITH(oss,       AS_HELP_STRING([--without-oss],[do not use the OSS sound support]))
-@@ -430,7 +430,6 @@ AC_CHECK_HEADERS(\
+@@ -404,7 +404,6 @@
  AC_CHECK_HEADERS(\
        CL/cl.h \
        EGL/egl.h \
 -      OpenCL/opencl.h \
-       PCSC/pcsclite.h \
        arpa/inet.h \
        arpa/nameser.h \
+       asm/types.h \
 @@ -515,6 +514,8 @@ AC_CHECK_HEADERS(\
        valgrind/memcheck.h \
        valgrind/valgrind.h

That's looks like wine-tkg-git/wine-tkg-patches/hotfixes/autoconf-opencl-hotfix/opencl-fixup-f74c4af.mypatch, not sure how to fix this in a correct, PR-worthy way

[adolfintel]

I didn't have time to investigate this the other day but it seems like a simple fix.

If you want to send a PR:

• Fork this repo
• Clone your fork to your computer
• Modify the patch
• Make sure that it actually works and doesn't break other builds
• Commit and push to your fork
• Open the PR from the site

I can do it for you if you're too busy or you're not practical with git.