forked from FreeBSD/ports
Browse Source
- EOL reached on 2021-12-06 https://www.php.net/eol.php PR: 260624 Approved by: tz (private email) ale portmgr (blanket) Sponsored by: Bounce Expertsmain
Muhammad Moinur Rahman
7 months ago
127 changed files with 72 additions and 3167 deletions
@ -1,9 +0,0 @@
|
||||
CATEGORIES= archivers
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -bz2
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= archivers
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -phar
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,41 +0,0 @@
|
||||
--- config.m4.orig 2016-06-21 19:56:50 UTC |
||||
+++ config.m4 |
||||
@@ -4,8 +4,38 @@ dnl config.m4 for extension phar |
||||
PHP_ARG_ENABLE(phar, for phar archive support, |
||||
[ --disable-phar Disable phar support], yes) |
||||
|
||||
+PHP_ARG_WITH(pcre-dir, pcre install prefix, |
||||
+[ --with-pcre-dir PHAR: pcre install prefix], no, no) |
||||
+ |
||||
+ |
||||
if test "$PHP_PHAR" != "no"; then |
||||
+ |
||||
+ dnl This is PECL build, check if bundled PCRE library is used |
||||
+ old_CPPFLAGS=$CPPFLAGS |
||||
+ CPPFLAGS=$INCLUDES |
||||
+ AC_EGREP_CPP(yes,[ |
||||
+#include <main/php_config.h> |
||||
+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) |
||||
+yes |
||||
+#endif |
||||
+ ],[ |
||||
+ PHP_PCRE_REGEX=yes |
||||
+ ],[ |
||||
+ AC_EGREP_CPP(yes,[ |
||||
+#include <main/php_config.h> |
||||
+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) |
||||
+yes |
||||
+#endif |
||||
+ ],[ |
||||
+ PHP_PCRE_REGEX=pecl |
||||
+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) |
||||
+ ],[ |
||||
+ PHP_PCRE_REGEX=no |
||||
+ ]) |
||||
+ ]) |
||||
+ |
||||
PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) |
||||
+ PHP_HASH=yes |
||||
AC_MSG_CHECKING([for phar openssl support]) |
||||
if test "$PHP_HASH_SHARED" != "yes"; then |
||||
if test "$PHP_HASH" != "no"; then |
||||
@ -1,11 +0,0 @@
|
||||
--- phar.c.orig 2016-06-21 19:56:49 UTC |
||||
+++ phar.c |
||||
@@ -3589,7 +3589,7 @@ static const zend_module_dep phar_deps[] |
||||
ZEND_MOD_OPTIONAL("openssl") |
||||
ZEND_MOD_OPTIONAL("zlib") |
||||
ZEND_MOD_OPTIONAL("standard") |
||||
-#if defined(HAVE_HASH) && !defined(COMPILE_DL_HASH) |
||||
+#if defined(HAVE_HASH) |
||||
ZEND_MOD_REQUIRED("hash") |
||||
#endif |
||||
#if HAVE_SPL |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= archivers
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -zip
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= archivers
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -zlib
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,10 +0,0 @@
|
||||
--- zlib.c.orig 2016-06-21 19:57:08 UTC |
||||
+++ zlib.c |
||||
@@ -1480,6 +1480,7 @@ static PHP_MSHUTDOWN_FUNCTION(zlib) |
||||
/* {{{ PHP_RINIT_FUNCTION */ |
||||
static PHP_RINIT_FUNCTION(zlib) |
||||
{ |
||||
+ ZLIBG(output_compression) = 0; |
||||
ZLIBG(compression_coding) = 0; |
||||
if (!ZLIBG(handler_registered)) { |
||||
ZLIBG(output_compression) = ZLIBG(output_compression_default); |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= converters
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -iconv
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= converters
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -mbstring
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,51 +0,0 @@
|
||||
--- config.m4.orig 2018-09-25 09:08:02 UTC |
||||
+++ config.m4 |
||||
@@ -41,6 +41,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ |
||||
PHP_ADD_INCLUDE([$ext_builddir/$dir]) |
||||
done |
||||
|
||||
+ dnl This is PECL build, check if bundled PCRE library is used |
||||
+ old_CPPFLAGS=$CPPFLAGS |
||||
+ CPPFLAGS=$INCLUDES |
||||
+ AC_EGREP_CPP(yes,[ |
||||
+#include <main/php_config.h> |
||||
+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) |
||||
+yes |
||||
+#endif |
||||
+ ],[ |
||||
+ PHP_PCRE_REGEX=yes |
||||
+ ],[ |
||||
+ AC_EGREP_CPP(yes,[ |
||||
+#include <main/php_config.h> |
||||
+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) |
||||
+yes |
||||
+#endif |
||||
+ ],[ |
||||
+ PHP_PCRE_REGEX=pecl |
||||
+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) |
||||
+ ],[ |
||||
+ PHP_PCRE_REGEX=no |
||||
+ ]) |
||||
+ ]) |
||||
+ |
||||
if test "$ext_shared" = "no"; then |
||||
PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES) |
||||
out="php_config.h" |
||||
@@ -83,7 +107,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ |
||||
int foo(int x, ...) { |
||||
va_list va; |
||||
va_start(va, x); |
||||
- va_arg(va, int); |
||||
va_arg(va, char *); |
||||
va_arg(va, double); |
||||
return 0; |
||||
@@ -334,6 +357,9 @@ PHP_ARG_WITH(onig, [for external oniguru |
||||
[ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. |
||||
If DIR is not set, the bundled oniguruma will be used], no, no) |
||||
|
||||
+PHP_ARG_WITH(pcre-dir, pcre install prefix, |
||||
+[ --with-pcre-dir MBSTRING: pcre install prefix], no, no) |
||||
+ |
||||
if test "$PHP_MBSTRING" != "no"; then |
||||
AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) |
||||
|
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= converters
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -recode
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -dba
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,50 +0,0 @@
|
||||
--- config.m4.orig 2016-01-06 15:14:47 UTC |
||||
+++ config.m4 |
||||
@@ -324,6 +324,38 @@ if test "$PHP_DB4" != "no"; then |
||||
THIS_PREFIX=$i |
||||
THIS_INCLUDE=$i/include/db5.3/db.h |
||||
break |
||||
+ elif test -f "$i/include/db5/db.h"; then |
||||
+ THIS_PREFIX=$i |
||||
+ THIS_INCLUDE=$i/include/db5/db.h |
||||
+ break |
||||
+ elif test -f "$i/include/db48/db.h"; then |
||||
+ THIS_PREFIX=$i |
||||
+ THIS_INCLUDE=$i/include/db48/db.h |
||||
+ break |
||||
+ elif test -f "$i/include/db47/db.h"; then |
||||
+ THIS_PREFIX=$i |
||||
+ THIS_INCLUDE=$i/include/db47/db.h |
||||
+ break |
||||
+ elif test -f "$i/include/db46/db.h"; then |
||||
+ THIS_PREFIX=$i |
||||
+ THIS_INCLUDE=$i/include/db46/db.h |
||||
+ break |
||||
+ elif test -f "$i/include/db44/db.h"; then |
||||
+ THIS_PREFIX=$i |
||||
+ THIS_INCLUDE=$i/include/db44/db.h |
||||
+ break |
||||
+ elif test -f "$i/include/db43/db.h"; then |
||||
+ THIS_PREFIX=$i |
||||
+ THIS_INCLUDE=$i/include/db43/db.h |
||||
+ break |
||||
+ elif test -f "$i/include/db42/db.h"; then |
||||
+ THIS_PREFIX=$i |
||||
+ THIS_INCLUDE=$i/include/db42/db.h |
||||
+ break |
||||
+ elif test -f "$i/include/db41/db.h"; then |
||||
+ THIS_PREFIX=$i |
||||
+ THIS_INCLUDE=$i/include/db41/db.h |
||||
+ break |
||||
elif test -f "$i/include/db5.1/db.h"; then |
||||
THIS_PREFIX=$i |
||||
THIS_INCLUDE=$i/include/db5.1/db.h |
||||
@@ -366,7 +398,7 @@ if test "$PHP_DB4" != "no"; then |
||||
break |
||||
fi |
||||
done |
||||
- PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) |
||||
+ PHP_DBA_DB_CHECK(4, db-5 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) |
||||
fi |
||||
PHP_DBA_STD_RESULT(db4,Berkeley DB4) |
||||
|
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -interbase
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -mysqli
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,13 +0,0 @@
|
||||
--- mysqli_api.c.orig 2019-12-17 10:29:23 UTC |
||||
+++ mysqli_api.c |
||||
@@ -31,8 +31,9 @@ |
||||
#include "zend_smart_str.h" |
||||
#include "php_mysqli_structs.h" |
||||
#include "mysqli_priv.h" |
||||
+#if defined(MYSQLI_USE_MYSQLND) |
||||
#include "ext/mysqlnd/mysql_float_to_double.h" |
||||
- |
||||
+#endif |
||||
|
||||
#if !defined(MYSQLI_USE_MYSQLND) |
||||
/* {{{ mysqli_tx_cor_options_to_string */ |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -odbc
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,111 +0,0 @@
|
||||
--- config.m4.orig 2018-09-25 09:07:57 UTC |
||||
+++ config.m4 |
||||
@@ -97,6 +97,9 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS |
||||
dnl |
||||
dnl configure options |
||||
dnl |
||||
+PHP_ARG_ENABLE(odbc,, |
||||
+[ --enable-odbc Enable ODBC support with selected driver]) |
||||
+ |
||||
|
||||
PHP_ARG_WITH(odbcver,, |
||||
[ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0350. |
||||
@@ -104,7 +107,7 @@ PHP_ARG_WITH(odbcver,, |
||||
|
||||
if test -z "$ODBC_TYPE"; then |
||||
PHP_ARG_WITH(adabas,, |
||||
-[ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) |
||||
+[ --with-adabas[=DIR] Include Adabas D support [/usr/local]], no, no) |
||||
|
||||
AC_MSG_CHECKING([for Adabas support]) |
||||
if test "$PHP_ADABAS" != "no"; then |
||||
@@ -133,7 +136,7 @@ fi |
||||
|
||||
if test -z "$ODBC_TYPE"; then |
||||
PHP_ARG_WITH(sapdb,, |
||||
-[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]]) |
||||
+[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], no, no) |
||||
|
||||
AC_MSG_CHECKING([for SAP DB support]) |
||||
if test "$PHP_SAPDB" != "no"; then |
||||
@@ -153,7 +156,7 @@ fi |
||||
|
||||
if test -z "$ODBC_TYPE"; then |
||||
PHP_ARG_WITH(solid,, |
||||
-[ --with-solid[=DIR] Include Solid support [/usr/local/solid]]) |
||||
+[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], no, no) |
||||
|
||||
AC_MSG_CHECKING(for Solid support) |
||||
if test "$PHP_SOLID" != "no"; then |
||||
@@ -180,7 +183,7 @@ fi |
||||
|
||||
if test -z "$ODBC_TYPE"; then |
||||
PHP_ARG_WITH(ibm-db2,, |
||||
-[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]]) |
||||
+[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], no, no) |
||||
|
||||
AC_MSG_CHECKING(for IBM DB2 support) |
||||
if test "$PHP_IBM_DB2" != "no"; then |
||||
@@ -220,7 +223,7 @@ fi |
||||
if test -z "$ODBC_TYPE"; then |
||||
PHP_ARG_WITH(empress,, |
||||
[ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] |
||||
- (Empress Version >= 8.60 required)]) |
||||
+ (Empress Version >= 8.60 required)], no, no) |
||||
|
||||
AC_MSG_CHECKING(for Empress support) |
||||
if test "$PHP_EMPRESS" != "no"; then |
||||
@@ -245,7 +248,7 @@ fi |
||||
if test -z "$ODBC_TYPE"; then |
||||
PHP_ARG_WITH(empress-bcs,, |
||||
[ --with-empress-bcs[=DIR] Include Empress Local Access support [\$EMPRESSPATH] |
||||
- (Empress Version >= 8.60 required)]) |
||||
+ (Empress Version >= 8.60 required)], no, no) |
||||
|
||||
AC_MSG_CHECKING(for Empress local access support) |
||||
if test "$PHP_EMPRESS_BCS" != "no"; then |
||||
@@ -292,7 +295,7 @@ PHP_ARG_WITH(custom-odbc,, |
||||
running this configure script: |
||||
CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" |
||||
LDFLAGS=-lunix |
||||
- CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"]) |
||||
+ CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no) |
||||
|
||||
AC_MSG_CHECKING(for a custom ODBC support) |
||||
if test "$PHP_CUSTOM_ODBC" != "no"; then |
||||
@@ -314,7 +317,7 @@ fi |
||||
|
||||
if test -z "$ODBC_TYPE"; then |
||||
PHP_ARG_WITH(iodbc,, |
||||
-[ --with-iodbc[=DIR] Include iODBC support [/usr/local]]) |
||||
+[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], no, no) |
||||
|
||||
AC_MSG_CHECKING(for iODBC support) |
||||
if test "$PHP_IODBC" != "no"; then |
||||
@@ -352,7 +355,7 @@ fi |
||||
|
||||
if test -z "$ODBC_TYPE"; then |
||||
PHP_ARG_WITH(esoob,, |
||||
-[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]]) |
||||
+[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no) |
||||
|
||||
AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) |
||||
if test "$PHP_ESOOB" != "no"; then |
||||
@@ -374,7 +377,7 @@ fi |
||||
|
||||
if test -z "$ODBC_TYPE"; then |
||||
PHP_ARG_WITH(unixODBC,, |
||||
-[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]]) |
||||
+[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], no, no) |
||||
|
||||
AC_MSG_CHECKING(for unixODBC support) |
||||
if test "$PHP_UNIXODBC" != "no"; then |
||||
@@ -397,7 +400,7 @@ fi |
||||
|
||||
if test -z "$ODBC_TYPE"; then |
||||
PHP_ARG_WITH(dbmaker,, |
||||
-[ --with-dbmaker[=DIR] Include DBMaker support]) |
||||
+[ --with-dbmaker[=DIR] Include DBMaker support], no, no) |
||||
|
||||
AC_MSG_CHECKING(for DBMaker support) |
||||
if test "$PHP_DBMAKER" != "no"; then |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -pdo
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -pdo_dblib
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -pdo_firebird
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -pdo_mysql
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -pdo_odbc
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -pdo_pgsql
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -pdo_sqlite
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -pgsql
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= databases
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -sqlite3
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= devel
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -gettext
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,14 +0,0 @@
|
||||
CATEGORIES= devel
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -intl
|
||||
|
||||
USES= compiler:c++11-lib
|
||||
USE_CXXSTD= gnu++11
|
||||
|
||||
CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,213 +0,0 @@
|
||||
Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 |
||||
|
||||
ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE' |
||||
this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); |
||||
^ |
||||
ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE' |
||||
this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); |
||||
^ |
||||
ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE' |
||||
return FALSE; |
||||
^ |
||||
ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE' |
||||
return FALSE; |
||||
^ |
||||
ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE' |
||||
return TRUE; |
||||
^ |
||||
ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE' |
||||
return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); |
||||
^ |
||||
ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE' |
||||
return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); |
||||
^ |
||||
ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE' |
||||
this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); |
||||
^ |
||||
ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE' |
||||
this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); |
||||
^ |
||||
ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE' |
||||
this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); |
||||
^ |
||||
ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE' |
||||
this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); |
||||
^ |
||||
ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE' |
||||
collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); |
||||
^ |
||||
ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE' |
||||
collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); |
||||
^ |
||||
ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE' |
||||
zend_bool is_pattern_localized =FALSE; |
||||
^ |
||||
ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE' |
||||
zend_bool is_pattern_localized =FALSE; |
||||
^ |
||||
ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE' |
||||
zend_bool isLenient = FALSE; |
||||
^ |
||||
ext/intl/normalizer/normalizer_normalize.c:95:10: error: use of undeclared identifier 'FALSE' |
||||
return FALSE; |
||||
^ |
||||
ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE' |
||||
UBool uret = FALSE; |
||||
^ |
||||
ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE' |
||||
tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); |
||||
^ |
||||
ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE' |
||||
tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, |
||||
^ |
||||
|
||||
--- breakiterator/codepointiterator_internal.cpp.orig 2020-09-29 08:33:05 UTC |
||||
+++ breakiterator/codepointiterator_internal.cpp |
||||
@@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat |
||||
return *this; |
||||
} |
||||
|
||||
- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); |
||||
+ this->fText = utext_clone(this->fText, that.fText, false, true, &uec); |
||||
|
||||
//don't bother copying the character iterator, getText() is deprecated |
||||
clearCurrentCharIter(); |
||||
@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakIterator() |
||||
UBool CodePointBreakIterator::operator==(const BreakIterator& that) const |
||||
{ |
||||
if (typeid(*this) != typeid(that)) { |
||||
- return FALSE; |
||||
+ return false; |
||||
} |
||||
|
||||
const CodePointBreakIterator& that2 = |
||||
static_cast<const CodePointBreakIterator&>(that); |
||||
|
||||
if (!utext_equals(this->fText, that2.fText)) { |
||||
- return FALSE; |
||||
+ return false; |
||||
} |
||||
|
||||
- return TRUE; |
||||
+ return true; |
||||
} |
||||
|
||||
CodePointBreakIterator* CodePointBreakIterator::clone(void) const |
||||
@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi |
||||
|
||||
UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const |
||||
{ |
||||
- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); |
||||
+ return utext_clone(fillIn, this->fText, false, true, &status); |
||||
} |
||||
|
||||
void CodePointBreakIterator::setText(const UnicodeString &text) |
||||
@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UText *text, UErr |
||||
return; |
||||
} |
||||
|
||||
- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); |
||||
+ this->fText = utext_clone(this->fText, text, false, true, &status); |
||||
|
||||
clearCurrentCharIter(); |
||||
} |
||||
@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres |
||||
} |
||||
|
||||
int64_t pos = utext_getNativeIndex(this->fText); |
||||
- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); |
||||
+ this->fText = utext_clone(this->fText, input, false, true, &status); |
||||
if (U_FAILURE(status)) { |
||||
return *this; |
||||
} |
||||
--- collator/collator_sort.c.orig 2020-09-29 08:33:05 UTC |
||||
+++ collator/collator_sort.c |
||||
@@ -346,7 +346,7 @@ static void collator_sort_internal( int renumber, INTE |
||||
*/ |
||||
PHP_FUNCTION( collator_sort ) |
||||
{ |
||||
- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); |
||||
+ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU ); |
||||
} |
||||
/* }}} */ |
||||
|
||||
@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys ) |
||||
*/ |
||||
PHP_FUNCTION( collator_asort ) |
||||
{ |
||||
- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); |
||||
+ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU ); |
||||
} |
||||
/* }}} */ |
||||
|
||||
--- dateformat/dateformat_attr.c.orig 2020-09-29 08:33:05 UTC |
||||
+++ dateformat/dateformat_attr.c |
||||
@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern ) |
||||
UChar value_buf[64]; |
||||
uint32_t length = USIZE( value_buf ); |
||||
UChar* value = value_buf; |
||||
- zend_bool is_pattern_localized =FALSE; |
||||
+ zend_bool is_pattern_localized = false; |
||||
|
||||
DATE_FORMAT_METHOD_INIT_VARS; |
||||
|
||||
@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern ) |
||||
size_t value_len = 0; |
||||
int32_t slength = 0; |
||||
UChar* svalue = NULL; |
||||
- zend_bool is_pattern_localized =FALSE; |
||||
+ zend_bool is_pattern_localized = false; |
||||
|
||||
|
||||
DATE_FORMAT_METHOD_INIT_VARS; |
||||
@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient ) |
||||
*/ |
||||
PHP_FUNCTION( datefmt_set_lenient ) |
||||
{ |
||||
- zend_bool isLenient = FALSE; |
||||
+ zend_bool isLenient = false; |
||||
|
||||
DATE_FORMAT_METHOD_INIT_VARS; |
||||
|
||||
--- normalizer/normalizer_normalize.c.orig 2020-09-29 08:33:05 UTC |
||||
+++ normalizer/normalizer_normalize.c |
||||
@@ -92,7 +92,7 @@ static UBool intl_is_normalized(zend_long form, const |
||||
const UNormalizer2 *norm = intl_get_normalizer(form, err); |
||||
|
||||
if(U_FAILURE(*err)) { |
||||
- return FALSE; |
||||
+ return false; |
||||
} |
||||
|
||||
return unorm2_isNormalized(norm, uinput, uinput_len, err); |
||||
@@ -263,7 +263,7 @@ PHP_FUNCTION( normalizer_is_normalized ) |
||||
int uinput_len = 0; |
||||
UErrorCode status = U_ZERO_ERROR; |
||||
|
||||
- UBool uret = FALSE; |
||||
+ UBool uret = false; |
||||
|
||||
intl_error_reset( NULL ); |
||||
|
||||
--- timezone/timezone_class.cpp.orig 2020-09-29 08:33:05 UTC |
||||
+++ timezone/timezone_class.cpp |
||||
@@ -322,7 +322,7 @@ static HashTable *TimeZone_get_debug_info(zval *object |
||||
|
||||
int32_t rawOffset, dstOffset; |
||||
UDate now = Calendar::getNow(); |
||||
- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); |
||||
+ tz->getOffset(now, false, rawOffset, dstOffset, uec); |
||||
if (U_FAILURE(uec)) { |
||||
return debug_info; |
||||
} |
||||
--- timezone/timezone_methods.cpp.orig 2020-09-29 08:33:05 UTC |
||||
+++ timezone/timezone_methods.cpp |
||||
@@ -95,7 +95,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone) |
||||
RETURN_NULL(); |
||||
} |
||||
|
||||
- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, |
||||
+ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL, |
||||
"intltz_from_date_time_zone"); |
||||
if (tz == NULL) { |
||||
RETURN_NULL(); |
||||
@ -1,38 +0,0 @@
|
||||
Regressed by https://github.com/unicode-org/icu/commit/633438f8da99 |
||||
|
||||
In file included from breakiterator/breakiterator_class.cpp:23: |
||||
breakiterator/codepointiterator_internal.h:42:17: error: virtual function 'operator==' has a different return type ('UBool' (aka 'signed char')) than the function it overrides (which has return type 'bool') |
||||
virtual UBool operator==(const BreakIterator& that) const; |
||||
~~~~~ ^ |
||||
/usr/local/include/unicode/brkiter.h:127:18: note: overridden virtual function is here |
||||
virtual bool operator==(const BreakIterator&) const = 0; |
||||
~~~~ ^ |
||||
|
||||
--- breakiterator/codepointiterator_internal.cpp.orig 2021-09-21 10:24:05 UTC |
||||
+++ breakiterator/codepointiterator_internal.cpp |
||||
@@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator() |
||||
clearCurrentCharIter(); |
||||
} |
||||
|
||||
+#if U_ICU_VERSION_MAJOR_NUM < 70 |
||||
UBool CodePointBreakIterator::operator==(const BreakIterator& that) const |
||||
+#else |
||||
+bool CodePointBreakIterator::operator==(const BreakIterator& that) const |
||||
+#endif |
||||
{ |
||||
if (typeid(*this) != typeid(that)) { |
||||
return FALSE; |
||||
--- breakiterator/codepointiterator_internal.h.orig 2021-09-21 10:24:05 UTC |
||||
+++ breakiterator/codepointiterator_internal.h |
||||
@@ -39,7 +39,11 @@ namespace PHP { |
||||
|
||||
virtual ~CodePointBreakIterator(); |
||||
|
||||
+#if U_ICU_VERSION_MAJOR_NUM < 70 |
||||
virtual UBool operator==(const BreakIterator& that) const; |
||||
+#else |
||||
+ virtual bool operator==(const BreakIterator& that) const; |
||||
+#endif |
||||
|
||||
virtual CodePointBreakIterator* clone(void) const; |
||||
|
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= devel
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -json
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= devel
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -pcntl
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= devel
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -readline
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,30 +0,0 @@
|
||||
--- config.m4.orig 2019-02-05 13:10:04 UTC |
||||
+++ config.m4 |
||||
@@ -3,13 +3,8 @@ dnl config.m4 for extension readline |
||||
PHP_ARG_WITH(libedit,for libedit readline replacement, |
||||
[ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) |
||||
|
||||
-if test "$PHP_LIBEDIT" = "no"; then |
||||
PHP_ARG_WITH(readline,for readline support, |
||||
[ --with-readline[=DIR] Include readline support (CLI/CGI only)]) |
||||
-else |
||||
- dnl "register" the --with-readline option to preven invalid "unknown configure option" warning |
||||
- php_with_readline=no |
||||
-fi |
||||
|
||||
if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then |
||||
for i in $PHP_READLINE /usr/local /usr; do |
||||
@@ -72,6 +67,13 @@ if test "$PHP_READLINE" && test "$PHP_RE |
||||
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS |
||||
]) |
||||
|
||||
+ PHP_CHECK_LIBRARY(readline, rl_completion_matches, |
||||
+ [ |
||||
+ AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ]) |
||||
+ ],[],[ |
||||
+ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS |
||||
+ ]) |
||||
+ |
||||
AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) |
||||
|
||||
elif test "$PHP_LIBEDIT" != "no"; then |
||||
@ -1,13 +0,0 @@
|
||||
--- readline_cli.c.orig 2012-03-02 16:40:26.000000000 +0100 |
||||
+++ readline_cli.c 2012-03-02 16:40:43.000000000 +0100 |
||||
@@ -19,6 +19,10 @@ |
||||
|
||||
/* $Id: readline_cli.c 321634 2012-01-01 13:15:04Z felipe $ */ |
||||
|
||||
+#ifdef HAVE_CONFIG_H |
||||
+#include "config.h" |
||||
+#endif |
||||
+ |
||||
#include "php.h" |
||||
|
||||
#ifndef HAVE_RL_COMPLETION_MATCHES |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= devel
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -shmop
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= devel
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -sysvmsg
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= devel
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -sysvsem
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= devel
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -sysvshm
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= devel
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -tokenizer
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= ftp
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -curl
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,13 +0,0 @@
|
||||
CATEGORIES= ftp
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -ftp
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
post-patch: |
||||
@${REINPLACE_CMD} s/HAVE_OPENSSL_EXT/__FreeBSD__/ \
|
||||
${WRKSRC}/ftp.* ${WRKSRC}/php_ftp.*
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,9 +0,0 @@
|
||||
CATEGORIES= graphics
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -exif
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
@ -1,11 +0,0 @@
|
||||
CATEGORIES= graphics
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../lang/php73
|
||||
|
||||
PKGNAMESUFFIX= -gd
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
.include "${MASTERDIR}/Makefile" |
||||
|
||||
LIB_DEPENDS+= libgd.so:graphics/gd
|
||||
@ -1,63 +0,0 @@
|
||||
--- config.m4.orig 2020-11-24 11:10:57 UTC |
||||
+++ config.m4 |
||||
@@ -184,6 +184,9 @@ AC_DEFUN([PHP_GD_XPM],[ |
||||
AC_DEFUN([PHP_GD_FREETYPE2],[ |
||||
if test "$PHP_FREETYPE_DIR" != "no"; then |
||||
|
||||
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
||||
+ |
||||
+ AC_MSG_CHECKING([for freetype]) |
||||
for i in $PHP_FREETYPE_DIR /usr/local /usr; do |
||||
if test -f "$i/bin/freetype-config"; then |
||||
FREETYPE2_DIR=$i |
||||
@@ -192,13 +195,20 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ |
||||
fi |
||||
done |
||||
|
||||
- if test -z "$FREETYPE2_DIR"; then |
||||
+ if test -n "$FREETYPE2_CONFIG"; then |
||||
+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` |
||||
+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` |
||||
+ AC_MSG_RESULT([found in $FREETYPE2_DIR]) |
||||
+ elif test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists freetype2; then |
||||
+ FREETYPE2_DIR=pkg-config |
||||
+ FREETYPE2_CFLAGS=`$PKG_CONFIG freetype2 --cflags` |
||||
+ FREETYPE2_LIBS=`$PKG_CONFIG freetype2 --libs` |
||||
+ AC_MSG_RESULT([found by pkg-config]) |
||||
+ else |
||||
+ AC_MSG_RESULT([not found]) |
||||
AC_MSG_ERROR([freetype-config not found.]) |
||||
fi |
||||
|
||||
- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` |
||||
- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` |
||||
- |
||||
PHP_EVAL_INCLINE($FREETYPE2_CFLAGS) |
||||
PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD) |
||||
AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) |
||||
@@ -285,6 +295,7 @@ dnl enable the support in bundled GD library |
||||
|
||||
if test -n "$GD_XPM_DIR"; then |
||||
AC_DEFINE(HAVE_GD_XPM, 1, [ ]) |
||||
+ AC_DEFINE(HAVE_XPM, 1, [ ]) |
||||
GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM" |
||||
fi |
||||
|
||||
@@ -347,7 +358,7 @@ if test "$PHP_GD" != "no"; then |
||||
|
||||
if test "$GD_MODULE_TYPE" = "builtin"; then |
||||
PHP_ADD_BUILD_DIR($ext_builddir/libgd) |
||||
- GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" |
||||
+ GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS" |
||||
GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" |
||||
|
||||
PHP_TEST_BUILD(foobar, [], [ |
||||
@@ -355,7 +366,7 @@ if test "$PHP_GD" != "no"; then |
||||
], [ $GD_SHARED_LIBADD ], [char foobar () {}]) |
||||
else |
||||
GD_HEADER_DIRS="ext/gd/" |
||||
- GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS" |
||||
+ GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS" |
||||
PHP_ADD_INCLUDE($GD_INCLUDE) |
||||
PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [ |
||||
AC_MSG_ERROR([GD build test failed. Please check the config.log for details.]) |
||||
@ -1,83 +0,0 @@
|
||||
--- gd.c.orig 2018-09-25 09:07:58 UTC |
||||
+++ gd.c |
||||
@@ -51,7 +51,7 @@ |
||||
# include <Wingdi.h> |
||||
#endif |
||||
|
||||
-#ifdef HAVE_GD_XPM |
||||
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) |
||||
# include <X11/xpm.h> |
||||
#endif |
||||
|
||||
@@ -75,7 +75,7 @@ static int le_gd, le_gd_font; |
||||
# endif |
||||
#endif |
||||
|
||||
-#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) |
||||
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) |
||||
# include "X11/xpm.h" |
||||
#endif |
||||
|
||||
@@ -322,7 +322,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatef |
||||
ZEND_ARG_INFO(0, filename) |
||||
ZEND_END_ARG_INFO() |
||||
|
||||
-#if defined(HAVE_GD_XPM) |
||||
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) |
||||
ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0) |
||||
ZEND_ARG_INFO(0, filename) |
||||
ZEND_END_ARG_INFO() |
||||
@@ -931,7 +931,7 @@ static const zend_function_entry gd_func |
||||
#endif |
||||
PHP_FE(imagecreatefromwbmp, arginfo_imagecreatefromwbmp) |
||||
PHP_FE(imagecreatefromxbm, arginfo_imagecreatefromxbm) |
||||
-#if defined(HAVE_GD_XPM) |
||||
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) |
||||
PHP_FE(imagecreatefromxpm, arginfo_imagecreatefromxpm) |
||||
#endif |
||||
PHP_FE(imagecreatefromgd, arginfo_imagecreatefromgd) |
||||
@@ -1296,7 +1296,7 @@ PHP_MINFO_FUNCTION(gd) |
||||
php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString()); |
||||
#endif |
||||
php_info_print_table_row(2, "WBMP Support", "enabled"); |
||||
-#if defined(HAVE_GD_XPM) |
||||
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) |
||||
php_info_print_table_row(2, "XPM Support", "enabled"); |
||||
{ |
||||
char tmp[12]; |
||||
@@ -1351,7 +1351,7 @@ PHP_FUNCTION(gd_info) |
||||
add_assoc_bool(return_value, "PNG Support", 0); |
||||
#endif |
||||
add_assoc_bool(return_value, "WBMP Support", 1); |
||||
-#if defined(HAVE_GD_XPM) |
||||
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) |
||||
add_assoc_bool(return_value, "XPM Support", 1); |
||||
#else |
||||
add_assoc_bool(return_value, "XPM Support", 0); |
||||
@@ -2178,7 +2178,7 @@ PHP_FUNCTION(imagetypes) |
||||
ret |= PHP_IMG_PNG; |
||||
#endif |
||||
ret |= PHP_IMG_WBMP; |
||||
-#if defined(HAVE_GD_XPM) |
||||
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) |
||||
ret |= PHP_IMG_XPM; |
||||
#endif |
||||
#ifdef HAVE_GD_WEBP |
||||
@@ -2446,7 +2446,7 @@ static void _php_image_create_from(INTER |
||||
case PHP_GDIMG_TYPE_GD2PART: |
||||
im = (*func_p)(fp, srcx, srcy, width, height); |
||||
break; |
||||
-#if defined(HAVE_GD_XPM) |
||||
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) |
||||
case PHP_GDIMG_TYPE_XPM: |
||||
im = gdImageCreateFromXpm(file); |
||||
break; |
||||
@@ -2528,7 +2528,7 @@ PHP_FUNCTION(imagecreatefromxbm) |
||||
} |
||||
/* }}} */ |
||||
|
||||
-#if defined(HAVE_GD_XPM) |
||||
+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) |
||||
/* {{{ proto resource imagecreatefromxpm(string filename)
|
||||
Create a new image from XPM file or URL */ |
||||
PHP_FUNCTION(imagecreatefromxpm) |
||||