[arch-commits] Commit in kitty/trunk (2884-fix-wayland-segfault.patch PKGBUILD)

[Maxim Baz]

    Date: Wednesday, July 29, 2020 @ 12:12:17
  Author: maximbaz
Revision: 665763

kitty: apply patch to fix segfaults on wayland

Added:
  kitty/trunk/2884-fix-wayland-segfault.patch
Modified:
  kitty/trunk/PKGBUILD

---------------------------------+
 2884-fix-wayland-segfault.patch |   18 ++++++++++++++++++
 PKGBUILD                        |   12 +++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

Added: 2884-fix-wayland-segfault.patch
===================================================================
--- 2884-fix-wayland-segfault.patch	                        (rev 0)
+++ 2884-fix-wayland-segfault.patch	2020-07-29 12:12:17 UTC (rev 665763)
@@ -0,0 +1,18 @@
+--- a/glfw/wl_init.c
++++ b/glfw/wl_init.c
+@@ -802,6 +802,7 @@ void _glfwPlatformTerminate(void)
+     glfw_xkb_release(&_glfw.wl.xkb);
+     glfw_dbus_terminate(&_glfw.wl.dbus);
+
++    glfw_wlc_destroy();
+     if (_glfw.wl.cursor.handle)
+     {
+         _glfw_dlclose(_glfw.wl.cursor.handle);
+@@ -810,7 +811,6 @@ void _glfwPlatformTerminate(void)
+
+     if (_glfw.wl.cursorSurface)
+         wl_surface_destroy(_glfw.wl.cursorSurface);
+-    glfw_wlc_destroy();
+     if (_glfw.wl.subcompositor)
+         wl_subcompositor_destroy(_glfw.wl.subcompositor);
+     if (_glfw.wl.compositor)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-29 12:10:14 UTC (rev 665762)
+++ PKGBUILD	2020-07-29 12:12:17 UTC (rev 665763)
@@ -6,7 +6,7 @@
 pkgbase=kitty
 pkgname=(kitty kitty-terminfo)
 pkgver=0.18.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern, hackable, featureful, OpenGL-based terminal emulator"
 arch=('x86_64')
 url="https://github.com/kovidgoyal/kitty"
@@ -13,9 +13,15 @@
 license=('GPL3')
 depends=('python3' 'freetype2'  'fontconfig' 'wayland' 'libx11' 'libxkbcommon-x11' 'libxi' 'hicolor-icon-theme' 'libgl' 'libcanberra' 'dbus')
 makedepends=('libxinerama' 'libxcursor' 'libxrandr' 'wayland-protocols' 'python-sphinx')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/kovidgoyal/$pkgname/archive/v$pkgver.tar.gz")
-sha512sums=('a0b053ed67ab197b5f5f25bfc9cd7df99b85bdfd62a68b6ca64ba194cb1823434d084864bdf115f40423d929ec127b3884ed6de5b42afcc921ccb74db999af40')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/kovidgoyal/$pkgname/archive/v$pkgver.tar.gz"
+        "2884-fix-wayland-segfault.patch")
+sha512sums=('a0b053ed67ab197b5f5f25bfc9cd7df99b85bdfd62a68b6ca64ba194cb1823434d084864bdf115f40423d929ec127b3884ed6de5b42afcc921ccb74db999af40'
+            'f7cebb4f68d331f06ffeb83123f621a101f46762e69d8c5b9191d5c0c16d8f1bcb8ec99c4dde415f08eebbfca347eb56b35ad69cf83233667bb92328a759c743')
 
+prepare() {
+  patch -Np1 -i "$srcdir/2884-fix-wayland-segfault.patch" -d "$srcdir/$pkgname-$pkgver"
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   python3 setup.py linux-package --update-check-interval=0