From b3ca0c0012607d524ce4e0b5237d33fc8d7cac3a Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 4 Mar 2022 16:24:12 +0100
Subject: [PATCH] git subrepo pull waydroid

subrepo:
  subdir:   "waydroid"
  merged:   "aad9dcb"
upstream:
  origin:   "https://aur.archlinux.org/waydroid.git"
  branch:   "master"
  commit:   "aad9dcb"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
---
 waydroid/.SRCINFO                             |  4 +++-
 waydroid/.gitrepo                             |  4 ++--
 .../0001-fix-bad-eol-of-proc-dt-values.patch  | 22 +++++++++++++++++++
 waydroid/PKGBUILD                             | 13 ++++++++---
 4 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 waydroid/0001-fix-bad-eol-of-proc-dt-values.patch

diff --git a/waydroid/.SRCINFO b/waydroid/.SRCINFO
index a57d639..fe2a26d 100644
--- a/waydroid/.SRCINFO
+++ b/waydroid/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = waydroid
 	pkgdesc = A container-based approach to boot a full Android system on a regular Linux system
 	pkgver = 1.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/waydroid
 	arch = any
 	license = GPL
@@ -16,7 +16,9 @@ pkgbase = waydroid
 	optdepends = python-pyclip: share clipboard with container
 	source = waydroid::git+https://github.com/waydroid/waydroid.git#commit=9a87b10bbfd9cc04c8259207233fadad9acbf5d3
 	source = gbinder.conf
+	source = 0001-fix-bad-eol-of-proc-dt-values.patch
 	sha256sums = SKIP
 	sha256sums = 87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd
+	sha256sums = a0f2f5fe6c3e5af6afee144ad6deec067679d39a9544dfaa2d10e8dac7013bf8
 
 pkgname = waydroid
diff --git a/waydroid/.gitrepo b/waydroid/.gitrepo
index 9a19c60..8de1629 100644
--- a/waydroid/.gitrepo
+++ b/waydroid/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://aur.archlinux.org/waydroid.git
 	branch = master
-	commit = 8a4b43c41d5a5829210edf6f4c858151ec3d234b
-	parent = 55ec747a84c987167218a1772a3fe2f4a8bd7a1f
+	commit = aad9dcb307cc0ee98f36d7acba4f0034ca49c1f8
+	parent = de13eedfb4c7d1b31ea9f26fd326774b7ecd59c3
 	method = merge
 	cmdver = 0.4.3
diff --git a/waydroid/0001-fix-bad-eol-of-proc-dt-values.patch b/waydroid/0001-fix-bad-eol-of-proc-dt-values.patch
new file mode 100644
index 0000000..80093c7
--- /dev/null
+++ b/waydroid/0001-fix-bad-eol-of-proc-dt-values.patch
@@ -0,0 +1,22 @@
+From 71f9249c9e08e9abbd08f6ce95d2906c23cfe433 Mon Sep 17 00:00:00 2001
+From: Erfan Abdi <erfangplus@gmail.com>
+Date: Mon, 25 Oct 2021 12:18:02 +0330
+Subject: [PATCH] lxc: Fix bad eol of proc dt values
+
+---
+ tools/helpers/lxc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
+index 1319442..d57e63c 100644
+--- a/tools/helpers/lxc.py
++++ b/tools/helpers/lxc.py
+@@ -231,7 +231,7 @@ def find_hal(hardware):
+         else:
+             if os.path.isfile("/proc/device-tree/" + product):
+                 with open("/proc/device-tree/" + product) as f:
+-                    f_value = f.read().strip()
++                    f_value = f.read().strip().rstrip('\x00')
+                     if f_value != "":
+                         props.append("ro.product.waydroid." +
+                                      product + "=" + f_value)
diff --git a/waydroid/PKGBUILD b/waydroid/PKGBUILD
index d61801b..eabbf6e 100644
--- a/waydroid/PKGBUILD
+++ b/waydroid/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=waydroid
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A container-based approach to boot a full Android system on a regular Linux system"
 arch=('any')
 url='https://github.com/waydroid'
@@ -14,13 +14,19 @@ optdepends=('waydroid-image: Android image for use with waydroid'
             'python-pyclip: share clipboard with container')
 _commit="9a87b10bbfd9cc04c8259207233fadad9acbf5d3" # tags/1.2.0
 source=("waydroid::git+https://github.com/waydroid/waydroid.git#commit=$_commit"
-        gbinder.conf)
+        gbinder.conf
+        0001-fix-bad-eol-of-proc-dt-values.patch)
 
 pkgver() {
   cd "$pkgname"
   git describe --tags | sed 's/^v//;s/-/+/g'
 }
 
+prepare() {
+  cd waydroid
+  patch -p1 < ../0001-fix-bad-eol-of-proc-dt-values.patch
+}
+
 package() {
   cd waydroid
   install -dm755 "$pkgdir/usr/lib/waydroid"
@@ -37,4 +43,5 @@ package() {
 }
 
 sha256sums=('SKIP'
-            '87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd')
+            '87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd'
+            'a0f2f5fe6c3e5af6afee144ad6deec067679d39a9544dfaa2d10e8dac7013bf8')