remove upstreamed patch

4 files changed, 7 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 960c63617630..5afa6aef0294 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnome-remote-desktop-git
 	pkgdesc = Remote desktop daemon for GNOME using pipewire
-	pkgver = 0.1.6.0.g81ae42e
-	pkgrel = 1
+	pkgver = 0.1.6.6.g2ce8dce
+	pkgrel = 2
 	url = https://wiki.gnome.org/Projects/Mutter/RemoteDesktop
 	arch = i686
 	arch = x86_64
@@ -18,9 +18,7 @@ pkgbase = gnome-remote-desktop-git
 	provides = gnome-remote-desktop
 	conflicts = gnome-remote-desktop
 	source = git+https://gitlab.gnome.org/jadahl/gnome-remote-desktop.git
-	source = 0001-build-with-pipewire-0.2.2.patch
 	sha512sums = SKIP
-	sha512sums = bd09b027a81557d143fb912f477bf60b98b4336eec8fdfe80fdef7e0cb1ed055f2ecd50cf370bab326349fbe4ee64c757e00a4a411e5779c8d5c47ef00a76445
 
 pkgname = gnome-remote-desktop-git
 
diff --git a/0001-build-with-pipewire-0.2.2.patch b/0001-build-with-pipewire-0.2.2.patch
deleted file mode 100644
index 01ea45e2fa75..000000000000
--- a/0001-build-with-pipewire-0.2.2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8e9c2142282be15ed7ee0a2a5124cee6bd4b60e4 Mon Sep 17 00:00:00 2001
-From: Gabriel Rauter <rauter.gabriel@gmail.com>
-Date: Thu, 9 Aug 2018 22:15:23 +0200
-Subject: [PATCH 1/1] build with pipewire 0.2.2
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 6951b89..0600fca 100644
---- a/meson.build
-+++ b/meson.build
-@@ -10,7 +10,7 @@ gnome = import('gnome')
- glib_dep = dependency('glib-2.0')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
--pipewire_dep = dependency('libpipewire-0.1')
-+pipewire_dep = dependency('libpipewire-0.2')
- systemd_dep = dependency('systemd')
- libvncserver_dep = dependency('libvncserver')
- libsecret_dep = dependency('libsecret-1')
-2.18.0
diff --git a/PKGBUILD b/PKGBUILD
index f3f9bc571595..ee9b4921c5a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgname=gnome-remote-desktop
 pkgname=$_pkgname-git
-pkgver=0.1.6.0.g81ae42e
-pkgrel=1
+pkgver=0.1.6.6.g2ce8dce
+pkgrel=2
 pkgdesc='Remote desktop daemon for GNOME using pipewire'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
@@ -12,10 +12,8 @@ depends=('dconf' 'libvncserver' 'libnotify' 'libsecret' 'pipewire')
 makedepends=('git' 'meson')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=(git+https://gitlab.gnome.org/jadahl/$_pkgname.git
-        0001-build-with-pipewire-0.2.2.patch)
-sha512sums=('SKIP'
-            'bd09b027a81557d143fb912f477bf60b98b4336eec8fdfe80fdef7e0cb1ed055f2ecd50cf370bab326349fbe4ee64c757e00a4a411e5779c8d5c47ef00a76445')
+source=(git+https://gitlab.gnome.org/jadahl/$_pkgname.git)
+sha512sums=('SKIP')
 
 pkgver() {
   cd $_pkgname
@@ -23,7 +21,7 @@ pkgver() {
 }
 
 build() {
-  patch -d $_pkgname < 0001-build-with-pipewire-0.2.2.patch
+  rm -rf build
   arch-meson $_pkgname build
   ninja -C build
 }
diff --git a/gnome-remote-desktop-git.install b/gnome-remote-desktop-git.install
deleted file mode 100644
index e0aef9b0b304..000000000000
--- a/gnome-remote-desktop-git.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_upgrade() {
-  echo "WARNING: This package now depends on pipewire-git which breaks gnome-session from extra."
-}