summaryrefslogtreecommitdiffstats
path: root/source/n
diff options
context:
space:
mode:
Diffstat (limited to 'source/n')
-rwxr-xr-xsource/n/epic5/epic5.SlackBuild11
-rwxr-xr-xsource/n/php/fetch-php.sh4
-rwxr-xr-xsource/n/php/php.SlackBuild1
-rw-r--r--source/n/php/php.ini-development.diff9
4 files changed, 14 insertions, 11 deletions
diff --git a/source/n/epic5/epic5.SlackBuild b/source/n/epic5/epic5.SlackBuild
index f89eb837a..7a8943b4c 100755
--- a/source/n/epic5/epic5.SlackBuild
+++ b/source/n/epic5/epic5.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2013, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2013, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,11 +26,12 @@ PKGNAM=epic5
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
EPICVER=5
HELPFILE=current
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
-# Default to no Ruby support, since it seems that ruby-2.7.0 is not compatible.
-# Patches to fix this are welcome, otherwise we'll keep an eye on upstream.
-RUBY_OPTION=${RUBY_OPTION:---without-ruby}
+## Default to no Ruby support, since it seems that ruby-2.7.0 is not compatible.
+## Patches to fix this are welcome, otherwise we'll keep an eye on upstream.
+## NOTE: Commenting this out since ruby-2.7.1 is working.
+#RUBY_OPTION=${RUBY_OPTION:---without-ruby}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh
index b9958ca33..f38c97fa4 100755
--- a/source/n/php/fetch-php.sh
+++ b/source/n/php/fetch-php.sh
@@ -1,2 +1,2 @@
-lftpget http://us.php.net/distributions/php-7.4.5.tar.xz.asc
-lftpget http://us.php.net/distributions/php-7.4.5.tar.xz
+lftpget http://us.php.net/distributions/php-7.4.6.tar.xz.asc
+lftpget http://us.php.net/distributions/php-7.4.6.tar.xz
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index 0937850b4..2205ffe65 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -257,6 +257,7 @@ CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \
--without-readline \
--with-libedit \
--with-pear \
+ --with-tidy=shared \
--build=$ARCH-slackware-linux || exit 1
# I am told this option is worse than nothing. :-)
diff --git a/source/n/php/php.ini-development.diff b/source/n/php/php.ini-development.diff
index b6b895b3e..ce12f5a4b 100644
--- a/source/n/php/php.ini-development.diff
+++ b/source/n/php/php.ini-development.diff
@@ -1,6 +1,6 @@
---- ./php.ini-development.orig 2020-01-21 05:35:21.000000000 -0600
-+++ ./php.ini-development 2020-01-26 12:55:22.614578322 -0600
-@@ -899,7 +899,49 @@
+--- ./php.ini-development.orig 2020-05-12 03:09:16.000000000 -0500
++++ ./php.ini-development 2020-05-12 14:14:32.901530776 -0500
+@@ -899,7 +899,50 @@
; 'extension='php_<ext>.dll') is supported for legacy reasons and may be
; deprecated in a future PHP major version. So, when it is possible, please
; move to the new ('extension=<ext>) syntax.
@@ -40,6 +40,7 @@
+extension=snmp
+extension=soap
+extension=sqlite3
++extension=tidy
+extension=tokenizer
+extension=xmlreader
+extension=xmlrpc
@@ -50,7 +51,7 @@
; Notes for Windows environments :
;
; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
-@@ -1334,7 +1376,7 @@
+@@ -1335,7 +1378,7 @@
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
; http://php.net/session.save-path