From ebce8994fe3cc4ca9fbc96ca837cb4c4e98adcbd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 6 May 2018 11:18:16 +0100 Subject: gentoo resync : 06.05.2018 --- dev-lang/php/Manifest | 15 +- dev-lang/php/files/php-freetype-2.9.1.patch | 231 ++++++++++++++++++++++++++++ dev-lang/php/php-5.6.35-r1.ebuild | 1 + dev-lang/php/php-5.6.36.ebuild | 1 + dev-lang/php/php-7.0.29.ebuild | 1 + dev-lang/php/php-7.0.30.ebuild | 1 + dev-lang/php/php-7.1.16.ebuild | 1 + dev-lang/php/php-7.1.17.ebuild | 1 + dev-lang/php/php-7.2.5.ebuild | 1 + 9 files changed, 246 insertions(+), 7 deletions(-) create mode 100644 dev-lang/php/files/php-freetype-2.9.1.patch (limited to 'dev-lang/php') diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 53d1c74c056b..2bd7286cbf70 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -5,6 +5,7 @@ AUX mbstring-oniguruma-6.8.patch 1488 BLAKE2B 181aacdd5fc01e5b11246d624cd88a5d31 AUX php-5.6-no-bison-warnings.patch 1428 BLAKE2B d37bc7a1ae803aa4a14d32f0ca5613b7bc82610248d6de5ef7b6078fdcfa944cd1c245aa919137ff0d6968c8621b5acf2638386307c46fdbb8c98eba991eb674 SHA512 8f751c638c833d535e022434cd8ace5c175703bf61dfab7bea3e52d9419700e2b85c4cca40da9ab6056e8fd9c0bc1fab55810bb1193bed14ce0a50ce653fe62b AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8 +AUX php-freetype-2.9.1.patch 7609 BLAKE2B f1dbcf00f4097b303ebca5275d2d188ef6d8deba0349c07fa8406f41571b14fcce3879070c8fc51e9318c9d267542a661126ce56b8ce7d74d40a4fbbf2612c45 SHA512 b3ae8a2dddd39e46c791934546d290f54a0c6d0d4a1fd7b06f06b6accc71f72d7289e04f04cb41ace619c663ccf81b19855433709ef87be495aefb86a28a2062 DIST php-5.6.33.tar.xz 12465256 BLAKE2B a33ce429c1565e6304031304168aa63ce82fa6c0968fc5ef09f5955e43c04ebe112db92475a999f39d997e2a3c9724ece60902ef0db84e2599d97d0e42ce57d2 SHA512 c494721594511f79a103ea3c73c5035aa0fcbca626710a0b85d2395693caf6762edefa3347cd0f8567b186f98c0df7f83cd4c698b158f0f72aa62aabbbb4e297 DIST php-5.6.34.tar.xz 12465748 BLAKE2B 6b12f52a04d6b645d78f3d00617386a72fafffda24850e10f545464c9d0ca55321e91a292c3eb83409d0a303c4e37c2a686f547d86227c280ec78b428e73a92e SHA512 9aa02f943d6949a28ad96df5e75eec3ecab3731824400d0a0a8ccba9dee95b7af6421b38b86f352a45c778019ebfb1e6161a03256e4ef712341a9e0bad596ae7 DIST php-5.6.35.tar.xz 12466396 BLAKE2B 96757fc064c139f238329c51741538fdbdefd04abad59c37565e1882a5a7df7d3755cf496561336b25748a968fb18dbf9d542a54a672f553f4be5ead292141cc SHA512 dd7d891954aa7f8e83eecb265e1bb01dfd357092dad0cfc5a3f441bea069f7181cd79330653b178d4953ac1ee8570d7f4c21acc8fc67975dd7dc1413eaebf0af @@ -20,15 +21,15 @@ DIST php-7.1.17.tar.xz 12213536 BLAKE2B bf358bc4920d38f74e4bdbc53f4744274071b4ce DIST php-7.2.5.tar.xz 12034928 BLAKE2B 36c9ec413b5332a1ef138a5724fd1718f5a8ffa8873dbe27ae7b6ca9a55ecfa0de7f7504a20581edb48605c2afcc799784eb3d94e08236222f6de2094d1921d0 SHA512 1d49fc6e47d2e86d4fd62396e558965502f44cc8f72459bb0d406e157298cac67703b219837952da11122722d9fa8cb4cda8ef66ddf063cb063859db34110f58 EBUILD php-5.6.33.ebuild 22554 BLAKE2B 0ab011b206772d7d83ee135cadcf0a9d304f29d6ce78fa0bbe7779d13cc1205287033878870810240996de89c519b805da989babcab926a2285e16e33d0352a7 SHA512 27eef42a39637986fe63823cb387e5d6ec481776baaa15ee51009f265d0fdc4ea0d8120349858f290f9c743091e679f309a190318bd02baf0b87931d0567dc24 EBUILD php-5.6.34.ebuild 22656 BLAKE2B a63c4fa80152985d8d931a7476f86061bd6c127c9c7ca31f6162066383234b5fdeabde7a3bb7cf43cf87d2eaf23b78d7456e803a17a1fce9070bc70e322922fa SHA512 31727757aff2777cc10ce5d9cf11030e77fa9982cf22536086aad8ed24ddcccb2a186b7383d9b3305ee8f645a83999673c6f5fa079c506f0656b141faac67feb -EBUILD php-5.6.35-r1.ebuild 22664 BLAKE2B b394f600e69c195ee2c479467626561232e615151b4b0cef9d96cc583bd3aee34ba5d4e06772bc10924db0fe312bf901fb6034d971cd2824d4de487eb35a6c76 SHA512 0214b68054d5b620710c066af3469c70e0e7971a3dfb45a58a4614e7c5aa4a559e9a4152d4f2e8069dd8d49618d560a0b267f5d73322329672bedccc7ca25540 -EBUILD php-5.6.36.ebuild 22718 BLAKE2B 38e53cd9e1e505d6cb420162096918b4f6ad1383ac923ba35619fe53431bc741bdf4393e02f51f6ebba2b0dc23683579c8ef7968eb2ab5d8353d13912169ec17 SHA512 75f255516bba2bcd9d15f826025586d8730e01f6666b60bd689307b34631be8c055f37c2ae084ff7ea12ebd69ccb6db125d045c07b1e6bc53fa27b83e5beb1a7 +EBUILD php-5.6.35-r1.ebuild 22711 BLAKE2B 3df69e4b35018ea8d757442b68652349a953b9e7fc2124c804434b27502d1abd0fa1de2a84d4194cddab6888adeb4249d95dcefbcd6b173d4a426482ff4f5da0 SHA512 27926348fe8f3e5760d365e18cd056d9c587ec25876da7b6692e1fd83707318006fa4aab171a85690b27d6b03cbce31306b0bd3b07301907738bbeb19a1f043d +EBUILD php-5.6.36.ebuild 22765 BLAKE2B 7a46ae434144bf9619edaa08ff18ae14ac856d3a2923ddfd63aad2c6a43d38282cb54795b59326f5a1325d02321d19eea0abab7daac9844ab08c6fd3d0dd521a SHA512 0375de2cb65ca24bfdd84d35e5ac937462156fc733d47d9b77bc95b01351fa55206608390e406781ad66936643b488a7737177aeb3ac42905d0647a0bf681326 EBUILD php-7.0.27.ebuild 21672 BLAKE2B d7f777112996d44d36b912639eddac4e5d2e415033793e5cb0e6e596f54f6a6922efc6e9b8152a56e5c35220c7bfdcfa0fbb21e98b34ed23dee31ad9499f93ee SHA512 7e9cc8ba4cf70338636b7048199fed99b967a26e540ddf605a28b3fd2053daff701202f822819bb60d528c260d137f4089de60e36460834fc6b716e212c982be EBUILD php-7.0.28.ebuild 21774 BLAKE2B 866a588a4afef0a7e84d9ff87a318826c119b4d50c9f964e4fea0f768c7c4a1b9f8bf647ad9ac07312f810848332c1449caac6286baa3c89501d698a506aae0b SHA512 5b4c87510f915fc5668b6df7d9c3bf56790203d1eb03e2244e10e926c9b76b7c86c4f9ae182c9f2ba9df9a3f6266fa65b4571203cc1ccd23bb70148b898a6c76 -EBUILD php-7.0.29.ebuild 21929 BLAKE2B 1660bdcd577fc71b901ff6a41201b43f77df2b99971a742750e7f783485b434beff08d427eb51eebd0cc1882b720943f7251a775959881afa5d4fd4e158df738 SHA512 16d754494fd1c1d1d000337e87b788b0d47882d71083c6d9c5ae73a428b10606c0e427385155abb4342ada54eb77d323d4e82b569db580a673d65bedfae4f247 -EBUILD php-7.0.30.ebuild 21935 BLAKE2B c6b56e35f7df342ac907d1dcb4dff621ddcd1fd9c61bb5e65fd78f73ddc7b726c59baa66c81853c0f30ca380e545d2516fb03ca6f58e5d85dd44b6bab4c86c1e SHA512 4006471855676a3a07ed6f026664b23c827aa69419e096c905e4103f99de6ddff122b1bc58983f1682aff72288372bfb290522d3e67dfc195190f7ce9629392d +EBUILD php-7.0.29.ebuild 21969 BLAKE2B 2d993e4ebc89c7786f9d0444fd503ab91322cfbf19e6d65321980f1a07431c71d59824d37a6eae02b40dcaf8e2e9534f82bf403ec365ad274bd197299dcdfa5d SHA512 79ab1847c656e3e357bfecb35ad621c9583c12508a69e9a7a385195f1d971cc87b4c66a73adee5084d5ea234ffd4fb0833d0f51914a05b27b841909743b9eab4 +EBUILD php-7.0.30.ebuild 21975 BLAKE2B 413e3c9d6cd4d43a5d74a2c064352b39d45b2a006f92a5f88749a0a189778748ad1ae4b4e28bdc9b2d5dcddc3cf8e94fbd20b74659dba3ae39396f76a2143740 SHA512 aa5eb136a50b7522d7157cd9e1b3a100ef114e6bcab42a854a15a549e1426b655f6bf52d84929bf3619b604bbcdf4d21a16ead62581762a9c9b6af19442a4016 EBUILD php-7.1.13.ebuild 21538 BLAKE2B 69b0b2778758211dfdf3af43178034d0586547406a5e471b88097efe338278d799a1f1fd48c346dc0a10bcc815e3994e90cb901649325933fda1575b46e27037 SHA512 9f41de25f42053c059181833e1ce3a51eb63a0f8bfca48fc1a4bc8216b421832e3afe287e36857c568c5032622db7ff5650b6548cb5dfd91eaf7bb87277597b4 EBUILD php-7.1.15.ebuild 21662 BLAKE2B 27de4a51f061bc318d457081d175a08df4233567299fdd2287369b597e5084c0782e5567d8d11ff467b5d65c80ab82c1d0930f906e61c1fc76e47cdeca3a93d0 SHA512 d35543b2e097b8fff290a4d6e57ed0884be55e4c9adc7727e6b63079cf54a3300ee2b60cd1678956652cb17d7bd8d5940084fc5ef89abdf82105a0bb90bc1ad5 -EBUILD php-7.1.16.ebuild 21817 BLAKE2B be00263e5cc5a5393fa200e4a4e3a5403b82dd664fac24bb9045fc5e8d749ac3bad3b5936c590af3213b6c61e9ae60d6089d5eb8b70ab12465faa713ccdae4e5 SHA512 6efbd94f210eabd8e85ebf678a4c431e63146bf24aaa1fea8549ceb237fa9026b01c9a007e2a7b6a883841c665baa8ca225e71b7b26dd6b98d34651bfd8d8126 -EBUILD php-7.1.17.ebuild 21778 BLAKE2B 3e33233b4b6cc4d3b0a3fae073954e9a8fcf0d9d2205e4e2222808f9307ae4ab37b06d6541de782fcea11f24a53a3f522904bd75389d0158956722259f20a538 SHA512 6ee1f238559cb75c19fefe51d230be325b6e848847610dedb49a03ca5b67a74bf1719846d3bc990e7234f556dd8ff163e1c1b0651f84bd1f6213cdbce9ec6cc2 -EBUILD php-7.2.5.ebuild 22309 BLAKE2B 82283f0574691a9798d2857c52c2e8de3653117bca435003e6a2d89814088d960fb06ef19af331f33a7e4ec09eb837fa06fcede37711ad855c8a84262726364e SHA512 e1e1357562d18497eee855a3d0f2a15ee530519ea0204e2a27e44990e8bb5e86eaa2047aa9f93a6402ac390797e97d8fe8c04950c6edf52744236df3cf845bcb +EBUILD php-7.1.16.ebuild 21857 BLAKE2B ab2ae117f48aeb9cdbdc98de7e6d048e6b89cb60ce34362fd3ff8192e5e9844065abb5dd0e5f3cac007c4de979f86931691def2753160f0daea56972190f1cdf SHA512 9cacbca61759aee1987c4eafbdb119df6fdc7794073c7ab33e319ed37cd5253e974e89f119a401d9e4e18819a4bf30f6209aabef2417f967d44b77c3fea1b56c +EBUILD php-7.1.17.ebuild 21818 BLAKE2B ce339e941dadb1672c866a94e611fa8c329c95c7fafbbd4f135e4ea734f77120c6b06e6b204b59b46c930e440aac1308d209749576024265b04ced1fac7ad451 SHA512 0dbb7ddac39a1d02532edda4fd5caccc42cf9a25c1bf7b33e795f86b7bd8a2020a4c8f911d6881989b7aa11eba2c0d638be2aa94c519405e54decdf30abd41fa +EBUILD php-7.2.5.ebuild 22349 BLAKE2B ade2a77aa0ebdb57085266b89f2b1e3f893acaf8f738944e5b1cc55512e6d27eb517ec7d01da359a1f84848ec6d014e14d8155861ea71b0d0397374e946ad63c SHA512 e3c62327d81ce1e40c7a790243b7549cf0d3881fa8b25e2fa1af8d21bc1912553adffa7b5f35e0ab84b77e531bd0879fff4fb14f931fc695d21cc014ad672c7a MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa diff --git a/dev-lang/php/files/php-freetype-2.9.1.patch b/dev-lang/php/files/php-freetype-2.9.1.patch new file mode 100644 index 000000000000..3ddf8d1154da --- /dev/null +++ b/dev-lang/php/files/php-freetype-2.9.1.patch @@ -0,0 +1,231 @@ +--- a/ext/gd/config.m4 2018-04-24 11:09:54.000000000 -0400 ++++ b/ext/gd/config.m4 2018-05-04 15:18:49.867283889 -0400 +@@ -186,21 +186,35 @@ + AC_DEFUN([PHP_GD_FREETYPE2],[ + if test "$PHP_FREETYPE_DIR" != "no"; then + +- for i in $PHP_FREETYPE_DIR /usr/local /usr; do +- if test -f "$i/bin/freetype-config"; then +- FREETYPE2_DIR=$i +- FREETYPE2_CONFIG="$i/bin/freetype-config" +- break ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ AC_MSG_CHECKING(for freetype2) ++ ++ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then ++ ++ FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2` ++ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` ++ FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2` ++ ++ AC_MSG_RESULT(from pkgconfig: version $FREETYPE2_VERSION found) ++ else ++ ++ for i in $PHP_FREETYPE_DIR /usr/local /usr; do ++ if test -f "$i/bin/freetype-config"; then ++ FREETYPE2_DIR=$i ++ FREETYPE2_CONFIG="$i/bin/freetype-config" ++ break ++ fi ++ done ++ ++ if test -z "$FREETYPE2_DIR"; then ++ AC_MSG_ERROR([freetype-config not found.]) + fi +- done + +- if test -z "$FREETYPE2_DIR"; then +- AC_MSG_ERROR([freetype-config not found.]) ++ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` ++ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` ++ AC_MSG_RESULT(found via freetype-config) + 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,[ ]) +--- a/configure 2018-04-24 11:10:05.000000000 -0400 ++++ b/configure 2018-05-04 15:18:45.626367913 -0400 +@@ -34348,21 +34348,78 @@ + + if test "$PHP_FREETYPE_DIR" != "no"; then + +- for i in $PHP_FREETYPE_DIR /usr/local /usr; do +- if test -f "$i/bin/freetype-config"; then +- FREETYPE2_DIR=$i +- FREETYPE2_CONFIG="$i/bin/freetype-config" +- break ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_path_PKG_CONFIG+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5 ++$as_echo_n "checking for freetype2... " >&6; } ++ ++ ++ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then ++ ++ FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2` ++ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` ++ FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2` ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE2_VERSION found" >&5 ++$as_echo "from pkgconfig: version $FREETYPE2_VERSION found" >&6; } ++ else ++ ++ for i in $PHP_FREETYPE_DIR /usr/local /usr; do ++ if test -f "$i/bin/freetype-config"; then ++ FREETYPE2_DIR=$i ++ FREETYPE2_CONFIG="$i/bin/freetype-config" ++ break ++ fi ++ done ++ ++ if test -z "$FREETYPE2_DIR"; then ++ as_fn_error $? "freetype-config not found." "$LINENO" 5 + fi +- done + +- if test -z "$FREETYPE2_DIR"; then +- as_fn_error $? "freetype-config not found." "$LINENO" 5 ++ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` ++ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found via freetype-config" >&5 ++$as_echo "found via freetype-config" >&6; } + fi + +- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` +- + + for ac_i in $FREETYPE2_CFLAGS; do + case $ac_i in +@@ -36019,21 +36076,78 @@ + + if test "$PHP_FREETYPE_DIR" != "no"; then + +- for i in $PHP_FREETYPE_DIR /usr/local /usr; do +- if test -f "$i/bin/freetype-config"; then +- FREETYPE2_DIR=$i +- FREETYPE2_CONFIG="$i/bin/freetype-config" +- break ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5 ++$as_echo_n "checking for freetype2... " >&6; } ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_path_PKG_CONFIG+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ ++ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then ++ ++ FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2` ++ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` ++ FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2` ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE_VERSON found" >&5 ++$as_echo "from pkgconfig: version $FREETYPE_VERSON found" >&6; } ++ else ++ ++ for i in $PHP_FREETYPE_DIR /usr/local /usr; do ++ if test -f "$i/bin/freetype-config"; then ++ FREETYPE2_DIR=$i ++ FREETYPE2_CONFIG="$i/bin/freetype-config" ++ break ++ fi ++ done ++ ++ if test -z "$FREETYPE2_DIR"; then ++ as_fn_error $? "freetype-config not found." "$LINENO" 5 + fi +- done + +- if test -z "$FREETYPE2_DIR"; then +- as_fn_error $? "freetype-config not found." "$LINENO" 5 ++ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` ++ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found via freetype-config" >&5 ++$as_echo "found via freetype-config" >&6; } + fi + +- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` +- + + for ac_i in $FREETYPE2_CFLAGS; do + case $ac_i in diff --git a/dev-lang/php/php-5.6.35-r1.ebuild b/dev-lang/php/php-5.6.35-r1.ebuild index 8f87fde7f25b..e5d5dafb0a87 100644 --- a/dev-lang/php/php-5.6.35-r1.ebuild +++ b/dev-lang/php/php-5.6.35-r1.ebuild @@ -232,6 +232,7 @@ php_set_ini_dir() { src_prepare() { eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch" + eapply "${FILESDIR}/php-freetype-2.9.1.patch" # Change PHP branding # Get the alpha/beta/rc version diff --git a/dev-lang/php/php-5.6.36.ebuild b/dev-lang/php/php-5.6.36.ebuild index 97094f855af9..fbcbe63b2d16 100644 --- a/dev-lang/php/php-5.6.36.ebuild +++ b/dev-lang/php/php-5.6.36.ebuild @@ -233,6 +233,7 @@ php_set_ini_dir() { src_prepare() { eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch" eapply "${FILESDIR}/5.6-mbstring-oniguruma-6.8.patch" + eapply "${FILESDIR}/php-freetype-2.9.1.patch" # Change PHP branding # Get the alpha/beta/rc version diff --git a/dev-lang/php/php-7.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild index f0c6303f1cbb..1ad39e6fafc4 100644 --- a/dev-lang/php/php-7.0.29.ebuild +++ b/dev-lang/php/php-7.0.29.ebuild @@ -168,6 +168,7 @@ PATCHES=( # hopefully upstream will include the same version check fixes in upcoming releases # patch added 20180429 "${FILESDIR}/libressl-compatibility.patch" + "${FILESDIR}/php-freetype-2.9.1.patch" ) PHP_MV="$(get_major_version)" diff --git a/dev-lang/php/php-7.0.30.ebuild b/dev-lang/php/php-7.0.30.ebuild index 8de4204d1c02..5a851d1f41ea 100644 --- a/dev-lang/php/php-7.0.30.ebuild +++ b/dev-lang/php/php-7.0.30.ebuild @@ -168,6 +168,7 @@ PATCHES=( # hopefully upstream will include the same version check fixes in upcoming releases # patch added 20180429 "${FILESDIR}/libressl-compatibility.patch" + "${FILESDIR}/php-freetype-2.9.1.patch" ) PHP_MV="$(get_major_version)" diff --git a/dev-lang/php/php-7.1.16.ebuild b/dev-lang/php/php-7.1.16.ebuild index 0075b8f5bd7c..7dbfde0cd8be 100644 --- a/dev-lang/php/php-7.1.16.ebuild +++ b/dev-lang/php/php-7.1.16.ebuild @@ -150,6 +150,7 @@ PATCHES=( # hopefully upstream will include the same version check fixes in upcoming releases # patch added 20180429 "${FILESDIR}/libressl-compatibility.patch" + "${FILESDIR}/php-freetype-2.9.1.patch" ) PHP_MV="$(get_major_version)" diff --git a/dev-lang/php/php-7.1.17.ebuild b/dev-lang/php/php-7.1.17.ebuild index fcd553f31484..39336570acbd 100644 --- a/dev-lang/php/php-7.1.17.ebuild +++ b/dev-lang/php/php-7.1.17.ebuild @@ -148,6 +148,7 @@ PATCHES=( # hopefully upstream will include the same version check fixes in upcoming releases # patch added 20180429 "${FILESDIR}/libressl-compatibility.patch" + "${FILESDIR}/php-freetype-2.9.1.patch" ) PHP_MV="$(get_major_version)" diff --git a/dev-lang/php/php-7.2.5.ebuild b/dev-lang/php/php-7.2.5.ebuild index 558d91754f32..f781eb4d8033 100644 --- a/dev-lang/php/php-7.2.5.ebuild +++ b/dev-lang/php/php-7.2.5.ebuild @@ -153,6 +153,7 @@ PATCHES=( # hopefully upstream will include the same version check fixes in upcoming releases # patch added 20180429 "${FILESDIR}/libressl-compatibility.patch" + "${FILESDIR}/php-freetype-2.9.1.patch" ) PHP_MV="$(get_major_version)" -- cgit v1.2.3