Index: head/x11-wm/spectrwm/Makefile =================================================================== --- head/x11-wm/spectrwm/Makefile (revision 540402) +++ head/x11-wm/spectrwm/Makefile (revision 540403) @@ -1,70 +1,70 @@ # Created by: Aragon Gouveia # $FreeBSD$ PORTNAME= spectrwm DISTVERSIONPREFIX= SPECTRWM_ -DISTVERSION= 3_4_0 +DISTVERSION= 3_4_1 CATEGORIES= x11-wm MAINTAINER= zeising@FreeBSD.org COMMENT= Small, dynamic tiling window manager for X11 LICENSE= ISCL LIB_DEPENDS+= libxcb-util.so:x11/xcb-util \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-keysyms.so:x11/xcb-util-keysyms RUN_DEPENDS+= dmenu:x11/dmenu USE_GITHUB= yes GH_ACCOUNT= conformal OPTIONS_DEFINE= EXAMPLES .include USES= xorg USE_XORG= x11 xcb xcursor xft xrandr xt USE_LDCONFIG= yes CONFEXAMPLES= spectrwm_cz.conf \ spectrwm_es.conf \ spectrwm_fr.conf \ spectrwm_fr_ch.conf \ spectrwm_se.conf \ spectrwm_us.conf SCRIPTEXAMPLES= baraction.sh \ screenshot.sh post-patch: @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/spectrwm.* do-build: ln -sf ${WRKSRC}/linux/pledge.h ${WRKSRC}/pledge.h ${CC} ${CFLAGS} -Wall -Wextra -Wshadow -Werror -I${LOCALBASE}/include \ -I${LOCALBASE}/include/freetype2 -I${WRKSRC}/freebsd \ -lutil -L${LOCALBASE}/lib -lX11 -lX11-xcb -lxcb -lxcb-icccm \ -lxcb-keysyms -lxcb-randr -lxcb-util -lxcb-xinput -lxcb-xtest \ -lXcursor -lXft -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so\" \ -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c ${CC} ${CFLAGS} -Wall -Wextra -Wshadow -Werror -I${LOCALBASE}/include \ -shared -fpic -DPIC -L${LOCALBASE}/lib -lX11 \ -o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_LIB} ${WRKSRC}/libswmhack.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_MAN} ${WRKSRC}/spectrwm.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/spectrwm.conf ${STAGEDIR}${PREFIX}/etc/spectrwm.conf.sample do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for file in ${CONFEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR} .endfor .for file in ${SCRIPTEXAMPLES} ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR} .endfor .include Index: head/x11-wm/spectrwm/distinfo =================================================================== --- head/x11-wm/spectrwm/distinfo (revision 540402) +++ head/x11-wm/spectrwm/distinfo (revision 540403) @@ -1,3 +1,3 @@ -TIMESTAMP = 1592557801 -SHA256 (conformal-spectrwm-SPECTRWM_3_4_0_GH0.tar.gz) = 85972fdda157ad9f5dae73f9859bf71c73ce2227e6bb29e3fb82f529c82f146b -SIZE (conformal-spectrwm-SPECTRWM_3_4_0_GH0.tar.gz) = 164188 +TIMESTAMP = 1593084248 +SHA256 (conformal-spectrwm-SPECTRWM_3_4_1_GH0.tar.gz) = c030ef30bd11bbdfce3d4a1daf51f0c1358821ba95ebdc4cdb32d3944c8ce03c +SIZE (conformal-spectrwm-SPECTRWM_3_4_1_GH0.tar.gz) = 164507 Index: head/x11-wm/spectrwm/files/patch-6c1a7ca.c =================================================================== --- head/x11-wm/spectrwm/files/patch-6c1a7ca.c (revision 540402) +++ head/x11-wm/spectrwm/files/patch-6c1a7ca.c (nonexistent) @@ -1,42 +0,0 @@ -From 6c1a7ca9176ff6924239c75f0ccdae7c3189b8bf Mon Sep 17 00:00:00 2001 -From: Reginald Kennedy -Date: Fri, 19 Jun 2020 12:17:51 +0800 -Subject: [PATCH] Fix always_raise. - ---- - spectrwm.c | 14 +++++--------- - 1 file changed, 5 insertions(+), 9 deletions(-) - -diff --git a/spectrwm.c b/spectrwm.c -index b2632cc..49640d2 100644 ---- spectrwm.c -+++ spectrwm.c -@@ -4824,9 +4824,8 @@ focus_win(struct ws_win *win) - win->focus_redirect = NULL; /* Clear any redirect from this window. */ - - if (ws->r) { -- if (ws->cur_layout->flags & SWM_L_MAPONFOCUS || -- ws->always_raise) { -- /* Stack all related. */ -+ if (ws->cur_layout->flags & SWM_L_MAPONFOCUS) { -+ /* Only related windows should be mapped. */ - mainw = find_main_window(win); - TAILQ_FOREACH(w, &ws->stack, stack_entry) { - if (ICONIC(w)) -@@ -4837,13 +4836,10 @@ focus_win(struct ws_win *win) - else - unmap_window(w); - } -- - update_stacking(win->s); -- } else if (tile_gap < 0 && !FLOATING(win)) { -- /* -- * Windows overlap in the layout. -- * Raise focused win above all tiled wins. -- */ -+ } else if ((tile_gap < 0 && !FLOATING(win)) || -+ ws->always_raise) { -+ /* Focused window needs to be raised. */ - raise_window(win); - update_win_stacking(win); - map_window(win); Property changes on: head/x11-wm/spectrwm/files/patch-6c1a7ca.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property