summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository QA checks <repo-qa-checks@gentoo.org>2018-05-13 10:07:01 +0000
committerRepository QA checks <repo-qa-checks@gentoo.org>2018-05-13 10:07:01 +0000
commit249eff319a9e1d1f76008cc18b133e4e48b4ffb0 (patch)
treeaeaebb070b89278d8d3b9d1dd84ad5457f39cc60 /dev-java
parent2018-05-13 09:26:18 UTC (diff)
parentdev-libs/cloog: drop to ~arm64 (diff)
downloadgentoo-249eff319a9e1d1f76008cc18b133e4e48b4ffb0.tar.gz
gentoo-249eff319a9e1d1f76008cc18b133e4e48b4ffb0.tar.bz2
gentoo-249eff319a9e1d1f76008cc18b133e4e48b4ffb0.zip
Merge updates from master
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch b/dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch
deleted file mode 100644
index 5b45a973e41d..000000000000
--- a/dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nur json_simple-1.1-all/src/org/json/simple/JSONArray.java json_simple-1.1-all_patched//src/org/json/simple/JSONArray.java
---- json_simple-1.1-all/src/org/json/simple/JSONArray.java 2009-02-01 12:45:34.000000000 +0200
-+++ json_simple-1.1-all_patched//src/org/json/simple/JSONArray.java 2011-09-25 11:23:37.398818358 +0300
-@@ -19,6 +19,18 @@
- public class JSONArray extends ArrayList implements List, JSONAware, JSONStreamAware {
- private static final long serialVersionUID = 3957988303675231981L;
-
-+ public JSONArray() {
-+ super();
-+ }
-+
-+ public JSONArray(java.util.Collection arg0) {
-+ super(arg0);
-+ }
-+
-+ public JSONArray(int initialCapacity) {
-+ super(initialCapacity);
-+ }
-+
- /**
- * Encode a list into JSON text and write it to out.
- * If this list is also a JSONStreamAware or a JSONAware, JSONStreamAware and JSONAware specific behaviours will be ignored at this top level.
-diff -Nur json_simple-1.1-all/src/org/json/simple/JSONObject.java json_simple-1.1-all_patched//src/org/json/simple/JSONObject.java
---- json_simple-1.1-all/src/org/json/simple/JSONObject.java 2009-02-01 12:45:34.000000000 +0200
-+++ json_simple-1.1-all_patched//src/org/json/simple/JSONObject.java 2011-09-25 11:24:34.815103065 +0300
-@@ -18,6 +18,22 @@
- public class JSONObject extends HashMap implements Map, JSONAware, JSONStreamAware{
- private static final long serialVersionUID = -503443796854799292L;
-
-+ public JSONObject() {
-+ super();
-+ }
-+
-+ public JSONObject(int initialCapacity, float loadFactor) {
-+ super(initialCapacity, loadFactor);
-+ }
-+
-+ public JSONObject(int initialCapacity) {
-+ super(initialCapacity);
-+ }
-+
-+ public JSONObject(Map arg0) {
-+ super(arg0);
-+ }
-+
- /**
- * Encode a map into JSON text and write it to out.
- * If this map is also a JSONAware or JSONStreamAware, JSONAware or JSONStreamAware specific behaviours will be ignored at this top level.