upgrade to 1.2.0

3 files changed, 6 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca49d61ac4c4..a57d639a3ea9 100644
--- a/.SRCINFO
+++ b/.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.1.1
-	pkgrel = 2
+	pkgver = 1.2.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=96204ad92421fd3e1a17b3555e7057d05255046e
-	source = 122.patch
+	source = waydroid::git+https://github.com/waydroid/waydroid.git#commit=9a87b10bbfd9cc04c8259207233fadad9acbf5d3
 	source = gbinder.conf
 	sha256sums = SKIP
-	sha256sums = d222e8bc0286b9f414d48c276e32ba8318e2cacbb7cee4895d9f6a065e098ec2
 	sha256sums = 87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd
 
 pkgname = waydroid
diff --git a/122.patch b/122.patch
deleted file mode 100644
index 572ca4d2b044..000000000000
--- a/122.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ae75e44d8aca9d514c5298f9ee9a5a74bca30a8f Mon Sep 17 00:00:00 2001
-From: Nbiba Bedis <bedisnbiba@gmail.com>
-Date: Thu, 30 Sep 2021 21:53:55 +0100
-Subject: [PATCH] container: don't panic if binder device already exists
-
----
- tools/helpers/drivers.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tools/helpers/drivers.py b/tools/helpers/drivers.py
-index 31005a5..25a5b62 100644
---- a/tools/helpers/drivers.py
-+++ b/tools/helpers/drivers.py
-@@ -58,7 +58,10 @@ def IOWR(_type, nr, size):
-     for node in binder_dev_nodes:
-         node_struct = struct.pack(
-             '256sII', bytes(node, 'utf-8'), 0, 0)
--        fcntl.ioctl(binderctrlfd.fileno(), BINDER_CTL_ADD, node_struct)
-+        try:
-+            fcntl.ioctl(binderctrlfd.fileno(), BINDER_CTL_ADD, node_struct)
-+        except FileExistsError:
-+            pass
- 
- def probeBinderDriver(args):
-     binder_dev_nodes = []
diff --git a/PKGBUILD b/PKGBUILD
index 216c43d1845b..d61801b373b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 
 pkgname=waydroid
-pkgver=1.1.1
-pkgrel=2
+pkgver=1.2.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,9 +12,8 @@ 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="96204ad92421fd3e1a17b3555e7057d05255046e" # tags/1.1.1
+_commit="9a87b10bbfd9cc04c8259207233fadad9acbf5d3" # tags/1.2.0
 source=("waydroid::git+https://github.com/waydroid/waydroid.git#commit=$_commit"
-        122.patch
         gbinder.conf)
 
 pkgver() {
@@ -22,11 +21,6 @@ pkgver() {
   git describe --tags | sed 's/^v//;s/-/+/g'
 }
 
-prepare() {
-  cd waydroid
-  patch -p1 < ../122.patch
-}
-
 package() {
   cd waydroid
   install -dm755 "$pkgdir/usr/lib/waydroid"
@@ -43,5 +37,4 @@ package() {
 }
 
 sha256sums=('SKIP'
-            'd222e8bc0286b9f414d48c276e32ba8318e2cacbb7cee4895d9f6a065e098ec2'
             '87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd')