diff --git a/srcpkgs/python3-Brotli/patches/missing-test-cases.patch b/srcpkgs/python3-Brotli/patches/missing-test-cases.patch deleted file mode 100644 index cbefb7557a2..00000000000 --- a/srcpkgs/python3-Brotli/patches/missing-test-cases.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/python/tests/_test_utils.py b/python/tests/_test_utils.py -index 104e654..6cf12b0 100644 ---- a/python/tests/_test_utils.py -+++ b/python/tests/_test_utils.py -@@ -36,10 +36,7 @@ TESTDATA_DIR = os.path.join(test_dir, 'testdata') - - TESTDATA_FILES = [ - 'empty', # Empty file -- '10x10y', # Small text -- 'alice29.txt', # Large text -- 'random_org_10k.bin', # Small data -- 'mapsdatazrh', # Large data -+ 'ukkonooa', # Small text - ] - - TESTDATA_PATHS = [os.path.join(TESTDATA_DIR, f) for f in TESTDATA_FILES] diff --git a/srcpkgs/python3-Brotli/patches/use-system-brotli.patch b/srcpkgs/python3-Brotli/patches/use-system-brotli.patch index d24964295cb..6c3290b9adf 100644 --- a/srcpkgs/python3-Brotli/patches/use-system-brotli.patch +++ b/srcpkgs/python3-Brotli/patches/use-system-brotli.patch @@ -1,15 +1,16 @@ diff --git a/setup.py b/setup.py -index 25626ec..fdf27a2 100644 +index 2cb89c3..748ecc5 100644 --- a/setup.py +++ b/setup.py -@@ -181,93 +181,18 @@ EXT_MODULES = [ +@@ -177,96 +177,17 @@ EXT_MODULES = [ '_brotli', sources=[ - 'python/_brotli.cc', + 'python/_brotli.c', - 'c/common/constants.c', - 'c/common/context.c', - 'c/common/dictionary.c', - 'c/common/platform.c', +- 'c/common/shared_dictionary.c', - 'c/common/transform.c', - 'c/dec/bit_reader.c', - 'c/dec/decode.c', @@ -22,6 +23,7 @@ index 25626ec..fdf27a2 100644 - 'c/enc/brotli_bit_stream.c', - 'c/enc/cluster.c', - 'c/enc/command.c', +- 'c/enc/compound_dictionary.c', - 'c/enc/compress_fragment.c', - 'c/enc/compress_fragment_two_pass.c', - 'c/enc/dictionary_hash.c', @@ -41,6 +43,7 @@ index 25626ec..fdf27a2 100644 - 'c/common/context.h', - 'c/common/dictionary.h', - 'c/common/platform.h', +- 'c/common/shared_dictionary_internal.h', - 'c/common/transform.h', 'c/common/version.h', - 'c/dec/bit_reader.h', @@ -59,6 +62,7 @@ index 25626ec..fdf27a2 100644 - 'c/enc/cluster.h', - 'c/enc/cluster_inc.h', - 'c/enc/command.h', +- 'c/enc/compound_dictionary.h', - 'c/enc/compress_fragment.h', - 'c/enc/compress_fragment_two_pass.h', - 'c/enc/dictionary_hash.h', @@ -92,12 +96,11 @@ index 25626ec..fdf27a2 100644 ], include_dirs=[ 'c/include', - ], ++ ], + libraries=[ + 'brotlicommon', + 'brotlidec', + 'brotlienc', -+ ], - language='c++'), + ]), ] diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template index 3c792b38867..d2b86573d87 100644 --- a/srcpkgs/python3-Brotli/template +++ b/srcpkgs/python3-Brotli/template @@ -1,7 +1,7 @@ # Template file for 'python3-Brotli' pkgname=python3-Brotli -version=1.0.9 -revision=3 +version=1.1.0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel brotli-devel" @@ -11,7 +11,7 @@ maintainer="Joel Beckmeyer " license="MIT" homepage="https://github.com/google/brotli" distfiles="https://github.com/google/brotli/archive/v${version}.tar.gz" -checksum=f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46 +checksum=e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff post_install() { vlicense LICENSE