Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: python3-adblock-0.4.2
@ 2021-02-01 21:01 ahesford
  2021-02-01 21:02 ` ahesford
                   ` (24 more replies)
  0 siblings, 25 replies; 26+ messages in thread
From: ahesford @ 2021-02-01 21:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1489 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages adblock
https://github.com/void-linux/void-packages/pull/28396

New package: python3-adblock-0.4.2
This supersedes #28380 and #27490.

Compiles natively on `x86_64*`, `aarch64` and `armv7l`. Works as expected on `x86_64` and `aarch64`. I haven't tried the other ARM architectures.

I can't figure out what happens with `openssl-sys` when cross-compiling; the flags passed to GCC include `-m64`, which are rejected by the ARM compilers. On `i686`, the build fails with SIGABRT when trying to build the `psl` crate. The `openssl-sys` issue appears even if I try using the built-in `cargo` build style rather than `maturin`, so this is some configuration problem that extends beyond `maturin`.

Any help fixing these issue would be appreciated. If we can't sort them out, `broken` on `i686` and `nocross` will be sufficient for now.

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR


A patch file from https://github.com/void-linux/void-packages/pull/28396.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-adblock-28396.patch --]
[-- Type: text/x-diff, Size: 3406 bytes --]

From 26080c8cebee773a1e32352e050fc83ebcb0d594 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Feb 2021 11:13:44 +0300
Subject: [PATCH 1/2] New package: maturin-0.9.0

---
 srcpkgs/maturin/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/maturin/template

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
new file mode 100644
index 00000000000..34b9556bb91
--- /dev/null
+++ b/srcpkgs/maturin/template
@@ -0,0 +1,28 @@
+# Template file for 'maturin'
+pkgname=maturin
+version=0.9.0
+revision=1
+build_style=cargo
+hostmakedepends="python3-setuptools python3-toml"
+depends="python3-toml"
+short_desc="Build and publish crates as python packages"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/PyO3/maturin"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=22e8082a743e1dc11f5909b596f9053deb7dc1a56336003677381ba02cf67da8
+
+post_patch() {
+	# setup.py is broken, just use it for the pure python part
+	vsed -e 's/cmdclass.*/packages=["maturin"],/' -i setup.py
+}
+
+post_build() {
+	# python package is pure; the cross environment is not relevant
+	python3 setup.py build
+}
+
+post_install() {
+	vlicense license-mit LICENSE-MIT
+	python3 setup.py install --prefix=/usr --root=${DESTDIR}
+}

From 4b8005562d50c84d839a0776ea8a7668882e0c16 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 1 Feb 2021 13:50:32 +0300
Subject: [PATCH 2/2] New package: python3-adblock-0.4.2

---
 srcpkgs/python3-adblock/template | 48 ++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 srcpkgs/python3-adblock/template

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
new file mode 100644
index 00000000000..0602a510fe1
--- /dev/null
+++ b/srcpkgs/python3-adblock/template
@@ -0,0 +1,48 @@
+# Template file for 'python3-adblock'
+pkgname=python3-adblock
+version=0.4.2
+revision=1
+wrksrc="${pkgname/python3/python}-${version}"
+build_style=python3-pep517
+build_helper="rust"
+hostmakedepends="maturin pkg-config cargo"
+makedepends="libressl-devel python3-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Brave's adblock library in Python"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/ArniDagur/python-adblock"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=06de6074e6cfe889fc0383cc929a5a2306570251c14e51abbfcedd328b83e0e9
+nocross="openssl-sys gets wrong compiler flags on cross targets"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) broken="compiler throws SIGABRT on the psl crate" ;;
+esac
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" rust-std"
+	export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib"
+	export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
+fi
+
+do_build() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		RUSTFLAGS+=" -C target-feature=-crt-static"
+	fi
+
+	mkdir -p build
+	maturin build -o . --release --target "${RUST_TARGET}" \
+		--rustc-extra-args="$RUSTFLAGS" --manylinux off
+}
+
+pre_check() {
+	# Tests require the compiled extension
+	cp target/release/libadblock.so adblock/adblock.so
+}
+
+post_install() {
+	vlicense LICENSE-MIT
+	chmod 755 ${DESTDIR}/${py3_sitelib}/${pkgname#python3-}/*.so
+}

^ permalink raw reply	[flat|nested] 26+ messages in thread
end of thread, other threads:[~2021-02-04  5:33 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-01 21:01 [PR PATCH] New package: python3-adblock-0.4.2 ahesford
2021-02-01 21:02 ` ahesford
2021-02-01 21:09 ` [PR REVIEW] " ericonr
2021-02-01 21:10 ` ahesford
2021-02-01 21:14 ` ericonr
2021-02-01 21:15 ` ericonr
2021-02-01 21:22 ` ericonr
2021-02-01 21:23 ` ericonr
2021-02-01 21:24 ` ericonr
2021-02-01 21:25 ` ericonr
2021-02-01 21:35 ` ericonr
2021-02-01 21:46 ` ericonr
2021-02-01 21:48 ` ericonr
2021-02-02  1:42 ` ericonr
2021-02-02 15:34 ` [PR PATCH] [Updated] " ahesford
2021-02-02 15:49 ` ahesford
2021-02-03 22:06 ` [PR PATCH] [Updated] " ahesford
2021-02-04  1:23 ` [PR REVIEW] " ericonr
2021-02-04  1:23 ` ericonr
2021-02-04  1:23 ` ericonr
2021-02-04  1:23 ` ericonr
2021-02-04  1:34 ` ericonr
2021-02-04  4:21 ` [PR PATCH] [Updated] " ahesford
2021-02-04  4:22 ` ahesford
2021-02-04  4:25 ` ahesford
2021-02-04  5:33 ` [PR PATCH] [Closed]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).