bootstrap: dwm and dmenu

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

README.md

@@ -19,14 +19,8 @@ No, Aero runs its own kernel that does *not* originate from Linux and does not s
 **Official Discord Server**: <https://discord.gg/8gwhTTZwt8>
 
 # Screenshots
-<img src="misc/demo.png">
-<p align="center"><i>Aero running TCC in Qemu (the background image is by <a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ">Rick Astley</a>)</i></p>
-
-<img src="misc/qjs-in-aero.png">
-<p align="center"><i>Aero running Quick JS in Qemu (the background image is by <a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ">Rick Astley</a>)</i></p>
-
-<img src="misc/aero-doom.png">
-<p align="center"><i>Aero running DOOM in Qemu (the background image is by <a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ">Rick Astley</a>)</i></p>
+<img src="misc/dwm-xeyes.png">
+<p align="center">Running <a href="https://dwm.suckless.org/">DWM</a> and <a href="https://github.com/freedesktop/xorg-xeyes">Xeyes</a> in Aero!</p>
 
 # Features
 - 64-bit higher half kernel

bootstrap.yml

@@ -871,7 +871,9 @@ packages:
     build:
       - args: ['make', '-j@PARALLELISM@']
       - args: ['make', 'DESTDIR=@THIS_COLLECT_DIR@', 'install']
-      - args: ['ln', '-sf', 'bash', '@THIS_COLLECT_DIR@/usr/bin/sh']
+      - args: ['ln', '-sf', '/usr/bin/bash', '@THIS_COLLECT_DIR@/usr/bin/sh']
+      - args: ['mkdir', '-p', '@THIS_COLLECT_DIR@/bin']
+      - args: ['ln', '-sf', '/usr/bin/bash', '@THIS_COLLECT_DIR@/bin/sh']
 
   - name: tcc
     source:

bootstrap/xorg.yml

@@ -1196,6 +1196,90 @@ packages:
         environ:
           DESTDIR: '@THIS_COLLECT_DIR@'
 
+  - name: dwm
+    source:
+      subdir: 'bundled'
+      git: 'https://git.suckless.org/dwm/'
+      branch: master
+    tools_required:
+      - host-autoconf-v2.69
+      - host-automake-v1.16
+      - host-pkg-config
+      - host-gcc
+    pkgs_required:
+      - mlibc
+      - libx11
+      - libxmu
+      - libxaw
+      - libxrender
+      - libxft
+      - libxt
+      - libxkbfile
+      - libiconv
+      - libxi
+      - dejavu
+    configure:
+      - args: ['cp', '-r', '@THIS_SOURCE_DIR@/.', '@THIS_BUILD_DIR@']
+    build:
+      - args: ['make', 'CC=x86_64-aero-gcc', 'CXX=x86_64-aero-g++']
+      - args: ['make', 'install']
+        environ:
+          DESTDIR: '@THIS_COLLECT_DIR@'
+
+  - name: dmenu
+    source:
+      subdir: 'bundled'
+      git: 'https://git.suckless.org/dmenu/'
+      branch: master
+    tools_required:
+      - host-autoconf-v2.69
+      - host-automake-v1.16
+      - host-pkg-config
+      - host-gcc
+    pkgs_required:
+      - mlibc
+      - libx11
+      - libxmu
+      - libxaw
+      - libxrender
+      - libxft
+      - libxt
+      - libxkbfile
+      - libiconv
+      - libxi
+      - dejavu
+    configure:
+      - args: ['cp', '-r', '@THIS_SOURCE_DIR@/.', '@THIS_BUILD_DIR@']
+    build:
+      - args: ['make', 'CC=x86_64-aero-gcc', 'CXX=x86_64-aero-g++']
+      - args: ['make', 'install']
+        environ:
+          PREFIX: '/usr'
+          DESTDIR: '@THIS_COLLECT_DIR@'
+
+  - name: dejavu
+    source:
+      subdir: bundled
+      url: 'https://sourceforge.net/projects/dejavu/files/dejavu/2.37/dejavu-fonts-ttf-2.37.tar.bz2'
+      format: 'tar.bz2'
+      checksum: blake2b:d8614907887f20967fc7c75cb33b636a0eb5c682a076ccc7aef09f4ac243507afc005ef90d0b2aeee6a4a6a1ff3d5ce4fac0d1722a382525b3883ef53cdec26a
+      extract_path: 'dejavu-fonts-ttf-2.37'
+      version: '2.37'
+    pkgs_required:
+      - freetype
+      - fontconfig
+    revision: 3
+    configure:
+      - args: ['cp', '-r', '@THIS_SOURCE_DIR@/ttf', '@THIS_SOURCE_DIR@/dejavu']
+      - args: ['cp', '-r', '@THIS_SOURCE_DIR@/', '@THIS_BUILD_DIR@']
+    build:
+      - args: ['mkdir', '-p', '@THIS_COLLECT_DIR@/usr/share/fonts/truetype/']
+      - args: ['cp', '-r', '@THIS_BUILD_DIR@/dejavu/dejavu', '@THIS_COLLECT_DIR@/usr/share/fonts/truetype/']
+    scripts:
+        post_install:
+          - args: 'echo "Running fc-cache; this may take a few seconds..."'
+          - args: ['fc-cache']
+
   - name: libxv
     source:
       subdir: 'bundled'

misc/dwm-xeyes.png

@@ -0,0 +1,27 @@
+From 919950798aa0175e18a12e3ab970d133ea0947c5 Mon Sep 17 00:00:00 2001
+From: Andy-Python-Programmer <[email protected]>
+Date: Sat, 12 Nov 2022 19:41:25 +1100
+Subject: [PATCH] <xxx>
+
+---
+ config.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config.mk b/config.mk
+index 566348b..ae68b54 100644
+--- a/config.mk
++++ b/config.mk
+@@ -9,8 +9,8 @@ X11INC = /usr/X11R6/include
+ X11LIB = /usr/X11R6/lib
+ 
+ # Xinerama, comment if you don't want it
+-XINERAMALIBS  = -lXinerama
+-XINERAMAFLAGS = -DXINERAMA
++# XINERAMALIBS  = -lXinerama
++# XINERAMAFLAGS = -DXINERAMA
+ 
+ # freetype
+ FREETYPELIBS = -lfontconfig -lXft
+-- 
+2.38.1
+

patches/dmenu/dmenu.patch

@@ -0,0 +1,41 @@
+From b037341e78de204069d705b2fcb16f7de53b15b4 Mon Sep 17 00:00:00 2001
+From: Andy-Python-Programmer <[email protected]>
+Date: Sun, 13 Nov 2022 12:09:35 +1100
+Subject: [PATCH] <xxx>
+
+---
+ config.def.h | 2 +-
+ config.mk    | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index 9efa774..cb4f512 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -58,7 +58,7 @@ static const Layout layouts[] = {
+ /* 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_cyan, "-sf", col_gray4, NULL };
+-static const char *termcmd[]  = { "st", NULL };
++static const char *termcmd[]  = { "xeyes", NULL };
+ 
+ static const Key keys[] = {
+ 	/* modifier                     key        function        argument */
+diff --git a/config.mk b/config.mk
+index ef8acf7..3d7341e 100644
+--- a/config.mk
++++ b/config.mk
+@@ -11,8 +11,8 @@ X11INC = /usr/X11R6/include
+ X11LIB = /usr/X11R6/lib
+ 
+ # Xinerama, comment if you don't want it
+-XINERAMALIBS  = -lXinerama
+-XINERAMAFLAGS = -DXINERAMA
++# XINERAMALIBS  = -lXinerama
++# XINERAMAFLAGS = -DXINERAMA
+ 
+ # freetype
+ FREETYPELIBS = -lfontconfig -lXft
+-- 
+2.38.1
+

patches/dwm/dwm.patch

@@ -1,24 +1,25 @@
-From 52be7281e3becafe49603ed6bbc01c0ded64d9e1 Mon Sep 17 00:00:00 2001
+From 9ad862a1edb6ce5b86fc4fa49e8ce365af507f47 Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <[email protected]>
-Date: Fri, 8 Jul 2022 12:32:32 +1000
+Date: Sat, 12 Nov 2022 18:58:33 +1100
 Subject: [PATCH] yes
 
 Signed-off-by: Andy-Python-Programmer <[email protected]>
 ---
- .gitignore                          |  2 +
- options/glibc/generic/execinfo.cpp  |  5 +-
- options/rtdl/generic/linker.cpp     |  2 +-
- sysdeps/aero/generic/aero.cpp       | 38 +++++++-------
- sysdeps/aero/generic/filesystem.cpp | 25 ++++++++--
- sysdeps/aero/generic/sockets.cpp    | 77 ++++++++++++++++++++++++++++-
- sysdeps/aero/generic/time.cpp       | 24 +++++++++
- sysdeps/aero/include/aero/syscall.h |  6 +++
- sysdeps/aero/meson.build            |  1 +
- 9 files changed, 152 insertions(+), 28 deletions(-)
+ .gitignore                              |  2 +
+ options/glibc/generic/execinfo.cpp      |  5 +-
+ options/posix/generic/termios-stubs.cpp |  5 +-
+ options/rtdl/generic/linker.cpp         |  2 +-
+ sysdeps/aero/generic/aero.cpp           | 38 ++++++------
+ sysdeps/aero/generic/filesystem.cpp     | 25 ++++++--
+ sysdeps/aero/generic/sockets.cpp        | 77 ++++++++++++++++++++++++-
+ sysdeps/aero/generic/time.cpp           | 24 ++++++++
+ sysdeps/aero/include/aero/syscall.h     |  6 ++
+ sysdeps/aero/meson.build                |  1 +
+ 10 files changed, 155 insertions(+), 30 deletions(-)
  create mode 100644 sysdeps/aero/generic/time.cpp
 
 diff --git a/.gitignore b/.gitignore
-index fdd60a00..9f811f47 100644
+index fdd60a0..9f811f4 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -3,3 +3,5 @@ subprojects
@@ -28,7 +29,7 @@ index fdd60a00..9f811f47 100644
 +# clangd cache files:
 +.cache
 diff --git a/options/glibc/generic/execinfo.cpp b/options/glibc/generic/execinfo.cpp
-index 3474615e..10a2109e 100644
+index 3474615..10a2109 100644
 --- a/options/glibc/generic/execinfo.cpp
 +++ b/options/glibc/generic/execinfo.cpp
 @@ -1,9 +1,10 @@
@@ -44,11 +45,34 @@ index 3474615e..10a2109e 100644
  }
 
  char **backtrace_symbols(void *const *, int) {
+diff --git a/options/posix/generic/termios-stubs.cpp b/options/posix/generic/termios-stubs.cpp
+index 3e621ad..583c1f5 100644
+--- a/options/posix/generic/termios-stubs.cpp
++++ b/options/posix/generic/termios-stubs.cpp
+@@ -5,6 +5,7 @@
+ 
+ #include <bits/ensure.h>
+ #include <mlibc/posix-sysdeps.hpp>
++#include <mlibc/debug.hpp>
+ 
+ speed_t cfgetispeed(const struct termios *tios) {
+ 	return tios->ibaud;
+@@ -50,8 +51,8 @@ int tcflow(int fd, int action) {
+ }
+ 
+ int tcflush(int, int) {
+-	__ensure(!"Not implemented");
+-	__builtin_unreachable();
++	mlibc::infoLogger() << "mlibc::tcflush: is a stub!" << frg::endlog;
++	return 0;
+ }
+ 
+ int tcgetattr(int fd, struct termios *attr) {
 diff --git a/options/rtdl/generic/linker.cpp b/options/rtdl/generic/linker.cpp
-index f51a543f..74f4e96a 100644
+index 2e2d3f1..3ff5fef 100644
 --- a/options/rtdl/generic/linker.cpp
 +++ b/options/rtdl/generic/linker.cpp
-@@ -16,7 +16,7 @@ uintptr_t libraryBase = 0x41000000;
+@@ -18,7 +18,7 @@ uintptr_t libraryBase = 0x41000000;
 
  constexpr bool verbose = false;
  constexpr bool stillSlightlyVerbose = false;
@@ -58,7 +82,7 @@ index f51a543f..74f4e96a 100644
  constexpr bool eagerBinding = true;
 
 diff --git a/sysdeps/aero/generic/aero.cpp b/sysdeps/aero/generic/aero.cpp
-index 29fb9610..a27da559 100644
+index 29fb961..a27da55 100644
 --- a/sysdeps/aero/generic/aero.cpp
 +++ b/sysdeps/aero/generic/aero.cpp
 @@ -69,22 +69,22 @@ int sys_futex_tid() {
@@ -135,7 +159,7 @@ index 29fb9610..a27da559 100644
  }
 
 diff --git a/sysdeps/aero/generic/filesystem.cpp b/sysdeps/aero/generic/filesystem.cpp
-index a3e2aca2..4187059e 100644
+index a3e2aca..4187059 100644
 --- a/sysdeps/aero/generic/filesystem.cpp
 +++ b/sysdeps/aero/generic/filesystem.cpp
 @@ -158,11 +158,6 @@ int sys_tcsetattr(int fd, int optional_action, const struct termios *attr) {
@@ -176,7 +200,7 @@ index a3e2aca2..4187059e 100644
 +}
  } // namespace mlibc
 diff --git a/sysdeps/aero/generic/sockets.cpp b/sysdeps/aero/generic/sockets.cpp
-index b6b18fe7..e03c634b 100644
+index b6b18fe..e03c634 100644
 --- a/sysdeps/aero/generic/sockets.cpp
 +++ b/sysdeps/aero/generic/sockets.cpp
 @@ -1,5 +1,6 @@
@@ -276,7 +300,7 @@ index b6b18fe7..e03c634b 100644
  } // namespace mlibc
 diff --git a/sysdeps/aero/generic/time.cpp b/sysdeps/aero/generic/time.cpp
 new file mode 100644
-index 00000000..460412d0
+index 0000000..460412d
 --- /dev/null
 +++ b/sysdeps/aero/generic/time.cpp
 @@ -0,0 +1,24 @@
@@ -306,7 +330,7 @@ index 00000000..460412d0
 +}
 \ No newline at end of file
 diff --git a/sysdeps/aero/include/aero/syscall.h b/sysdeps/aero/include/aero/syscall.h
-index 12f8dc61..03001c46 100644
+index 12f8dc6..03001c4 100644
 --- a/sysdeps/aero/include/aero/syscall.h
 +++ b/sysdeps/aero/include/aero/syscall.h
 @@ -64,6 +64,12 @@
@@ -323,7 +347,7 @@ index 12f8dc61..03001c46 100644
  // Invalid syscall used to trigger a log error in the kernel (as a hint)
  // so, that we can implement the syscall in the kernel.
 diff --git a/sysdeps/aero/meson.build b/sysdeps/aero/meson.build
-index 14975990..8e30aa3a 100644
+index a807b37..878c216 100644
 --- a/sysdeps/aero/meson.build
 +++ b/sysdeps/aero/meson.build
 @@ -11,6 +11,7 @@ libc_sources += files(
@@ -335,5 +359,5 @@ index 14975990..8e30aa3a 100644
 
  if not no_headers
 -- 
-2.25.1
+2.38.1