Opened 5 years ago

Closed 5 years ago

#59418 closed defect (fixed)

webkit2-gtk: fails to patch on 10.9 buildbot

Reported by: dbevans (David B. Evans) Owned by: dbevans (David B. Evans)
Priority: Normal Milestone:
Component: ports Version:
Keywords: Cc: kencu (Ken)
Port: webkit2-gtk

Description

--->  Applying patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff
DEBUG: Environment: 
CC_PRINT_OPTIONS='YES'
CC_PRINT_OPTIONS_FILE='/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_www_webkit2-gtk/webkit2-gtk/work/.CC_PRINT_OPTIONS'
CPATH='/opt/local/include'
DEVELOPER_DIR='/Library/Developer/CommandLineTools'
LIBRARY_PATH='/opt/local/lib'
MACOSX_DEPLOYMENT_TARGET='10.9'
Executing:  cd "/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_www_webkit2-gtk/webkit2-gtk/work/webkitgtk-2.26.1" && /usr/bin/patch -p0 < '/opt/bblocal/var/buildworker/ports/build/ports/www/webkit2-gtk/files/patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff'
DEBUG: system:  cd "/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_www_webkit2-gtk/webkit2-gtk/work/webkitgtk-2.26.1" && /usr/bin/patch -p0 < '/opt/bblocal/var/buildworker/ports/build/ports/www/webkit2-gtk/files/patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff'
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git Source/WTF/wtf/posix/OSAllocatorPosix.cpp Source/WTF/wtf/posix/OSAllocatorPosix.cpp
|index a5eb8d44..051c439e 100644
|--- Source/WTF/wtf/posix/OSAllocatorPosix.cpp
|+++ Source/WTF/wtf/posix/OSAllocatorPosix.cpp
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
Command failed:  cd "/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_www_webkit2-gtk/webkit2-gtk/work/webkitgtk-2.26.1" && /usr/bin/patch -p0 < '/opt/bblocal/var/buildworker/ports/build/ports/www/webkit2-gtk/files/patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff'

See full log at https://build.macports.org/builders/ports-10.9_x86_64-builder/builds/103089/steps/install-port/logs/stdio.

Change History (5)

comment:1 Changed 5 years ago by dbevans (David B. Evans)

@kencu: any ideas?

comment:2 Changed 5 years ago by kencu (Ken)

Well. That is odd. I will spin up my VM and see if I can see how that can be.

comment:3 Changed 5 years ago by jmroot (Joshua Root)

Wrong case in the filename in the patch. It's OSAllocatorPOSIX.cpp not OSAllocatorPosix.cpp.

comment:4 Changed 5 years ago by kencu (Ken)

Thanks!

comment:5 Changed 5 years ago by kencu (Ken)

Resolution: fixed
Status: assignedclosed

In 820252024c79c9ec78add1ae22c262d14d4645c2/macports-ports (master):

webkit2-gtk: fix case of patchfile

thanks to @jmr for spotting this
closes: #59418

Note: See TracTickets for help on using tickets.