| 1 |
commit: fd1b21ca74ca7aa419199d6b1c293105aede7517 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 15 17:40:15 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 15 17:40:15 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd1b21ca |
| 7 |
|
| 8 |
dev-php/PEAR-Services_JSON: Add an additional upstream patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../PEAR-Services_JSON-1.0.3-r1.ebuild | 2 +- |
| 13 |
.../files/JSON-1.0.3-constructor.patch | 2 +- |
| 14 |
.../files/JSON-1.0.3-upstream-typo.patch | 20 ++++++++++++++++++++ |
| 15 |
3 files changed, 22 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild b/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild |
| 18 |
index 7203bc34815..9e52d443b4b 100644 |
| 19 |
--- a/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild |
| 20 |
+++ b/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild |
| 21 |
@@ -10,7 +10,7 @@ DESCRIPTION="PHP implementaion of json_encode/decode" |
| 22 |
LICENSE="BSD" |
| 23 |
SLOT="0" |
| 24 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 25 |
-PATCHES=( "${FILESDIR}/JSON-1.0.3-constructor.patch" ) |
| 26 |
+PATCHES=( "${FILESDIR}/JSON-1.0.3-upstream-typo.patch" "${FILESDIR}/JSON-1.0.3-constructor.patch" ) |
| 27 |
|
| 28 |
src_install() { |
| 29 |
php-pear-r2_src_install |
| 30 |
|
| 31 |
diff --git a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch |
| 32 |
index d9d63fc28fc..d7348f0f858 100644 |
| 33 |
--- a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch |
| 34 |
+++ b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch |
| 35 |
@@ -35,7 +35,7 @@ diff -aurN a/JSON.php b/JSON.php |
| 36 |
+ function __construct($message = 'unknown error', $code = null, |
| 37 |
+ $mode = null, $options = null, $userinfo = null) |
| 38 |
+ { |
| 39 |
-+ |
| 40 |
++ return; |
| 41 |
+ } |
| 42 |
function Services_JSON_Error($message = 'unknown error', $code = null, |
| 43 |
$mode = null, $options = null, $userinfo = null) |
| 44 |
|
| 45 |
diff --git a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch |
| 46 |
new file mode 100644 |
| 47 |
index 00000000000..c7d8be3aa91 |
| 48 |
--- /dev/null |
| 49 |
+++ b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch |
| 50 |
@@ -0,0 +1,20 @@ |
| 51 |
+--- a/JSON.php 2011/01/28 00:16:42 307804 |
| 52 |
++++ b/JSON.php 2013/04/30 02:37:26 330165 |
| 53 |
+@@ -554,7 +544,7 @@ |
| 54 |
+ |
| 55 |
+ return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) |
| 56 |
+ ? 'null' |
| 57 |
+- : new Services_JSON_Error(class_name($var). |
| 58 |
++ : new Services_JSON_Error(get_class($var). |
| 59 |
+ " toJSON returned an object with a toJSON method."); |
| 60 |
+ |
| 61 |
+ } |
| 62 |
+@@ -995,7 +985,7 @@ |
| 63 |
+ function Services_JSON_Error($message = 'unknown error', $code = null, |
| 64 |
+ $mode = null, $options = null, $userinfo = null) |
| 65 |
+ { |
| 66 |
+- |
| 67 |
++ return; |
| 68 |
+ } |
| 69 |
+ } |
| 70 |
+ |
Archives