Merge pull request 'add wayland, my implementation' (#45) from Ohio2/repo:master into master

Reviewed-on: alnux/repo#45

curses-lib/build

@@ -12,44 +12,44 @@ popd
 ./configure --prefix=/ --build=$(./config.guess) --mandir=//share/man --with-manpage-format=normal --with-shared --without-debug --without-ada --without-normal --enable-widec --with-pkg-config-libdir=//lib/ncurses//lib/pkgconfig
 make
 make DESTDIR="$1" install 
-ln -s $1//lib/ncurses/bin/captoinfo $1//bin/
-ln -s $1//lib/ncurses/bin/clear $1//bin/
-ln -s $1//lib/ncurses/bin/infocmp $1//bin/
-ln -s $1//lib/ncurses/bin/infotocap $1//bin/
-ln -s $1//lib/ncurses/bin/ncurses6-config $1//bin/
-ln -s $1//lib/ncurses/bin/reset $1//bin/
-ln -s $1//lib/ncurses/bin/tabs $1//bin/
-ln -s $1//lib/ncurses/bin/tic $1//bin/
-ln -s $1//lib/ncurses/bin/toe $1//bin/
-ln -s $1//lib/ncurses/bin/tput $1//bin/
-ln -s $1//lib/ncurses/bin/tset $1//bin/
-ln -s $1//lib/ncurses/include/ncurses $1//include
-ln -s $1//lib/ncurses/lib/libform.a $1//lib/
-ln -s $1//lib/ncurses/lib/libform_g.a $1//lib/
-ln -s $1//lib/ncurses/lib/libform.so $1//lib/
-ln -s $1//lib/ncurses/lib/libform.so.6 $1//lib/
-ln -s $1//lib/ncurses/lib/libform.so.6.1 $1//lib/
-ln -s $1//lib/ncurses/lib/libmenu.a $1//lib/
-ln -s $1//lib/ncurses/lib/libmenu_g.a $1//lib/
-ln -s $1//lib/ncurses/lib/libmenu.so $1//lib/
-ln -s $1//lib/ncurses/lib/libmenu.so.6 $1//lib/
-ln -s $1//lib/ncurses/lib/libmenu.so.6.1 $1//lib/
-ln -s $1//lib/ncurses/lib/libncurses++.a $1//lib/
-ln -s $1//lib/ncurses/lib/libncurses.a $1//lib/
-ln -s $1//lib/ncurses/lib/libncurses++_g.a $1//lib/
-ln -s $1//lib/ncurses/lib/libncurses_g.a $1//lib/
-ln -s $1//lib/ncurses/lib/libncurses.so $1//lib/
-ln -s $1//lib/ncurses/lib/libncurses.so.6 $1//lib/
-ln -s $1//lib/ncurses/lib/libncurses.so.6.1 $1//lib/
-ln -s $1//lib/ncurses/lib/libpanel.a $1//lib/
-ln -s $1//lib/ncurses/lib/libpanel_g.a $1//lib/
-ln -s $1//lib/ncurses/lib/libpanel.so $1//lib/
-ln -s $1//lib/ncurses/lib/libpanel.so.6 $1//lib/
-ln -s $1//lib/ncurses/lib/libpanel.so.6.1 $1//lib/
-ln -s $1//lib/ncurses/lib/terminfo $1//lib/
-ln -s $1//lib/ncurses/lib/pkgconfig/form.pc $1//lib/pkgconfig/
-ln -s $1//lib/ncurses/lib/pkgconfig/menu.pc $1//lib/pkgconfig/
-ln -s $1//lib/ncurses/lib/pkgconfig/ncurses++.pc $1//lib/pkgconfig/
-ln -s $1//lib/ncurses/lib/pkgconfig/ncurses.pc $1//lib/pkgconfig/
-ln -s $1//lib/ncurses/lib/pkgconfig/panel.pc $1//lib/pkgconfig/
+ln -s lib/ncurses/bin/captoinfo bin/
+ln -s lib/ncurses/bin/clear $1//bin
+ln -s lib/ncurses/bin/infocmp $1//bin/
+ln -s lib/ncurses/bin/infotocap $1//bin/
+ln -s lib/ncurses/bin/ncurses6-config $1//bin/
+ln -s lib/ncurses/bin/reset $1//bin/
+ln -s lib/ncurses/bin/tabs $1//bin/
+ln -s lib/ncurses/bin/tic $1//bin/
+ln -s lib/ncurses/bin/toe $1//bin/
+ln -s lib/ncurses/bin/tput $1//bin/
+ln -s lib/ncurses/bin/tset $1//bin/
+ln -s lib/ncurses/include/ncurses $1//include
+ln -s lib/ncurses/lib/libform.a $1//lib/
+ln -s lib/ncurses/lib/libform_g.a $1//lib/
+ln -s lib/ncurses/lib/libform.so $1//lib/
+ln -s lib/ncurses/lib/libform.so.6 $1//lib/
+ln -s lib/ncurses/lib/libform.so.6.1 $1//lib/
+ln -s lib/ncurses/lib/libmenu.a $1//lib/
+ln -s lib/ncurses/lib/libmenu_g.a $1//lib/
+ln -s lib/ncurses/lib/libmenu.so $1//lib/
+ln -s lib/ncurses/lib/libmenu.so.6 $1//lib/
+ln -s lib/ncurses/lib/libmenu.so.6.1 $1//lib/
+ln -s lib/ncurses/lib/libncurses++.a $1//lib/
+ln -s lib/ncurses/lib/libncurses.a $1//lib/
+ln -s lib/ncurses/lib/libncurses++_g.a $1//lib/
+ln -s lib/ncurses/lib/libncurses_g.a $1//lib/
+ln -s lib/ncurses/lib/libncurses.so $1//lib/
+ln -s lib/ncurses/lib/libncurses.so.6 $1//lib/
+ln -s lib/ncurses/lib/libncurses.so.6.1 $1//lib/
+ln -s lib/ncurses/lib/libpanel.a $1//lib/
+ln -s lib/ncurses/lib/libpanel_g.a $1//lib/
+ln -s lib/ncurses/lib/libpanel.so $1//lib/
+ln -s lib/ncurses/lib/libpanel.so.6 $1//lib/
+ln -s lib/ncurses/lib/libpanel.so.6.1 $1//lib/
+ln -s lib/ncurses/lib/terminfo $1//lib/
+ln -s lib/ncurses/lib/pkgconfig/form.pc $1//lib/pkgconfig/
+ln -s lib/ncurses/lib/pkgconfig/menu.pc $1//lib/pkgconfig/
+ln -s lib/ncurses/lib/pkgconfig/ncurses++.pc $1//lib/pkgconfig/
+ln -s lib/ncurses/lib/pkgconfig/ncurses.pc $1//lib/pkgconfig/
+ln -s lib/ncurses/lib/pkgconfig/panel.pc $1//lib/pkgconfig/
 echo "INPUT(-lncursesw)" > $1//lib/libncurses.so

evdev/build

@@ -0,0 +1,11 @@
+wget https://freedesktop.org/software/libevdev/libevdev-1.11.0.tar.xz
+tar -xf libevdev-1.11.0.tar.xz
+cd libevdev-1.11.0
+
+./configure \
+    --prefix=/usr \
+    --disable-shared \
+    --disable-gcov
+
+make
+make DESTDIR="$1" install

evdev/package

@@ -0,0 +1,5 @@
+pkg_config_deploy=true
+pkg_config_ver="1.11.0"
+pkg_config_name="evdev"
+pkg_config_makedepends=""
+pkg_config_depends=""

foot/build

@@ -0,0 +1,19 @@
+wget https://codeberg.org/dnkl/foot/archive/8bdd019227225c94fa6e282d941ffbc09fd7a81c.tar.gz
+tar -xf 8bdd019227225c94fa6e282d941ffbc09fd7a81c.tar.gz
+cd 8bdd019227225c94fa6e282d941ffbc09fd7a81c
+
+meson \
+    --prefix=/usr \
+    --buildtype=release \
+    --force-fallback-for=fcft,tllist \
+    -Dime=false \
+    . output
+
+ninja -C output
+ninja -C output install
+
+rm -rf \
+    "$1/usr/share/doc" \
+    "$1/usr/share/zsh" \
+    "$1/usr/share/fish" \
+    "$1/usr/share/bash-completion"

foot/package

@@ -0,0 +1,5 @@
+pkg_config_deploy=true
+pkg_config_ver="8bdd019227225c94fa6e282d941ffbc09fd7a81c"
+pkg_config_name="foot"
+pkg_config_makedepends="meson ncurses pkg-config-fd python wayland"
+pkg_config_depends="fontconfig libxkb wayland"

grim/build

@@ -0,0 +1,11 @@
+wget https://github.com/emersion/grim/releases/download/VERSION/grim-1.3.2.tar.gz
+tar -xf grim-1.3.2
+cd grim-1.3.2
+
+meson \
+    --prefix=/usr \
+    -Djpeg=disabled \
+    . build
+
+ninja -C build
+ninja -C build install

grim/package

@@ -0,0 +1,5 @@
+pkg_config_deploy=true
+pkg_config_ver="1.3.2"
+pkg_config_name="grim"
+pkg_config_makedepends="pkg-config-fd wayland-protocls"
+pkg_config_depends="cairo wayland"

libinput/build

@@ -0,0 +1,25 @@
+wget https://github.com/wayland-project/libinput/archive/1.18.1.tar.gz
+tar -xf 1.18.1
+cd 1.18.1
+
+export CFLAGS="-Wno-unused-command-line-argument $CFLAGS"
+
+export PKG_CONFIG_PATH="$PWD/usr/lib/pkgconfig"
+export CFLAGS="$CFLAGS -I$PWD/usr/include -L$PWD/usr/lib"
+export CFLAGS="$CFLAGS -I$PWD/usr/include/libevdev-1.0"
+export DESTDIR="$1"
+
+meson \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --mandir=/usr/share/man \
+    --libexecdir=/usr/lib \
+    -Ddefault_library=both \
+    -Ddebug-gui=false \
+    -Ddocumentation=false \
+    -Dtests=false \
+    -Dlibwacom=false \
+    . output
+
+ninja -C output
+ninja -C output install

libinput/package

@@ -0,0 +1,5 @@
+pkg_config_deploy=true
+pkg_config_ver="1.18.1"
+pkg_config_name="libinput"
+pkg_config_makedepends="linux-headers udev meson pkg-config-fd mtdev"
+pkg_config_depends=""

libpciaccess/build

@@ -0,0 +1,9 @@
+wget https://x.org/releases/individual/lib/libpciaccess-0.16.tar.bz2
+tar -xf libpciaccess-0.16.tar.bz2
+cd libpciaccess-0.16
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install

libpciaccess/package

@@ -0,0 +1,5 @@
+pkg_config_deploy=true
+pkg_config_ver="0.16"
+pkg_config_name="libpciaccess"
+pkg_config_makedepends=""
+pkg_config_depends=""

libxkbcommon/build

@@ -0,0 +1,18 @@
+wget https://xkbcommon.org/download/libxkbcommon-1.3.0.tar.xz
+tar -xf libxkbcommon-1.3.0.tar.xz
+cd lixkbcommon-1.3.0
+export DESTDIR="$1"
+
+meson \
+    --prefix=/usr \
+    --libexecdir=/usr/lib \
+    -Ddefault_library=both \
+    -Denable-docs=false \
+    -Denable-wayland=true \
+    -Denable-x11=false \
+    -Denable-xkbregistry=false \
+    . output
+
+ninja -C output
+ninja -C output install
+

libxkbcommon/package

@@ -0,0 +1,5 @@
+pkg_config_deploy=true
+pkg_config_ver="1.3.0"
+pkg_config_name="libxkbcommon"
+pkg_config_makedepends="bison meson pkg-config-fd wayland-protocols"
+pkg_config_depends="wayland xkeyboard-config"

sway/build

@@ -0,0 +1,47 @@
+wget https://github.com/swaywm/sway/archive/6ffa4b1f7000cd90d63213820039ee432803e66a.tar.gz
+wget https://github.com/swaywm/wlroots/archive/e5063ef3a3b12d4384595cb0554cf1f84d5be6f8.tar.gz
+wget https://raw.githubusercontent.com/kisslinux/repo/master/wayland/sway-no-seat/patches/no-evdev.patch
+wget https://raw.githubusercontent.com/kisslinux/repo/master/wayland/sway-no-seat/patches/sway-static.patch
+tar -xf 6ffa4b1f7000cd90d63213820039ee432803e66a.tar.gz
+cd 6ffa4b1f7000cd90d63213820039ee432803e66a
+
+mkdir -p subprojects/wlroots
+tar -xf subprojects/wlroots e5063ef3a3b12d4384595cb0554cf1f84d5be6f8.tar.gz
+
+
+patch -p1 < sway-static.patch
+patch -p1 < no-evdev.patch
+
+# Build fails in subprojects/seatd with clang
+# due to -Werror -> -Wsign-compare.
+export CFLAGS="-Wno-error $CFLAGS"
+
+# Default background color.
+sed 's/0.25f, 0.25f, 0.25f/0.929, 0.870, 0.678/' \
+    sway/desktop/render.c > _
+mv -f _ sway/desktop/render.c
+
+meson \
+    --prefix=/usr \
+    -Dexamples=false \
+    -Dxwayland=disabled \
+    -Dx11-backend=disabled \
+    -Dxcb-errors=disabled \
+    -Dxcb-icccm=disabled \
+    -Dwlroots:examples=false \
+    -Dwlroots:xcb-errors=disabled \
+    -Dwlroots:x11-backend=disabled \
+    -Dwlroots:default_library=static \
+    -Dseatd:builtin=enabled \
+    -Dseatd:default_library=static \
+    --force-fallback-for=wlroots,seatd \
+    . build
+
+ninja -C build
+meson install -C build --skip-subprojects
+
+rm -rf \
+    "$1/usr/share/fish" \
+    "$1/usr/share/bash-completion" \
+    "$1/usr/share/backgrounds" \
+    "$1/usr/share/zsh"

sway/package

@@ -0,0 +1,5 @@
+pkg_config_deploy=true
+pkg_config_ver="6ffa4b1f7000cd90d63213820039ee432803e66a"
+pkg_config_name="sway"
+pkg_config_makedepends="flex meson pkg-config-fd wayland-protocols linux-headers"
+pkg_config_depends="cairo wayland pixman pcre pango mesa libinput"

sway/postdeploy

@@ -0,0 +1,12 @@
+chown root:input "$KISS_ROOT/usr/bin/sway"
+chmod g+s        "$KISS_ROOT/usr/bin/sway"
+
+cat <<EOF
+NOTE: You must be in the 'video', 'audio', and 'tty' 
+      groups. There is no 'input' group requirement 
+      as this sway binary is setgid input.
+NOTE: You must set XDG_RUNTIME_DIR in your shellrc
+      or .profile for things to work. This directory
+      must exist and must be writable by your user.
+      export XDG_RUNTIME_DIR=/run/user/\$(id -u)
+EOF

ufetch/payload/usr/bin/ufetch

@@ -9,7 +9,7 @@ host="$(hostname)"
 os='Alnux'	# I'd just like to interject for a moment...
 kernel="$(uname -sr)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
-packages="$(aps list | sed "s/README.md//" | wc -l)"
+packages="$(aps list | wc -l)"
 shell="$(basename "${SHELL}")"
 
 ## UI DETECTION

wayland-protocols/build

@@ -0,0 +1,9 @@
+wget https://wayland.freedesktop.org/releases/wayland-protocols-1.21.tar.xz
+tar -xf wayland-protocols-1.12.tar.xz
+cd wayland-protocols-1.12
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install

wayland-protocols/package

@@ -0,0 +1,5 @@
+pkg_config_deploy=true
+pkg_config_ver="1.21"
+pkg_config_name="wayland-protocols"
+pkg_config_makedepends="wayland"
+pkg_config_depends=""

wayland/build

@@ -0,0 +1,13 @@
+wget https://wayland.freedesktop.org/releases/wayland-1.19.tar.xz
+tar -xf wayland-1.19.tar.xz
+cd wayland-1.19
+
+./configure \
+    --prefix=/usr \
+    --disable-documentation \
+    --disable-dtd-validation \
+    --enable-static
+
+make
+make DESTDIR="$1" install
+

wayland/package

@@ -0,0 +1,5 @@
+pkg_config_deploy=true
+pkg_config_ver="1.19"
+pkg_config_name="wayland-protocols"
+pkg_config_makedepends="meson flex"
+pkg_config_depends="expat libffi"

xkeyboard-config/build

@@ -0,0 +1,8 @@
+wget https://alpine.global.ssl.fastly.net/alpine/edge/main/x86_64/xkeyboard-config-2.33-r0.apk
+wget https://alpine.global.ssl.fastly.net/alpine/edge/main/x86_64/libx11-1.7.2-r0.apk
+
+tar -xf xkeyboard-config-*.apk
+tar -xf libx11-*.apk
+
+mkdir -p $1/usr/bin
+cp xkeyboard-config $1/usr/bin

xkeyboard-config/package

@@ -0,0 +1,5 @@
+pkg_config_deploy=true
+pkg_config_ver="2.33"
+pkg_config_name="xkeyboard-config"
+pkg_config_makedepends=""
+pkg_config_depends=""