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

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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
index 7203bc34815aca7fa81558c70dd64afaf17511a0..9e52d443b4b0918bdb711218c355f584fbdbe812 100644 (file)
--- 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
@@ -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

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
index d9d63fc28fcd259cf09a1784fb0ac18620d8bbb7..d7348f0f858e54ec7eae2281f455f86955c2cf2c 100644 (file)
--- 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
@@ -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)

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
new file mode 100644 (file)
index 0000000..c7d8be3
--- /dev/null
+++ b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch
@@ -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;
+         }
+     }
+