From 75b03c95c6e6c5be1e4464e516b96d2d12843cba Mon Sep 17 00:00:00 2001
From: Caleb Gingles <nairou@gmail.com>
Date: Mon, 13 Apr 2020 17:36:41 -0400
Subject: [PATCH] herbstluftwm: update to 0.8.0

---
 srcpkgs/herbstluftwm/patches/frametree.patch | 11 +++++++++++
 srcpkgs/herbstluftwm/template                | 18 +++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/herbstluftwm/patches/frametree.patch

diff --git a/srcpkgs/herbstluftwm/patches/frametree.patch b/srcpkgs/herbstluftwm/patches/frametree.patch
new file mode 100644
index 00000000000..5f50a4142fe
--- /dev/null
+++ b/srcpkgs/herbstluftwm/patches/frametree.patch
@@ -0,0 +1,11 @@
+--- src/frametree.cpp	2020-04-15 08:33:59.781482744 -0400
++++ src/frametree.cpp	2020-04-15 08:34:43.006495582 -0400
+@@ -505,7 +505,7 @@
+         output << "\"" << std::regex_replace(layoutString, whitespace, string(" "))
+                << "\"" << endl;
+         // and underline the token
+-        int token_len = std::max(1ul, parsingResult.error_->first.second.size());
++        int token_len = std::max((size_t)1, parsingResult.error_->first.second.size());
+         output << " " // for the \" above
+                << string(parsingResult.error_->first.first, ' ')
+                << string(token_len, '~')
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 007ae71aafc..819211caf02 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,24 +1,20 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.7.2
+version=0.8.0
 revision=1
-hostmakedepends="pkg-config"
-makedepends="libXinerama-devel libglib-devel"
+build_style=cmake
+hostmakedepends="pkg-config asciidoc"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
-short_desc="A manual tiling window manager for X"
+short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
 distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=dff613fc6d7883ea2011318ef8a7b15b92f7864eaf63229df9ce0e99a44281cd
+checksum=5823f1c1a6a6ae6d4f843992658fcdb91a246e7f337570ac9b2091f57265c812
 
-do_build() {
-	make COLOR=0 CXX="$CXX" CC="$CC" LD="$CC" LDXX="$CXX" \
-		CFLAGS="$CFLAGS -std=c99" LDFLAGS="$LDFLAGS" LDXXFLAGS="$LDFLAGS"
-}
-do_install() {
-	make PREFIX=/usr DESTDIR=${DESTDIR} COLOR=0 install
+post_install() {
 	vmkdir usr/share/bash-completion/completions
 	mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions
 	vlicense LICENSE