revision

2 files changed, 23 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 535bf50f6116..88a175b7a3ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kitty-git
 	pkgdesc = Modern, hackable, featureful, OpenGL based terminal emulator
-	pkgver = r11076.gc03af4d29
+	pkgver = 0.32.2.r373.ge9c4e7310
 	pkgrel = 2
 	epoch = 1
 	url = https://sw.kovidgoyal.net/kitty/
@@ -17,40 +17,38 @@ pkgbase = kitty-git
 	makedepends = wayland-protocols
 	makedepends = python-sphinx
 	makedepends = python-sphinx-copybutton
+	makedepends = ttf-roboto
+	makedepends = freetype2
+	makedepends = libxi
+	makedepends = libgl
+	makedepends = libcanberra
+	makedepends = simde
 	makedepends = python-sphinx-inline-tabs
 	makedepends = python-sphinxext-opengraph
 	makedepends = python-sphinx-furo
 	makedepends = go
 	depends = python
-	depends = freetype2
-	depends = fontconfig
 	depends = wayland
 	depends = libx11
-	depends = libxi
-	depends = libgl
-	depends = libcanberra
 	depends = dbus
 	depends = lcms2
+	depends = fontconfig
 	depends = libxkbcommon-x11
 	depends = librsync
-	depends = python-pygments
+	depends = xxhash
 	source = git+https://github.com/kovidgoyal/kitty.git
 	sha256sums = SKIP
 
 pkgname = kitty-git
 	depends = python
-	depends = freetype2
-	depends = fontconfig
 	depends = wayland
 	depends = libx11
-	depends = libxi
-	depends = libgl
-	depends = libcanberra
 	depends = dbus
 	depends = lcms2
+	depends = fontconfig
 	depends = libxkbcommon-x11
 	depends = librsync
-	depends = python-pygments
+	depends = xxhash
 	depends = kitty-terminfo-git
 	depends = kitty-shell-integration-git
 	optdepends = imagemagick: viewing images with icat
diff --git a/PKGBUILD b/PKGBUILD
index aee244667ba1..b63d3bc4b6ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,29 +4,36 @@
 
 pkgbase=kitty-git
 pkgname=(kitty-git kitty-terminfo-git kitty-shell-integration-git)
-pkgver=r11076.gc03af4d29
+pkgver=0.32.2.r373.ge9c4e7310
 pkgrel=2
 epoch=1
 pkgdesc="Modern, hackable, featureful, OpenGL based terminal emulator"
 arch=(i686 x86_64)
 url="https://sw.kovidgoyal.net/kitty/"
 license=(GPL3)
-depends=(python freetype2 fontconfig wayland libx11 libxi libgl libcanberra dbus lcms2
-         libxkbcommon-x11 librsync python-pygments)
+depends=(python wayland libx11 dbus lcms2 fontconfig
+         libxkbcommon-x11 librsync xxhash) #python-pygments
 makedepends=(git python-setuptools libxinerama libxcursor libxrandr libxkbcommon mesa
              wayland-protocols python-sphinx python-sphinx-copybutton
+             ttf-roboto freetype2 libxi libgl libcanberra simde
              python-sphinx-inline-tabs python-sphinxext-opengraph python-sphinx-furo go)
 source=("git+https://github.com/kovidgoyal/kitty.git")
 sha256sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/${pkgname%-git}"
-  printf "r%s.g%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  #printf "r%s.g%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --long --tags --exclude nightly | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
   cd "${srcdir}/${pkgname%-git}"
-  python3 setup.py linux-package --update-check-interval=0 
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+  python setup.py linux-package --update-check-interval=0
 }
 
 package_kitty-git() {