From 30935b6991dcf92b681eb94f1c793e6a2ec36fda Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 15 Jun 2018 21:52:03 +0000 Subject: mythtv, mythplugins & mythweb: update to latest fixes --- abs/core/mythtv/stable-29/git_src/git_hash | 2 +- abs/core/mythtv/stable-29/git_src/git_hash_web | 2 +- abs/core/mythtv/stable-29/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-29/mythtv/PKGBUILD | 4 ++-- .../mythtv/mythfrontend_en_us.ts_Title_Case.patch | 4 ++-- .../stable-29/mythweb/FixPHPWarnings_13260.patch | 21 --------------------- abs/core/mythtv/stable-29/mythweb/PKGBUILD | 8 +++----- 7 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 abs/core/mythtv/stable-29/mythweb/FixPHPWarnings_13260.patch diff --git a/abs/core/mythtv/stable-29/git_src/git_hash b/abs/core/mythtv/stable-29/git_src/git_hash index 298cf81..98ae14a 100644 --- a/abs/core/mythtv/stable-29/git_src/git_hash +++ b/abs/core/mythtv/stable-29/git_src/git_hash @@ -1 +1 @@ -1777cc442597e5c4d64124ba3de554514961df6b +675676bb38ea8142931bd63861eef07e0164f2e6 diff --git a/abs/core/mythtv/stable-29/git_src/git_hash_web b/abs/core/mythtv/stable-29/git_src/git_hash_web index 38dfcdc..22e5e67 100644 --- a/abs/core/mythtv/stable-29/git_src/git_hash_web +++ b/abs/core/mythtv/stable-29/git_src/git_hash_web @@ -1 +1 @@ -99838ff4323d7dfc20fd720d4ed3a2042592df69 +6a6eb1a4a9e48a3f7fcf3006cb4404051e572911 diff --git a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD index d4d43eb..abcff52 100644 --- a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=29.1 -pkgrel=5 +pkgrel=6 arch=('x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-29/mythtv/PKGBUILD b/abs/core/mythtv/stable-29/mythtv/PKGBUILD index 14eb9f0..d74deb4 100644 --- a/abs/core/mythtv/stable-29/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-29/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=29.1 -pkgrel=5 +pkgrel=6 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('x86_64') @@ -138,7 +138,7 @@ md5sums=('fb5a87c52a31168a0c8fdde72f27cc45' '6add9c16bbb988067e82029327e567b2' 'b0b238320fa78a4928dce2cea7c85071' '8e4492d1777234a021f368bd6ee964ee' - '3d194fa65b0ec8332d09e65aefbfdc7a' + 'da21518b594970b001476247aac4167c' '17452a48ef2e27740f961480449b6303' 'd05eaf66c434a131c8efb4d87e99b402' '5f2bd4065b145b7b7ff09dfd6f08276c' diff --git a/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch b/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch index 5b8a318..04a74f6 100644 --- a/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch +++ b/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch @@ -1,5 +1,5 @@ --- src/mythtv/i18n/mythfrontend_en_us.ts.orig 2018-05-23 18:35:11.221352872 +0000 -+++ src/mythtv/i18n/mythfrontend_en_us.ts 2018-05-31 12:58:17.529459302 +0000 ++++ src/mythtv/i18n/mythfrontend_en_us.ts 2018-06-05 21:26:49.794659793 +0000 @@ -573,7 +573,7 @@ @@ -14246,7 +14246,7 @@ - This showing is not scheduled to record - This showing is not scheduled to record -+ This showing is not scheduled to record ++ This showing is not scheduled to record. - diff --git a/abs/core/mythtv/stable-29/mythweb/FixPHPWarnings_13260.patch b/abs/core/mythtv/stable-29/mythweb/FixPHPWarnings_13260.patch deleted file mode 100644 index 9fb3c04..0000000 --- a/abs/core/mythtv/stable-29/mythweb/FixPHPWarnings_13260.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ./modules/tv/recorded.php -+++ ./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/abs/core/mythtv/stable-29/mythweb/PKGBUILD b/abs/core/mythtv/stable-29/mythweb/PKGBUILD index a32f039..f83912e 100644 --- a/abs/core/mythtv/stable-29/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-29/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=29 -pkgrel=4 +pkgrel=5 commit_hash=`cat ../git_src/git_hash_web` pkgdesc="Web interface for MythTV's backend, $commit_hash" arch=('x86_64') @@ -10,8 +10,7 @@ depends=('lighttpd' "mythtv>=${pkgver}" 'php' 'supplemental-web') groups=('mythtv-extras') install=mythweb.install -patches=('FixPHPWarnings_13260.patch' - 'video.css.patch') +patches=('video.css.patch') source=(`echo ${patches[@]:0}` 'mythweb.include' 'mythweb_gen_light.conf') @@ -54,7 +53,6 @@ package() { #gen_light_conf install -D -m0744 ${srcdir}/mythweb_gen_light.conf ${pkgdir}/etc/gen_light_conf.d/mythweb.conf } -md5sums=('df80362c995ddfcf6a2119b83d26b2b4' - '668a36e404c8254f56e7a7304e655332' +md5sums=('668a36e404c8254f56e7a7304e655332' '7645a6399434cbba35639713ac5d88e0' 'df190116b3aba35720fb6631885f973f') -- cgit v0.12