- Update to 0.25.2

- Add fixes for PHP 5.4
This commit is contained in:
Bernhard Froehlich 2012-08-04 08:13:01 +00:00
parent 950da2ba42
commit b5afbb67e2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=302009
5 changed files with 30 additions and 6 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= mythweb
PORTVERSION= 0.25
PORTVERSION= 0.25.2
CATEGORIES= www
MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \
http://ftp.osuosl.org/pub/mythtv/old_releases/ \
@ -48,7 +48,7 @@ post-patch:
do-install:
${MKDIR} ${WWWDIR}
${MKDIR} ${WWWDIR}/data
(cd ${WRKSRC}/mythweb/ && ${COPYTREE_SHARE} "*" ${WWWDIR})
(cd ${WRKSRC}/mythweb/ && ${COPYTREE_SHARE} "*" ${WWWDIR} "! -name *.orig")
${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
${CHMOD} -R 775 ${WWWDIR}/data

View file

@ -1,2 +1,2 @@
SHA256 (mythplugins-0.25.tar.bz2) = 8b74e84a11772274f6f90752d8ce2adf8156162879e4ff716f763bbc695d3b4d
SIZE (mythplugins-0.25.tar.bz2) = 36795780
SHA256 (mythplugins-0.25.2.tar.bz2) = e8507dcddfbb63ab50fe738400639c20bf2f2a278a8947fa85d9096e537f11f3
SIZE (mythplugins-0.25.2.tar.bz2) = 36763594

View file

@ -0,0 +1,11 @@
--- mythweb/includes/sorting.php.orig 2012-05-30 23:22:20.000000000 +0200
+++ mythweb/includes/sorting.php 2012-07-29 14:17:07.402674096 +0200
@@ -119,7 +119,7 @@
function by_user_choice(&$a, &$b) {
foreach ($GLOBALS['user_sort_choice'] as $sort) {
$function = 'by_'.$sort['field'];
- $response = $function(&$a, &$b);
+ $response = $function($a, $b);
// Identical response, go on to the next sort choice
if (!$response)
continue;

View file

@ -0,0 +1,13 @@
--- mythweb/modules/tv/tmpl/default/schedules.php.orig 2012-05-30 23:22:20.000000000 +0200
+++ mythweb/modules/tv/tmpl/default/schedules.php 2012-07-29 14:17:07.405673220 +0200
@@ -85,6 +85,10 @@
</tr>
</thead>
<?php
+ // Hack: Disable warnings about "Creating default
+ // object from empty value" from below line
+ // "$schedule->channel->name = '[ '.t('Any').' ]';"
+ ini_set('error_reporting', E_ERROR);
$prev_group = '';
$cur_group = '';
foreach ($the_schedules as $schedule) {

View file

@ -709,8 +709,8 @@
@dirrm %%WWWDIR%%/js/dialog
@dirrm %%WWWDIR%%/js
@dirrm %%WWWDIR%%/includes
@dirrm %%WWWDIR%%/data/tv_icons
@dirrm %%WWWDIR%%/data/cache
@dirrmtry %%WWWDIR%%/data/tv_icons
@dirrmtry %%WWWDIR%%/data/cache
@dirrmtry %%WWWDIR%%/data
@dirrm %%WWWDIR%%/configuration
@dirrm %%WWWDIR%%/classes/UPnP