gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-php/PEAR-Services_JSON: Add an additional upstream patch

Browse Source 
Package-Manager: Portage-2.3.24, Repoman-2.3.6
This commit is contained in:
Brian Evans
2018-02-15 12:40:15 -05:00
parent 38aaac2048
commit fd1b21ca74
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild
View File

@@ -10,7 +10,7 @@ DESCRIPTION="PHP implementaion of json_encode/decode"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
PATCHES=( "${FILESDIR}/JSON-1.0.3-constructor.patch" )
PATCHES=( "${FILESDIR}/JSON-1.0.3-upstream-typo.patch" "${FILESDIR}/JSON-1.0.3-constructor.patch" )
src_install() {
php-pear-r2_src_install

2
dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch
View File

@@ -35,7 +35,7 @@ diff -aurN a/JSON.php b/JSON.php
+ function __construct($message = 'unknown error', $code = null,
+ $mode = null, $options = null, $userinfo = null)
+ {
+
+ return;
+ }
function Services_JSON_Error($message = 'unknown error', $code = null,
$mode = null, $options = null, $userinfo = null)

20
dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch Normal file
View File

@@ -0,0 +1,20 @@
--- a/JSON.php 2011/01/28 00:16:42 307804
+++ b/JSON.php 2013/04/30 02:37:26 330165
@@ -554,7 +544,7 @@
return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
? 'null'
- : new Services_JSON_Error(class_name($var).
+ : new Services_JSON_Error(get_class($var).
" toJSON returned an object with a toJSON method.");
}
@@ -995,7 +985,7 @@
function Services_JSON_Error($message = 'unknown error', $code = null,
$mode = null, $options = null, $userinfo = null)
{
-
+ return;
}
}