Attachment 246720 Details for Bug 275479 – py-adblock update.

[patch] py-adblock update.

py-adblock.patch (text/plain), 28.77 KB, created by Adam Jimerson on 2023-12-02 07:43:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jimerson

Created: 2023-12-02 07:43:21 UTC

Size: 28.77 KB

patch

obsolete

>diff --git a/www/py-adblock/Makefile b/www/py-adblock/Makefile
>index baad3e5c0f6..217814a5d10 100644
>--- a/www/py-adblock/Makefile
>+++ b/www/py-adblock/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	adblock
>-DISTVERSION=	0.5.0
>-PORTREVISION=	51
>+DISTVERSION=	0.6.0
> CATEGORIES=	www python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -31,71 +30,70 @@ GH_ACCOUNT=	ArniDagur
> GH_PROJECT=	python-adblock
> USE_PYTHON=	autoplist concurrent cython distutils
> 
>-CARGO_CRATES=	adblock-0.3.13 \
>+CARGO_CRATES=	adblock-0.5.6 \
> 		addr-0.14.0 \
> 		adler-1.0.2 \
> 		aho-corasick-0.7.18 \
>-		autocfg-1.0.1 \
>+		autocfg-1.1.0 \
> 		base64-0.13.0 \
>-		bitflags-1.2.1 \
>+		bitflags-1.3.2 \
> 		byteorder-1.4.3 \
> 		cfg-if-1.0.0 \
>-		crc32fast-1.2.1 \
>-		ctor-0.1.20 \
>-		either-1.6.1 \
>-		flate2-1.0.20 \
>+		crc32fast-1.3.2 \
>+		either-1.7.0 \
>+		flate2-1.0.24 \
> 		form_urlencoded-1.0.1 \
>-		ghost-0.1.2 \
>-		idna-0.2.2 \
>-		indoc-0.3.6 \
>-		indoc-impl-0.3.6 \
>-		instant-0.1.9 \
>-		inventory-0.1.10 \
>-		inventory-impl-0.1.10 \
>-		itertools-0.9.0 \
>-		libc-0.2.93 \
>-		lock_api-0.4.3 \
>-		matches-0.1.8 \
>-		memchr-2.4.0 \
>-		miniz_oxide-0.4.4 \
>-		num-traits-0.2.14 \
>-		once_cell-1.7.2 \
>-		parking_lot-0.11.1 \
>-		parking_lot_core-0.8.3 \
>-		paste-0.1.18 \
>-		paste-impl-0.1.18 \
>+		idna-0.2.3 \
>+		indoc-1.0.6 \
>+		itertools-0.10.3 \
>+		libc-0.2.126 \
>+		lock_api-0.4.7 \
>+		matches-0.1.9 \
>+		memchr-2.5.0 \
>+		miniz_oxide-0.5.3 \
>+		num-traits-0.2.15 \
>+		once_cell-1.13.0 \
>+		parking_lot-0.12.1 \
>+		parking_lot_core-0.9.3 \
>+		paste-1.0.7 \
> 		percent-encoding-2.1.0 \
>-		proc-macro-hack-0.5.19 \
>-		proc-macro2-1.0.26 \
>-		psl-2.0.18 \
>-		psl-types-2.0.7 \
>-		pyo3-0.13.2 \
>-		pyo3-macros-0.13.2 \
>-		pyo3-macros-backend-0.13.2 \
>-		quote-1.0.9 \
>-		redox_syscall-0.2.5 \
>-		regex-1.5.4 \
>-		regex-syntax-0.6.25 \
>-		rmp-0.8.10 \
>+		proc-macro2-1.0.40 \
>+		psl-2.0.90 \
>+		psl-types-2.0.10 \
>+		pyo3-0.16.5 \
>+		pyo3-build-config-0.16.5 \
>+		pyo3-ffi-0.16.5 \
>+		pyo3-macros-0.16.5 \
>+		pyo3-macros-backend-0.16.5 \
>+		quote-1.0.20 \
>+		redox_syscall-0.2.13 \
>+		regex-1.6.0 \
>+		regex-syntax-0.6.27 \
>+		rmp-0.8.11 \
> 		rmp-serde-0.13.7 \
>+		rmp-serde-0.15.5 \
> 		scopeguard-1.1.0 \
> 		seahash-3.0.7 \
>-		serde-1.0.125 \
>-		serde_derive-1.0.125 \
>-		smallvec-1.6.1 \
>-		syn-1.0.69 \
>-		tinyvec-1.2.0 \
>+		serde-1.0.139 \
>+		serde_derive-1.0.139 \
>+		smallvec-1.9.0 \
>+		syn-1.0.98 \
>+		target-lexicon-0.12.4 \
>+		tinyvec-1.6.0 \
> 		tinyvec_macros-0.1.0 \
>-		twoway-0.2.1 \
>+		twoway-0.2.2 \
> 		unchecked-index-0.2.2 \
>-		unicode-bidi-0.3.5 \
>-		unicode-normalization-0.1.17 \
>-		unicode-xid-0.2.1 \
>-		unindent-0.1.7 \
>-		url-2.2.1 \
>-		winapi-0.3.9 \
>-		winapi-i686-pc-windows-gnu-0.4.0 \
>-		winapi-x86_64-pc-windows-gnu-0.4.0
>+		unicode-bidi-0.3.8 \
>+		unicode-ident-1.0.2 \
>+		unicode-normalization-0.1.21 \
>+		unindent-0.1.9 \
>+		url-2.2.2 \
>+		windows-sys-0.36.1 \
>+		windows_aarch64_msvc-0.36.1 \
>+		windows_i686_gnu-0.36.1 \
>+		windows_i686_msvc-0.36.1 \
>+		windows_x86_64_gnu-0.36.1 \
>+		windows_x86_64_msvc-0.36.1
> CARGO_BUILD=		no
> CARGO_INSTALL=		no
> CARGO_TARGET_DIR=	${WRKSRC}/target
>@@ -113,20 +111,22 @@ do-configure:
> do-build:
> 	@(cd ${BUILD_WRKSRC} ; \
> 		PSL_PATH="${PREFIX}/share/public_suffix_list/public_suffix_list.dat" \
>-		${SETENV} ${MAKE_ENV} maturin-${PYTHON_VER} build --release ${WITH_DEBUG:D:U--strip})
>+		${SETENV} ${MAKE_ENV} maturin-${PYTHON_VER} build --release \
>+		${WITH_DEBUG:D:U--strip})
> 
> # Due to upstream not supplying a setup.py file or other way to install
> # using pip command for now...
> do-install:
> .if ${ARCH:Mpowerpc64*}
> 	@(cd ${INSTALL_WRKSRC}; \
>-		${FIND} . -name "*whl" -exec sh -c 'mv {} `echo {} | sed  -E -e "s/powerpc.*/powerpc.whl/"`' \;)
>+		${FIND} . -name "*whl" -exec ${SH} -c 'mv {} `echo {} | ${SED}  -E -e "s/powerpc.*/powerpc.whl/"`' \
>+		\;)
> .endif
> 	@(cd ${INSTALL_WRKSRC} ; \
> 		${INSTALL_DATA} "target/release/libadblock.so" \
> 		"${STAGEDIR}/${PREFIX}/lib" ; \
>-		${SETENV} ${MAKE_ENV} pip-${PYTHON_VER} install --isolated --root=${STAGEDIR} \
>-		--ignore-installed --no-deps target/wheels/*.whl)
>+		${SETENV} ${MAKE_ENV} pip-${PYTHON_VER} install --isolated \
>+		--root=${STAGEDIR} --ignore-installed --no-deps target/wheels/*.whl)
> 
> post-install:
> 	(cd ${STAGEDIR}${PREFIX} && \
>@@ -138,8 +138,14 @@ post-install:
> # contains only the EGG files as a whole.
> # SEE devel/py-maturin/Makefile
> 	@${FIND} ${STAGEDIR} \
>-		-type f -o -type l | \
>-		${SORT} | ${SED} -e 's|${STAGEDIR}||' > \
>+		-type \
>+		f \
>+		-o \
>+		-type \
>+		l | \
>+		${SORT} | \
>+		${SED} -e 's|${STAGEDIR}||' \
>+		> \
> 		${WRKDIR}/.PLIST.pymodtmp
> 
> .include <bsd.port.mk>
>diff --git a/www/py-adblock/distinfo b/www/py-adblock/distinfo
>index de9faecec59..4a8f4655a21 100644
>--- a/www/py-adblock/distinfo
>+++ b/www/py-adblock/distinfo
>@@ -1,133 +1,131 @@
>-TIMESTAMP = 1624975338
>-SHA256 (rust/crates/adblock-0.3.13.crate) = 13df3d8a7e24ea2cc711b82a047ef2b9f743aa6580bea2552fcec68f0289603c
>-SIZE (rust/crates/adblock-0.3.13.crate) = 7691310
>+TIMESTAMP = 1701242170
>+SHA256 (rust/crates/adblock-0.5.6.crate) = 27785ef5b89bc88fd2def3e1ecfefdf5ec1583795b916667afd15b13058f8315
>+SIZE (rust/crates/adblock-0.5.6.crate) = 7704188
> SHA256 (rust/crates/addr-0.14.0.crate) = c54ccac949a2afafdfc889e15c753bbc6ee8783e026bbe3d057b00b13907db70
> SIZE (rust/crates/addr-0.14.0.crate) = 90210
> SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
> SIZE (rust/crates/adler-1.0.2.crate) = 12778
> SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
> SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
>-SHA256 (rust/crates/autocfg-1.0.1.crate) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
>-SIZE (rust/crates/autocfg-1.0.1.crate) = 12908
>+SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
>+SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
> SHA256 (rust/crates/base64-0.13.0.crate) = 904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd
> SIZE (rust/crates/base64-0.13.0.crate) = 62070
>-SHA256 (rust/crates/bitflags-1.2.1.crate) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
>-SIZE (rust/crates/bitflags-1.2.1.crate) = 16745
>+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
>+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
> SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
> SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
> SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
> SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
>-SHA256 (rust/crates/crc32fast-1.2.1.crate) = 81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a
>-SIZE (rust/crates/crc32fast-1.2.1.crate) = 38172
>-SHA256 (rust/crates/ctor-0.1.20.crate) = 5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d
>-SIZE (rust/crates/ctor-0.1.20.crate) = 9328
>-SHA256 (rust/crates/either-1.6.1.crate) = e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457
>-SIZE (rust/crates/either-1.6.1.crate) = 13641
>-SHA256 (rust/crates/flate2-1.0.20.crate) = cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0
>-SIZE (rust/crates/flate2-1.0.20.crate) = 74036
>+SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
>+SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
>+SHA256 (rust/crates/either-1.7.0.crate) = 3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be
>+SIZE (rust/crates/either-1.7.0.crate) = 15492
>+SHA256 (rust/crates/flate2-1.0.24.crate) = f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6
>+SIZE (rust/crates/flate2-1.0.24.crate) = 70191
> SHA256 (rust/crates/form_urlencoded-1.0.1.crate) = 5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191
> SIZE (rust/crates/form_urlencoded-1.0.1.crate) = 8773
>-SHA256 (rust/crates/ghost-0.1.2.crate) = 1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479
>-SIZE (rust/crates/ghost-0.1.2.crate) = 12777
>-SHA256 (rust/crates/idna-0.2.2.crate) = 89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21
>-SIZE (rust/crates/idna-0.2.2.crate) = 271070
>-SHA256 (rust/crates/indoc-0.3.6.crate) = 47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8
>-SIZE (rust/crates/indoc-0.3.6.crate) = 9663
>-SHA256 (rust/crates/indoc-impl-0.3.6.crate) = ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0
>-SIZE (rust/crates/indoc-impl-0.3.6.crate) = 7933
>-SHA256 (rust/crates/instant-0.1.9.crate) = 61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec
>-SIZE (rust/crates/instant-0.1.9.crate) = 5213
>-SHA256 (rust/crates/inventory-0.1.10.crate) = 0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f
>-SIZE (rust/crates/inventory-0.1.10.crate) = 11572
>-SHA256 (rust/crates/inventory-impl-0.1.10.crate) = 75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51
>-SIZE (rust/crates/inventory-impl-0.1.10.crate) = 6228
>-SHA256 (rust/crates/itertools-0.9.0.crate) = 284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b
>-SIZE (rust/crates/itertools-0.9.0.crate) = 96429
>-SHA256 (rust/crates/libc-0.2.93.crate) = 9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41
>-SIZE (rust/crates/libc-0.2.93.crate) = 510944
>-SHA256 (rust/crates/lock_api-0.4.3.crate) = 5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176
>-SIZE (rust/crates/lock_api-0.4.3.crate) = 20351
>-SHA256 (rust/crates/matches-0.1.8.crate) = 7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08
>-SIZE (rust/crates/matches-0.1.8.crate) = 2216
>-SHA256 (rust/crates/memchr-2.4.0.crate) = b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc
>-SIZE (rust/crates/memchr-2.4.0.crate) = 63392
>-SHA256 (rust/crates/miniz_oxide-0.4.4.crate) = a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b
>-SIZE (rust/crates/miniz_oxide-0.4.4.crate) = 49938
>-SHA256 (rust/crates/num-traits-0.2.14.crate) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290
>-SIZE (rust/crates/num-traits-0.2.14.crate) = 45476
>-SHA256 (rust/crates/once_cell-1.7.2.crate) = af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3
>-SIZE (rust/crates/once_cell-1.7.2.crate) = 28250
>-SHA256 (rust/crates/parking_lot-0.11.1.crate) = 6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb
>-SIZE (rust/crates/parking_lot-0.11.1.crate) = 39854
>-SHA256 (rust/crates/parking_lot_core-0.8.3.crate) = fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018
>-SIZE (rust/crates/parking_lot_core-0.8.3.crate) = 32147
>-SHA256 (rust/crates/paste-0.1.18.crate) = 45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880
>-SIZE (rust/crates/paste-0.1.18.crate) = 12259
>-SHA256 (rust/crates/paste-impl-0.1.18.crate) = d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6
>-SIZE (rust/crates/paste-impl-0.1.18.crate) = 9451
>+SHA256 (rust/crates/idna-0.2.3.crate) = 418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8
>+SIZE (rust/crates/idna-0.2.3.crate) = 271023
>+SHA256 (rust/crates/indoc-1.0.6.crate) = 05a0bd019339e5d968b37855180087b7b9d512c5046fbd244cf8c95687927d6e
>+SIZE (rust/crates/indoc-1.0.6.crate) = 14312
>+SHA256 (rust/crates/itertools-0.10.3.crate) = a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3
>+SIZE (rust/crates/itertools-0.10.3.crate) = 118661
>+SHA256 (rust/crates/libc-0.2.126.crate) = 349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836
>+SIZE (rust/crates/libc-0.2.126.crate) = 590481
>+SHA256 (rust/crates/lock_api-0.4.7.crate) = 327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53
>+SIZE (rust/crates/lock_api-0.4.7.crate) = 25371
>+SHA256 (rust/crates/matches-0.1.9.crate) = a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f
>+SIZE (rust/crates/matches-0.1.9.crate) = 2246
>+SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
>+SIZE (rust/crates/memchr-2.5.0.crate) = 65812
>+SHA256 (rust/crates/miniz_oxide-0.5.3.crate) = 6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc
>+SIZE (rust/crates/miniz_oxide-0.5.3.crate) = 53452
>+SHA256 (rust/crates/num-traits-0.2.15.crate) = 578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd
>+SIZE (rust/crates/num-traits-0.2.15.crate) = 49262
>+SHA256 (rust/crates/once_cell-1.13.0.crate) = 18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1
>+SIZE (rust/crates/once_cell-1.13.0.crate) = 31726
>+SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
>+SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
>+SHA256 (rust/crates/parking_lot_core-0.9.3.crate) = 09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929
>+SIZE (rust/crates/parking_lot_core-0.9.3.crate) = 32256
>+SHA256 (rust/crates/paste-1.0.7.crate) = 0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc
>+SIZE (rust/crates/paste-1.0.7.crate) = 18285
> SHA256 (rust/crates/percent-encoding-2.1.0.crate) = d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e
> SIZE (rust/crates/percent-encoding-2.1.0.crate) = 9748
>-SHA256 (rust/crates/proc-macro-hack-0.5.19.crate) = dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5
>-SIZE (rust/crates/proc-macro-hack-0.5.19.crate) = 15556
>-SHA256 (rust/crates/proc-macro2-1.0.26.crate) = a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec
>-SIZE (rust/crates/proc-macro2-1.0.26.crate) = 38233
>-SHA256 (rust/crates/psl-2.0.18.crate) = b0cbbbcd909251c04efa3c0dda636f26a9e5b91734d5ce119212528b8ba32d55
>-SIZE (rust/crates/psl-2.0.18.crate) = 182781
>-SHA256 (rust/crates/psl-types-2.0.7.crate) = 66b398073e7cdd6f05934389a8f5961e3aabfa66675b6f440df4e2c793d51a4f
>-SIZE (rust/crates/psl-types-2.0.7.crate) = 3423
>-SHA256 (rust/crates/pyo3-0.13.2.crate) = 4837b8e8e18a102c23f79d1e9a110b597ea3b684c95e874eb1ad88f8683109c3
>-SIZE (rust/crates/pyo3-0.13.2.crate) = 281372
>-SHA256 (rust/crates/pyo3-macros-0.13.2.crate) = a47f2c300ceec3e58064fd5f8f5b61230f2ffd64bde4970c81fdd0563a2db1bb
>-SIZE (rust/crates/pyo3-macros-0.13.2.crate) = 5434
>-SHA256 (rust/crates/pyo3-macros-backend-0.13.2.crate) = 87b097e5d84fcbe3e167f400fbedd657820a375b034c78bd852050749a575d66
>-SIZE (rust/crates/pyo3-macros-backend-0.13.2.crate) = 33106
>-SHA256 (rust/crates/quote-1.0.9.crate) = c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7
>-SIZE (rust/crates/quote-1.0.9.crate) = 25042
>-SHA256 (rust/crates/redox_syscall-0.2.5.crate) = 94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9
>-SIZE (rust/crates/redox_syscall-0.2.5.crate) = 23449
>-SHA256 (rust/crates/regex-1.5.4.crate) = d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461
>-SIZE (rust/crates/regex-1.5.4.crate) = 236581
>-SHA256 (rust/crates/regex-syntax-0.6.25.crate) = f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b
>-SIZE (rust/crates/regex-syntax-0.6.25.crate) = 293293
>-SHA256 (rust/crates/rmp-0.8.10.crate) = 4f55e5fa1446c4d5dd1f5daeed2a4fe193071771a2636274d0d7a3b082aa7ad6
>-SIZE (rust/crates/rmp-0.8.10.crate) = 23541
>+SHA256 (rust/crates/proc-macro2-1.0.40.crate) = dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7
>+SIZE (rust/crates/proc-macro2-1.0.40.crate) = 40559
>+SHA256 (rust/crates/psl-2.0.90.crate) = 7e9c7d362659b525758d09e2a3ae965e371b347605e5fb2bc5bec5c2a1ecf41b
>+SIZE (rust/crates/psl-2.0.90.crate) = 188750
>+SHA256 (rust/crates/psl-types-2.0.10.crate) = e8eda7c62d9ecaafdf8b62374c006de0adf61666ae96a96ba74a37134aa4e470
>+SIZE (rust/crates/psl-types-2.0.10.crate) = 7929
>+SHA256 (rust/crates/pyo3-0.16.5.crate) = 1e6302e85060011447471887705bb7838f14aba43fcb06957d823739a496b3dc
>+SIZE (rust/crates/pyo3-0.16.5.crate) = 363266
>+SHA256 (rust/crates/pyo3-build-config-0.16.5.crate) = b5b65b546c35d8a3b1b2f0ddbac7c6a569d759f357f2b9df884f5d6b719152c8
>+SIZE (rust/crates/pyo3-build-config-0.16.5.crate) = 28880
>+SHA256 (rust/crates/pyo3-ffi-0.16.5.crate) = c275a07127c1aca33031a563e384ffdd485aee34ef131116fcd58e3430d1742b
>+SIZE (rust/crates/pyo3-ffi-0.16.5.crate) = 60737
>+SHA256 (rust/crates/pyo3-macros-0.16.5.crate) = 284fc4485bfbcc9850a6d661d627783f18d19c2ab55880b021671c4ba83e90f7
>+SIZE (rust/crates/pyo3-macros-0.16.5.crate) = 8456
>+SHA256 (rust/crates/pyo3-macros-backend-0.16.5.crate) = 53bda0f58f73f5c5429693c96ed57f7abdb38fdfc28ae06da4101a257adb7faf
>+SIZE (rust/crates/pyo3-macros-backend-0.16.5.crate) = 49221
>+SHA256 (rust/crates/quote-1.0.20.crate) = 3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804
>+SIZE (rust/crates/quote-1.0.20.crate) = 28160
>+SHA256 (rust/crates/redox_syscall-0.2.13.crate) = 62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42
>+SIZE (rust/crates/redox_syscall-0.2.13.crate) = 23759
>+SHA256 (rust/crates/regex-1.6.0.crate) = 4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b
>+SIZE (rust/crates/regex-1.6.0.crate) = 239329
>+SHA256 (rust/crates/regex-syntax-0.6.27.crate) = a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244
>+SIZE (rust/crates/regex-syntax-0.6.27.crate) = 297300
>+SHA256 (rust/crates/rmp-0.8.11.crate) = 44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f
>+SIZE (rust/crates/rmp-0.8.11.crate) = 28829
> SHA256 (rust/crates/rmp-serde-0.13.7.crate) = 011e1d58446e9fa3af7cdc1fb91295b10621d3ac4cb3a85cc86385ee9ca50cd3
> SIZE (rust/crates/rmp-serde-0.13.7.crate) = 16676
>+SHA256 (rust/crates/rmp-serde-0.15.5.crate) = 723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d
>+SIZE (rust/crates/rmp-serde-0.15.5.crate) = 28657
> SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
> SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
> SHA256 (rust/crates/seahash-3.0.7.crate) = 58f57ca1d128a43733fd71d583e837b1f22239a37ebea09cde11d8d9a9080f47
> SIZE (rust/crates/seahash-3.0.7.crate) = 28697
>-SHA256 (rust/crates/serde-1.0.125.crate) = 558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171
>-SIZE (rust/crates/serde-1.0.125.crate) = 75144
>-SHA256 (rust/crates/serde_derive-1.0.125.crate) = b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d
>-SIZE (rust/crates/serde_derive-1.0.125.crate) = 54155
>-SHA256 (rust/crates/smallvec-1.6.1.crate) = fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e
>-SIZE (rust/crates/smallvec-1.6.1.crate) = 26444
>-SHA256 (rust/crates/syn-1.0.69.crate) = 48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb
>-SIZE (rust/crates/syn-1.0.69.crate) = 231954
>-SHA256 (rust/crates/tinyvec-1.2.0.crate) = 5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342
>-SIZE (rust/crates/tinyvec-1.2.0.crate) = 41625
>+SHA256 (rust/crates/serde-1.0.139.crate) = 0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6
>+SIZE (rust/crates/serde-1.0.139.crate) = 76405
>+SHA256 (rust/crates/serde_derive-1.0.139.crate) = dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb
>+SIZE (rust/crates/serde_derive-1.0.139.crate) = 54848
>+SHA256 (rust/crates/smallvec-1.9.0.crate) = 2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1
>+SIZE (rust/crates/smallvec-1.9.0.crate) = 28396
>+SHA256 (rust/crates/syn-1.0.98.crate) = c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd
>+SIZE (rust/crates/syn-1.0.98.crate) = 235451
>+SHA256 (rust/crates/target-lexicon-0.12.4.crate) = c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1
>+SIZE (rust/crates/target-lexicon-0.12.4.crate) = 23020
>+SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
>+SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
> SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c
> SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817
>-SHA256 (rust/crates/twoway-0.2.1.crate) = 6b40075910de3a912adbd80b5d8bad6ad10a23eeb1f5bf9d4006839e899ba5bc
>-SIZE (rust/crates/twoway-0.2.1.crate) = 30486
>+SHA256 (rust/crates/twoway-0.2.2.crate) = c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47
>+SIZE (rust/crates/twoway-0.2.2.crate) = 30454
> SHA256 (rust/crates/unchecked-index-0.2.2.crate) = eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c
> SIZE (rust/crates/unchecked-index-0.2.2.crate) = 8325
>-SHA256 (rust/crates/unicode-bidi-0.3.5.crate) = eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0
>-SIZE (rust/crates/unicode-bidi-0.3.5.crate) = 33423
>-SHA256 (rust/crates/unicode-normalization-0.1.17.crate) = 07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef
>-SIZE (rust/crates/unicode-normalization-0.1.17.crate) = 100345
>-SHA256 (rust/crates/unicode-xid-0.2.1.crate) = f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564
>-SIZE (rust/crates/unicode-xid-0.2.1.crate) = 14392
>-SHA256 (rust/crates/unindent-0.1.7.crate) = f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7
>-SIZE (rust/crates/unindent-0.1.7.crate) = 8346
>-SHA256 (rust/crates/url-2.2.1.crate) = 9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b
>-SIZE (rust/crates/url-2.2.1.crate) = 65434
>-SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
>-SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
>-SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
>-SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
>-SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
>-SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
>-SHA256 (ArniDagur-python-adblock-0.5.0_GH0.tar.gz) = 35ab20170bcfe447efee4d988508d99477cc23b95a901383bf606ca2960148a3
>-SIZE (ArniDagur-python-adblock-0.5.0_GH0.tar.gz) = 23000
>+SHA256 (rust/crates/unicode-bidi-0.3.8.crate) = 099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992
>+SIZE (rust/crates/unicode-bidi-0.3.8.crate) = 36575
>+SHA256 (rust/crates/unicode-ident-1.0.2.crate) = 15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7
>+SIZE (rust/crates/unicode-ident-1.0.2.crate) = 34951
>+SHA256 (rust/crates/unicode-normalization-0.1.21.crate) = 854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6
>+SIZE (rust/crates/unicode-normalization-0.1.21.crate) = 121745
>+SHA256 (rust/crates/unindent-0.1.9.crate) = 52fee519a3e570f7df377a06a1a7775cdbfb7aa460be7e08de2b1f0e69973a44
>+SIZE (rust/crates/unindent-0.1.9.crate) = 8392
>+SHA256 (rust/crates/url-2.2.2.crate) = a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c
>+SIZE (rust/crates/url-2.2.2.crate) = 68555
>+SHA256 (rust/crates/windows-sys-0.36.1.crate) = ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2
>+SIZE (rust/crates/windows-sys-0.36.1.crate) = 3347053
>+SHA256 (rust/crates/windows_aarch64_msvc-0.36.1.crate) = 9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47
>+SIZE (rust/crates/windows_aarch64_msvc-0.36.1.crate) = 661960
>+SHA256 (rust/crates/windows_i686_gnu-0.36.1.crate) = 180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6
>+SIZE (rust/crates/windows_i686_gnu-0.36.1.crate) = 818115
>+SHA256 (rust/crates/windows_i686_msvc-0.36.1.crate) = e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024
>+SIZE (rust/crates/windows_i686_msvc-0.36.1.crate) = 724575
>+SHA256 (rust/crates/windows_x86_64_gnu-0.36.1.crate) = 4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1
>+SIZE (rust/crates/windows_x86_64_gnu-0.36.1.crate) = 790934
>+SHA256 (rust/crates/windows_x86_64_msvc-0.36.1.crate) = c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680
>+SIZE (rust/crates/windows_x86_64_msvc-0.36.1.crate) = 661999
>+SHA256 (ArniDagur-python-adblock-0.6.0_GH0.tar.gz) = cdde5db640f1d9205785641665b79e6edb7c51092a68536bc4907560c71136b2
>+SIZE (ArniDagur-python-adblock-0.6.0_GH0.tar.gz) = 24976
>diff --git a/www/py-adblock/files/patch-Cargo.toml b/www/py-adblock/files/patch-Cargo.toml
>new file mode 100644
>index 00000000000..ca71d6f5564
>--- /dev/null
>+++ b/www/py-adblock/files/patch-Cargo.toml
>@@ -0,0 +1,17 @@
>+--- Cargo.toml.orig	2023-11-30 00:15:19 UTC
>++++ Cargo.toml
>+@@ -9,15 +9,6 @@ repository = "https://github.com/ArniDagur/python-adbl
>+ homepage = "https://github.com/ArniDagur/python-adblock"
>+ repository = "https://github.com/ArniDagur/python-adblock"
>+
>+-[package.metadata.maturin]
>+-classifier = [
>+-    "Programming Language :: Python",
>+-    "Programming Language :: Rust",
>+-    "License :: OSI Approved :: MIT License",
>+-    "License :: OSI Approved :: Apache Software License",
>+-]
>+-requires-python = ">=3.7"
>+-
>+ [profile.release]
>+ debug = true
>diff --git a/www/py-adblock/files/patch-maturin b/www/py-adblock/files/patch-maturin
>deleted file mode 100644
>index a66468ec42b..00000000000
>--- a/www/py-adblock/files/patch-maturin
>+++ /dev/null
>@@ -1,59 +0,0 @@
>-Obtained from:	https://github.com/ArniDagur/python-adblock/commit/7597cd0b841a0ede22ff4cec6b4b91fb7d26a805
>-
>---- Cargo.toml.orig	2021-06-26 20:50:00 UTC
>-+++ Cargo.toml
>-@@ -9,15 +9,6 @@ readme = "README.md"
>- homepage = "https://github.com/ArniDagur/python-adblock"
>- repository = "https://github.com/ArniDagur/python-adblock"
>- 
>--[package.metadata.maturin]
>--classifier = [
>--    "Programming Language :: Python",
>--    "Programming Language :: Rust",
>--    "License :: OSI Approved :: MIT License",
>--    "License :: OSI Approved :: Apache Software License",
>--]
>--requires-python = ">=3.6"
>--
>- [profile.release]
>- debug = true
>- 
>---- pyproject.toml.orig	2021-06-26 20:50:00 UTC
>-+++ pyproject.toml
>-@@ -1,8 +1,18 @@
>--[tool.poetry]
>-+[project]
>- name = "adblock"
>- version = "0.0.0"
>- description = "Brave's adblocking in Python"
>--authors = ["Ãrni Dagur <arni@dagur.eu>"]
>-+requires-python = ">=3.6"
>-+authors = [
>-+    {email = "arni@dagur.eu"},
>-+    {name = "Ãrni Dagur"}
>-+]
>-+classifiers = [
>-+    "Programming Language :: Python",
>-+    "Programming Language :: Rust",
>-+    "License :: OSI Approved :: MIT License",
>-+    "License :: OSI Approved :: Apache Software License",
>-+]
>- 
>- [tool.poetry.dependencies]
>- python = "^3.6"
>---- tests/test_metadata.py.orig	2021-06-26 20:50:00 UTC
>-+++ tests/test_metadata.py
>-@@ -52,10 +52,10 @@ def test_required_python_version():
>-     Make sure that the Python interpreter we're running this test suite on
>-     falls into the required Python range.
>-     """
>--    with open("Cargo.toml", encoding="utf-8") as f:
>--        cargo_toml = toml.loads(f.read())
>-+    with open("pyproject.toml", encoding="utf-8") as f:
>-+        pyproject_toml = toml.loads(f.read())
>- 
>--    required_python = cargo_toml["package"]["metadata"]["maturin"]["requires-python"]
>-+    required_python = pyproject_toml["project"]["requires-python"]
>-     assert required_python.startswith(">=")
>-     required_python = required_python[2:]
>-     assert get_current_python_version() >= required_python
>diff --git a/www/py-adblock/files/patch-pyproject.toml b/www/py-adblock/files/patch-pyproject.toml
>new file mode 100644
>index 00000000000..550ec2020af
>--- /dev/null
>+++ b/www/py-adblock/files/patch-pyproject.toml
>@@ -0,0 +1,39 @@
>+--- pyproject.toml.orig	2023-11-30 00:16:23 UTC
>++++ pyproject.toml
>+@@ -1,11 +1,21 @@
>+-[tool.poetry]
>++[project]
>+ name = "adblock"
>+ version = "0.0.0"
>+ description = "Brave's adblocking in Python"
>+-authors = ["Ãrni Dagur <arni@dagur.eu>"]
>++requires-python = ">=3.7"
>++authors = [
>++    {email = "arni@dagur.eu"},
>++    {name = "Ãrni Dagur"}
>++]
>++classifiers = [
>++    "Programming Language :: Python",
>++    "Programming Language :: Rust",
>++    "License :: OSI Approved :: MIT License",
>++    "License :: OSI Approved :: Apache Software License",
>++]
>+
>+ [tool.poetry.dependencies]
>+-python = "^3.6"
>++python = "^3.7"
>+
>+ [tool.poetry.dev-dependencies]
>+ maturin = "*"
>+@@ -15,3 +25,11 @@ build-backend = "maturin"
>+ [build-system]
>+ requires = ["maturin>=0.12,<0.13"]
>+ build-backend = "maturin"
>++
>++[package.metadata.maturin]
>++classifier = [
>++    "Programming Language :: Python",
>++    "Programming Language :: Rust",
>++    "License :: OSI Approved :: MIT License",
>++    "License :: OSI Approved :: Apache Software License",
>++]
>diff --git a/www/py-adblock/files/patch-tests_test__metadata.py b/www/py-adblock/files/patch-tests_test__metadata.py
>new file mode 100644
>index 00000000000..bded0a42a99
>--- /dev/null
>+++ b/www/py-adblock/files/patch-tests_test__metadata.py
>@@ -0,0 +1,16 @@
>+--- tests/test_metadata.py.orig	2023-11-30 00:16:36 UTC
>++++ tests/test_metadata.py
>+@@ -57,10 +57,10 @@ def test_required_python_version():
>+     Make sure that the Python interpreter we're running this test suite on
>+     falls into the required Python range.
>+     """
>+-    with open("Cargo.toml", encoding="utf-8") as f:
>+-        cargo_toml = toml.loads(f.read())
>++    with open("pyproject.toml", encoding="utf-8") as f:
>++        pyproject_toml = toml.loads(f.read())
>+
>+-    required_python = cargo_toml["package"]["metadata"]["maturin"]["requires-python"]
>++    required_python = pyproject_toml["project"]["requires-python"]
>+     assert required_python.startswith(">=")
>+     required_python = required_python[2:]
>+     assert get_current_python_version() >= parse_version(required_python)

Flags:

vendion: maintainer-approval+

Actions: View | Diff

Attachments on bug 275479: 246720