[mythweb: 1/2] Addresses PHP 7.2 issue, fixes #4937.
by Richard Shaw
commit e39b4a3ca6333d10c6ba56dfd19feab5a532c9ae
Author: Richard Shaw <hobbes1069(a)gmail.com>
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>
+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> - 29.1-3
+- Addresses PHP 7.2 issue, fixes #4937.
+
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 29.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 2 months
[unrar] Add BuildRequires: gcc-c++
by Leigh Scott
commit 46d09edd342b32e34a9cbb0edd1e7945a55ef2cb
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Sep 8 14:34:57 2018 +0100
Add BuildRequires: gcc-c++
unrar.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/unrar.spec b/unrar.spec
index b191074..4b98df1 100644
--- a/unrar.spec
+++ b/unrar.spec
@@ -8,6 +8,7 @@ Source0: https://www.rarlab.com/rar/unrarsrc-%{version}.tar.gz
# Man page from Debian
Source1: unrar-nonfree.1
+BuildRequires: gcc-c++
Requires(post): chkconfig
Requires(preun): chkconfig
6 years, 2 months
[mythtv/el7] (7 commits) ...Update update_fixes.sh to include f29 and be more specific on which branch is being built.
by Richard Shaw
Summary of changes:
ada98b9... Remove mythwikiscripts as it no longer appears to be includ (*)
cb7775b... Define python2 path to configure (*)
851cc53... Define python2 path to configure (*)
a10b995... Add unpacked file (*)
83f0ae5... require python2 (*)
0d3359f... Update to v29.1.36.20180907.gdde16d475a from branch fixes/2 (*)
044b37c... Update update_fixes.sh to include f29 and be more specific (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 2 months
[mythtv] Update update_fixes.sh to include f29 and be more specific on which branch is being built.
by Richard Shaw
commit 044b37c170b5c461f53dea9376e0f9ce04af4cfb
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sat Sep 8 07:38:36 2018 -0500
Update update_fixes.sh to include f29 and be more specific on which branch is being built.
update_fixes.sh | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/update_fixes.sh b/update_fixes.sh
index a7b58af..4a57f07 100755
--- a/update_fixes.sh
+++ b/update_fixes.sh
@@ -25,11 +25,13 @@ echo Press enter to run: rfpkg new-sources mythtv-${version}-${shorthash}.tar.gz
rfpkg new-sources mythtv-${version}-${shorthash}.tar.gz
echo Press enter to continue; read dummy;
rfpkg ci -c && git show
-echo Press enter to continue; read dummy;
+echo Press enter to build current branch.; read dummy;
rfpkg push && rfpkg build --nowait
-echo Press enter to continue; read dummy;
+echo Press enter to build f29; read dummy;
git checkout f28 && git merge master && git push && rfpkg build --nowait; git checkout master
-echo Press enter to continue; read dummy;
+echo Press enter to build f28; read dummy;
+git checkout f28 && git merge master && git push && rfpkg build --nowait; git checkout master
+echo Press enter to build f27; read dummy;
git checkout f27 && git merge master && git push && rfpkg build --nowait; git checkout master
-echo Press enter to continue; read dummy;
+echo Press enter to build elf; read dummy;
git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
6 years, 2 months
[mythtv/f27] (7 commits) ...Update to v29.1.36.20180907.gdde16d475a from branch fixes/29
by Richard Shaw
Summary of changes:
1e3cf3c... Remove f26 target from helper script. (*)
ada98b9... Remove mythwikiscripts as it no longer appears to be includ (*)
cb7775b... Define python2 path to configure (*)
851cc53... Define python2 path to configure (*)
a10b995... Add unpacked file (*)
83f0ae5... require python2 (*)
0d3359f... Update to v29.1.36.20180907.gdde16d475a from branch fixes/2 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 2 months
[mythtv/f28] (7 commits) ...Update to v29.1.36.20180907.gdde16d475a from branch fixes/29
by Richard Shaw
Summary of changes:
1e3cf3c... Remove f26 target from helper script. (*)
ada98b9... Remove mythwikiscripts as it no longer appears to be includ (*)
cb7775b... Define python2 path to configure (*)
851cc53... Define python2 path to configure (*)
a10b995... Add unpacked file (*)
83f0ae5... require python2 (*)
0d3359f... Update to v29.1.36.20180907.gdde16d475a from branch fixes/2 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 2 months