community/waydroid: backport patch for Python 3.12 syntax warning

From 66c8343c4d

Closes https://gitlab.alpinelinux.org/alpine/aports/-/issues/16100
This commit is contained in:
Stefan Hansson 2024-05-10 08:46:32 +02:00 committed by J0WI
parent 7ff4fe4554
commit 8ff69d291c
2 changed files with 26 additions and 1 deletions

View File

@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=waydroid
pkgver=1.4.2
pkgrel=5
pkgrel=6
pkgdesc="A container-based approach to boot a full Android system on a regular Linux system"
url="https://github.com/waydroid/waydroid"
# Only x86, armv7, x86_64 and aarch64 supported upstream
@ -27,6 +27,7 @@ subpackages="
$pkgname-nftables
"
source="https://github.com/waydroid/waydroid/archive/$pkgver/waydroid-$pkgver.tar.gz
python3.12-syntax-warning-fix.patch
waydroid-container.initd
waydroid-container.confd
51_waydroid.nft
@ -63,6 +64,7 @@ pyc() {
sha512sums="
0d3eba799895c853545b7087e3c07160d593d4a3166822039973669bc0ee93a8a6b9c394a7d982e57cfbbfbd8df1ba7991dd33b1b1517d79fcbe191d8a86890a waydroid-1.4.2.tar.gz
0e1d83000e60ab5c1962044823dec45a254087cbab74142c0b02a6520bd6f44e8f621c08dfb9022a4210776500b602cf4d8188e6b333704a06c8415820612100 python3.12-syntax-warning-fix.patch
f319dde4f4bb365069dff2c1ddaa0a85d711c9e9d49011b15aec0d10da2ba0da39c464505d28cd7e8b4f803e932fdde04ca69602805d084529bac0ee6b22ba59 waydroid-container.initd
b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706 waydroid-container.confd
27cec579cfda197ff70d6328043755fc3d1719347bf4987edb86a07341bc4f02b99b65a6ef1fcde58b48a925176e6d770ed7cef304edff6a860bf4d408a62e06 51_waydroid.nft

View File

@ -0,0 +1,23 @@
From 66c8343c4d2ea118601ba5d8ce52fa622cbcd665 Mon Sep 17 00:00:00 2001
From: Aarron Lee <aclee91@gmail.com>
Date: Sun, 19 Nov 2023 16:11:44 -0500
Subject: [PATCH] update regex for deprecation warning
---
tools/helpers/net.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/helpers/net.py b/tools/helpers/net.py
index c20a95bc..b267357a 100644
--- a/tools/helpers/net.py
+++ b/tools/helpers/net.py
@@ -31,6 +31,6 @@ def get_device_ip_address():
try:
with open(lease_file) as f:
- return re.search("(\d{1,3}\.){3}\d{1,3}\s", f.read()).group().strip()
+ return re.search(r"(\d{1,3}\.){3}\d{1,3}\s", f.read()).group().strip()
except:
- pass
\ No newline at end of file
+ pass