#72959 closed defect (fixed)

textmate2 @2.0.23: Fuzzy patch is silently ignored on Ventura and later

Reported by: ryandesign (Ryan Carsten Schmidt) Owned by: neverpanic (Clemens Lang)
Priority: Normal Milestone:
Component: ports Version: 2.11.5
Keywords: ventura sonoma sequoia tahoe Cc:
Port: textmate2

Description

On Monterey and earlier one of the patchfiles is applied with fuzz:

--->  Applying patches to textmate2
--->  Applying patch-Frameworks__io__src__path.cc-use-home-from-env.diff
DEBUG: Environment: 
CC_PRINT_OPTIONS='YES'
CC_PRINT_OPTIONS_FILE='/opt/local/var/macports/build/textmate2-8ec59dae/work/.CC_PRINT_OPTIONS'
CPATH='/opt/local/include'
DEVELOPER_DIR='/Applications/Xcode.app/Contents/Developer'
LIBRARY_PATH='/opt/local/lib'
MACOSX_DEPLOYMENT_TARGET='11.0'
SDKROOT='/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk'
SOURCE_DATE_EPOCH='1756324032'
Executing:  cd "/opt/local/var/macports/build/textmate2-8ec59dae/work/textmate-2.0.23" && /usr/bin/patch -t -N -p0 < '/opt/bblocal/var/buildworker/ports/build/ports/editors/textmate2/files/patch-Frameworks__io__src__path.cc-use-home-from-env.diff'
DEBUG: system:  cd "/opt/local/var/macports/build/textmate2-8ec59dae/work/textmate-2.0.23" && /usr/bin/patch -t -N -p0 < '/opt/bblocal/var/buildworker/ports/build/ports/editors/textmate2/files/patch-Frameworks__io__src__path.cc-use-home-from-env.diff'
patching file Frameworks/io/src/path.cc
Hunk #1 succeeded at 830 with fuzz 1 (offset -216 lines).

That same patch is ignored by Ventura and later:

--->  Applying patches to textmate2
--->  Applying patch-Frameworks__io__src__path.cc-use-home-from-env.diff
DEBUG: Environment: 
CC_PRINT_OPTIONS='YES'
CC_PRINT_OPTIONS_FILE='/opt/local/var/macports/build/textmate2-8ec59dae/work/.CC_PRINT_OPTIONS'
CPATH='/opt/local/include'
DEVELOPER_DIR='/Applications/Xcode.app/Contents/Developer'
LIBRARY_PATH='/opt/local/lib'
MACOSX_DEPLOYMENT_TARGET='15.0'
SDKROOT='/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.sdk'
SOURCE_DATE_EPOCH='1756324032'
Executing:  cd "/opt/local/var/macports/build/textmate2-8ec59dae/work/textmate-2.0.23" && /usr/bin/patch -t -N -p0 < '/opt/bblocal/var/buildworker/ports/build/ports/editors/textmate2/files/patch-Frameworks__io__src__path.cc-use-home-from-env.diff'
DEBUG: system:  cd "/opt/local/var/macports/build/textmate2-8ec59dae/work/textmate-2.0.23" && /usr/bin/patch -t -N -p0 < '/opt/bblocal/var/buildworker/ports/build/ports/editors/textmate2/files/patch-Frameworks__io__src__path.cc-use-home-from-env.diff'
patching file 'Frameworks/io/src/path.cc'
No such line 1045 in input file, ignoring

If the patch is still needed, please defuzz it so it applies on all systems; otherwise remove it.

Change History (2)

comment:1 Changed 13 months ago by neverpanic (Clemens Lang)

Thanks, this may well be while it doesn't build on the buildbot.

​https://github.com/macports/macports-ports/pull/29266

comment:2 Changed 13 months ago by neverpanic (Clemens Lang)

Resolution: → fixed
Status: assigned → closed

In 1c5f4f363c99462cdf546e58a10af3b19a6d9a6f/macports-ports (master):

textmate2: Unfuzz patchfile

Closes: #72959

Note: See TracTickets for help on using tickets.