From 1c75bfd140b4c386263d0234d3fe974049035441 Mon Sep 17 00:00:00 2001 From: AluminumTank Date: Wed, 2 Jun 2021 13:03:05 -0400 Subject: [PATCH] synapse: update to 1.37.1 --- .../patches/remove-yajl-backend-test.patch | 19 ++++++++++++++ srcpkgs/python3-ijson/template | 26 +++++++++++++++++++ srcpkgs/synapse/files/synapse/log/run | 1 + srcpkgs/synapse/template | 6 ++--- 4 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/python3-ijson/patches/remove-yajl-backend-test.patch create mode 100644 srcpkgs/python3-ijson/template create mode 120000 srcpkgs/synapse/files/synapse/log/run diff --git a/srcpkgs/python3-ijson/patches/remove-yajl-backend-test.patch b/srcpkgs/python3-ijson/patches/remove-yajl-backend-test.patch new file mode 100644 index 000000000000..c99bafee8362 --- /dev/null +++ b/srcpkgs/python3-ijson/patches/remove-yajl-backend-test.patch @@ -0,0 +1,19 @@ +# this patch removes testing of the `yajl` backend which depends on yajl 1.x +--- a/test/test_base.py 2021-06-29 12:52:48.720874344 -0400 ++++ b/test/test_base.py 2021-06-29 12:53:18.342495467 -0400 +@@ -593,7 +593,7 @@ + + def generate_backend_specific_tests(module, classname_prefix, method_suffix, + *bases, **kwargs): +- for backend in ['python', 'yajl', 'yajl2', 'yajl2_cffi', 'yajl2_c']: ++ for backend in ['python', 'yajl2', 'yajl2_cffi', 'yajl2_c']: + try: + classname = '%s%sTests' % ( + ''.join(p.capitalize() for p in backend.split('_')), +@@ -628,4 +628,4 @@ + 'handles_incomplete_json_tokens': name != 'yajl' + } + return generate_backend_specific_tests(module, classname, method_suffix, +- members=members, *_bases) +\ No newline at end of file ++ members=members, *_bases) diff --git a/srcpkgs/python3-ijson/template b/srcpkgs/python3-ijson/template new file mode 100644 index 000000000000..bd9fda6fc054 --- /dev/null +++ b/srcpkgs/python3-ijson/template @@ -0,0 +1,26 @@ +# Template file for 'python3-ijson' +pkgname=python3-ijson +version=3.1.4 +revision=1 +wrksrc="ijson-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools_scm" +makedepends="yajl-devel python3-devel" +checkdepends="python3-cffi" +short_desc="Iterative JSON parser with Pythonic interfaces" +maintainer="Joel Beckmeyer " +license="BSD-3-Clause" +homepage="https://github.com/ICRAR/ijson" +distfiles="${PYPI_SITE}/i/ijson/ijson-${version}.tar.gz" +checksum=1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea + +post_patch() { + # yajl.py is the backend for yajl 1.x, while void-packages only includes the + # latest version of yajl (2.x), which can be used via several other included + # backends (yajl2, yajl2_c, yajl2_cffi) + rm ijson/backends/yajl.py +} + +post_install() { + vlicense LICENSE.txt +} diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/synapse/files/synapse/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index 24dd39948aa5..5d522ae7a221 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,6 +1,6 @@ # Template file for 'synapse' pkgname=synapse -version=1.33.2 +version=1.37.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,14 +12,14 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson python3-attrs python3-netaddr python3-setuptools python3-bleach python3-Jinja2 python3-psycopg2 python3-lxml python3-saml2 python3-treq python3-txacme python3-macaroons python3-sortedcontainers - python3-typing_extensions" + python3-typing_extensions python3-ijson" short_desc="Matrix reference homeserver" maintainer="Pete " license="Apache-2.0" homepage="https://github.com/matrix-org/synapse" changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md" distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz" -checksum=5e0a934dba5994ec102e94ba323e88746b9aec6ccaae03ba2c94780a6dbfeb97 +checksum=1c2e9acbc52c55585d864e708f6299b0fda23e70ab7a01a0f6e01c3944889dc5 system_accounts="synapse" synapse_homedir="/var/lib/synapse"