summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortcberner <tcberner@FreeBSD.org>2017-01-23 11:54:17 +0000
committertcberner <tcberner@FreeBSD.org>2017-01-23 11:54:17 +0000
commitd6aaff50334dbb671de77d2f706abc281d0fbbee (patch)
treefb93d7f9c0d1a3902da8b3e3d00731583ff559a5
parenta240c16b36218c55e017b497a4ae84bff7a7e86c (diff)
downloadFreeBSD-ports-d6aaff50334dbb671de77d2f706abc281d0fbbee.zip
FreeBSD-ports-d6aaff50334dbb671de77d2f706abc281d0fbbee.tar.gz
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)
-rw-r--r--mail/pear-Mail_Queue/Makefile1
-rw-r--r--mail/pear-Mail_Queue/files/patch-Mail_Queue.php11
2 files changed, 12 insertions, 0 deletions
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'));
+ }
OpenPOWER on IntegriCloud