* [gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Services_JSON/, dev-php/PEAR-Services_JSON/files/
@ 2018-02-15 17:40 Brian Evans
0 siblings, 0 replies; 2+ messages in thread
From: Brian Evans @ 2018-02-15 17:40 UTC (permalink / raw
To: gentoo-commits
commit: fd1b21ca74ca7aa419199d6b1c293105aede7517
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 15 17:40:15 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 17:40:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd1b21ca
dev-php/PEAR-Services_JSON: Add an additional upstream patch
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../PEAR-Services_JSON-1.0.3-r1.ebuild | 2 +-
.../files/JSON-1.0.3-constructor.patch | 2 +-
.../files/JSON-1.0.3-upstream-typo.patch | 20 ++++++++++++++++++++
3 files changed, 22 insertions(+), 2 deletions(-)
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 7203bc34815..9e52d443b4b 100644
--- 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 d9d63fc28fc..d7348f0f858 100644
--- 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
index 00000000000..c7d8be3aa91
--- /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;
+ }
+ }
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Services_JSON/, dev-php/PEAR-Services_JSON/files/
@ 2024-07-11 18:47 Viorel Munteanu
0 siblings, 0 replies; 2+ messages in thread
From: Viorel Munteanu @ 2024-07-11 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 2901bcf632742b711d1c06eb7c76450f01debb8c
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 11 17:36:12 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 18:43:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2901bcf6
dev-php/PEAR-Services_JSON: treeclean
Bug: https://bugs.gentoo.org/933998
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
dev-php/PEAR-Services_JSON/Manifest | 1 -
.../PEAR-Services_JSON-1.0.3-r1.ebuild | 19 ----------
.../files/JSON-1.0.3-constructor.patch | 42 ----------------------
.../files/JSON-1.0.3-upstream-typo.patch | 20 -----------
dev-php/PEAR-Services_JSON/metadata.xml | 8 -----
5 files changed, 90 deletions(-)
diff --git a/dev-php/PEAR-Services_JSON/Manifest b/dev-php/PEAR-Services_JSON/Manifest
deleted file mode 100644
index 9b6ab90d9430..000000000000
--- a/dev-php/PEAR-Services_JSON/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Services_JSON-1.0.3.tgz 9529 BLAKE2B 5a35899d53b66f3534afd64105c361e7aafa22641f540ef5ed38789ccc771f4e62577b1044af8d617579aed36e014e38e6bc30f39b476b09b47202d8822028d7 SHA512 2a94bebb662e250d56ae1f02f6debbff9e956820a603b8c4520f48ad0ed67a40c342d4eb000be9a9cf0e5b91c7bf9ebf98fae87f9ecca217b94b12441b746e5e
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
deleted file mode 100644
index d3d89067cc4c..000000000000
--- a/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit php-pear-r2
-
-IUSE=""
-DESCRIPTION="PHP implementaion of json_encode/decode"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
-PATCHES=( "${FILESDIR}/JSON-1.0.3-upstream-typo.patch" "${FILESDIR}/JSON-1.0.3-constructor.patch" )
-
-src_install() {
- php-pear-r2_src_install
- insinto /usr/share/php/Services
- doins JSON.php
-}
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
deleted file mode 100644
index d7348f0f858e..000000000000
--- a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -aurN a/JSON.php b/JSON.php
---- a/JSON.php 2011-01-13 21:40:48.000000000 -0500
-+++ b/JSON.php 2018-02-15 11:42:06.551287857 -0500
-@@ -139,6 +139,14 @@
- * strings or numbers, if you return an object, make sure it does
- * not have a toJSON method, otherwise an error will occur.
- */
-+ function __construct($use = 0)
-+ {
-+ $this->use = $use;
-+ $this->_mb_strlen = function_exists('mb_strlen');
-+ $this->_mb_convert_encoding = function_exists('mb_convert_encoding');
-+ $this->_mb_substr = function_exists('mb_substr');
-+ }
-+
- function Services_JSON($use = 0)
- {
- $this->use = $use;
-@@ -909,6 +917,11 @@
-
- class Services_JSON_Error extends PEAR_Error
- {
-+ function __construct($message = 'unknown error', $code = null,
-+ $mode = null, $options = null, $userinfo = null)
-+ {
-+ parent::__construct($message, $code, $mode, $options, $userinfo);
-+ }
- function Services_JSON_Error($message = 'unknown error', $code = null,
- $mode = null, $options = null, $userinfo = null)
- {
-@@ -923,6 +936,11 @@
- */
- class Services_JSON_Error
- {
-+ 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
deleted file mode 100644
index c7d8be3aa910..000000000000
--- a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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;
- }
- }
-
diff --git a/dev-php/PEAR-Services_JSON/metadata.xml b/dev-php/PEAR-Services_JSON/metadata.xml
deleted file mode 100644
index 77793b997e9e..000000000000
--- a/dev-php/PEAR-Services_JSON/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>php-bugs@gentoo.org</email>
- <name>PHP</name>
-</maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-11 18:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-15 17:40 [gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Services_JSON/, dev-php/PEAR-Services_JSON/files/ Brian Evans
-- strict thread matches above, loose matches on Subject: below --
2024-07-11 18:47 Viorel Munteanu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox