[Bug 47091] New: Wine-Staging 4.7 release server-Desktop_Refcount patchset breaks ' patchinstall.sh ... --backend=git --force-autoconf --all'

[wine-bugs at winehq.org]

https://bugs.winehq.org/show_bug.cgi?id=47091

            Bug ID: 47091
           Summary: Wine-Staging 4.7 release server-Desktop_Refcount
                    patchset breaks 'patchinstall.sh ... --backend=git
                    --force-autoconf --all'
           Product: Wine-staging
           Version: 4.7
          Hardware: x86-64
                OS: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: -unknown
          Assignee: wine-bugs at winehq.org
          Reporter: focht at gmx.net
                CC: leslie_alistair at hotmail.com, z.figura12 at gmail.com
      Distribution: ---

Hello folks,

encountered this when building official Wine-Staging 4.7 release.

With the reintroduction of server-Desktop_Refcount patchset, running
'patchinstall.sh' script with '... --backend=git --force-autoconf --all'
doesn't work anymore. You might argue why people use '--force-autoconf' option
but that's a separate thing :-)

--- snip ---
...
HEAD is now at 6e3f39a4c5 Release 4.7.
Cloning into '/home/focht/projects/wine/staging-patches-4.7'...
remote: Enumerating objects: 102, done.
remote: Counting objects: 100% (102/102), done.
remote: Compressing objects: 100% (70/70), done.
remote: Total 35588 (delta 45), reused 61 (delta 31), pack-reused 35486
Receiving objects: 100% (35588/35588), 29.56 MiB | 4.26 MiB/s, done.
Resolving deltas: 100% (23518/23518), done.
HEAD is now at 547e7c81 Release v4.7
Cloning into '/home/focht/projects/wine/staging-src-4.7'...
done.
Checking out files: 100% (7764/7764), done.
HEAD is now at 6e3f39a4c5 Release 4.7.
Applying
/home/focht/projects/wine/staging-patches-4.7/patches/Compiler_Warnings/0001-windowscodecs-Avoid-implicit-cast-of-interface-point.patch
Applying: windowscodecs: Avoid implicit cast of interface pointer.
Auto packing the repository in background for optimum performance.
...
Applying
/home/focht/projects/wine/staging-patches-4.7/patches/riched20-IText_Interface/0010-riched20-Silence-repeated-FIXMEs-triggered-by-Adobe-.patch
Applying: riched20: Silence repeated FIXMEs triggered by Adobe Reader.
Applying
/home/focht/projects/wine/staging-patches-4.7/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch
Applying: server: Introduce a new alloc_handle object callback. (v2)
error: patch failed: include/wine/server_protocol.h:6677
error: include/wine/server_protocol.h: patch does not apply
Patch failed at 0001 server: Introduce a new alloc_handle object callback. (v2)
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
ERROR: Failed to apply patch, aborting!
ERROR in build.sh: line 470 with exit code 1
ERROR message: "Failed to run Wine-Staging 'patchinstall' script!"
--- snip ---

https://github.com/wine-staging/wine-staging/tree/master/patches/server-Desktop_Refcount

Introduced here:
https://github.com/wine-staging/wine-staging/commit/4e7071e4f14f6ce85b0eb4b88accfb0267d6545b

Specifically:

https://github.com/wine-staging/wine-staging/blob/master/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch#L46

It seems 'include/wine/server_protocol.h' was committed by mistake here?

Regards

-- 
Do not reply to this email, post in Bugzilla using the
above URL to reply.
You are receiving this mail because:
You are watching all bug changes.