From aca2c6fd9d8850091a072a5ab7b0e0aa184cb9e1 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 4 Aug 2020 20:20:30 -0400 Subject: [PATCH 1/8] python3-ipython: update to 7.17.0. --- srcpkgs/python3-ipython/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template index e42a00f8326..f40bfc437bb 100644 --- a/srcpkgs/python3-ipython/template +++ b/srcpkgs/python3-ipython/template @@ -1,6 +1,6 @@ # Template file for 'python3-ipython' pkgname=python3-ipython -version=7.16.1 +version=7.17.0 revision=1 archs=noarch wrksrc="ipython-${version}" @@ -17,7 +17,7 @@ maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://ipython.org/" distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz" -checksum=9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf +checksum=b70974aaa2674b05eb86a910c02ed09956a33f2dd6c71afc60f0b128a77e7f28 conflicts="python-ipython<=5.8.0_2" do_check() { From 617e4f7b89bc334c6bf82d467b8c6e3d1e021b26 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 4 Aug 2020 20:24:56 -0400 Subject: [PATCH 2/8] python-parso: update to 0.7.1, drop python3 --- srcpkgs/python-parso/template | 18 ++++-------------- srcpkgs/python-parso/update | 1 + srcpkgs/python3-parso | 1 - 3 files changed, 5 insertions(+), 15 deletions(-) create mode 100644 srcpkgs/python-parso/update delete mode 120000 srcpkgs/python3-parso diff --git a/srcpkgs/python-parso/template b/srcpkgs/python-parso/template index dbb02db3f7f..49ed2fbdf20 100644 --- a/srcpkgs/python-parso/template +++ b/srcpkgs/python-parso/template @@ -1,29 +1,19 @@ # Template file for 'python-parso' pkgname=python-parso -version=0.7.0 +version=0.7.1 revision=1 archs=noarch wrksrc="parso-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" +build_style=python2-module +hostmakedepends="python-setuptools" depends="python" short_desc="Python parser (Python 2)" maintainer="Alessio Sergi " license="MIT" homepage="https://github.com/davidhalter/parso" distfiles="${PYPI_SITE}/p/parso/parso-${version}.tar.gz" -checksum=908e9fae2144a076d72ae4e25539143d40b8e3eafbaeae03c1bfe226f4cdf12c +checksum=caba44724b994a8a5e086460bb212abc5a8bc46951bf4a9a1210745953622eb9 post_install() { vlicense LICENSE.txt } - -python3-parso_package() { - archs=noarch - depends="python3" - short_desc="${short_desc/2/3}" - pkg_install() { - vmove "usr/lib/python3*" - vlicense LICENSE.txt - } -} diff --git a/srcpkgs/python-parso/update b/srcpkgs/python-parso/update new file mode 100644 index 00000000000..6c7527aa483 --- /dev/null +++ b/srcpkgs/python-parso/update @@ -0,0 +1 @@ +pattern="parso-\K0.7[0-9.]+(?=.tar.gz)" diff --git a/srcpkgs/python3-parso b/srcpkgs/python3-parso deleted file mode 120000 index e4b557e5a8a..00000000000 --- a/srcpkgs/python3-parso +++ /dev/null @@ -1 +0,0 @@ -python-parso \ No newline at end of file From 7035806c7a90cc7a6077472fddbc28255bfde770 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 4 Aug 2020 20:37:03 -0400 Subject: [PATCH 3/8] New package: python3-parso-0.8.0 --- srcpkgs/python3-parso/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/python3-parso/template diff --git a/srcpkgs/python3-parso/template b/srcpkgs/python3-parso/template new file mode 100644 index 00000000000..5fed4bfb7ee --- /dev/null +++ b/srcpkgs/python3-parso/template @@ -0,0 +1,19 @@ +# Template file for 'python3-parso' +pkgname=python3-parso +version=0.8.0 +revision=1 +archs=noarch +wrksrc="parso-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3" +short_desc="Python parser (Python 3)" +maintainer="Andrew J. Hesford " +license="MIT" +homepage="https://github.com/davidhalter/parso" +distfiles="${PYPI_SITE}/p/parso/parso-${version}.tar.gz" +checksum=2b6db14759c528d857eeb9eac559c2166b2554548af39f5198bdfb976f72aa64 + +post_install() { + vlicense LICENSE.txt +} From 1c274f0b1654158fb2de3cbab8331e3d60c565d5 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 4 Aug 2020 20:37:07 -0400 Subject: [PATCH 4/8] python3-setuptools: update to 49.2.1. --- srcpkgs/python3-setuptools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template index b5e463b7c68..9bf5b316e66 100644 --- a/srcpkgs/python3-setuptools/template +++ b/srcpkgs/python3-setuptools/template @@ -1,6 +1,6 @@ # Template file for 'python3-setuptools' pkgname=python3-setuptools -version=49.2.0 +version=49.2.1 revision=1 archs=noarch wrksrc="setuptools-${version}" @@ -12,7 +12,7 @@ maintainer="Alessio Sergi " license="MIT" homepage="https://github.com/pypa/setuptools" distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip" -checksum=afe9e81fee0270d3f60d52608549cc8ec4c46dada8c95640c1a00160f577acf2 +checksum=88094d17c8d273390659a72e9d93374cd7bfd188c12bf2747b306e2bed48df18 alternatives="setuptools:easy_install:/usr/bin/easy_install3" provides="python3-distribute-${version}_1" replaces="python3-distribute>=0" From dc0936da876088c829d749938e3a340d1bf32183 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 4 Aug 2020 20:39:08 -0400 Subject: [PATCH 5/8] python-jedi: update to 0.17.2. --- srcpkgs/python-jedi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-jedi/template b/srcpkgs/python-jedi/template index 224b55f9820..5eb9fff0617 100644 --- a/srcpkgs/python-jedi/template +++ b/srcpkgs/python-jedi/template @@ -1,6 +1,6 @@ # Template file for 'python-jedi' pkgname=python-jedi -version=0.17.1 +version=0.17.2 revision=1 archs=noarch wrksrc="jedi-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " license="MIT" homepage="https://jedi.readthedocs.io/" distfiles="${PYPI_SITE}/j/jedi/jedi-${version}.tar.gz" -checksum=807d5d4f96711a2bcfdd5dfa3b1ae6d09aa53832b182090b222b5efb81f52f63 +checksum=86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20 post_install() { vlicense LICENSE.txt From 574500f238c5ad5cc5f3fc6361bc1d994ace8ad5 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 4 Aug 2020 20:51:37 -0400 Subject: [PATCH 6/8] python3-ultrajson: update to 3.1.0, claim maintainer --- ...static-to-C-functions-where-possible.patch | 597 ------------------ .../patches/lower-stack-usage.patch | 19 - srcpkgs/python3-ultrajson/template | 12 +- 3 files changed, 5 insertions(+), 623 deletions(-) delete mode 100644 srcpkgs/python3-ultrajson/patches/added-static-to-C-functions-where-possible.patch delete mode 100644 srcpkgs/python3-ultrajson/patches/lower-stack-usage.patch diff --git a/srcpkgs/python3-ultrajson/patches/added-static-to-C-functions-where-possible.patch b/srcpkgs/python3-ultrajson/patches/added-static-to-C-functions-where-possible.patch deleted file mode 100644 index 2e197dd2b99..00000000000 --- a/srcpkgs/python3-ultrajson/patches/added-static-to-C-functions-where-possible.patch +++ /dev/null @@ -1,597 +0,0 @@ -From 6cf6c7ff25c883349e8e9e5468e61498358e2e91 Mon Sep 17 00:00:00 2001 -From: WGH -Date: Sat, 27 Aug 2016 17:34:22 +0300 -Subject: [PATCH] added "static" to C functions, where possible - -1. It reduces clutter in symbol table. -2. It fixes issues with C99 inline semantics for functions - marked as inline (#237, #180, #222), which manifests - when compiled with GCC>=5. ---- - lib/ultrajsondec.c | 24 ++++++++-------- - lib/ultrajsonenc.c | 24 ++++++++-------- - python/JSONtoObj.c | 24 ++++++++-------- - python/objToJSON.c | 72 +++++++++++++++++++++++----------------------- - 4 files changed, 72 insertions(+), 72 deletions(-) - -diff --git a/lib/ultrajsondec.c b/lib/ultrajsondec.c -index 21a732e..19efc60 100644 ---- a/lib/ultrajsondec.c -+++ b/lib/ultrajsondec.c -@@ -66,7 +66,7 @@ struct DecoderState - JSONObjectDecoder *dec; - }; - --JSOBJ FASTCALL_MSVC decode_any( struct DecoderState *ds) FASTCALL_ATTR; -+static JSOBJ FASTCALL_MSVC decode_any( struct DecoderState *ds) FASTCALL_ATTR; - typedef JSOBJ (*PFN_DECODER)( struct DecoderState *ds); - - static JSOBJ SetError( struct DecoderState *ds, int offset, const char *message) -@@ -76,13 +76,13 @@ static JSOBJ SetError( struct DecoderState *ds, int offset, const char *message) - return NULL; - } - --double createDouble(double intNeg, double intValue, double frcValue, int frcDecimalCount) -+static double createDouble(double intNeg, double intValue, double frcValue, int frcDecimalCount) - { - static const double g_pow10[] = {1.0, 0.1, 0.01, 0.001, 0.0001, 0.00001, 0.000001,0.0000001, 0.00000001, 0.000000001, 0.0000000001, 0.00000000001, 0.000000000001, 0.0000000000001, 0.00000000000001, 0.000000000000001}; - return (intValue + (frcValue * g_pow10[frcDecimalCount])) * intNeg; - } - --FASTCALL_ATTR JSOBJ FASTCALL_MSVC decodePreciseFloat(struct DecoderState *ds) -+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decodePreciseFloat(struct DecoderState *ds) - { - char *end; - double value; -@@ -99,7 +99,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decodePreciseFloat(struct DecoderState *ds) - return ds->dec->newDouble(ds->prv, value); - } - --FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds) -+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds) - { - int intNeg = 1; - int mantSize = 0; -@@ -309,7 +309,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds) - return ds->dec->newDouble (ds->prv, createDouble( (double) intNeg, (double) intValue , frcValue, decimalCount) * pow(10.0, expValue * expNeg)); - } - --FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_true ( struct DecoderState *ds) -+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_true ( struct DecoderState *ds) - { - char *offset = ds->start; - offset ++; -@@ -329,7 +329,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_true ( struct DecoderState *ds) - return SetError(ds, -1, "Unexpected character found when decoding 'true'"); - } - --FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_false ( struct DecoderState *ds) -+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_false ( struct DecoderState *ds) - { - char *offset = ds->start; - offset ++; -@@ -351,7 +351,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_false ( struct DecoderState *ds) - return SetError(ds, -1, "Unexpected character found when decoding 'false'"); - } - --FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_null ( struct DecoderState *ds) -+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_null ( struct DecoderState *ds) - { - char *offset = ds->start; - offset ++; -@@ -371,7 +371,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_null ( struct DecoderState *ds) - return SetError(ds, -1, "Unexpected character found when decoding 'null'"); - } - --FASTCALL_ATTR void FASTCALL_MSVC SkipWhitespace(struct DecoderState *ds) -+static FASTCALL_ATTR void FASTCALL_MSVC SkipWhitespace(struct DecoderState *ds) - { - char *offset = ds->start; - -@@ -422,7 +422,7 @@ static const JSUINT8 g_decoderLookup[256] = - /* 0xf0 */ 4, 4, 4, 4, 4, 4, 4, 4, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, - }; - --FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_string ( struct DecoderState *ds) -+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_string ( struct DecoderState *ds) - { - JSUTF16 sur[2] = { 0 }; - int iSur = 0; -@@ -672,7 +672,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_string ( struct DecoderState *ds) - } - } - --FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_array(struct DecoderState *ds) -+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_array(struct DecoderState *ds) - { - JSOBJ itemValue; - JSOBJ newObj; -@@ -736,7 +736,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_array(struct DecoderState *ds) - } - } - --FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_object( struct DecoderState *ds) -+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_object( struct DecoderState *ds) - { - JSOBJ itemName; - JSOBJ itemValue; -@@ -819,7 +819,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_object( struct DecoderState *ds) - } - } - --FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_any(struct DecoderState *ds) -+static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_any(struct DecoderState *ds) - { - for (;;) - { -diff --git a/lib/ultrajsonenc.c b/lib/ultrajsonenc.c -index 6c1b120..f330171 100644 ---- a/lib/ultrajsonenc.c -+++ b/lib/ultrajsonenc.c -@@ -112,7 +112,7 @@ static void SetError (JSOBJ obj, JSONObjectEncoder *enc, const char *message) - /* - FIXME: Keep track of how big these get across several encoder calls and try to make an estimate - That way we won't run our head into the wall each call */ --void Buffer_Realloc (JSONObjectEncoder *enc, size_t cbNeeded) -+static void Buffer_Realloc (JSONObjectEncoder *enc, size_t cbNeeded) - { - size_t curSize = enc->end - enc->start; - size_t newSize = curSize * 2; -@@ -148,7 +148,7 @@ void Buffer_Realloc (JSONObjectEncoder *enc, size_t cbNeeded) - enc->end = enc->start + newSize; - } - --FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC Buffer_AppendShortHexUnchecked (char *outputOffset, unsigned short value) -+static FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC Buffer_AppendShortHexUnchecked (char *outputOffset, unsigned short value) - { - *(outputOffset++) = g_hexChars[(value & 0xf000) >> 12]; - *(outputOffset++) = g_hexChars[(value & 0x0f00) >> 8]; -@@ -156,7 +156,7 @@ FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC Buffer_AppendShortHexUnchecked (c - *(outputOffset++) = g_hexChars[(value & 0x000f) >> 0]; - } - --int Buffer_EscapeStringUnvalidated (JSONObjectEncoder *enc, const char *io, const char *end) -+static int Buffer_EscapeStringUnvalidated (JSONObjectEncoder *enc, const char *io, const char *end) - { - char *of = (char *) enc->offset; - -@@ -260,7 +260,7 @@ int Buffer_EscapeStringUnvalidated (JSONObjectEncoder *enc, const char *io, cons - } - } - --int Buffer_EscapeStringValidated (JSOBJ obj, JSONObjectEncoder *enc, const char *io, const char *end) -+static int Buffer_EscapeStringValidated (JSOBJ obj, JSONObjectEncoder *enc, const char *io, const char *end) - { - JSUTF32 ucs; - char *of = (char *) enc->offset; -@@ -498,19 +498,19 @@ int Buffer_EscapeStringValidated (JSOBJ obj, JSONObjectEncoder *enc, const char - #define Buffer_AppendCharUnchecked(__enc, __chr) \ - *((__enc)->offset++) = __chr; \ - --FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC strreverse(char* begin, char* end) -+static FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC strreverse(char* begin, char* end) - { - char aux; - while (end > begin) - aux = *end, *end-- = *begin, *begin++ = aux; - } - --void Buffer_AppendIndentNewlineUnchecked(JSONObjectEncoder *enc) -+static void Buffer_AppendIndentNewlineUnchecked(JSONObjectEncoder *enc) - { - if (enc->indent > 0) Buffer_AppendCharUnchecked(enc, '\n'); - } - --void Buffer_AppendIndentUnchecked(JSONObjectEncoder *enc, JSINT32 value) -+static void Buffer_AppendIndentUnchecked(JSONObjectEncoder *enc, JSINT32 value) - { - int i; - if (enc->indent > 0) -@@ -519,7 +519,7 @@ void Buffer_AppendIndentUnchecked(JSONObjectEncoder *enc, JSINT32 value) - Buffer_AppendCharUnchecked(enc, ' '); - } - --void Buffer_AppendIntUnchecked(JSONObjectEncoder *enc, JSINT32 value) -+static void Buffer_AppendIntUnchecked(JSONObjectEncoder *enc, JSINT32 value) - { - char* wstr; - JSUINT32 uvalue = (value < 0) ? -value : value; -@@ -535,7 +535,7 @@ void Buffer_AppendIntUnchecked(JSONObjectEncoder *enc, JSINT32 value) - enc->offset += (wstr - (enc->offset)); - } - --void Buffer_AppendLongUnchecked(JSONObjectEncoder *enc, JSINT64 value) -+static void Buffer_AppendLongUnchecked(JSONObjectEncoder *enc, JSINT64 value) - { - char* wstr; - JSUINT64 uvalue = (value < 0) ? -value : value; -@@ -551,7 +551,7 @@ void Buffer_AppendLongUnchecked(JSONObjectEncoder *enc, JSINT64 value) - enc->offset += (wstr - (enc->offset)); - } - --void Buffer_AppendUnsignedLongUnchecked(JSONObjectEncoder *enc, JSUINT64 value) -+static void Buffer_AppendUnsignedLongUnchecked(JSONObjectEncoder *enc, JSUINT64 value) - { - char* wstr; - JSUINT64 uvalue = value; -@@ -566,7 +566,7 @@ void Buffer_AppendUnsignedLongUnchecked(JSONObjectEncoder *enc, JSUINT64 value) - enc->offset += (wstr - (enc->offset)); - } - --int Buffer_AppendDoubleUnchecked(JSOBJ obj, JSONObjectEncoder *enc, double value) -+static int Buffer_AppendDoubleUnchecked(JSOBJ obj, JSONObjectEncoder *enc, double value) - { - /* if input is larger than thres_max, revert to exponential */ - const double thres_max = (double) 1e16 - 1; -@@ -714,7 +714,7 @@ Handle integration functions returning NULL here */ - FIXME: - Perhaps implement recursion detection */ - --void encode(JSOBJ obj, JSONObjectEncoder *enc, const char *name, size_t cbName) -+static void encode(JSOBJ obj, JSONObjectEncoder *enc, const char *name, size_t cbName) - { - const char *value; - char *objName; -diff --git a/python/JSONtoObj.c b/python/JSONtoObj.c -index 79d9f1a..6cef088 100644 ---- a/python/JSONtoObj.c -+++ b/python/JSONtoObj.c -@@ -43,7 +43,7 @@ Numeric decoder derived from from TCL library - //#define PRINTMARK() fprintf(stderr, "%s: MARK(%d)\n", __FILE__, __LINE__) - #define PRINTMARK() - --void Object_objectAddKey(void *prv, JSOBJ obj, JSOBJ name, JSOBJ value) -+static void Object_objectAddKey(void *prv, JSOBJ obj, JSOBJ name, JSOBJ value) - { - PyDict_SetItem (obj, name, value); - Py_DECREF( (PyObject *) name); -@@ -51,59 +51,59 @@ void Object_objectAddKey(void *prv, JSOBJ obj, JSOBJ name, JSOBJ value) - return; - } - --void Object_arrayAddItem(void *prv, JSOBJ obj, JSOBJ value) -+static void Object_arrayAddItem(void *prv, JSOBJ obj, JSOBJ value) - { - PyList_Append(obj, value); - Py_DECREF( (PyObject *) value); - return; - } - --JSOBJ Object_newString(void *prv, wchar_t *start, wchar_t *end) -+static JSOBJ Object_newString(void *prv, wchar_t *start, wchar_t *end) - { - return PyUnicode_FromWideChar (start, (end - start)); - } - --JSOBJ Object_newTrue(void *prv) -+static JSOBJ Object_newTrue(void *prv) - { - Py_RETURN_TRUE; - } - --JSOBJ Object_newFalse(void *prv) -+static JSOBJ Object_newFalse(void *prv) - { - Py_RETURN_FALSE; - } - --JSOBJ Object_newNull(void *prv) -+static JSOBJ Object_newNull(void *prv) - { - Py_RETURN_NONE; - } - --JSOBJ Object_newObject(void *prv) -+static JSOBJ Object_newObject(void *prv) - { - return PyDict_New(); - } - --JSOBJ Object_newArray(void *prv) -+static JSOBJ Object_newArray(void *prv) - { - return PyList_New(0); - } - --JSOBJ Object_newInteger(void *prv, JSINT32 value) -+static JSOBJ Object_newInteger(void *prv, JSINT32 value) - { - return PyInt_FromLong( (long) value); - } - --JSOBJ Object_newLong(void *prv, JSINT64 value) -+static JSOBJ Object_newLong(void *prv, JSINT64 value) - { - return PyLong_FromLongLong (value); - } - --JSOBJ Object_newUnsignedLong(void *prv, JSUINT64 value) -+static JSOBJ Object_newUnsignedLong(void *prv, JSUINT64 value) - { - return PyLong_FromUnsignedLongLong (value); - } - --JSOBJ Object_newDouble(void *prv, double value) -+static JSOBJ Object_newDouble(void *prv, double value) - { - return PyFloat_FromDouble(value); - } -diff --git a/python/objToJSON.c b/python/objToJSON.c -index 04a4575..1960d40 100644 ---- a/python/objToJSON.c -+++ b/python/objToJSON.c -@@ -226,7 +226,7 @@ static void *PyDateToINT64(JSOBJ _obj, JSONTypeContext *tc, void *outValue, size - return NULL; - } - --int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc) -+static int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc) - { - PyObject *item; - -@@ -242,21 +242,21 @@ int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc) - return 1; - } - --void Tuple_iterEnd(JSOBJ obj, JSONTypeContext *tc) -+static void Tuple_iterEnd(JSOBJ obj, JSONTypeContext *tc) - { - } - --JSOBJ Tuple_iterGetValue(JSOBJ obj, JSONTypeContext *tc) -+static JSOBJ Tuple_iterGetValue(JSOBJ obj, JSONTypeContext *tc) - { - return GET_TC(tc)->itemValue; - } - --char *Tuple_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) -+static char *Tuple_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) - { - return NULL; - } - --int Iter_iterNext(JSOBJ obj, JSONTypeContext *tc) -+static int Iter_iterNext(JSOBJ obj, JSONTypeContext *tc) - { - PyObject *item; - -@@ -282,7 +282,7 @@ int Iter_iterNext(JSOBJ obj, JSONTypeContext *tc) - return 1; - } - --void Iter_iterEnd(JSOBJ obj, JSONTypeContext *tc) -+static void Iter_iterEnd(JSOBJ obj, JSONTypeContext *tc) - { - if (GET_TC(tc)->itemValue) - { -@@ -297,17 +297,17 @@ void Iter_iterEnd(JSOBJ obj, JSONTypeContext *tc) - } - } - --JSOBJ Iter_iterGetValue(JSOBJ obj, JSONTypeContext *tc) -+static JSOBJ Iter_iterGetValue(JSOBJ obj, JSONTypeContext *tc) - { - return GET_TC(tc)->itemValue; - } - --char *Iter_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) -+static char *Iter_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) - { - return NULL; - } - --void Dir_iterEnd(JSOBJ obj, JSONTypeContext *tc) -+static void Dir_iterEnd(JSOBJ obj, JSONTypeContext *tc) - { - if (GET_TC(tc)->itemValue) - { -@@ -325,7 +325,7 @@ void Dir_iterEnd(JSOBJ obj, JSONTypeContext *tc) - PRINTMARK(); - } - --int Dir_iterNext(JSOBJ _obj, JSONTypeContext *tc) -+static int Dir_iterNext(JSOBJ _obj, JSONTypeContext *tc) - { - PyObject *obj = (PyObject *) _obj; - PyObject *itemValue = GET_TC(tc)->itemValue; -@@ -401,20 +401,20 @@ int Dir_iterNext(JSOBJ _obj, JSONTypeContext *tc) - return 1; - } - --JSOBJ Dir_iterGetValue(JSOBJ obj, JSONTypeContext *tc) -+static JSOBJ Dir_iterGetValue(JSOBJ obj, JSONTypeContext *tc) - { - PRINTMARK(); - return GET_TC(tc)->itemValue; - } - --char *Dir_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) -+static char *Dir_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) - { - PRINTMARK(); - *outLen = PyString_GET_SIZE(GET_TC(tc)->itemName); - return PyString_AS_STRING(GET_TC(tc)->itemName); - } - --int List_iterNext(JSOBJ obj, JSONTypeContext *tc) -+static int List_iterNext(JSOBJ obj, JSONTypeContext *tc) - { - if (GET_TC(tc)->index >= GET_TC(tc)->size) - { -@@ -427,16 +427,16 @@ int List_iterNext(JSOBJ obj, JSONTypeContext *tc) - return 1; - } - --void List_iterEnd(JSOBJ obj, JSONTypeContext *tc) -+static void List_iterEnd(JSOBJ obj, JSONTypeContext *tc) - { - } - --JSOBJ List_iterGetValue(JSOBJ obj, JSONTypeContext *tc) -+static JSOBJ List_iterGetValue(JSOBJ obj, JSONTypeContext *tc) - { - return GET_TC(tc)->itemValue; - } - --char *List_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) -+static char *List_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) - { - return NULL; - } -@@ -447,7 +447,7 @@ char *List_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) - // itemValue is borrowed from object (which is dict). No refCounting - //============================================================================= - --int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc) -+static int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc) - { - #if PY_MAJOR_VERSION >= 3 - PyObject* itemNameTmp; -@@ -488,7 +488,7 @@ int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc) - return 1; - } - --void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc) -+static void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc) - { - if (GET_TC(tc)->itemName) - { -@@ -499,18 +499,18 @@ void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc) - PRINTMARK(); - } - --JSOBJ Dict_iterGetValue(JSOBJ obj, JSONTypeContext *tc) -+static JSOBJ Dict_iterGetValue(JSOBJ obj, JSONTypeContext *tc) - { - return GET_TC(tc)->itemValue; - } - --char *Dict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) -+static char *Dict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) - { - *outLen = PyString_GET_SIZE(GET_TC(tc)->itemName); - return PyString_AS_STRING(GET_TC(tc)->itemName); - } - --int SortedDict_iterNext(JSOBJ obj, JSONTypeContext *tc) -+static int SortedDict_iterNext(JSOBJ obj, JSONTypeContext *tc) - { - PyObject *items = NULL, *item = NULL, *key = NULL, *value = NULL; - Py_ssize_t i, nitems; -@@ -603,7 +603,7 @@ int SortedDict_iterNext(JSOBJ obj, JSONTypeContext *tc) - return -1; - } - --void SortedDict_iterEnd(JSOBJ obj, JSONTypeContext *tc) -+static void SortedDict_iterEnd(JSOBJ obj, JSONTypeContext *tc) - { - GET_TC(tc)->itemName = NULL; - GET_TC(tc)->itemValue = NULL; -@@ -612,19 +612,19 @@ void SortedDict_iterEnd(JSOBJ obj, JSONTypeContext *tc) - PRINTMARK(); - } - --JSOBJ SortedDict_iterGetValue(JSOBJ obj, JSONTypeContext *tc) -+static JSOBJ SortedDict_iterGetValue(JSOBJ obj, JSONTypeContext *tc) - { - return GET_TC(tc)->itemValue; - } - --char *SortedDict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) -+static char *SortedDict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) - { - *outLen = PyString_GET_SIZE(GET_TC(tc)->itemName); - return PyString_AS_STRING(GET_TC(tc)->itemName); - } - - --void SetupDictIter(PyObject *dictObj, TypeContext *pc, JSONObjectEncoder *enc) -+static void SetupDictIter(PyObject *dictObj, TypeContext *pc, JSONObjectEncoder *enc) - { - if (enc->sortKeys) { - pc->iterEnd = SortedDict_iterEnd; -@@ -642,7 +642,7 @@ void SetupDictIter(PyObject *dictObj, TypeContext *pc, JSONObjectEncoder *enc) - pc->index = 0; - } - --void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObjectEncoder *enc) -+static void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObjectEncoder *enc) - { - PyObject *obj, *exc, *iter; - TypeContext *pc; -@@ -929,7 +929,7 @@ void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObjectEncoder - return; - } - --void Object_endTypeContext(JSOBJ obj, JSONTypeContext *tc) -+static void Object_endTypeContext(JSOBJ obj, JSONTypeContext *tc) - { - Py_XDECREF(GET_TC(tc)->newObj); - -@@ -937,33 +937,33 @@ void Object_endTypeContext(JSOBJ obj, JSONTypeContext *tc) - tc->prv = NULL; - } - --const char *Object_getStringValue(JSOBJ obj, JSONTypeContext *tc, size_t *_outLen) -+static const char *Object_getStringValue(JSOBJ obj, JSONTypeContext *tc, size_t *_outLen) - { - return GET_TC(tc)->PyTypeToJSON (obj, tc, NULL, _outLen); - } - --JSINT64 Object_getLongValue(JSOBJ obj, JSONTypeContext *tc) -+static JSINT64 Object_getLongValue(JSOBJ obj, JSONTypeContext *tc) - { - JSINT64 ret; - GET_TC(tc)->PyTypeToJSON (obj, tc, &ret, NULL); - return ret; - } - --JSUINT64 Object_getUnsignedLongValue(JSOBJ obj, JSONTypeContext *tc) -+static JSUINT64 Object_getUnsignedLongValue(JSOBJ obj, JSONTypeContext *tc) - { - JSUINT64 ret; - GET_TC(tc)->PyTypeToJSON (obj, tc, &ret, NULL); - return ret; - } - --JSINT32 Object_getIntValue(JSOBJ obj, JSONTypeContext *tc) -+static JSINT32 Object_getIntValue(JSOBJ obj, JSONTypeContext *tc) - { - JSINT32 ret; - GET_TC(tc)->PyTypeToJSON (obj, tc, &ret, NULL); - return ret; - } - --double Object_getDoubleValue(JSOBJ obj, JSONTypeContext *tc) -+static double Object_getDoubleValue(JSOBJ obj, JSONTypeContext *tc) - { - double ret; - GET_TC(tc)->PyTypeToJSON (obj, tc, &ret, NULL); -@@ -975,22 +975,22 @@ static void Object_releaseObject(JSOBJ _obj) - Py_DECREF( (PyObject *) _obj); - } - --int Object_iterNext(JSOBJ obj, JSONTypeContext *tc) -+static int Object_iterNext(JSOBJ obj, JSONTypeContext *tc) - { - return GET_TC(tc)->iterNext(obj, tc); - } - --void Object_iterEnd(JSOBJ obj, JSONTypeContext *tc) -+static void Object_iterEnd(JSOBJ obj, JSONTypeContext *tc) - { - GET_TC(tc)->iterEnd(obj, tc); - } - --JSOBJ Object_iterGetValue(JSOBJ obj, JSONTypeContext *tc) -+static JSOBJ Object_iterGetValue(JSOBJ obj, JSONTypeContext *tc) - { - return GET_TC(tc)->iterGetValue(obj, tc); - } - --char *Object_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) -+static char *Object_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) - { - return GET_TC(tc)->iterGetName(obj, tc, outLen); - } - diff --git a/srcpkgs/python3-ultrajson/patches/lower-stack-usage.patch b/srcpkgs/python3-ultrajson/patches/lower-stack-usage.patch deleted file mode 100644 index de3258cfdeb..00000000000 --- a/srcpkgs/python3-ultrajson/patches/lower-stack-usage.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Shiz -Bug-Report: https://github.com/esnme/ultrajson/issues/254 - -musl default thread size is 80 kiB, so using 128 kiB by default will -overflow the stack and cause segmentation faults. - -Allocating 128 kiB on the stack is a rather bad idea anyway, so we'll -lower it to 8 kiB. ---- ultrajson-1.35/lib/ultrajson.h -+++ ultrajson-1.35-patched/lib/ultrajson.h -@@ -77,7 +77,7 @@ - /* - Dictates and limits how much stack space for buffers UltraJSON will use before resorting to provided heap functions */ - #ifndef JSON_MAX_STACK_BUFFER_SIZE --#define JSON_MAX_STACK_BUFFER_SIZE 131072 -+#define JSON_MAX_STACK_BUFFER_SIZE 8192 - #endif - - #ifdef _WIN32 diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template index cdd99fe060e..88ef8cc45d4 100644 --- a/srcpkgs/python3-ultrajson/template +++ b/srcpkgs/python3-ultrajson/template @@ -1,20 +1,18 @@ # Template file for 'python3-ultrajson' pkgname=python3-ultrajson -version=1.35 +version=3.1.0 revision=1 wrksrc="ujson-${version}" build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" short_desc="Ultra fast JSON encoder and decoder for Python" -maintainer="k4leg " +maintainer="Andrew J. Hesford " license="BSD-3-Clause" -homepage="https://github.com/esnme/ultrajson" +homepage="https://github.com/ultrajson/ultrajson" distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz" -checksum=f66073e5506e91d204ab0c614a148d5aa938bdbf104751be66f8ad7a222f5f86 -patch_args="-Np1" +checksum=00bda1de275ed6fe81817902189c75dfd156b4fa29b44dc1f4620775d2f50cf7 post_install() { - sed -n '/Developed/,/terms/p' python/ujson.c > LICENSE - vlicense LICENSE + vlicense LICENSE.txt } From f7e9c5304e7b1f90e252dfbaeb094b6448d63df8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 4 Aug 2020 21:09:08 -0400 Subject: [PATCH 7/8] python3-jsonrpc-server: update to 0.3.4. --- srcpkgs/python3-jsonrpc-server/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jsonrpc-server/template b/srcpkgs/python3-jsonrpc-server/template index 3958f607684..b51e185efe9 100644 --- a/srcpkgs/python3-jsonrpc-server/template +++ b/srcpkgs/python3-jsonrpc-server/template @@ -1,12 +1,12 @@ # Template file for 'python3-jsonrpc-server' pkgname=python3-jsonrpc-server version=0.3.4 -revision=1 +revision=2 archs=noarch wrksrc="${pkgname/3}-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-future python3-ultrajson" +depends="python3-ultrajson" short_desc="Python library implementing asynchronous JSON RPC server" maintainer="k4leg " license="MIT" @@ -15,6 +15,10 @@ distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" checksum=c73bf5495c9dd4d2f902755bedeb6da5afe778e0beee82f0e195c4655352fe37 patch_args="-Np1" +post_patch() { + vsed -i setup.py -e 's/\bujson<=1\.35\b/ujson/' +} + post_install() { vlicense LICENSE } From e8d0b449730b6237261807e3ec3da30e490f5730 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 4 Aug 2020 21:09:11 -0400 Subject: [PATCH 8/8] python3-language-server: update to 0.34.1. --- srcpkgs/python3-language-server/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-language-server/template b/srcpkgs/python3-language-server/template index 11e6facea6d..8ac0842f3b9 100644 --- a/srcpkgs/python3-language-server/template +++ b/srcpkgs/python3-language-server/template @@ -1,13 +1,12 @@ # Template file for 'python3-language-server' pkgname=python3-language-server version=0.34.1 -revision=1 +revision=2 archs=noarch wrksrc="${pkgname/3}-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-future python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson - python3-setuptools" +depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson" short_desc="Python implementation of the Language Server Protocol" maintainer="k4leg " license="MIT" @@ -15,6 +14,10 @@ homepage="https://github.com/palantir/python-language-server" distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" checksum=b96ff466b5aa24e212493de863899298f229a9e250e7353972563c7f2495d23d +post_patch() { + vsed -i setup.py -e 's/\bujson<=1.35\b/ujson/' +} + post_install() { vlicense LICENSE }