[PR PATCH] bookworm: simplify patch

[PR PATCH] bookworm: simplify patch

[sgn]

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

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

https://github.com/sgn/void-packages bookworm-simplify-patch
https://github.com/void-linux/void-packages/pull/50850

bookworm: simplify patch
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

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?=
 <congdanhqx@gmail.com>
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() {

Re: [PR PATCH] [Merged]: bookworm: simplify patch

[sgn]

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

There's a merged pull request on the void-packages repository

bookworm: simplify patch
https://github.com/void-linux/void-packages/pull/50850

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->