[arch-commits] Commit in tt-rss/trunk (4 files)

[Anatol Pomozov]

    Date: Friday, March 12, 2021 @ 23:25:05
  Author: anatolik
Revision: 889888

upgpkg: tt-rss 2:r10820.4e81233ac-1: Switch back to php8

Modified:
  tt-rss/trunk/PKGBUILD
  tt-rss/trunk/tt-rss.install
  tt-rss/trunk/tt-rss.service
Deleted:
  tt-rss/trunk/php7.patch

----------------+
 PKGBUILD       |   21 +++++++--------------
 php7.patch     |   26 --------------------------
 tt-rss.install |   13 ++++++++-----
 tt-rss.service |    2 +-
 4 files changed, 16 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-12 22:54:49 UTC (rev 889887)
+++ PKGBUILD	2021-03-12 23:25:05 UTC (rev 889888)
@@ -5,8 +5,8 @@
 # Contributor: Erik Mank <erik at braindisorder.org>
 
 pkgname=tt-rss
-pkgver=r10198.6d8f2221b
-pkgrel=2
+pkgver=r10820.4e81233ac
+pkgrel=1
 epoch=2
 pkgdesc='Web-based news feed (RSS/Atom) aggregator'
 arch=(any)
@@ -13,20 +13,18 @@
 url='https://tt-rss.org'
 license=(GPL)
 backup=(etc/webapps/tt-rss/config.php)
-depends=(php7 php7-intl)
+depends=(php php-intl)
 install=tt-rss.install
 optdepends=('mysql'
             'postgresql'
-            'php7-gd: for coloured feed badges')
+            'php-gd: for coloured feed badges')
 makedepends=('git')
-_commit=6d8f2221b82b6a31becbeed8baf5e05ad9e053fe
+_commit=4e81233ac9d0749677bce1e505ddc464709a4b98
 # 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
-        tt-rss.service
-	php7.patch)
+        tt-rss.service)
 sha1sums=('SKIP'
-          '6975508c8cbe86152489fc6f1887c1d0d7df19e0'
-          '6e6a6350bf645f2d84785aa1c8e613be0cca337e')
+          'd764e22065f8e0104b4f1d5dcf41cce01cd7bec5')
 
 pkgver() {
   cd tt-rss
@@ -33,11 +31,6 @@
   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

Deleted: php7.patch
===================================================================
--- php7.patch	2021-03-12 22:54:49 UTC (rev 889887)
+++ php7.patch	2021-03-12 23:25:05 UTC (rev 889888)
@@ -1,26 +0,0 @@
-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: tt-rss.install
===================================================================
--- tt-rss.install	2021-03-12 22:54:49 UTC (rev 889887)
+++ tt-rss.install	2021-03-12 23:25:05 UTC (rev 889888)
@@ -1,14 +1,17 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-  if [ "$(vercmp $2 2:r10198.6d8f2221b-2)" -le 0 ]; then
+  if [ "$(vercmp $2 2:r10820.4e81233ac-1)" -le 0 ]; then
     cat << EOF
-===> tt-rss is not compliant with PHP 8 yet and requires use of PHP 7.
-===>   https://bugs.archlinux.org/task/69462
+===> tt-rss switched back to PHP 8.
 ===> Please reconfigure PHP-specific bits:
-===>   * Enable required modules in /etc/php7/php.ini
-===>   * Start/enable php-fpm7 systemd service
+===>   * Enable required modules in /etc/php/php.ini
+===>   * Start/enable php-fpm systemd service
 ===> See https://wiki.archlinux.org/index.php/TT-RSS for more information.
+===> ********************************************************************
+===> TT-RSS has restructured its config files, please consult
+===>   https://tt-rss.org/wiki/GlobalConfig
+===> on the config file migration plan.
 EOF
   fi
 }

Modified: tt-rss.service
===================================================================
--- tt-rss.service	2021-03-12 22:54:49 UTC (rev 889887)
+++ tt-rss.service	2021-03-12 23:25:05 UTC (rev 889888)
@@ -3,7 +3,7 @@
 After=network.target mysqld.service postgresql.service
 
 [Service]
-ExecStart=/usr/bin/php7 /usr/share/webapps/tt-rss/update.php --daemon
+ExecStart=/usr/bin/php /usr/share/webapps/tt-rss/update.php --daemon
 User=http
 
 [Install]