pool/php8
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added patches

Browse Source 
fix b3646440b1
  + php8-gd-removed-unused-constants.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:php/php8?expand=0&rev=31
This commit is contained in:
Petr Gajdos
2021-09-23 11:50:34 +00:00
committed by Git OBS Bridge
parent 8d0fb39ed7
commit bd7d00ea78
3 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
php8-gd-removed-unused-constants.patch Normal file
View File

@@ -0,0 +1,47 @@
Index: php-8.0.10/ext/gd/gd.c
===================================================================
--- php-8.0.10.orig/ext/gd/gd.c 2021-08-24 17:40:40.000000000 +0200
+++ php-8.0.10/ext/gd/gd.c 2021-09-23 13:43:51.490658267 +0200
@@ -95,6 +95,10 @@ static int le_gd_font;
#define GD_FLIP_HORIZONTAL GD_FLIP_HORINZONTAL
#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);
#endif
@@ -350,9 +354,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_HORIZONTAL, 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);
@@ -3526,15 +3530,15 @@ PHP_FUNCTION(imageflip)
im = php_gd_libgdimageptr_from_zval_p(IM);
switch (mode) {
- case GD_FLIP_VERTICAL:
+ case PHP_GD_FLIP_VERTICAL:
gdImageFlipVertical(im);
break;
- case GD_FLIP_HORIZONTAL:
+ case PHP_GD_FLIP_HORIZONTAL:
gdImageFlipHorizontal(im);
break;
- case GD_FLIP_BOTH:
+ case PHP_GD_FLIP_BOTH:
gdImageFlipBoth(im);
break;

7
php8.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 23 11:49:08 UTC 2021 - pgajdos@suse.com
- added patches
fix https://github.com/php/php-src/commit/b3646440b1808abf0874b6f89027ce53ec5da03f
+ php8-gd-removed-unused-constants.patch
-------------------------------------------------------------------
Thu Aug 26 11:51:51 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>

4
php8.spec
View File

@@ -1,5 +1,5 @@
#
# spec file for package php8
# spec file
#
# Copyright (c) 2021 SUSE LLC
#
@@ -94,6 +94,8 @@ Patch20: php-crypt-tests.patch
Patch22: 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
Patch23: php8-gd-removed-unused-constants.patch
BuildRequires: apache-rpm-macros
BuildRequires: autoconf
BuildRequires: bison