Report: Patches that no longer apply

[Bryce Harrington]

On Fri, Jul 17, 2015 at 03:19:20PM -0700, Bryce Harrington wrote:
> Hi Derek,
> 
> Here's a list of your patches in patchwork, and whether they still apply
> or not.  (This just sequentially applied all your patches, so
> potentially the conflict could be between one of your newer patches and
> one of your older ones.)
> 
> Bryce
> 
> 
> 
> 47258
> Applying: desktop-shell: add output co-ordinates to get_output_work_area()
> Applying patch #47258 using 'git am'
> Description: [weston,1/3] desktop-shell: add output co-ordinates to get_output_work_area()
> 
> 47256
> Applying: desktop-shell: use output position in get_output_panel_size()
> Applying patch #47256 using 'git am'
> Description: [weston,2/3] desktop-shell: use output position in get_output_panel_size()
> 
> 47257
> Applying: desktop-shell: use work area instead of panel size to constrain moves
> Applying patch #47257 using 'git am'
> Description: [weston,3/3] desktop-shell: use work area instead of panel size to constrain moves

Reviewed and pushed these three.
remote: I: 3 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/wayland/weston
   c683623..6feb0f9  master -> master

 
> 47719
> Applying: window: Use wl_cursor_frame_and_duration() for mouse cursor updates
> Applying patch #47719 using 'git am'
> Description: [v2,weston] window: Use wl_cursor_frame_and_duration() for mouse cursor updates

This basically just adds a timer function for animated cursor sets that
have delays longer than 100ms.  I'm not versed enough in input to know
whether this is a common problem or corner case, so am trusting Derek's
judgment.

The solution seems a bit brute force, but the implementation is
straightforward enough and it looks ok to me.

Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>

Pushed:
remote: I: patch #47719 updated using rev
118a429504055dab3062304ec0dadc60a2919ce5

> 48592
> Applying: input: Split get_udev_seat() into its own function
> error: patch failed: src/libinput-seat.c:45
> error: src/libinput-seat.c: patch does not apply
> Patch failed at 0001 input: Split get_udev_seat() into its own function
> The copy of the patch that failed is found in:
>    /home/bryce/src/Wayland/weston/.git/rebase-apply/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".
> Applying patch #48592 using 'git am'
> Description: [weston,1/4] input: Split get_udev_seat() into its own function

Acked-by: Bryce Harrington <bryce at osg.samsung.com>

> 48593
> Applying: input: make a function for device removal
> Applying patch #48593 using 'git am'
> Description: [weston,2/4] input: make a function for device removal

This one looks simple enough.  Pushed:

To ssh://git.freedesktop.org/git/wayland/weston
   6feb0f9..6b557a7  master -> master

Patches 1,3,4 in this series will need rebased

> 48594
> Applying: input: Move seat capability update sends out of init functions
> error: patch failed: src/compositor-headless.c:184
> error: src/compositor-headless.c: patch does not apply
> error: patch failed: src/compositor-rdp.c:842
> error: src/compositor-rdp.c: patch does not apply
> error: patch failed: src/compositor-x11.c:336
> error: src/compositor-x11.c: patch does not apply
> error: patch failed: src/input.c:2136
> error: src/input.c: patch does not apply
> Patch failed at 0001 input: Move seat capability update sends out of init functions
> The copy of the patch that failed is found in:
>    /home/bryce/src/Wayland/weston/.git/rebase-apply/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".
> Applying patch #48594 using 'git am'
> Description: [weston,3/4] input: Move seat capability update sends out of init functions
> 
> 48595
> Applying: input: Detect keyboard capabilities
> error: patch failed: src/compositor-headless.c:184
> error: src/compositor-headless.c: patch does not apply
> error: patch failed: src/compositor-rdp.c:842
> error: src/compositor-rdp.c: patch does not apply
> error: patch failed: src/compositor-wayland.c:1463
> error: src/compositor-wayland.c: patch does not apply
> error: patch failed: src/compositor-x11.c:336
> error: src/compositor-x11.c: patch does not apply
> error: patch failed: src/compositor.h:451
> error: src/compositor.h: patch does not apply
> error: patch failed: src/input.c:601
> error: src/input.c: patch does not apply
> error: patch failed: src/libinput-seat.c:45
> error: src/libinput-seat.c: patch does not apply
> error: patch failed: src/screen-share.c:214
> error: src/screen-share.c: patch does not apply
> Patch failed at 0001 input: Detect keyboard capabilities
> The copy of the patch that failed is found in:
>    /home/bryce/src/Wayland/weston/.git/rebase-apply/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".
> Applying patch #48595 using 'git am'
> Description: [weston,4/4] input: Detect keyboard capabilities

Patches 3 and 4 of this series will need a reviewer.
 
> 48817
> Applying: rpi-renderer: use weston_output matrix instead of a private matrix
> Applying patch #48817 using 'git am'
> Description: [weston] rpi-renderer: use weston_output matrix instead of a private matrix

Needs a reviewer.

This is the type of patch for which it'd be nice to have some synthetic
output manipulation tests.

> 49058
> Applying: input: add a weston_pointer_clear_focus() helper function
> error: patch failed: desktop-shell/exposay.c:572
> error: desktop-shell/exposay.c: patch does not apply
> Patch failed at 0001 input: add a weston_pointer_clear_focus() helper function
> The copy of the patch that failed is found in:
>    /home/bryce/src/Wayland/weston/.git/rebase-apply/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".
> Applying patch #49058 using 'git am'
> Description: [weston,v2] input: add a weston_pointer_clear_focus() helper function
> 
> 50501
> Applying: exposay: Fix use after free when a view is destroyed during animation
> Applying patch #50501 using 'git am'
> Description: [weston] exposay: Fix use after free when a view is destroyed during animation

LGTM

To ssh://git.freedesktop.org/git/wayland/weston
   daf846e..d8156e2  master -> master

(btw, it'd be interesting to know with patches like these if they're
fixing an actual observed crash in practice, or if the error was just
found by inspection.)
 
> 50713
> Applying: desktop-shell: drop shell_client from the head of the surface list on destroy
> Applying patch #50713 using 'git am'
> Description: [weston,v2] desktop-shell: drop shell_client from the head of the surface list on destroy

Needs reviewer.

> 51395
> Applying: compositor: Respect WESTON_BUILD_DIR env var in weston_load_module
> Applying patch #51395 using 'git am'
> Description: [v2,weston] compositor: Respect WESTON_BUILD_DIR env var in weston_load_module

LGTM, pushed:
remote: I: 1 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/wayland/weston
   d8156e2..3f86e50  master -> master

> 52259
> Applying: build: Build libwayland-private
> error: patch failed: Makefile.am:42
> error: Makefile.am: patch does not apply
> Patch failed at 0001 build: Build libwayland-private
> The copy of the patch that failed is found in:
>    /home/bryce/src/Wayland/weston/.git/rebase-apply/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".
> Applying patch #52259 using 'git am'
> Description: build: Build libwayland-private
 
> 52833
> Applying: text: Launch input method in text_backend_init
> Applying patch #52833 using 'git am'
> Description: [weston,1/3] text: Launch input method in text_backend_init
> 
> 52835
> Applying: text: Don't track binding in struct text_backend
> Applying patch #52835 using 'git am'
> Description: [weston,2/3] text: Don't track binding in struct text_backend
> 
> 52834
> Applying: text: Switch to weston_client_start instead of weston_client_launch
> Applying patch #52834 using 'git am'
> Description: [weston,3/3] text: Switch to weston_client_start instead of weston_client_launch

These three all look simple enough, but needs a reviewer.
 
> 53028
> Applying: shm: Deprecate wl_shm_buffer_create()
> error: src/wayland-server-core.h: does not exist in index
> error: src/wayland-shm.c: does not exist in index
> Patch failed at 0001 shm: Deprecate wl_shm_buffer_create()
> The copy of the patch that failed is found in:
>    /home/bryce/src/Wayland/weston/.git/rebase-apply/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".
> Applying patch #53028 using 'git am'
> Description: [1/3,v2] shm: Deprecate wl_shm_buffer_create()
> 
> 53026
> Applying: shm: Move deprecated function to the bottom of the file
> error: src/wayland-shm.c: does not exist in index
> Patch failed at 0001 shm: Move deprecated function to the bottom of the file
> The copy of the patch that failed is found in:
>    /home/bryce/src/Wayland/weston/.git/rebase-apply/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".
> Applying patch #53026 using 'git am'
> Description: [2/3] shm: Move deprecated function to the bottom of the file
> 
> 53027
> Applying: shm: wl_shm_buffer_get_data() requires a valid pool.
> error: src/wayland-shm.c: does not exist in index
> Patch failed at 0001 shm: wl_shm_buffer_get_data() requires a valid pool.
> The copy of the patch that failed is found in:
>    /home/bryce/src/Wayland/weston/.git/rebase-apply/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".
> Applying patch #53027 using 'git am'
> Description: [3/3] shm: wl_shm_buffer_get_data() requires a valid pool.
> 
> 53183
> Applying: compositor/clients: Protect CLOCK_BOOTTIME with ifdefs
> error: patch failed: src/compositor.c:4760
> error: src/compositor.c: patch does not apply
> Patch failed at 0001 compositor/clients: Protect CLOCK_BOOTTIME with ifdefs
> The copy of the patch that failed is found in:
>    /home/bryce/src/Wayland/weston/.git/rebase-apply/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".
> Applying patch #53183 using 'git am'
> Description: [weston] compositor/clients: Protect CLOCK_BOOTTIME with ifdefs
> 
> 53184
> Applying: build: Add -lrt for programs that use clock_gettime()
> Applying patch #53184 using 'git am'
> Description: [weston] build: Add -lrt for programs that use clock_gettime()

This is trivial enough, but I'd be more comfortable if pekka or daniel
could give an Acked-by on this, since it's adding a dependency.
 
> 54592
> Applying: input: Check device counts in bind_seat()
> Applying patch #54592 using 'git am'
> Description: [weston,13/17] input: Check device counts in bind_seat()
> 
> 54588
> Applying: desktop-shell: Don't call wl_list_init() in the middle of a list
> Applying patch #54588 using 'git am'
> Description: [weston,14/17] desktop-shell: Don't call wl_list_init() in the middle of a list
> 
> 54589
> Applying: desktop-shell: Check for device presence properly
> Applying patch #54589 using 'git am'
> Description: [weston,15/17] desktop-shell: Check for device presence properly
> 
> 54595
> Applying: fullscreen-shell: Test for device presence properly
> Applying patch #54595 using 'git am'
> Description: [weston,16/17] fullscreen-shell: Test for device presence properly
> 
> 54598
> Applying: input: Don't test keyboard/pointer/touch pointers
> Applying patch #54598 using 'git am'
> Description: [v7,weston,17/17] input: Don't test keyboard/pointer/touch pointers

The above still need a reviewer.
I'd hoped to get to these but have run out of time.
 
> 54855
> Applying: shm: Add wl_shm_buffer get/put functions
> error: src/wayland-server-core.h: does not exist in index
> error: src/wayland-shm.c: does not exist in index
> Patch failed at 0001 shm: Add wl_shm_buffer get/put functions
> The copy of the patch that failed is found in:
>    /home/bryce/src/Wayland/weston/.git/rebase-apply/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".
> Applying patch #54855 using 'git am'
> Description: shm: Add wl_shm_buffer get/put functions

Looks like this is a wayland patch rather than weston, and my script was
too stupid to realize.  If some of the other "failures" are wayland
patches, just assume that's the case and don't worry about them.  I'll
do another pass when I'm back from the beach in a week.

Bryce
 
> HEAD is now at c683623 logind-util: Use %u for unsigned int in snprintf
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel