summaryrefslogtreecommitdiff
path: root/user/php7/libgd-unused-constants.patch
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2022-05-27 16:20:52 +0000
committerZach van Rijn <me@zv.io>2022-10-21 18:34:02 -0500
commit0198396fdd4296a886bb39e2b890e592be37f271 (patch)
treead27e05fbb52c5b148f86ce926ab54174ac9c362 /user/php7/libgd-unused-constants.patch
parent746769adba02cea5665624523811883df7b35100 (diff)
downloadpackages-0198396fdd4296a886bb39e2b890e592be37f271.tar.gz
packages-0198396fdd4296a886bb39e2b890e592be37f271.tar.bz2
packages-0198396fdd4296a886bb39e2b890e592be37f271.tar.xz
packages-0198396fdd4296a886bb39e2b890e592be37f271.zip
user/php7: bump { 7.4.4 --> 7.4.30 }. disable tests. fixes #266, #267, #617.
* Drop getsockopt.patch [1] * Parts of no-max-ent-size.patch are obsoleted by [2] * Drop zip-glob-pathc.patch [3] * Fix build with libgd-2.3.3 * Update secfixes [1] https://github.com/php/php-src/commit/f1bf058d7cbb7eaa62c1850c0d931a2c2ee127db [2] https://github.com/php/php-src/commit/6aff9a50cae40582d2571e7aa6f336d5c6a99547 [3] https://github.com/php/php-src/commit/04920645f14ea117d5248ef3a0e03c6784c2fb49 Failing tests: ext/curl/tests/curl_basic_007.phpt ext/gd/tests/bug38212-mb.phpt ext/gd/tests/bug38212.phpt ext/gd/tests/bug41442.phpt ext/gd/tests/bug71912-mb.phpt ext/gd/tests/bug71912.phpt ext/gd/tests/bug72339.phpt ext/gd/tests/bug73155.phpt ext/gd/tests/bug73157.phpt ext/gd/tests/bug73159.phpt ext/gd/tests/bug73161.phpt ext/gd/tests/bug73868.phpt ext/gd/tests/bug79676.phpt ext/gd/tests/crafted_gd2.phpt ext/gd/tests/createfromgd2.phpt ext/gd/tests/gif2gd.phpt ext/gd/tests/imagegd_truecolor.phpt ext/gd/tests/imagescale_preserve_ratio.phpt ext/gd/tests/jpg2gd-mb.phpt ext/gd/tests/jpg2gd.phpt ext/gd/tests/png2gd.phpt ext/gettext/tests/gettext_basic-enus.phpt ext/gettext/tests/gettext_bindtextdomain-cwd.phpt ext/gettext/tests/gettext_dcgettext.phpt ext/gettext/tests/gettext_dgettext.phpt ext/gettext/tests/gettext_dngettext-plural.phpt ext/gettext/tests/gettext_ngettext.phpt ext/pcntl/tests/pcntl_unshare_01.phpt ext/pcre/tests/ctype_back_to_c.phpt ext/standard/tests/strings/bug79986.phpt
Diffstat (limited to 'user/php7/libgd-unused-constants.patch')
-rw-r--r--user/php7/libgd-unused-constants.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/user/php7/libgd-unused-constants.patch b/user/php7/libgd-unused-constants.patch
new file mode 100644
index 000000000..2b5ef2f83
--- /dev/null
+++ b/user/php7/libgd-unused-constants.patch
@@ -0,0 +1,51 @@
+Backport of https://github.com/php/php-src/commit/b3646440b1808abf0874b6f89027ce53ec5da03f
+
+Affects libgd <= 2.3.3
+
+See also https://github.com/libgd/libgd/commit/f4bc1f5c26925548662946ed7cfa473c190a104a
+
+--- php-7.4.29/ext/gd/gd.c 2022-04-12 10:55:40.000000000 +0000
++++ php-7.4.29/ext/gd/gd.c 2022-05-27 16:40:42.048499508 +0000
+@@ -90,6 +90,10 @@ static int le_gd, le_gd_font;
+ #ifndef M_PI
+ #define M_PI 3.14159265358979323846
+ #endif
++/* don't used libgd constants, not used, so going to be removed */
++#define PHP_GD_FLIP_HORIZONTAL 1
++#define PHP_GD_FLIP_VERTICAL 2
++#define PHP_GD_FLIP_BOTH 3
+
+ #ifdef HAVE_GD_FREETYPE
+ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int, int);
+@@ -1137,9 +1141,9 @@ PHP_MINIT_FUNCTION(gd)
+ /* GD2 image format types */
+ REGISTER_LONG_CONSTANT("IMG_GD2_RAW", GD2_FMT_RAW, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT);
+- REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORINZONTAL, CONST_CS | CONST_PERSISTENT);
+- REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
+- REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
++ REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", PHP_GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT);
++ REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", PHP_GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
++ REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", PHP_GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT);
+@@ -4696,15 +4700,15 @@ PHP_FUNCTION(imageflip)
+ }
+
+ switch (mode) {
+- case GD_FLIP_VERTICAL:
++ case PHP_GD_FLIP_VERTICAL:
+ gdImageFlipVertical(im);
+ break;
+
+- case GD_FLIP_HORINZONTAL:
++ case PHP_GD_FLIP_HORIZONTAL:
+ gdImageFlipHorizontal(im);
+ break;
+
+- case GD_FLIP_BOTH:
++ case PHP_GD_FLIP_BOTH:
+ gdImageFlipBoth(im);
+ break;
+