From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1729936-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8C3F31581EE
for <garchives@archives.gentoo.org>; Fri, 21 Mar 2025 14:03:02 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id 7202E3431C3
for <garchives@archives.gentoo.org>; Fri, 21 Mar 2025 14:03:02 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id 6618D1104AB;
Fri, 21 Mar 2025 14:03:01 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by bobolink.gentoo.org (Postfix) with ESMTPS id 59DC31104AB
for <gentoo-commits@lists.gentoo.org>; Fri, 21 Mar 2025 14:03:01 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0F1C6343088
for <gentoo-commits@lists.gentoo.org>; Fri, 21 Mar 2025 14:03:01 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9ED9D1F7D
for <gentoo-commits@lists.gentoo.org>; Fri, 21 Mar 2025 14:02:59 +0000 (UTC)
From: "Viorel Munteanu" <ceamac@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" <ceamac@gentoo.org>
Message-ID: <1742565768.9ba869dfdf7f44abbbc3f77e4f7b86b1e3aa465e.ceamac@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/woeusb-ng/files/, sys-boot/woeusb-ng/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild
X-VCS-Directories: sys-boot/woeusb-ng/files/ sys-boot/woeusb-ng/
X-VCS-Committer: ceamac
X-VCS-Committer-Name: Viorel Munteanu
X-VCS-Revision: 9ba869dfdf7f44abbbc3f77e4f7b86b1e3aa465e
X-VCS-Branch: master
Date: Fri, 21 Mar 2025 14:02:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5965875c-481f-4030-bb67-db5174cd1c2f
X-Archives-Hash: 8a3977b74724d74d4e383102c705463e
commit: 9ba869dfdf7f44abbbc3f77e4f7b86b1e3aa465e
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Fri Mar 21 12:31:27 2025 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Mar 21 14:02:48 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba869df
sys-boot/woeusb-ng: fix syntax warning in Python 3.12
https://github.com/WoeUSB/WoeUSB-ng/pull/134
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/41211
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch | 16 ++++++++++++++++
sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild | 1 +
2 files changed, 17 insertions(+)
diff --git a/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch b/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch
new file mode 100644
index 000000000000..dfda16cdb417
--- /dev/null
+++ b/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch
@@ -0,0 +1,16 @@
+https://github.com/WoeUSB/WoeUSB-ng/pull/134
+Fix invalid escape sequence
+\. is not a valid escape sequence since Python 3.12 and generates a warning.
+It will become an error in a future version.
+https://docs.python.org/3.12/whatsnew/3.12.html#other-language-changes
+--- a/WoeUSB/workaround.py
++++ b/WoeUSB/workaround.py
+@@ -52,7 +52,7 @@ def support_windows_7_uefi_boot(source_fs_mountpoint, target_fs_mountpoint):
+ :param target_fs_mountpoint:
+ :return:
+ """
+- grep = subprocess.run(["grep", "--extended-regexp", "--quiet", "^MinServer=7[0-9]{3}\.[0-9]",
++ grep = subprocess.run(["grep", "--extended-regexp", "--quiet", r"^MinServer=7[0-9]{3}\.[0-9]",
+ source_fs_mountpoint + "/sources/cversion.ini"],
+ stdout=subprocess.PIPE).stdout.decode("utf-8").strip()
+ if grep == "" and not os.path.isfile(source_fs_mountpoint + "/bootmgr.efi"):
diff --git a/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild b/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild
index 8e3fe806b529..c69498f1ff1a 100644
--- a/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild
+++ b/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-fix-pkg-discovery.patch
+ "${FILESDIR}"/${P}-python3.12.patch
"${FILESDIR}"/${P}-skip-postinstall.patch
)