[PR PATCH] herbstluftwm: update to 0.8.0

[PR PATCH] herbstluftwm: update to 0.8.0

[Nairou]

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

There is a new pull request by Nairou against master on the void-packages repository

https://github.com/Nairou/void-packages patch-1
https://github.com/void-linux/void-packages/pull/20961

herbstluftwm: update to 0.8.0


A patch file from https://github.com/void-linux/void-packages/pull/20961.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-20961.patch --]
[-- Type: text/x-diff, Size: 1852 bytes --]

From 49908b74ab45fc910ff639c83e4cb5d039bc8e11 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/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 007ae71aafc..65842ffdaa7 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,24 +1,28 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.7.2
+version=0.8.0
 revision=1
-hostmakedepends="pkg-config"
-makedepends="libXinerama-devel libglib-devel"
+hostmakedepends="pkg-config cmake 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() {
+	mkdir -p build && cd build
+	cmake -DCMAKE_INSTALL_PREFIX=/usr ..
 	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
+	cd build
+	make DESTDIR=${DESTDIR} COLOR=0 install
+	cd ..
 	vmkdir usr/share/bash-completion/completions
 	mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions
 	vlicense LICENSE

Re: [PR PATCH] [Updated] herbstluftwm: update to 0.8.0

[Nairou]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

There is an updated pull request by Nairou against master on the void-packages repository

https://github.com/Nairou/void-packages patch-1
https://github.com/void-linux/void-packages/pull/20961

herbstluftwm: update to 0.8.0


A patch file from https://github.com/void-linux/void-packages/pull/20961.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-20961.patch --]
[-- Type: text/x-diff, Size: 1865 bytes --]

From 65c1008a2104a4f8dccc1d6f0751fa5f48d5d984 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/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 007ae71aafc..c700dda84a3 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,24 +1,28 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.7.2
+version=0.8.0
 revision=1
-hostmakedepends="pkg-config"
-makedepends="libXinerama-devel libglib-devel"
+hostmakedepends="pkg-config cmake asciidoc"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libX11-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() {
+	mkdir -p build && cd build
+	cmake -DCMAKE_INSTALL_PREFIX=/usr ..
 	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
+	cd build
+	make DESTDIR=${DESTDIR} COLOR=0 install
+	cd ..
 	vmkdir usr/share/bash-completion/completions
 	mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions
 	vlicense LICENSE

Re: [PR PATCH] [Updated] herbstluftwm: update to 0.8.0

[Nairou]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

There is an updated pull request by Nairou against master on the void-packages repository

https://github.com/Nairou/void-packages patch-1
https://github.com/void-linux/void-packages/pull/20961

herbstluftwm: update to 0.8.0


A patch file from https://github.com/void-linux/void-packages/pull/20961.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-20961.patch --]
[-- Type: text/x-diff, Size: 1852 bytes --]

From 5032be22bf65f1544634a9ebda452783be36d7fa 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/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 007ae71aafc..65842ffdaa7 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,24 +1,28 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.7.2
+version=0.8.0
 revision=1
-hostmakedepends="pkg-config"
-makedepends="libXinerama-devel libglib-devel"
+hostmakedepends="pkg-config cmake 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() {
+	mkdir -p build && cd build
+	cmake -DCMAKE_INSTALL_PREFIX=/usr ..
 	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
+	cd build
+	make DESTDIR=${DESTDIR} COLOR=0 install
+	cd ..
 	vmkdir usr/share/bash-completion/completions
 	mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions
 	vlicense LICENSE

Re: herbstluftwm: update to 0.8.0

[Nairou]

[-- Attachment #1: Type: text/plain, Size: 272 bytes --]

New comment by Nairou on void-packages repository

https://github.com/void-linux/void-packages/pull/20961#issuecomment-613130374

Comment:
Works on x64. Not sure why CI complains about X11 for other platforms. I tried adding a libX11-devel dependency, but it didn't help.

Re: herbstluftwm: update to 0.8.0

[natrys]

[-- Attachment #1: Type: text/plain, Size: 442 bytes --]

New comment by natrys on void-packages repository

https://github.com/void-linux/void-packages/pull/20961#issuecomment-613479633

Comment:
Any reason you don't just use `build_style=cmake`? It will take care of cross-building. That way you can also get rid of `do_build` and `do_install` blocks. Move license and completions stuffs to `post_install`. You can test locally for other archs (like e.g. `./xbps-src -a aarch64 pkg herbstluftwm`).

Re: herbstluftwm: update to 0.8.0

[Nairou]

[-- Attachment #1: Type: text/plain, Size: 685 bytes --]

New comment by Nairou on void-packages repository

https://github.com/void-linux/void-packages/pull/20961#issuecomment-613486342

Comment:
> Any reason you don't just use `build_style=cmake`? It will take care of cross-building. That way you can also get rid of `do_build` and `do_install` blocks. Move license and completions stuffs to `post_install`. You can test locally for other archs (like e.g. `./xbps-src -a aarch64 pkg herbstluftwm`).

Testing other archs locally sounds great. Where can I see how to use build_style? These are new changes, the previous version didn't use cmake.

I'm just an end-user trying to get an orphaned package updated for the first time. :smile:

Re: herbstluftwm: update to 0.8.0

[mustaqimM]

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

New comment by mustaqimM on void-packages repository

https://github.com/void-linux/void-packages/pull/20961#issuecomment-613628897

Comment:
You can read it here:
https://github.com/void-linux/void-packages/blob/master/Manual.md#build-style-scripts

Re: herbstluftwm: update to 0.8.0

[travankor]

[-- Attachment #1: Type: text/plain, Size: 282 bytes --]

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/20961#issuecomment-613902504

Comment:
Basically, get rid of `do_build` and `do_install` sections and add `build_style=cmake`. Once you get it working run xlint to fix errors up.

Re: herbstluftwm: update to 0.8.0

[travankor]

[-- Attachment #1: Type: text/plain, Size: 471 bytes --]

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/20961#issuecomment-613902504

Comment:
Basically, get rid of `do_build()` and `do_install()` sections and add `build_style=cmake` below `revision`. Everything should just work, but you might need to make a few adjustments. Once you get it working run xlint to fix errors up.

You cant test cross-compiling like so:

`./xbps-src pkg -a aarch64-musl <package name>`

Re: herbstluftwm: update to 0.8.0

[travankor]

[-- Attachment #1: Type: text/plain, Size: 378 bytes --]

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/20961#issuecomment-613902504

Comment:
Basically, get rid of `do_build()` and `do_install()` sections and add `build_style=cmake` below `revision`. Everything should just work, but you might need to make a few adjustments. Once you get it working run xlint to fix errors up.

Re: [PR PATCH] [Updated] herbstluftwm: update to 0.8.0

[Nairou]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

There is an updated pull request by Nairou against master on the void-packages repository

https://github.com/Nairou/void-packages patch-1
https://github.com/void-linux/void-packages/pull/20961

herbstluftwm: update to 0.8.0


A patch file from https://github.com/void-linux/void-packages/pull/20961.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-20961.patch --]
[-- Type: text/x-diff, Size: 2764 bytes --]

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

Re: herbstluftwm: update to 0.8.0

[Nairou]

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

New comment by Nairou on void-packages repository

https://github.com/void-linux/void-packages/pull/20961#issuecomment-614035723

Comment:
@natrys @mustaqimM @travankor Thank you for your help! I think I'm getting the hang of this. :smile:

Re: [PR PATCH] [Merged]: herbstluftwm: update to 0.8.0

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

There's a merged pull request on the void-packages repository

herbstluftwm: update to 0.8.0
https://github.com/void-linux/void-packages/pull/20961

Description:

Re: [PR PATCH] [Updated] herbstluftwm: update to 0.8.0

[Nairou]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

There is an updated pull request by Nairou against master on the void-packages repository

https://github.com/Nairou/void-packages patch-1
https://github.com/void-linux/void-packages/pull/20955

herbstluftwm: update to 0.8.0


A patch file from https://github.com/void-linux/void-packages/pull/20955.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-20955.patch --]
[-- Type: text/x-diff, Size: 1880 bytes --]

From 1e26a21c2932d24e7b9d709fa2f82e2534ef0f8a Mon Sep 17 00:00:00 2001
From: Caleb Gingles <nairou@gmail.com>
Date: Mon, 13 Apr 2020 12:31:09 -0400
Subject: [PATCH 1/2] Update version to 0.8.0

---
 srcpkgs/herbstluftwm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 007ae71aafc..a9ab11bf268 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,6 +1,6 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.7.2
+version=0.8.0
 revision=1
 hostmakedepends="pkg-config"
 makedepends="libXinerama-devel libglib-devel"

From b5a8daf1243e87bce06b0604756f13d763cc436b Mon Sep 17 00:00:00 2001
From: Caleb Gingles <nairou@gmail.com>
Date: Mon, 13 Apr 2020 12:42:12 -0400
Subject: [PATCH 2/2] Fix checksum and short_desc

---
 srcpkgs/herbstluftwm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index a9ab11bf268..10cb414ac31 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -5,13 +5,13 @@ revision=1
 hostmakedepends="pkg-config"
 makedepends="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" \