rpms/mythtv/F-16 mythtv-0.25.1-php54.patch, NONE, 1.1 mythtv.spec, 1.94, 1.95

[Richard Shaw]

Author: hobbes1069

Update of /cvs/free/rpms/mythtv/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19948

Modified Files:
	mythtv.spec 
Added Files:
	mythtv-0.25.1-php54.patch 
Log Message:
* Fri Jul 06 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.25.1-2
- Patch for PHP 5.4 warnings.


mythtv-0.25.1-php54.patch:
 MythBase.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mythtv-0.25.1-php54.patch ---
commit cd670ec7bf5f04f1ba67b5a7cbc00374479eb9b0
Author: Chris Petersen <cpetersen at mythtv.org>
Date:   Wed Jun 13 21:01:18 2012 -0700

    Partial support for PHP 5.4
    
    Bindings portions of the patch re #10504

diff --git a/mythtv/bindings/php/MythBase.php b/mythtv/bindings/php/MythBase.php
index 9b41efc..563e6fb 100644
--- a/mythtv/bindings/php/MythBase.php
+++ b/mythtv/bindings/php/MythBase.php
@@ -47,7 +47,7 @@ class MythBase {
 
     public function __destruct() {
         if (!is_null($this->cacheKey))
-            Cache::setObject($this->cacheKey, &$this, $this->cacheLifetime);
+            Cache::setObject($this->cacheKey, $this, $this->cacheLifetime);
         $this->cacheKey = null;
     }
 


Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-16/mythtv.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- mythtv.spec	6 Jul 2012 00:46:08 -0000	1.94
+++ mythtv.spec	7 Jul 2012 16:47:16 -0000	1.95
@@ -82,7 +82,7 @@
 Release:        0.1.git.%{_gitrev}%{?dist}
 #Release: 0.1.rc1%{?dist}
 %else
-Release:        1%{?dist}
+Release:        2%{?dist}
 %endif
 
 # The primary license is GPLv2+, but bits are borrowed from a number of
@@ -137,6 +137,9 @@
 
 Patch0:    mythtv-0.25.1-fixes.patch
 
+# Fixes for PHP 5.4
+Patch1:    mythtv-0.25.1-php54.patch
+
 Source10:  PACKAGE-LICENSING
 Source11:  ChangeLog
 Source101: mythbackend.sysconfig
@@ -806,6 +809,7 @@
     fi
 
 %patch0 -p1 -b .mythtv
+%patch1 -p1 -b .php54
 
 # Install ChangeLog
 install -m 0644 %{SOURCE11} .
@@ -1433,6 +1437,9 @@
 
 
 %changelog
+* Fri Jul 06 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.25.1-2
+- Patch for PHP 5.4 warnings.
+
 * Tue Jun 05 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.25.1-1
 - Update to latest fixes/0.25.
 - Move mythweb to a stand alone package.