From 411b80b3de5a0398e1b2fa084fcf3ea2697677c4 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 20 Aug 2022 19:02:20 +0200
Subject: [PATCH] git subrepo pull waydroid

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

diff --git a/waydroid/.SRCINFO b/waydroid/.SRCINFO
index fe2a26d..f8165ca 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 = 2
+	pkgver = 1.3.0
+	pkgrel = 1
 	url = https://github.com/waydroid
 	arch = any
 	license = GPL
@@ -14,11 +14,9 @@ pkgbase = waydroid
 	depends = dnsmasq
 	optdepends = waydroid-image: Android image for use with waydroid
 	optdepends = python-pyclip: share clipboard with container
-	source = waydroid::git+https://github.com/waydroid/waydroid.git#commit=9a87b10bbfd9cc04c8259207233fadad9acbf5d3
+	source = waydroid::git+https://github.com/waydroid/waydroid.git#commit=1eba5463d904e3e87cc237627d96727a90960624
 	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 8de1629..7f73335 100644
--- a/waydroid/.gitrepo
+++ b/waydroid/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://aur.archlinux.org/waydroid.git
 	branch = master
-	commit = aad9dcb307cc0ee98f36d7acba4f0034ca49c1f8
-	parent = de13eedfb4c7d1b31ea9f26fd326774b7ecd59c3
+	commit = 6e8ae5f90316041b655372c9fb4faaf6e5a4fe37
+	parent = c074bdd5ba85d1b1879caed911a9ca78eca13f73
 	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
deleted file mode 100644
index 80093c7..0000000
--- a/waydroid/0001-fix-bad-eol-of-proc-dt-values.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 eabbf6e..3094a1e 100644
--- a/waydroid/PKGBUILD
+++ b/waydroid/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 
 pkgname=waydroid
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="A container-based approach to boot a full Android system on a regular Linux system"
 arch=('any')
 url='https://github.com/waydroid'
@@ -12,10 +12,9 @@ depends=('lxc' 'python' 'python-gbinder' 'python-gobject' 'nftables' 'dnsmasq')
 makedepends=('git')
 optdepends=('waydroid-image: Android image for use with waydroid'
             'python-pyclip: share clipboard with container')
-_commit="9a87b10bbfd9cc04c8259207233fadad9acbf5d3" # tags/1.2.0
+_commit="1eba5463d904e3e87cc237627d96727a90960624" # tags/1.3.0
 source=("waydroid::git+https://github.com/waydroid/waydroid.git#commit=$_commit"
-        gbinder.conf
-        0001-fix-bad-eol-of-proc-dt-values.patch)
+        gbinder.conf)
 
 pkgver() {
   cd "$pkgname"
@@ -24,7 +23,6 @@ pkgver() {
 
 prepare() {
   cd waydroid
-  patch -p1 < ../0001-fix-bad-eol-of-proc-dt-values.patch
 }
 
 package() {
@@ -38,10 +36,8 @@ package() {
   ln -s /usr/lib/waydroid/waydroid.py "$pkgdir/usr/bin/waydroid"
 
   install -Dm644 -t "$pkgdir/etc" "$srcdir/gbinder.conf"
-  install -Dm644 -t "$pkgdir/etc/gbinder.d" gbinder/anbox.conf
-  install -Dm644 -t "$pkgdir/usr/lib/systemd/system" debian/waydroid-container.service
+  install -Dm644 -t "$pkgdir/usr/lib/systemd/system" systemd/waydroid-container.service
 }
 
 sha256sums=('SKIP'
-            '87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd'
-            'a0f2f5fe6c3e5af6afee144ad6deec067679d39a9544dfaa2d10e8dac7013bf8')
+            '87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd')