From 13f7f92bb38b3e9ae2a92e0d9037d9e180a4510a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 16 Jun 2024 22:18:27 +0700 Subject: [PATCH] bookworm: simplify patch --- srcpkgs/bookworm/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template index 52e1007be6fe04..c28e11b9e88eb3 100644 --- a/srcpkgs/bookworm/template +++ b/srcpkgs/bookworm/template @@ -20,10 +20,9 @@ skip_extraction="python3.patch" python_version=3 post_patch() { - # remove the binary pyc files and file that needs to be patched separately - # also apply https://github.com/babluboy/bookworm/commit/5719d4367c2bded1c3660238465857d5d6f7f8fc - patch -Np1 < <(sed 's,#! /usr/bin/python,#!usr/bin/env python,; /^diff --git .*\.pyc$/,/^diff --git/d; /^--- .*constants.vala.in$/q' \ - "${XBPS_SRCDISTDIR}/${pkgname}-${version}/python3.patch") + vsrccopy python3.patch . + PATH=/usr/libexec/chroot-git:$PATH + git apply --include ="**/*.py" --whitespace=nowarn python3.patch } post_install() {