Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/PKGBUILD b/PKGBUILD
- index 35dd211..961e529 100644
- --- a/PKGBUILD
- +++ b/PKGBUILD
- @@ -21,7 +21,7 @@ pkgname=("${pkgbase}"
- "${pkgbase}-sqlite"
- "${pkgbase}-tidy"
- "${pkgbase}-xsl")
- -pkgver=7.2.1
- +pkgver=7.2.12
- pkgrel=1
- arch=('x86_64')
- license=('PHP')
- @@ -31,13 +31,13 @@ makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libso
- checkdepends=('procps-ng')
- source=("https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz"{,.asc}
- 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch')
- -sha512sums=('2445f2cff20214b521c48592e5ab42b770c291702178d7cb2a84912c81b7e5d2cc45948a3a4a7830194fa444708d544c73efbaa8e90c95ab77937f7feffb2ffc'
- +sha512sums=('bbeaed1278d0d2f1ecb2249dab1ebaab1489ef43be0797dac57d8b523d8e5d284166e6cbf52095f5d34eef447fbdeb0c6916caaa5770221a180ec064f4ffcad8'
- 'SKIP'
- - '65ea5cb38c1fc1874b2a4d08bc52443f9ed5dcc92cf99023a74292c78f9074516296f56c768f7efa8a1f0838feac47b356d3da6fdb1199419bebec3a93204ae6'
- + '9909867cf8c11e6e150c1f10a7ea2257873d55482efaab9ee68f76be3fea13c0d5438a9f47a68d605ec470a5d56b38a776d4f538a8858d9142e42fe3d60b7a37'
- 'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
- - '87453c9f41204bc7a20cbf2a85ee44965f7754529e2c17fb60bdfe42ded7a894d6e7fcc30fe6c650ea5f92f95920161522ef3ce0f355686a2fed7f0857abdd5c'
- + 'c9efb3f50770d6ddfa908b7f562355121f07ce528271e72ba188a4f1c788e264fc117c220053aaded42040825c03f3f17131a62a67d96cc91fd9da472e085deb'
- '824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f'
- - '1606178f55dee8ca6a3cf47c7db486dca0c261bfffbaf4f69450a3497643910c65f8ee1543839ae4213d8b396afc6e5f86141accac553545c35fe234a50f56e6')
- + '85000bcb4f5674bfcbac7f32aeb28c523904a23da716e7fd982ac225845843e0acb33c0b8552107c234b1dd106337ad0a6792253f200980b88a6f6239ec982d0')
- validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F'
- '1729F83938DA44E27BA0F4D3DBDB397470D12172')
- diff --git a/apache.patch b/apache.patch
- index 81b2cd8..9c45849 100644
- --- a/apache.patch
- +++ b/apache.patch
- @@ -10,7 +10,7 @@
- fi
- --- configure.orig
- +++ configure
- -@@ -7018,7 +7018,6 @@
- +@@ -7019,7 +7019,6 @@
- fi
- else
- @@ -18,3 +18,55 @@
- if test -n "$APACHE_THREADED_MPM"; then
- enable_maintainer_zts=yes
- +@@ -30232,6 +30231,9 @@
- + if test -f $i/include/enchant/enchant.h; then
- + ENCHANT_DIR=$i
- + ENCHANT_INCDIR=$i/include/enchant
- ++ elif test -f $i/include/enchant-2/enchant.h; then
- ++ ENCHANT_DIR=$i
- ++ ENCHANT_INCDIR=$i/include/enchant-2
- + elif test -f $i/include/enchant.h; then
- + ENCHANT_DIR=$i
- + ENCHANT_INCDIR=$i/include
- +@@ -34362,15 +34364,16 @@
- + 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"
- ++
- ++ if test -d "$i/include/freetype2"; then
- ++ FREETYPE2_DIR=$i/include/freetype2
- ++ FREETYPE2_CONFIG="pkg-config freetype2"
- + break
- + fi
- + done
- +
- + if test -z "$FREETYPE2_DIR"; then
- +- as_fn_error $? "freetype-config not found." "$LINENO" 5
- ++ as_fn_error $? "freetype2 not found." "$LINENO" 5
- + fi
- +
- + FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
- +@@ -36033,15 +36036,16 @@
- + 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"
- ++
- ++ if test -d "$i/include/freetype2"; then
- ++ FREETYPE2_DIR=$i/include/freetype2
- ++ FREETYPE2_CONFIG="pkg-config freetype2"
- + break
- + fi
- + done
- +
- + if test -z "$FREETYPE2_DIR"; then
- +- as_fn_error $? "freetype-config not found." "$LINENO" 5
- ++ as_fn_error $? "freetype2 not found." "$LINENO" 5
- + fi
- +
- + FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
- diff --git a/generate_patches b/generate_patches
- index 3288fcb..2a64a44 100755
- --- a/generate_patches
- +++ b/generate_patches
- @@ -6,7 +6,15 @@ makepkg -o --nodeps --noprepare --skipinteg
- pushd src/${_pkgbase}-${pkgver}
- -sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4 -i.orig configure
- +sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4
- +
- +sed \
- + -e '/APACHE_THREADED_MPM=/d' \
- + -e '/elif test -f $i\/include\/enchant.h; then/i\\t\telif test -f $i/include/enchant-2/enchant.h; then\n\t\t\tENCHANT_DIR=$i\n\t\t\tENCHANT_INCDIR=$i/include/enchant-2' \
- + -e '/for i in $PHP_FREETYPE_DIR \/usr\/local \/usr; do/a\\n\tif test -d "$i/include/freetype2"; then\n\t\tFREETYPE2_DIR=$i/include/freetype2\n\t\tFREETYPE2_CONFIG="pkg-config freetype2"' \
- + -e '/if test -f "$i\/bin\/freetype-config"; then/, +2d' \
- + -e '/freetype-config not found/c\\t\tas_fn_error $? "freetype2 not found." "$LINENO" 5' \
- + -i.orig configure
- sed 's/.conf.default/.conf/g' -i.orig sapi/fpm/Makefile.frag
- diff --git a/php-fpm.patch b/php-fpm.patch
- index d32d392..c827d2e 100644
- --- a/php-fpm.patch
- +++ b/php-fpm.patch
- @@ -9,7 +9,7 @@
- + $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
- + $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
- fi
- -
- +
- @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
- --- sapi/fpm/php-fpm.conf.in.orig
- +++ sapi/fpm/php-fpm.conf.in
- @@ -52,7 +52,7 @@
- ;listen.mode = 0660
- ; When POSIX Access Control Lists are supported you can set them using
- ; these options, value is a comma separated list of user/group names.
- -@@ -356,7 +356,7 @@
- +@@ -362,7 +362,7 @@
- ; Chdir to this directory at the start.
- ; Note: relative path can be used.
- ; Default Value: current directory or / when chroot
- diff --git a/php.ini.patch b/php.ini.patch
- index e0248fc..2c84444 100644
- --- a/php.ini.patch
- +++ b/php.ini.patch
- @@ -15,7 +15,6 @@
- ;
- -; Notes for Windows environments :
- -;
- --; - ODBC support is built in, so no dll is needed for it.
- -; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
- -; extension folders as well as the separate PECL DLL download (PHP 5+).
- -; Be sure to appropriately set the extension_dir directive.
- @@ -45,9 +44,9 @@
- -;extension=exif ; Must be after mbstring as it depends on it
- ;extension=mysqli
- -;extension=oci8_12c ; Use with Oracle Database 12c Instant Client
- + ;extension=odbc
- -;extension=openssl
- -;extension=pdo_firebird
- -+;extension=odbc
- +;zend_extension=opcache
- +;extension=pdo_dblib
- ;extension=pdo_mysql
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement