Date: Monday, February 1, 2021 @ 02:07:18 Author: anatolik Revision: 839123
FS#69462: Move to php 7 Added: tt-rss/trunk/php7.patch Modified: tt-rss/trunk/PKGBUILD tt-rss/trunk/service ------------+ PKGBUILD | 19 +++++++++++++------ php7.patch | 26 ++++++++++++++++++++++++++ service | 2 +- 3 files changed, 40 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-02-01 02:06:42 UTC (rev 839122) +++ PKGBUILD 2021-02-01 02:07:18 UTC (rev 839123) @@ -5,7 +5,7 @@ # Contributor: Erik Mank <e...@braindisorder.org> pkgname=tt-rss -pkgver=r10196.eb896f824 +pkgver=r10198.6d8f2221b pkgrel=1 epoch=2 pkgdesc='Web-based news feed (RSS/Atom) aggregator' @@ -13,18 +13,20 @@ url='https://tt-rss.org' license=(GPL) backup=(etc/webapps/tt-rss/config.php) -depends=(php php-intl) +depends=(php7 php7-intl) install=tt-rss.install optdepends=('mysql' 'postgresql' - 'php-gd: for coloured feed badges') + 'php7-gd: for coloured feed badges') makedepends=('git') -_commit=eb896f824d0c05ffce552c532a654b45a42f71fd +_commit=6d8f2221b82b6a31becbeed8baf5e05ad9e053fe # periodic releases are over https://tt-rss.org/forum/viewtopic.php?f=10&t=3262 source=(git+https://git.tt-rss.org/fox/tt-rss.git#commit=$_commit - service) + service + php7.patch) sha1sums=('SKIP' - 'd764e22065f8e0104b4f1d5dcf41cce01cd7bec5') + '6975508c8cbe86152489fc6f1887c1d0d7df19e0' + '6e6a6350bf645f2d84785aa1c8e613be0cca337e') pkgver() { cd tt-rss @@ -31,6 +33,11 @@ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } +prepare() { + cd tt-rss + patch -p1 < ../php7.patch # https://bugs.archlinux.org/task/69462#comment196184 +} + package() { cd tt-rss _instdir="$pkgdir"/usr/share/webapps/$pkgname Added: php7.patch =================================================================== --- php7.patch (rev 0) +++ php7.patch 2021-02-01 02:07:18 UTC (rev 839123) @@ -0,0 +1,26 @@ +diff --git a/config.php-dist b/config.php-dist +index eed1a699d..c18886390 100644 +--- a/config.php-dist ++++ b/config.php-dist +@@ -44,7 +44,7 @@ + // *** Files and directories *** + // ***************************** + +- define('PHP_EXECUTABLE', '/usr/bin/php'); ++ define('PHP_EXECUTABLE', '/usr/bin/php7'); + // Path to PHP *COMMAND LINE* executable, used for various command-line tt-rss + // programs and update daemon. Do not try to use CGI binary here, it won't work. + // If you see HTTP headers being displayed while running tt-rss scripts, +diff --git a/update.php b/update.php +index 2737b0456..721696d3a 100755 +--- a/update.php ++++ b/update.php +@@ -73,7 +73,7 @@ + } + + if (!defined('PHP_EXECUTABLE')) +- define('PHP_EXECUTABLE', '/usr/bin/php'); ++ define('PHP_EXECUTABLE', '/usr/bin/php7'); + + $pdo = Db::pdo(); + Modified: service =================================================================== --- service 2021-02-01 02:06:42 UTC (rev 839122) +++ service 2021-02-01 02:07:18 UTC (rev 839123) @@ -3,7 +3,7 @@ After=network.target mysqld.service postgresql.service [Service] -ExecStart=/usr/bin/php /usr/share/webapps/tt-rss/update.php --daemon +ExecStart=/usr/bin/php7 /usr/share/webapps/tt-rss/update.php --daemon User=http [Install]