* [PR PATCH] dwm: update to 6.5, adopt
@ 2024-03-22 12:02 iFoundSilentHouse
2024-03-22 14:56 ` Duncaen
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: iFoundSilentHouse @ 2024-03-22 12:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1755 bytes --]
There is a new pull request by iFoundSilentHouse against master on the void-packages repository
https://github.com/iFoundSilentHouse/void-packages dwm-6.5
https://github.com/void-linux/void-packages/pull/49449
dwm: update to 6.5, adopt
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
- x86_64-musl
- i686
- aarch64
I use dwm on a daily basis. Now I'm gonna make custom dwm build based on xbps-src to always test it. Already subscribed to suckless rss so I won't skip update. I know that I did strange things in this repo: PR'd single bash script, PR'd synth with questionable licensing (my apologies ahesford. You're right about that). But as for dwm: I understand how it works as a program, how it works together with xbps-src and I can maintain it efficently, even make patches/rebuilds if it's needed. And I do want to help my with favorite distro the way I can.
A patch file from https://github.com/void-linux/void-packages/pull/49449.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dwm-6.5-49449.patch --]
[-- Type: text/x-diff, Size: 1109 bytes --]
From 8f2c4dfb25623f6c3030461a55ae1d19c336bb93 Mon Sep 17 00:00:00 2001
From: IFoundSilentHouse <adeptslab@gmail.com>
Date: Fri, 22 Mar 2024 17:21:37 +0600
Subject: [PATCH] dwm: update to 6.5.
dwm: update to 6.5, adopt.
---
srcpkgs/dwm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template
index b0e801fe992bed..6905266ba3dcd4 100644
--- a/srcpkgs/dwm/template
+++ b/srcpkgs/dwm/template
@@ -1,14 +1,14 @@
# Template file for 'dwm'
pkgname=dwm
-version=6.4
+version=6.5
revision=1
makedepends="libXinerama-devel libXft-devel freetype-devel"
short_desc="Dynamic window manager for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="iFoundSilentHouse <adeptslab@gmail.com>"
license="MIT"
homepage="https://dwm.suckless.org"
distfiles="https://dl.suckless.org/dwm/dwm-${version}.tar.gz"
-checksum=fa9c0d69a584485076cfc18809fd705e5c2080dafb13d5e729a3646ca7703a6e
+checksum=21d79ebfa9f2fb93141836c2666cb81f4784c69d64e7f1b2352f9b970ba09729
do_build() {
[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: dwm: update to 6.5, adopt
2024-03-22 12:02 [PR PATCH] dwm: update to 6.5, adopt iFoundSilentHouse
@ 2024-03-22 14:56 ` Duncaen
2024-03-22 14:57 ` Duncaen
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Duncaen @ 2024-03-22 14:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 516 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/49449#issuecomment-2015283208
Comment:
Please don't adopt the package, we've had troubles with packages being adopted early on by new contributors that would then stop contributing. To avoid that we have a policy of contributors updating the packages or other packages for a while until they are adopted to avoid this.
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#adopting-a-template
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: dwm: update to 6.5, adopt
2024-03-22 12:02 [PR PATCH] dwm: update to 6.5, adopt iFoundSilentHouse
2024-03-22 14:56 ` Duncaen
@ 2024-03-22 14:57 ` Duncaen
2024-03-22 15:59 ` iFoundSilentHouse
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Duncaen @ 2024-03-22 14:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 515 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/49449#issuecomment-2015283208
Comment:
Please don't adopt the package, we've had troubles with packages being adopted early on by new contributors who would then stop contributing. To avoid that we have a policy of contributors updating the packages or other packages for a while until they are adopted to avoid this.
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#adopting-a-template
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: dwm: update to 6.5, adopt
2024-03-22 12:02 [PR PATCH] dwm: update to 6.5, adopt iFoundSilentHouse
2024-03-22 14:56 ` Duncaen
2024-03-22 14:57 ` Duncaen
@ 2024-03-22 15:59 ` iFoundSilentHouse
2024-03-22 16:04 ` [PR PATCH] [Updated] dwm: update to 6.5 iFoundSilentHouse
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: iFoundSilentHouse @ 2024-03-22 15:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49449#issuecomment-2015400423
Comment:
Ok. One second. I'll make new commit
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] dwm: update to 6.5.
2024-03-22 12:02 [PR PATCH] dwm: update to 6.5, adopt iFoundSilentHouse
` (2 preceding siblings ...)
2024-03-22 15:59 ` iFoundSilentHouse
@ 2024-03-22 16:04 ` iFoundSilentHouse
2024-03-22 16:06 ` iFoundSilentHouse
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: iFoundSilentHouse @ 2024-03-22 16:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1754 bytes --]
There is an updated pull request by iFoundSilentHouse against master on the void-packages repository
https://github.com/iFoundSilentHouse/void-packages dwm-6.5
https://github.com/void-linux/void-packages/pull/49449
dwm: update to 6.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
- x86_64-musl
- i686
- aarch64
I use dwm on a daily basis. Now I'm gonna make custom dwm build based on xbps-src to always test it. Already subscribed to suckless rss so I won't skip update. I know that I did strange things in this repo: PR'd single bash script, PR'd synth with questionable licensing (my apologies ahesford. You're right about that). But as for dwm: I understand how it works as a program, how it works together with xbps-src and I can maintain it efficently, even make patches/rebuilds if it's needed. And I do want to help my with favorite distro the way I can.
A patch file from https://github.com/void-linux/void-packages/pull/49449.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dwm-6.5-49449.patch --]
[-- Type: text/x-diff, Size: 8922 bytes --]
From 8f2c4dfb25623f6c3030461a55ae1d19c336bb93 Mon Sep 17 00:00:00 2001
From: IFoundSilentHouse <adeptslab@gmail.com>
Date: Fri, 22 Mar 2024 17:21:37 +0600
Subject: [PATCH 1/2] dwm: update to 6.5.
dwm: update to 6.5, adopt.
---
srcpkgs/dwm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template
index b0e801fe992bed..6905266ba3dcd4 100644
--- a/srcpkgs/dwm/template
+++ b/srcpkgs/dwm/template
@@ -1,14 +1,14 @@
# Template file for 'dwm'
pkgname=dwm
-version=6.4
+version=6.5
revision=1
makedepends="libXinerama-devel libXft-devel freetype-devel"
short_desc="Dynamic window manager for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="iFoundSilentHouse <adeptslab@gmail.com>"
license="MIT"
homepage="https://dwm.suckless.org"
distfiles="https://dl.suckless.org/dwm/dwm-${version}.tar.gz"
-checksum=fa9c0d69a584485076cfc18809fd705e5c2080dafb13d5e729a3646ca7703a6e
+checksum=21d79ebfa9f2fb93141836c2666cb81f4784c69d64e7f1b2352f9b970ba09729
do_build() {
[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
From e5a69ac3402b16c87c6bdef20fe26ef1d0aebae8 Mon Sep 17 00:00:00 2001
From: IFoundSilentHouse <adeptslab@gmail.com>
Date: Fri, 22 Mar 2024 22:02:32 +0600
Subject: [PATCH 2/2] dwm: update to 6.5.
dwm: update to 6.5
---
srcpkgs/dwm/files/config.h | 119 +++++++++++++++++++++++++++++++++++++
srcpkgs/dwm/template | 2 +-
2 files changed, 120 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dwm/files/config.h
diff --git a/srcpkgs/dwm/files/config.h b/srcpkgs/dwm/files/config.h
new file mode 100644
index 00000000000000..eefef30331edee
--- /dev/null
+++ b/srcpkgs/dwm/files/config.h
@@ -0,0 +1,119 @@
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+static const unsigned int borderpx = 3; /* border pixel of windows */
+static const unsigned int snap = 32; /* snap pixel */
+static const int showbar = 1; /* 0 means no bar */
+static const int topbar = 1; /* 0 means bottom bar */
+static const char *fonts[] = { "monospace:size=12" }; // def: 10
+static const char dmenufont[] = "monospace:size=12";
+static const char col_gray1[] = "#222222";
+static const char col_gray2[] = "#444444";
+static const char col_gray3[] = "#bbbbbb";
+static const char col_gray4[] = "#eeeeee";
+static const char col_void_green[] = "#7cb696";
+static const char col_my_gray[] = "#bcbcbc";
+static const char col_plan9_yell[] = "#ffffe9";
+static const char col_plan9_cyan[] = "#9eeeee";
+static const char *colors[][3] = {
+ /* fg bg border */
+ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+ [SchemeSel] = { col_gray4, col_plan9_cyan, col_plan9_cyan },
+};
+
+/* tagging */
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
+static const Rule rules[] = {
+ /* xprop(1):
+ * WM_CLASS(STRING) = instance, class
+ * WM_NAME(STRING) = title
+ */
+ /* class instance title tags mask isfloating monitor */
+ { "Gimp", NULL, NULL, 0, 1, -1 },
+ { "Firefox", NULL, NULL, 0, 0, -1 },
+};
+
+/* layout(s) */
+static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
+static const int nmaster = 1; /* number of clients in master area */
+static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
+static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
+
+static const Layout layouts[] = {
+ /* symbol arrange function */
+ { "[]=", tile }, /* first entry is default */
+ { "><>", NULL }, /* no layout function means floating behavior */
+ { "[M]", monocle },
+};
+
+/* key definitions */
+#define MODKEY Mod1Mask
+#define TAGKEYS(KEY,TAG) \
+ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
+ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
+ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
+ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
+
+/* helper for spawning shell commands in the pre dwm-5.0 fashion */
+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
+
+/* commands */
+static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_plan9_cyan, "-sf", col_gray4, NULL };
+static const char *termcmd[] = { "st", NULL };
+
+static const Key keys[] = {
+ /* modifier key function argument */
+ { MODKEY, XK_p, spawn, {.v = dmenucmd } },
+ { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
+ { MODKEY, XK_b, togglebar, {0} },
+ { MODKEY, XK_j, focusstack, {.i = +1 } },
+ { MODKEY, XK_k, focusstack, {.i = -1 } },
+ { MODKEY, XK_i, incnmaster, {.i = +1 } },
+ { MODKEY, XK_d, incnmaster, {.i = -1 } },
+ { MODKEY, XK_h, setmfact, {.f = -0.05} },
+ { MODKEY, XK_l, setmfact, {.f = +0.05} },
+ { MODKEY, XK_Return, zoom, {0} },
+ { MODKEY, XK_Tab, view, {0} },
+ { MODKEY|ShiftMask, XK_c, killclient, {0} },
+ { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
+ { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
+ { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
+ { MODKEY, XK_space, setlayout, {0} },
+ { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
+ { MODKEY, XK_0, view, {.ui = ~0 } },
+ { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
+ { MODKEY, XK_comma, focusmon, {.i = -1 } },
+ { MODKEY, XK_period, focusmon, {.i = +1 } },
+ { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
+ { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
+ TAGKEYS( XK_1, 0)
+ TAGKEYS( XK_2, 1)
+ TAGKEYS( XK_3, 2)
+ TAGKEYS( XK_4, 3)
+ TAGKEYS( XK_5, 4)
+ TAGKEYS( XK_6, 5)
+ TAGKEYS( XK_7, 6)
+ TAGKEYS( XK_8, 7)
+ TAGKEYS( XK_9, 8)
+ { MODKEY|ShiftMask, XK_q, quit, {0} },
+};
+
+/* button definitions */
+/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
+static const Button buttons[] = {
+ /* click event mask button function argument */
+ { ClkLtSymbol, 0, Button1, setlayout, {0} },
+ { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
+ { ClkWinTitle, 0, Button2, zoom, {0} },
+ { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
+ { ClkClientWin, MODKEY, Button1, movemouse, {0} },
+ { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
+ { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
+ { ClkTagBar, 0, Button1, view, {0} },
+ { ClkTagBar, 0, Button3, toggleview, {0} },
+ { ClkTagBar, MODKEY, Button1, tag, {0} },
+ { ClkTagBar, MODKEY, Button3, toggletag, {0} },
+};
+
diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template
index 6905266ba3dcd4..3fc2498e7a1e35 100644
--- a/srcpkgs/dwm/template
+++ b/srcpkgs/dwm/template
@@ -4,7 +4,7 @@ version=6.5
revision=1
makedepends="libXinerama-devel libXft-devel freetype-devel"
short_desc="Dynamic window manager for X"
-maintainer="iFoundSilentHouse <adeptslab@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://dwm.suckless.org"
distfiles="https://dl.suckless.org/dwm/dwm-${version}.tar.gz"
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] dwm: update to 6.5.
2024-03-22 12:02 [PR PATCH] dwm: update to 6.5, adopt iFoundSilentHouse
` (3 preceding siblings ...)
2024-03-22 16:04 ` [PR PATCH] [Updated] dwm: update to 6.5 iFoundSilentHouse
@ 2024-03-22 16:06 ` iFoundSilentHouse
2024-03-22 20:48 ` balejk
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: iFoundSilentHouse @ 2024-03-22 16:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1754 bytes --]
There is an updated pull request by iFoundSilentHouse against master on the void-packages repository
https://github.com/iFoundSilentHouse/void-packages dwm-6.5
https://github.com/void-linux/void-packages/pull/49449
dwm: update to 6.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
- x86_64-musl
- i686
- aarch64
I use dwm on a daily basis. Now I'm gonna make custom dwm build based on xbps-src to always test it. Already subscribed to suckless rss so I won't skip update. I know that I did strange things in this repo: PR'd single bash script, PR'd synth with questionable licensing (my apologies ahesford. You're right about that). But as for dwm: I understand how it works as a program, how it works together with xbps-src and I can maintain it efficently, even make patches/rebuilds if it's needed. And I do want to help my with favorite distro the way I can.
A patch file from https://github.com/void-linux/void-packages/pull/49449.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dwm-6.5-49449.patch --]
[-- Type: text/x-diff, Size: 16167 bytes --]
From 8f2c4dfb25623f6c3030461a55ae1d19c336bb93 Mon Sep 17 00:00:00 2001
From: IFoundSilentHouse <adeptslab@gmail.com>
Date: Fri, 22 Mar 2024 17:21:37 +0600
Subject: [PATCH 1/3] dwm: update to 6.5.
dwm: update to 6.5, adopt.
---
srcpkgs/dwm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template
index b0e801fe992bed..6905266ba3dcd4 100644
--- a/srcpkgs/dwm/template
+++ b/srcpkgs/dwm/template
@@ -1,14 +1,14 @@
# Template file for 'dwm'
pkgname=dwm
-version=6.4
+version=6.5
revision=1
makedepends="libXinerama-devel libXft-devel freetype-devel"
short_desc="Dynamic window manager for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="iFoundSilentHouse <adeptslab@gmail.com>"
license="MIT"
homepage="https://dwm.suckless.org"
distfiles="https://dl.suckless.org/dwm/dwm-${version}.tar.gz"
-checksum=fa9c0d69a584485076cfc18809fd705e5c2080dafb13d5e729a3646ca7703a6e
+checksum=21d79ebfa9f2fb93141836c2666cb81f4784c69d64e7f1b2352f9b970ba09729
do_build() {
[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
From e5a69ac3402b16c87c6bdef20fe26ef1d0aebae8 Mon Sep 17 00:00:00 2001
From: IFoundSilentHouse <adeptslab@gmail.com>
Date: Fri, 22 Mar 2024 22:02:32 +0600
Subject: [PATCH 2/3] dwm: update to 6.5.
dwm: update to 6.5
---
srcpkgs/dwm/files/config.h | 119 +++++++++++++++++++++++++++++++++++++
srcpkgs/dwm/template | 2 +-
2 files changed, 120 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dwm/files/config.h
diff --git a/srcpkgs/dwm/files/config.h b/srcpkgs/dwm/files/config.h
new file mode 100644
index 00000000000000..eefef30331edee
--- /dev/null
+++ b/srcpkgs/dwm/files/config.h
@@ -0,0 +1,119 @@
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+static const unsigned int borderpx = 3; /* border pixel of windows */
+static const unsigned int snap = 32; /* snap pixel */
+static const int showbar = 1; /* 0 means no bar */
+static const int topbar = 1; /* 0 means bottom bar */
+static const char *fonts[] = { "monospace:size=12" }; // def: 10
+static const char dmenufont[] = "monospace:size=12";
+static const char col_gray1[] = "#222222";
+static const char col_gray2[] = "#444444";
+static const char col_gray3[] = "#bbbbbb";
+static const char col_gray4[] = "#eeeeee";
+static const char col_void_green[] = "#7cb696";
+static const char col_my_gray[] = "#bcbcbc";
+static const char col_plan9_yell[] = "#ffffe9";
+static const char col_plan9_cyan[] = "#9eeeee";
+static const char *colors[][3] = {
+ /* fg bg border */
+ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+ [SchemeSel] = { col_gray4, col_plan9_cyan, col_plan9_cyan },
+};
+
+/* tagging */
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
+static const Rule rules[] = {
+ /* xprop(1):
+ * WM_CLASS(STRING) = instance, class
+ * WM_NAME(STRING) = title
+ */
+ /* class instance title tags mask isfloating monitor */
+ { "Gimp", NULL, NULL, 0, 1, -1 },
+ { "Firefox", NULL, NULL, 0, 0, -1 },
+};
+
+/* layout(s) */
+static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
+static const int nmaster = 1; /* number of clients in master area */
+static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
+static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
+
+static const Layout layouts[] = {
+ /* symbol arrange function */
+ { "[]=", tile }, /* first entry is default */
+ { "><>", NULL }, /* no layout function means floating behavior */
+ { "[M]", monocle },
+};
+
+/* key definitions */
+#define MODKEY Mod1Mask
+#define TAGKEYS(KEY,TAG) \
+ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
+ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
+ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
+ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
+
+/* helper for spawning shell commands in the pre dwm-5.0 fashion */
+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
+
+/* commands */
+static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_plan9_cyan, "-sf", col_gray4, NULL };
+static const char *termcmd[] = { "st", NULL };
+
+static const Key keys[] = {
+ /* modifier key function argument */
+ { MODKEY, XK_p, spawn, {.v = dmenucmd } },
+ { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
+ { MODKEY, XK_b, togglebar, {0} },
+ { MODKEY, XK_j, focusstack, {.i = +1 } },
+ { MODKEY, XK_k, focusstack, {.i = -1 } },
+ { MODKEY, XK_i, incnmaster, {.i = +1 } },
+ { MODKEY, XK_d, incnmaster, {.i = -1 } },
+ { MODKEY, XK_h, setmfact, {.f = -0.05} },
+ { MODKEY, XK_l, setmfact, {.f = +0.05} },
+ { MODKEY, XK_Return, zoom, {0} },
+ { MODKEY, XK_Tab, view, {0} },
+ { MODKEY|ShiftMask, XK_c, killclient, {0} },
+ { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
+ { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
+ { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
+ { MODKEY, XK_space, setlayout, {0} },
+ { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
+ { MODKEY, XK_0, view, {.ui = ~0 } },
+ { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
+ { MODKEY, XK_comma, focusmon, {.i = -1 } },
+ { MODKEY, XK_period, focusmon, {.i = +1 } },
+ { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
+ { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
+ TAGKEYS( XK_1, 0)
+ TAGKEYS( XK_2, 1)
+ TAGKEYS( XK_3, 2)
+ TAGKEYS( XK_4, 3)
+ TAGKEYS( XK_5, 4)
+ TAGKEYS( XK_6, 5)
+ TAGKEYS( XK_7, 6)
+ TAGKEYS( XK_8, 7)
+ TAGKEYS( XK_9, 8)
+ { MODKEY|ShiftMask, XK_q, quit, {0} },
+};
+
+/* button definitions */
+/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
+static const Button buttons[] = {
+ /* click event mask button function argument */
+ { ClkLtSymbol, 0, Button1, setlayout, {0} },
+ { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
+ { ClkWinTitle, 0, Button2, zoom, {0} },
+ { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
+ { ClkClientWin, MODKEY, Button1, movemouse, {0} },
+ { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
+ { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
+ { ClkTagBar, 0, Button1, view, {0} },
+ { ClkTagBar, 0, Button3, toggleview, {0} },
+ { ClkTagBar, MODKEY, Button1, tag, {0} },
+ { ClkTagBar, MODKEY, Button3, toggletag, {0} },
+};
+
diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template
index 6905266ba3dcd4..3fc2498e7a1e35 100644
--- a/srcpkgs/dwm/template
+++ b/srcpkgs/dwm/template
@@ -4,7 +4,7 @@ version=6.5
revision=1
makedepends="libXinerama-devel libXft-devel freetype-devel"
short_desc="Dynamic window manager for X"
-maintainer="iFoundSilentHouse <adeptslab@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://dwm.suckless.org"
distfiles="https://dl.suckless.org/dwm/dwm-${version}.tar.gz"
From ab33861b60ce97ae592940b771ba0cc9b8ea41d8 Mon Sep 17 00:00:00 2001
From: IFoundSilentHouse <adeptslab@gmail.com>
Date: Fri, 22 Mar 2024 22:05:42 +0600
Subject: [PATCH 3/3] dwm: update to 6.5.
dwm: update to 6.5
---
srcpkgs/dwm/files/config.h | 119 -------------------------------------
1 file changed, 119 deletions(-)
delete mode 100644 srcpkgs/dwm/files/config.h
diff --git a/srcpkgs/dwm/files/config.h b/srcpkgs/dwm/files/config.h
deleted file mode 100644
index eefef30331edee..00000000000000
--- a/srcpkgs/dwm/files/config.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/* appearance */
-static const unsigned int borderpx = 3; /* border pixel of windows */
-static const unsigned int snap = 32; /* snap pixel */
-static const int showbar = 1; /* 0 means no bar */
-static const int topbar = 1; /* 0 means bottom bar */
-static const char *fonts[] = { "monospace:size=12" }; // def: 10
-static const char dmenufont[] = "monospace:size=12";
-static const char col_gray1[] = "#222222";
-static const char col_gray2[] = "#444444";
-static const char col_gray3[] = "#bbbbbb";
-static const char col_gray4[] = "#eeeeee";
-static const char col_void_green[] = "#7cb696";
-static const char col_my_gray[] = "#bcbcbc";
-static const char col_plan9_yell[] = "#ffffe9";
-static const char col_plan9_cyan[] = "#9eeeee";
-static const char *colors[][3] = {
- /* fg bg border */
- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
- [SchemeSel] = { col_gray4, col_plan9_cyan, col_plan9_cyan },
-};
-
-/* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
-static const Rule rules[] = {
- /* xprop(1):
- * WM_CLASS(STRING) = instance, class
- * WM_NAME(STRING) = title
- */
- /* class instance title tags mask isfloating monitor */
- { "Gimp", NULL, NULL, 0, 1, -1 },
- { "Firefox", NULL, NULL, 0, 0, -1 },
-};
-
-/* layout(s) */
-static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
-static const int nmaster = 1; /* number of clients in master area */
-static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
-static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
-
-static const Layout layouts[] = {
- /* symbol arrange function */
- { "[]=", tile }, /* first entry is default */
- { "><>", NULL }, /* no layout function means floating behavior */
- { "[M]", monocle },
-};
-
-/* key definitions */
-#define MODKEY Mod1Mask
-#define TAGKEYS(KEY,TAG) \
- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
- { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
- { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
- { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
-
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-
-/* commands */
-static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_plan9_cyan, "-sf", col_gray4, NULL };
-static const char *termcmd[] = { "st", NULL };
-
-static const Key keys[] = {
- /* modifier key function argument */
- { MODKEY, XK_p, spawn, {.v = dmenucmd } },
- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
- { MODKEY, XK_b, togglebar, {0} },
- { MODKEY, XK_j, focusstack, {.i = +1 } },
- { MODKEY, XK_k, focusstack, {.i = -1 } },
- { MODKEY, XK_i, incnmaster, {.i = +1 } },
- { MODKEY, XK_d, incnmaster, {.i = -1 } },
- { MODKEY, XK_h, setmfact, {.f = -0.05} },
- { MODKEY, XK_l, setmfact, {.f = +0.05} },
- { MODKEY, XK_Return, zoom, {0} },
- { MODKEY, XK_Tab, view, {0} },
- { MODKEY|ShiftMask, XK_c, killclient, {0} },
- { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
- { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
- { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
- { MODKEY, XK_space, setlayout, {0} },
- { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
- { MODKEY, XK_0, view, {.ui = ~0 } },
- { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
- { MODKEY, XK_comma, focusmon, {.i = -1 } },
- { MODKEY, XK_period, focusmon, {.i = +1 } },
- { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
- { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
- TAGKEYS( XK_1, 0)
- TAGKEYS( XK_2, 1)
- TAGKEYS( XK_3, 2)
- TAGKEYS( XK_4, 3)
- TAGKEYS( XK_5, 4)
- TAGKEYS( XK_6, 5)
- TAGKEYS( XK_7, 6)
- TAGKEYS( XK_8, 7)
- TAGKEYS( XK_9, 8)
- { MODKEY|ShiftMask, XK_q, quit, {0} },
-};
-
-/* button definitions */
-/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
-static const Button buttons[] = {
- /* click event mask button function argument */
- { ClkLtSymbol, 0, Button1, setlayout, {0} },
- { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
- { ClkWinTitle, 0, Button2, zoom, {0} },
- { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
- { ClkClientWin, MODKEY, Button1, movemouse, {0} },
- { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
- { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
- { ClkTagBar, 0, Button1, view, {0} },
- { ClkTagBar, 0, Button3, toggleview, {0} },
- { ClkTagBar, MODKEY, Button1, tag, {0} },
- { ClkTagBar, MODKEY, Button3, toggletag, {0} },
-};
-
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: dwm: update to 6.5.
2024-03-22 12:02 [PR PATCH] dwm: update to 6.5, adopt iFoundSilentHouse
` (4 preceding siblings ...)
2024-03-22 16:06 ` iFoundSilentHouse
@ 2024-03-22 20:48 ` balejk
2024-03-22 21:42 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-03-23 17:23 ` [PR PATCH] [Merged]: " leahneukirchen
7 siblings, 0 replies; 9+ messages in thread
From: balejk @ 2024-03-22 20:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New comment by balejk on void-packages repository
https://github.com/void-linux/void-packages/pull/49449#issuecomment-2015887150
Comment:
You will probably want to squash these.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] dwm: update to 6.5.
2024-03-22 12:02 [PR PATCH] dwm: update to 6.5, adopt iFoundSilentHouse
` (5 preceding siblings ...)
2024-03-22 20:48 ` balejk
@ 2024-03-22 21:42 ` iFoundSilentHouse
2024-03-23 17:23 ` [PR PATCH] [Merged]: " leahneukirchen
7 siblings, 0 replies; 9+ messages in thread
From: iFoundSilentHouse @ 2024-03-22 21:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1754 bytes --]
There is an updated pull request by iFoundSilentHouse against master on the void-packages repository
https://github.com/iFoundSilentHouse/void-packages dwm-6.5
https://github.com/void-linux/void-packages/pull/49449
dwm: update to 6.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
- x86_64-musl
- i686
- aarch64
I use dwm on a daily basis. Now I'm gonna make custom dwm build based on xbps-src to always test it. Already subscribed to suckless rss so I won't skip update. I know that I did strange things in this repo: PR'd single bash script, PR'd synth with questionable licensing (my apologies ahesford. You're right about that). But as for dwm: I understand how it works as a program, how it works together with xbps-src and I can maintain it efficently, even make patches/rebuilds if it's needed. And I do want to help my with favorite distro the way I can.
A patch file from https://github.com/void-linux/void-packages/pull/49449.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dwm-6.5-49449.patch --]
[-- Type: text/x-diff, Size: 1039 bytes --]
From 0183fc5c540417080a07901223c5300b26dd7856 Mon Sep 17 00:00:00 2001
From: IFoundSilentHouse <adeptslab@gmail.com>
Date: Fri, 22 Mar 2024 17:21:37 +0600
Subject: [PATCH] dwm: update to 6.5.
---
srcpkgs/dwm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template
index b0e801fe992bed..3fc2498e7a1e35 100644
--- a/srcpkgs/dwm/template
+++ b/srcpkgs/dwm/template
@@ -1,6 +1,6 @@
# Template file for 'dwm'
pkgname=dwm
-version=6.4
+version=6.5
revision=1
makedepends="libXinerama-devel libXft-devel freetype-devel"
short_desc="Dynamic window manager for X"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://dwm.suckless.org"
distfiles="https://dl.suckless.org/dwm/dwm-${version}.tar.gz"
-checksum=fa9c0d69a584485076cfc18809fd705e5c2080dafb13d5e729a3646ca7703a6e
+checksum=21d79ebfa9f2fb93141836c2666cb81f4784c69d64e7f1b2352f9b970ba09729
do_build() {
[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: dwm: update to 6.5.
2024-03-22 12:02 [PR PATCH] dwm: update to 6.5, adopt iFoundSilentHouse
` (6 preceding siblings ...)
2024-03-22 21:42 ` [PR PATCH] [Updated] " iFoundSilentHouse
@ 2024-03-23 17:23 ` leahneukirchen
7 siblings, 0 replies; 9+ messages in thread
From: leahneukirchen @ 2024-03-23 17:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1578 bytes --]
There's a merged pull request on the void-packages repository
dwm: update to 6.5.
https://github.com/void-linux/void-packages/pull/49449
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures:
- x86_64-musl
- i686
- aarch64
I use dwm on a daily basis. Now I'm gonna make custom dwm build based on xbps-src to always test it. Already subscribed to suckless rss so I won't skip update. I know that I did strange things in this repo: PR'd single bash script, PR'd synth with questionable licensing (my apologies ahesford. You're right about that). But as for dwm: I understand how it works as a program, how it works together with xbps-src and I can maintain it efficently, even make patches/rebuilds if it's needed. And I do want to help my with favorite distro the way I can.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-03-23 17:23 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-22 12:02 [PR PATCH] dwm: update to 6.5, adopt iFoundSilentHouse
2024-03-22 14:56 ` Duncaen
2024-03-22 14:57 ` Duncaen
2024-03-22 15:59 ` iFoundSilentHouse
2024-03-22 16:04 ` [PR PATCH] [Updated] dwm: update to 6.5 iFoundSilentHouse
2024-03-22 16:06 ` iFoundSilentHouse
2024-03-22 20:48 ` balejk
2024-03-22 21:42 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-03-23 17:23 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).