From d6aaff50334dbb671de77d2f706abc281d0fbbee Mon Sep 17 00:00:00 2001 From: tcberner Date: Mon, 23 Jan 2017 11:54:17 +0000 Subject: mail/pear-Mail_Queue: overloading isError static mismatch Since devel/pear was upgraded to 1.10.1, mail/pear-Mail_Queue was broken and could not be used, giving the following error: PHP Fatal error: Cannot make static method PEAR::isError() non static in class Mail_Queue in /usr/local/share/pear/Mail/Queue.php on line 126 Upstream bug report: http://pear.php.net/bugs/bug.php?id=20976 PR: 215325 Submitted by: ml@netfence.it Reported by: ml@netfence.it MFH: 2017Q1 Approved by: Jochen Neumeister (maintainer), rakuco (mentor) --- mail/pear-Mail_Queue/Makefile | 1 + mail/pear-Mail_Queue/files/patch-Mail_Queue.php | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 mail/pear-Mail_Queue/files/patch-Mail_Queue.php diff --git a/mail/pear-Mail_Queue/Makefile b/mail/pear-Mail_Queue/Makefile index 4db3ed9..6efd565 100644 --- a/mail/pear-Mail_Queue/Makefile +++ b/mail/pear-Mail_Queue/Makefile @@ -3,6 +3,7 @@ PORTNAME= Mail_Queue PORTVERSION= 1.2.7 +PORTREVISION= 1 CATEGORIES= mail www pear MAINTAINER= joneum@bsdproject.de diff --git a/mail/pear-Mail_Queue/files/patch-Mail_Queue.php b/mail/pear-Mail_Queue/files/patch-Mail_Queue.php new file mode 100644 index 0000000..5c79af2 --- /dev/null +++ b/mail/pear-Mail_Queue/files/patch-Mail_Queue.php @@ -0,0 +1,11 @@ +--- Mail/Queue.php.orig 2016-12-15 17:08:51 UTC ++++ Mail/Queue.php +@@ -587,7 +587,7 @@ class Mail_Queue extends PEAR + * @return boolean whether $value is an MAILQUEUE_ERROR + * @access public + */ +- function isError($value) ++ static function isError($value) + { + return (is_object($value) && is_a($value, 'pear_error')); + } -- cgit v1.1