From a7ba6c9e99c93a26951f5c8218ae6b5ba9e593ab Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sat, 25 Apr 2020 18:22:17 +0000 Subject: [PATCH] x11-wm/herbstluftwm: Update to 0.8.1 - this fixes a segfault on start introduced in 0.8.0 Changelog: https://herbstluftwm.org/news.html - the frame index e refers to the first empty frame - new setting hide_covered_windows to improve the appearance when used with a compositor - keybind now checks that the bound command exists - bug fixes PR: 245779 Submitted by: Zsolt Udvari (maintainer) --- x11-wm/herbstluftwm/Makefile | 2 +- x11-wm/herbstluftwm/distinfo | 6 +++--- x11-wm/herbstluftwm/files/patch-CMakeLists.txt | 13 +++++++++++-- x11-wm/herbstluftwm/files/patch-src_completion.cpp | 10 ---------- x11-wm/herbstluftwm/pkg-plist | 3 +-- 5 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 x11-wm/herbstluftwm/files/patch-src_completion.cpp diff --git a/x11-wm/herbstluftwm/Makefile b/x11-wm/herbstluftwm/Makefile index 0d1a7075e293..e6148f0e57a4 100644 --- a/x11-wm/herbstluftwm/Makefile +++ b/x11-wm/herbstluftwm/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= herbstluftwm -PORTVERSION= 0.8.0 +PORTVERSION= 0.8.1 CATEGORIES= x11-wm MASTER_SITES= http://herbstluftwm.org/tarballs/ diff --git a/x11-wm/herbstluftwm/distinfo b/x11-wm/herbstluftwm/distinfo index f8ad4c610fd3..7e7e87a5d9b9 100644 --- a/x11-wm/herbstluftwm/distinfo +++ b/x11-wm/herbstluftwm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1586589706 -SHA256 (herbstluftwm-0.8.0.tar.gz) = 5823f1c1a6a6ae6d4f843992658fcdb91a246e7f337570ac9b2091f57265c812 -SIZE (herbstluftwm-0.8.0.tar.gz) = 358434 +TIMESTAMP = 1587446998 +SHA256 (herbstluftwm-0.8.1.tar.gz) = fe146d6b533dcabbc2588430de01b76acc0f716521d9a8157aa628f305723430 +SIZE (herbstluftwm-0.8.1.tar.gz) = 369291 diff --git a/x11-wm/herbstluftwm/files/patch-CMakeLists.txt b/x11-wm/herbstluftwm/files/patch-CMakeLists.txt index 91b373c0471c..baf6199023c3 100644 --- a/x11-wm/herbstluftwm/files/patch-CMakeLists.txt +++ b/x11-wm/herbstluftwm/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2020-04-11 08:01:07 UTC +--- CMakeLists.txt.orig 2020-04-20 22:03:58 UTC +++ CMakeLists.txt @@ -20,13 +20,13 @@ include(ccache) @@ -16,10 +16,19 @@ set(DOCDIR ${DATADIR}/doc/herbstluftwm) set(LICENSEDIR ${DOCDIR} CACHE PATH "Install path for license file") +@@ -36,7 +36,7 @@ set(ZSHCOMPLETIONDIR ${DATADIR}/zsh/site-functions + CACHE PATH "Install path for zsh completions file") + set(FISHCOMPLETIONDIR ${DATADIR}/fish/vendor_completions.d + CACHE PATH "Install path for fish completions file") +-set(BASHCOMPLETIONDIR ${DATADIR}/bash-completion/completions ++set(BASHCOMPLETIONDIR ${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d + CACHE PATH "Install path for bash completions file") + + ## do the actual work @@ -47,7 +47,6 @@ add_subdirectory(share) ## install everything that was not installed from subdirectories - install(FILES BUGS NEWS INSTALL DESTINATION ${DOCDIR}) + install(FILES BUGS NEWS DESTINATION ${DOCDIR}) -install(FILES LICENSE DESTINATION ${LICENSEDIR}) install(DIRECTORY scripts/ DESTINATION ${DOCDIR}/examples USE_SOURCE_PERMISSIONS) diff --git a/x11-wm/herbstluftwm/files/patch-src_completion.cpp b/x11-wm/herbstluftwm/files/patch-src_completion.cpp deleted file mode 100644 index c6d35177411f..000000000000 --- a/x11-wm/herbstluftwm/files/patch-src_completion.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/completion.cpp.orig 2020-04-11 07:35:02 UTC -+++ src/completion.cpp -@@ -1,6 +1,7 @@ - #include "completion.h" - - #include -+#include - #include - #include - diff --git a/x11-wm/herbstluftwm/pkg-plist b/x11-wm/herbstluftwm/pkg-plist index 234b4c8f42a7..5d985d0b8dcd 100644 --- a/x11-wm/herbstluftwm/pkg-plist +++ b/x11-wm/herbstluftwm/pkg-plist @@ -1,6 +1,6 @@ bin/herbstclient bin/herbstluftwm -etc/bash_completion.d/herbstclient-completion +etc/bash_completion.d/herbstclient etc/xdg/herbstluftwm/autostart etc/xdg/herbstluftwm/dmenu_run_hlwm etc/xdg/herbstluftwm/panel.sh @@ -12,7 +12,6 @@ share/fish/vendor_completions.d/herbstclient.fish share/xsessions/herbstluftwm.desktop share/zsh/site-functions/_herbstclient %%PORTDOCS%%%%DOCSDIR%%/BUGS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/herbstclient.html %%PORTDOCS%%%%DOCSDIR%%/herbstluftwm-tutorial.html