[mythweb: 1/2] Addresses PHP 7.2 issue, fixes #4937.

commit e39b4a3ca6333d10c6ba56dfd19feab5a532c9ae Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Mon Sep 10 15:04:06 2018 -0500 Addresses PHP 7.2 issue, fixes #4937. ChangeLog | 14 ++++++++++++++ mythweb-fixes.patch | 26 ++++++++++++++++++++++++++ mythweb.spec | 5 ++++- 3 files changed, 44 insertions(+), 1 deletion(-) --- diff --git a/ChangeLog b/ChangeLog index e69de29..93028ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,14 @@ +commit 6a6eb1a4a9e48a3f7fcf3006cb4404051e572911 +Author: Bill Meek <billmeek(a)mythtv.org&gt; +Date: Tue May 22 08:50:21 2018 -0500 + + Removes error messages from "Recorded Programs" page + + In Ubuntu 18.04, the following prints for lines + 188 (and 189 for disk_used) on the above screen: + + Warning at /var/www/mythweb/modules/tv/recorded.php, line 188: + + !!NoTrans: Use of undefined constant disk_size - assumed 'disk_size' (this will throw an Error in a future version of PHP)!! + + (cherry picked from commit 664dc1707ccf7be8b0b1d9eadf6366de8bbaa9c9) diff --git a/mythweb-fixes.patch b/mythweb-fixes.patch index e69de29..8b5fad4 100644 --- a/mythweb-fixes.patch +++ b/mythweb-fixes.patch @@ -0,0 +1,26 @@ + modules/tv/recorded.php | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/modules/tv/recorded.php b/modules/tv/recorded.php +index 70c04359..d374c034 100644 +--- a/modules/tv/recorded.php ++++ b/modules/tv/recorded.php +@@ -179,14 +179,14 @@ + if (function_exists('gmp_mul')) { + // GMP functions should work better with 64 bit numbers. + $size = gmp_mul('1024', $size); +- define(disk_size, gmp_strval($size)); ++ define('disk_size', gmp_strval($size)); + $size = gmp_mul('1024', $used); +- define(disk_used, gmp_strval($size)); ++ define('disk_used', gmp_strval($size)); + } + else { + // This is inaccurate, but it's the best we can get without GMP. +- define(disk_size, ($size * 1024)); +- define(disk_used, ($used * 1024)); ++ define('disk_size', ($size * 1024)); ++ define('disk_used', ($used * 1024)); + } + + // Load the class for this page diff --git a/mythweb.spec b/mythweb.spec index 08c2cfa..021ec8f 100644 --- a/mythweb.spec +++ b/mythweb.spec @@ -5,7 +5,7 @@ Summary: The web interface to MythTV URL: http://www.mythtv.org/ Version: 29.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and LGPLv2 and MIT @@ -75,6 +75,9 @@ rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog} %changelog +* Mon Sep 10 2018 Richard Shaw <hobbes1069(a)gmail.com&gt; - 29.1-3 +- Addresses PHP 7.2 issue, fixes #4937. + * Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 29.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild