Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2021-09-20 23:31:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7" Mon Sep 20 23:31:54 2021 rev:102 rq:919076 version:7.4.23 Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2021-09-03 21:25:37.546142581 +0200 +++ /work/SRC/openSUSE:Factory/.php7.new.1899/php7.changes 2021-09-20 23:32:07.427097274 +0200 @@ -1,0 +2,7 @@ +Wed Sep 15 07:36:53 UTC 2021 - pgaj...@suse.com + +- added patches + https://github.com/php/php-src/commit/b3646440b1808abf0874b6f89027ce53ec5da03f + + php7-gd-removed-unused-constants.patch + +------------------------------------------------------------------- New: ---- php7-gd-removed-unused-constants.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ --- /var/tmp/diff_new_pack.ycWzbA/_old 2021-09-20 23:32:08.231098267 +0200 +++ /var/tmp/diff_new_pack.ycWzbA/_new 2021-09-20 23:32:08.235098272 +0200 @@ -1,5 +1,5 @@ # -# spec file for package php7 +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -100,6 +100,8 @@ Patch17: php-date-regenerate-lexers.patch # PATCH-FEATURE-UPSTREAM https://github.com/php/php-src/pull/6564 Patch19: php-build-reproducible-phar.patch +# https://github.com/php/php-src/commit/b3646440b1808abf0874b6f89027ce53ec5da03f +Patch20: php7-gd-removed-unused-constants.patch BuildRequires: apache-rpm-macros BuildRequires: autoconf BuildRequires: bison @@ -960,6 +962,7 @@ %patch12 -p1 %patch17 -p1 %patch19 -p1 +%patch20 -p1 # use system pcre2 rm -r ext/pcre/pcre2lib ++++++ php7-gd-removed-unused-constants.patch ++++++ Index: php-7.4.23/ext/gd/gd.c =================================================================== --- php-7.4.23.orig/ext/gd/gd.c 2021-09-15 09:21:15.503241059 +0200 +++ php-7.4.23/ext/gd/gd.c 2021-09-15 09:29:04.434022076 +0200 @@ -91,6 +91,10 @@ static int le_gd, le_gd_font; #define M_PI 3.14159265358979323846 #endif +#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); #endif @@ -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;
