Date: Monday, August 12, 2013 @ 07:36:30 Author: jconder Revision: 95421
upgpkg: mythplugins 1:0.26.0-3 fix mythweb for PHP 5.5 Added: mythplugins/trunk/php55.patch Modified: mythplugins/trunk/PKGBUILD -------------+ PKGBUILD | 7 +++++-- php55.patch | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-08-12 05:12:07 UTC (rev 95420) +++ PKGBUILD 2013-08-12 05:36:30 UTC (rev 95421) @@ -14,7 +14,7 @@ 'mythplugins-mythweb' 'mythplugins-mythzoneminder') pkgver=0.26.0 -pkgrel=2 +pkgrel=3 epoch=1 arch=('i686' 'x86_64') url="http://www.mythtv.org" @@ -27,9 +27,11 @@ 'python2-pycurl' 'taglib' 'zlib') source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2" 'cdparanoia.patch' + 'php55.patch' 'mtd.rc') md5sums=('15bd7b2f4173488966f3d761e0eacffa' '5de8dd79d0b8a2b006f3c3258938b6b7' + 'a6df720ef22fe6bef8c650b1bd5948cb' '476c12ba074794ad7f4ae092bdf949d6') build() { @@ -40,11 +42,12 @@ sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp' patch -Np1 -i "$srcdir/cdparanoia.patch" + patch -Np1 -i "$srcdir/php55.patch" ./configure --prefix=/usr \ --enable-all \ --python=python2 - qmake mythplugins.pro + qmake-qt4 mythplugins.pro make -s } Added: php55.patch =================================================================== --- php55.patch (rev 0) +++ php55.patch 2013-08-12 05:36:30 UTC (rev 95421) @@ -0,0 +1,22 @@ +--- a/mythweb/includes/errors.php ++++ b/mythweb/includes/errors.php +@@ -103,6 +103,9 @@ + /**/ + function error_handler($errno, $errstr, $errfile, $errline, $vars) { + global $db; ++ // Leave early if we haven't requested reports from this kind of error ++ if (!($errno & error_reporting())) ++ return; + if (class_exists('Translate')) + $errstr = Translate::find()->string($errstr); + // Try to auto-repair damaged SQL tables +@@ -113,9 +116,6 @@ + add_error('Regular Expression Error: '.$match[1]); + return; + } +- // Leave early if we haven't requested reports from this kind of error +- if (!($errno & error_reporting())) +- return; + // Fatal errors should report considerably more detail + if (in_array($errno, array(E_USER_ERROR, E_ERROR))) { + // What type of error?