upgpkg: gamescope-git 3.7.1.r8.g072599c-1

Remove wlroots-master patch

3 files changed, 4 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07ae6652e882..8a771349b62d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gamescope-git
 	pkgdesc = Micro-compositor formerly known as steamcompmgr
-	pkgver = 3.7.1.r1.g85ba5c6
+	pkgver = 3.7.1.r8.g072599c
 	pkgrel = 1
 	url = https://github.com/Plagman/gamescope
 	arch = x86_64
@@ -22,9 +22,7 @@ pkgbase = gamescope-git
 	conflicts = gamescope
 	conflicts = steamcompmgr
 	source = git+https://github.com/Plagman/gamescope.git
-	source = wlroots-master.patch
 	sha512sums = SKIP
-	sha512sums = ae4aa8129575eb41ffa65119a05707d0b27e69502d15acd6ffb4540d65cdbb84cdb1f3a2bc636ffce5d971839fc7d4cc55db5a87f5a06d81b3492b9246b67d90
 
 pkgname = gamescope-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 62ece908c726..4d81092301cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=gamescope
 pkgname=${_pkgname}-git
-pkgver=3.7.1.r1.g85ba5c6
+pkgver=3.7.1.r8.g072599c
 pkgrel=1
 pkgdesc="Micro-compositor formerly known as steamcompmgr"
 arch=(x86_64)
@@ -12,10 +12,8 @@ depends=("wlroots-git" "sdl2" "libxcomposite" "vulkan-icd-loader" "libxtst" "lib
 makedepends=("git" "meson" "ninja" "patch" "vulkan-headers" "glslang")
 provides=($_pkgname "steamcompmgr")
 conflicts=($_pkgname "steamcompmgr")
-source=("git+https://github.com/Plagman/gamescope.git"
-        "wlroots-master.patch")
-sha512sums=('SKIP'
-            'ae4aa8129575eb41ffa65119a05707d0b27e69502d15acd6ffb4540d65cdbb84cdb1f3a2bc636ffce5d971839fc7d4cc55db5a87f5a06d81b3492b9246b67d90')
+source=("git+https://github.com/Plagman/gamescope.git")
+sha512sums=('SKIP')
 
 
 pkgver() {
@@ -26,7 +24,6 @@ pkgver() {
 
 prepare() {
     cd "$srcdir/$_pkgname"
-    patch -p1 < "${srcdir}/wlroots-master.patch"
 
     rm -rf "$srcdir/$_pkgname/subprojects/libliftoff"
     rm -rf "$srcdir/$_pkgname/subprojects/wlroots"
diff --git a/wlroots-master.patch b/wlroots-master.patch
deleted file mode 100644
index 7d7d5be9c36f..000000000000
--- a/wlroots-master.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/wlserver.cpp b/src/wlserver.cpp
-index 7830b7a..78e25c7 100644
---- a/src/wlserver.cpp
-+++ b/src/wlserver.cpp
-@@ -25,6 +25,7 @@ extern "C" {
- #include <wlr/backend/libinput.h>
- #include <wlr/interfaces/wlr_pointer.h>
- #include <wlr/render/wlr_renderer.h>
-+#include <wlr/types/wlr_touch.h>
- #include <wlr/xwayland.h>
- #include <wlr/util/log.h>
- #undef static
-@@ -135,7 +136,7 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data)
- 	xkb_keycode_t keycode = event->keycode + 8;
- 	xkb_keysym_t keysym = xkb_state_key_get_one_sym(keyboard->device->keyboard->xkb_state, keycode);
- 
--	if (wlserver.wlr.session && event->state == WLR_KEY_PRESSED && keysym >= XKB_KEY_XF86Switch_VT_1 && keysym <= XKB_KEY_XF86Switch_VT_12) {
-+	if (wlserver.wlr.session && event->state == WL_KEYBOARD_KEY_STATE_PRESSED && keysym >= XKB_KEY_XF86Switch_VT_1 && keysym <= XKB_KEY_XF86Switch_VT_12) {
- 		unsigned vt = keysym - XKB_KEY_XF86Switch_VT_1 + 1;
- 		wlr_session_change_vt(wlserver.wlr.session, vt);
- 		return;