[arch-commits] Commit in kitty/repos/community-x86_64 (3 files)

Maxim Baz maximbaz at archlinux.org
Wed Jul 29 12:12:22 UTC 2020


    Date: Wednesday, July 29, 2020 @ 12:12:22
  Author: maximbaz
Revision: 665764

archrelease: copy trunk to community-x86_64

Added:
  kitty/repos/community-x86_64/2884-fix-wayland-segfault.patch
    (from rev 665763, kitty/trunk/2884-fix-wayland-segfault.patch)
  kitty/repos/community-x86_64/PKGBUILD
    (from rev 665763, kitty/trunk/PKGBUILD)
Deleted:
  kitty/repos/community-x86_64/PKGBUILD

---------------------------------+
 2884-fix-wayland-segfault.patch |   18 +++++
 PKGBUILD                        |  116 +++++++++++++++++++-------------------
 2 files changed, 79 insertions(+), 55 deletions(-)

Copied: kitty/repos/community-x86_64/2884-fix-wayland-segfault.patch (from rev 665763, kitty/trunk/2884-fix-wayland-segfault.patch)
===================================================================
--- 2884-fix-wayland-segfault.patch	                        (rev 0)
+++ 2884-fix-wayland-segfault.patch	2020-07-29 12:12:22 UTC (rev 665764)
@@ -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)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-29 12:12:17 UTC (rev 665763)
+++ PKGBUILD	2020-07-29 12:12:22 UTC (rev 665764)
@@ -1,55 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
-# Contributor: Fabio 'Lolix' Loli <lolix at disroot.org> -> https://github.com/FabioLolix
-# Contributor: Maximilian Kindshofer <maximilian at kindshofer.net>
-
-pkgbase=kitty
-pkgname=(kitty kitty-terminfo)
-pkgver=0.18.2
-pkgrel=1
-pkgdesc="A modern, hackable, featureful, OpenGL-based terminal emulator"
-arch=('x86_64')
-url="https://github.com/kovidgoyal/kitty"
-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')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python3 setup.py linux-package --update-check-interval=0
-}
-
-package_kitty() {
-  depends+=('kitty-terminfo')
-  optdepends=('imagemagick: viewing images with icat')
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cp -r linux-package "${pkgdir}"/usr
-
-  # completions
-  python __main__.py + complete setup bash | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/bash-completion/completions/kitty
-  python __main__.py + complete setup fish | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/fish/vendor_completions.d/kitty.fish
-  # doesn't know how to http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Autoloaded-files
-  # so we write our own header
-  {
-      echo "#compdef kitty"
-      python __main__.py + complete setup zsh
-  } | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/zsh/site-functions/_kitty
-
-  install -Dm644 "${pkgdir}"/usr/share/icons/hicolor/256x256/apps/kitty.png "${pkgdir}"/usr/share/pixmaps/kitty.png
-
-  rm -r "$pkgdir"/usr/share/terminfo
-
-  install -Dm644 docs/generated/conf/kitty.conf "${pkgdir}"/usr/share/doc/${pkgname}/kitty.conf
-}
-
-package_kitty-terminfo() {
-  pkgdesc='Terminfo for kitty, an OpenGL-based terminal emulator'
-  depends=('ncurses')
-
-  mkdir -p "$pkgdir/usr/share/terminfo"
-  tic -x -o "$pkgdir/usr/share/terminfo" $pkgbase-$pkgver/terminfo/kitty.terminfo
-}

Copied: kitty/repos/community-x86_64/PKGBUILD (from rev 665763, kitty/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-29 12:12:22 UTC (rev 665764)
@@ -0,0 +1,61 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
+# Contributor: Fabio 'Lolix' Loli <lolix at disroot.org> -> https://github.com/FabioLolix
+# Contributor: Maximilian Kindshofer <maximilian at kindshofer.net>
+
+pkgbase=kitty
+pkgname=(kitty kitty-terminfo)
+pkgver=0.18.2
+pkgrel=2
+pkgdesc="A modern, hackable, featureful, OpenGL-based terminal emulator"
+arch=('x86_64')
+url="https://github.com/kovidgoyal/kitty"
+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"
+        "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
+}
+
+package_kitty() {
+  depends+=('kitty-terminfo')
+  optdepends=('imagemagick: viewing images with icat')
+
+  cd "$srcdir/$pkgname-$pkgver"
+
+  cp -r linux-package "${pkgdir}"/usr
+
+  # completions
+  python __main__.py + complete setup bash | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/bash-completion/completions/kitty
+  python __main__.py + complete setup fish | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/fish/vendor_completions.d/kitty.fish
+  # doesn't know how to http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Autoloaded-files
+  # so we write our own header
+  {
+      echo "#compdef kitty"
+      python __main__.py + complete setup zsh
+  } | install -Dm644 /dev/stdin "${pkgdir}"/usr/share/zsh/site-functions/_kitty
+
+  install -Dm644 "${pkgdir}"/usr/share/icons/hicolor/256x256/apps/kitty.png "${pkgdir}"/usr/share/pixmaps/kitty.png
+
+  rm -r "$pkgdir"/usr/share/terminfo
+
+  install -Dm644 docs/generated/conf/kitty.conf "${pkgdir}"/usr/share/doc/${pkgname}/kitty.conf
+}
+
+package_kitty-terminfo() {
+  pkgdesc='Terminfo for kitty, an OpenGL-based terminal emulator'
+  depends=('ncurses')
+
+  mkdir -p "$pkgdir/usr/share/terminfo"
+  tic -x -o "$pkgdir/usr/share/terminfo" $pkgbase-$pkgver/terminfo/kitty.terminfo
+}



More information about the arch-commits mailing list