[php84] xxhash in php81, php82, php83

[Bjarne D Mathiesen]

So, we discovered an error in xxhash for php @8.1.31, @8.2.27, @8.3.16
I'm attempting to backport the php @8.4.3 changes to these.

    if {[vercmp ${branch} >= 8.1] && [vercmp ${branch} <= 8.3]} {
        patchfiles-append \
                        patch-${php}-ext-hash-php_hash_xxhash.h.diff \
                        patch-${php}-ext-hash-config.m4.diff \
                        patch-${php}-ext-hash-config.w32.diff
    }

however, when I do :
	port clean --work php83
        port extract php83
        port -d patch php83
I get:
--->  Applying patch-php83-ext-hash-config.w32.diff
DEBUG: Environment:
CC_PRINT_OPTIONS='YES'
CC_PRINT_OPTIONS_FILE='/opt/local/var/macports/build/_Volumes_Bjarne4TB_Users_Bjarne_BDMdata_GitMacintosh_MacPorts_macports-ports_lang_php/php83/work/.CC_PRINT_OPTIONS'
CPATH='/opt/local/include'
DEVELOPER_DIR='/Library/Developer/CommandLineTools'
LIBRARY_PATH='/opt/local/lib'
MACOSX_DEPLOYMENT_TARGET='14.0'
SDKROOT='/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk'
SOURCE_DATE_EPOCH='1738944856'
Executing:  cd
"/opt/local/var/macports/build/_Volumes_Bjarne4TB_Users_Bjarne_BDMdata_GitMacintosh_MacPorts_macports-ports_lang_php/php83/work/php-8.3.16"
&& /usr/bin/patch -t -N -p1 <
'/Volumes/Bjarne4TB/Users/Bjarne/BDMdata/GitMacintosh/MacPorts/macports-ports/lang/php/files/patch-php83-ext-hash-config.w32.diff'
DEBUG: system:  cd
"/opt/local/var/macports/build/_Volumes_Bjarne4TB_Users_Bjarne_BDMdata_GitMacintosh_MacPorts_macports-ports_lang_php/php83/work/php-8.3.16"
&& /usr/bin/patch -t -N -p1 <
'/Volumes/Bjarne4TB/Users/Bjarne/BDMdata/GitMacintosh/MacPorts/macports-ports/lang/php/files/patch-php83-ext-hash-config.w32.diff'
patching file 'ext/hash/config.w32'
patch: **** malformed patch at line 18: -									'php_hash_murmur.h
php_hash_xxhash.h');
Command failed:  cd
"/opt/local/var/macports/build/_Volumes_Bjarne4TB_Users_Bjarne_BDMdata_GitMacintosh_MacPorts_macports-ports_lang_php/php83/work/php-8.3.16"
&& /usr/bin/patch -t -N -p1 <
'/Volumes/Bjarne4TB/Users/Bjarne/BDMdata/GitMacintosh/MacPorts/macports-ports/lang/php/files/patch-php83-ext-hash-config.w32.diff'
Exit code: 2
Error: Failed to patch php83: command execution failed

The patch in question is :
--- a/ext/hash/config.w32
+++ b/ext/hash/config.w32
@@ -34,13 +34,9 @@
 }
 ADD_SOURCES(hash_murmur_dir, 'PMurHash.c PMurHash128.c', 'hash');

-var hash_xxhash_dir = 'ext/hash/xxhash';
-if (!CHECK_HEADER_ADD_INCLUDE('xxhash.h', 'CFLAGS_HASH',
hash_xxhash_dir)) {
-	ERROR('Unable to locate xxhash headers');
-}
-
-PHP_INSTALL_HEADERS('ext/hash/',	'php_hash.h php_hash_md.h
php_hash_sha.h ' +
+PHP_INSTALL_HEADERS('ext/hash',	'php_hash.h php_hash_md.h
php_hash_sha.h ' +

 									'php_hash_ripemd.h php_hash_haval.h php_hash_tiger.h ' +
 									'php_hash_gost.h php_hash_snefru.h php_hash_whirlpool.h ' +
 									'php_hash_adler32.h php_hash_crc32.h php_hash_sha3.h ' +
-									'php_hash_murmur.h php_hash_xxhash.h');
+									'php_hash_murmur.h php_hash_xxhash.h php_hash_fnv.h ' +
+									'php_hash_joaat.h xxhash/xxhash.h');
(source file at
https://github.com/BjarneDMat/macports-ports/blob/php84/lang/php/files/patch-php83-ext-hash-config.w32.diff
)

Can anyone tell me what's wrong w/ that diff - please ...

-- 
Bjarne D Mathiesen
Slagelse ; Danmark ; Europa
-----------------------------------------------------------------------
denne besked er skrevet i et totalt M$-frit miljø
MacPro 2010 ; OpenCore + macOS 14.7.2 Sonoma
2 x 3,46 GHz 6-Core Intel Xeon ; 192 GB 1333 MHz DDR3 ECC RDIMM
ATI Radeon RX 590 8 GB