Skip to content

Commit f530ed7

Browse files
committed
Update patches
1 parent 509edcd commit f530ed7

2 files changed

Lines changed: 20 additions & 20 deletions

File tree

patches/8.6/cmake.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,10 @@ index 11111140679..0c2c671140f 100644
303303
* Other platforms may modify that configure check and add suitable #ifdefs
304304
* around the alternate code. */
305305
diff --git a/run-tests.php b/run-tests.php
306-
index c08d07cdd7c..685fe11e351 100755
306+
index f5c7be8b4f4..631edc1dfde 100755
307307
--- a/run-tests.php
308308
+++ b/run-tests.php
309-
@@ -857,10 +857,12 @@ function write_information(array $user_tests, $phpdbg): void
309+
@@ -858,10 +858,12 @@ function write_information(array $user_tests, $phpdbg): void
310310
<?php
311311
$exts = get_loaded_extensions();
312312
$ext_dir = ini_get('extension_dir');
@@ -323,7 +323,7 @@ index c08d07cdd7c..685fe11e351 100755
323323
}
324324
}
325325
}
326-
@@ -949,7 +951,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
326+
@@ -950,7 +952,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
327327

328328
$failed_tests_data .= "\n" . $sep . 'BUILD ENVIRONMENT' . $sep;
329329
$failed_tests_data .= "OS:\n" . PHP_OS . " - " . php_uname() . "\n\n";
@@ -332,7 +332,7 @@ index c08d07cdd7c..685fe11e351 100755
332332

333333
if (!IS_WINDOWS) {
334334
/* If PHP_AUTOCONF is set, use it; otherwise, use 'autoconf'. */
335-
@@ -960,7 +962,9 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
335+
@@ -961,7 +963,9 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
336336
}
337337

338338
/* Always use the generated libtool - Mac OSX uses 'glibtool' */
@@ -343,7 +343,7 @@ index c08d07cdd7c..685fe11e351 100755
343343

344344
/* Use shtool to find out if there is glibtool present (MacOSX) */
345345
$sys_libtool_path = shell_exec(__DIR__ . '/build/shtool path glibtool libtool');
346-
@@ -982,9 +986,17 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
346+
@@ -983,9 +987,17 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
347347
}
348348

349349
$ldd = shell_exec("ldd $php 2>/dev/null");

patches/8.6/swc.patch

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Subject: Enable linking with zlib for SWC files
44
See https://github.com/php/php-src/issues/20868
55
---
66
ext/standard/basic_functions.stub.php | 2 +-
7-
ext/standard/basic_functions_arginfo.h | Bin 176145 -> 176179 bytes
7+
ext/standard/basic_functions_arginfo.h | Bin 176343 -> 176377 bytes
88
ext/standard/basic_functions_decl.h | Bin 918 -> 918 bytes
99
ext/standard/config.m4 | 5 +++++
1010
ext/standard/config.w32 | 7 +++++++
@@ -16,7 +16,7 @@ See https://github.com/php/php-src/issues/20868
1616
10 files changed, 17 insertions(+), 13 deletions(-)
1717

1818
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
19-
index 7f7e0de0f65..77f46c862bd 100644
19+
index 7fc31e7d80c..4853bd20f13 100644
2020
--- a/ext/standard/basic_functions.stub.php
2121
+++ b/ext/standard/basic_functions.stub.php
2222
@@ -593,7 +593,7 @@ enum SortDirection {
@@ -29,17 +29,17 @@ index 7f7e0de0f65..77f46c862bd 100644
2929
* @var int
3030
* @cvalue IMAGE_FILETYPE_SWC
3131
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
32-
index a17efc6961d..50d531d9d12 100644
32+
index c5266c5a877..acf67914824 100644
3333
--- a/ext/standard/basic_functions_arginfo.h
3434
+++ b/ext/standard/basic_functions_arginfo.h
3535
@@ -1,5 +1,5 @@
3636
/* This is a generated file, edit basic_functions.stub.php instead.
37-
- * Stub hash: d997420d0668e5b6ac26c43a8f86cff64891aced
38-
+ * Stub hash: 33c87523b7fbd1a37d86a78a54210bf276a16ed1
37+
- * Stub hash: 3b1649a3abb3cfb5cb39d93f30a97765fe862d67
38+
+ * Stub hash: 2785478d906400fd3a2f793a3f11bbee3cfdb5c2
3939
* Has decl header: yes */
4040

4141
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
42-
@@ -3673,7 +3673,7 @@ static void register_basic_functions_symbols(int module_number)
42+
@@ -3677,7 +3677,7 @@ static void register_basic_functions_symbols(int module_number)
4343
REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_PERSISTENT);
4444
REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_PERSISTENT);
4545
REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_PERSISTENT);
@@ -49,27 +49,27 @@ index a17efc6961d..50d531d9d12 100644
4949
#endif
5050
REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_PERSISTENT);
5151
diff --git a/ext/standard/basic_functions_decl.h b/ext/standard/basic_functions_decl.h
52-
index 067959c8b5f..2d1930129a2 100644
52+
index 630a4b7e656..ec6bfd890c9 100644
5353
--- a/ext/standard/basic_functions_decl.h
5454
+++ b/ext/standard/basic_functions_decl.h
5555
@@ -1,8 +1,8 @@
5656
/* This is a generated file, edit basic_functions.stub.php instead.
57-
- * Stub hash: d997420d0668e5b6ac26c43a8f86cff64891aced */
58-
+ * Stub hash: 33c87523b7fbd1a37d86a78a54210bf276a16ed1 */
57+
- * Stub hash: 3b1649a3abb3cfb5cb39d93f30a97765fe862d67 */
58+
+ * Stub hash: 2785478d906400fd3a2f793a3f11bbee3cfdb5c2 */
5959

60-
-#ifndef ZEND_BASIC_FUNCTIONS_DECL_d997420d0668e5b6ac26c43a8f86cff64891aced_H
61-
-#define ZEND_BASIC_FUNCTIONS_DECL_d997420d0668e5b6ac26c43a8f86cff64891aced_H
62-
+#ifndef ZEND_BASIC_FUNCTIONS_DECL_33c87523b7fbd1a37d86a78a54210bf276a16ed1_H
63-
+#define ZEND_BASIC_FUNCTIONS_DECL_33c87523b7fbd1a37d86a78a54210bf276a16ed1_H
60+
-#ifndef ZEND_BASIC_FUNCTIONS_DECL_3b1649a3abb3cfb5cb39d93f30a97765fe862d67_H
61+
-#define ZEND_BASIC_FUNCTIONS_DECL_3b1649a3abb3cfb5cb39d93f30a97765fe862d67_H
62+
+#ifndef ZEND_BASIC_FUNCTIONS_DECL_2785478d906400fd3a2f793a3f11bbee3cfdb5c2_H
63+
+#define ZEND_BASIC_FUNCTIONS_DECL_2785478d906400fd3a2f793a3f11bbee3cfdb5c2_H
6464

6565
typedef enum zend_enum_SortDirection {
6666
ZEND_ENUM_SortDirection_Ascending = 1,
6767
@@ -20,4 +20,4 @@ typedef enum zend_enum_RoundingMode {
6868
ZEND_ENUM_RoundingMode_PositiveInfinity = 8,
6969
} zend_enum_RoundingMode;
7070

71-
-#endif /* ZEND_BASIC_FUNCTIONS_DECL_d997420d0668e5b6ac26c43a8f86cff64891aced_H */
72-
+#endif /* ZEND_BASIC_FUNCTIONS_DECL_33c87523b7fbd1a37d86a78a54210bf276a16ed1_H */
71+
-#endif /* ZEND_BASIC_FUNCTIONS_DECL_3b1649a3abb3cfb5cb39d93f30a97765fe862d67_H */
72+
+#endif /* ZEND_BASIC_FUNCTIONS_DECL_2785478d906400fd3a2f793a3f11bbee3cfdb5c2_H */
7373
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
7474
index 1d64c7ff696..6101dfed35a 100644
7575
--- a/ext/standard/config.m4

0 commit comments

Comments
 (0)