From 0882bb58721817942923d4cd0a18cf888b466107 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 13 Feb 2023 14:56:07 -0500 Subject: [PATCH] python3-adblock: fix build --- .../python3-adblock/patches/maturin-fix.patch | 48 +++++++++++++++++++ srcpkgs/python3-adblock/template | 2 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/python3-adblock/patches/maturin-fix.patch diff --git a/srcpkgs/python3-adblock/patches/maturin-fix.patch b/srcpkgs/python3-adblock/patches/maturin-fix.patch new file mode 100644 index 00000000000..d77ec44a62a --- /dev/null +++ b/srcpkgs/python3-adblock/patches/maturin-fix.patch @@ -0,0 +1,48 @@ +Maturin 0.14.0 and later requires Python package metadata be in pyproject.toml +rather than Cargo.toml or the package will fail to build. + +diff -u a/Cargo.toml b/Cargo.toml +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -9,15 +9,6 @@ + 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 -u a/pyproject.toml b/pyproject.toml +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -15,3 +15,22 @@ + [build-system] + requires = ["maturin>=0.12,<0.13"] + build-backend = "maturin" ++ ++[project] ++name = "adblock" ++version = "0.6.0" ++authors = [ ++ { name="Árni Dagur", email="arni@dagur.eu" }, ++] ++readme = "README.md" ++repository = "https://github.com/ArniDagur/python-adblock" ++classifier = [ ++ "Programming Language :: Python", ++ "Programming Language :: Rust", ++ "License :: OSI Approved :: MIT License", ++ "License :: OSI Approved :: Apache Software License", ++] ++requires-python = ">=3.7" ++ ++[project.urls] ++"Source Code" = "https://github.com/ArniDagur/python-adblock" diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template index ebd4a7f62ac..71cfc22f775 100644 --- a/srcpkgs/python3-adblock/template +++ b/srcpkgs/python3-adblock/template @@ -1,7 +1,7 @@ # Template file for 'python3-adblock' pkgname=python3-adblock version=0.6.0 -revision=2 +revision=3 build_style=python3-pep517 build_helper="rust" #XXX: Does statically link against openssl