From 8030691922dab4220cf50d6dcefc36163ed5e406 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Wed, 13 Jul 2022 13:38:21 +0200 Subject: [PATCH 1/5] [wayland/] better, add japokwm --- wayland/japokwm/SlackBuild | 139 +++++++++++++++++++++++++++++++++++++ wayland/qtile/SlackBuild | 10 ++- wayland/sway/SlackBuild | 8 +++ 3 files changed, 156 insertions(+), 1 deletion(-) create mode 100755 wayland/japokwm/SlackBuild diff --git a/wayland/japokwm/SlackBuild b/wayland/japokwm/SlackBuild new file mode 100755 index 00000000..f2f2f4cc --- /dev/null +++ b/wayland/japokwm/SlackBuild @@ -0,0 +1,139 @@ +#!/bin/bash + +# variables +GITHUB_REPO=werererer/japokwm +VERSION=${VERSION:-"latest"} +BUILD=2 + +TAG=gwh +OUTPUT=/tmp +TMP=/tmp/$TAG +CWD=$(pwd) + +PRGNAM=$(basename $CWD) +PKG=$TMP/pkg-$PRGNAM + +ARCH=$(uname -m) + +REPOSITORY=/home/installs/SlackBuilds/_repositories/$PRGNAM +PREFIX=/usr + +# nettoyage préalable +rm -fr $PKG $TMP/$PRGNAM + +mkdir -p $PKG + +# mise en place +[ ! -e $REPOSITORY ] && git clone https://github.com/${GITHUB_REPO} $REPOSITORY +cd $REPOSITORY +git pull --all + +cp -R $REPOSITORY $TMP/ + +cd $TMP/$PRGNAM/ +case $VERSION in + trunk) + VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" + ;; + latest) + VERSION=$(git describe --tags --abbrev=0) + git checkout $VERSION + ;; + *) + git checkout $VERSION + ;; +esac + +meson setup \ + --prefix /usr \ + --mandir /usr/man/ \ + -Dxwayland=true \ + -Dbash-completions=true \ + -Dzsh-completions=true \ + -Dfish-completions=true \ + build/ + +ninja -C build/ +cd build/ +meson install --destdir=$PKG +cd ../ + +cat < $PKG$PREFIX/bin/start_japokwm.sh +#!/bin/bash + +set -e + +# export QT_QPA_PLATFORMTHEME=qt5ct +# export QT_QPA_PLATFORM=wayland-egl +# export QT_WAYLAND_FORCE_DPI=physical +# export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 + +# export SAL_USE_VCLPLUGIN=gtk3 + +# export MOZ_ENABLE_WAYLAND=1 +# export MOZ_DBUS_REMOTE=1 + +# export _JAVA_AWT_WM_NONREPARENTING=1 + +# # export GDK_BACKEND=wayland +# export CLUTTER_BACKEND=gdk + +# export SDL_VIDEODRIVER=wayland + +#export XDG_CURRENT_DESKTOP=japokwm +export XDG_CURRENT_DESKTOP=Unity # for waybar's tray? + +# Décommenter s'il n'y a pas de curseur souris visible +# export WLR_NO_HARDWARE_CURSORS=1 + +[ -e $HOME/.profile ] && . $HOME/.profile + +unset DISPLAY + +export XDG_RUNTIME_DIR=/tmp/xdg-runtime-\$(id -u) +mkdir -p \$XDG_RUNTIME_DIR + +export LIBSEAT_BACKEND=logind + +exec dbus-run-session japokwm +EOF +chmod +x $PKG$PREFIX/bin/start_japokwm.sh + +sed -i 's|Exec=japokwm|Exec=/usr/bin/start_japokwm.sh|' $PKG$PREFIX/share/wayland-sessions/japokwm.desktop + +mkdir -p $PKG$PREFIX/doc/$PRGNAM +cp -R config LICENSE ./*.md $PKG$PREFIX/doc/$PRGNAM/ + +# correction +cd $PKG +chown -R root:root * +[ -d $PKG$PREFIX/man ] && find $PKG$PREFIX/man -name "*.?" -type f -exec gzip -9 {} \; + +# embaumement +mkdir -p $PKG/install + +cat < $PKG/install/slack-desc +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +$PRGNAM: $PRGNAM (A tiling wayland compositor based around creating layouts) +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: https://github.com/${GITHUB_REPO} +EOF + +# empaquetage +rm -f $PKG/{,usr/}lib$(uname -m | grep -o 64)/*.la +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD$TAG.txz diff --git a/wayland/qtile/SlackBuild b/wayland/qtile/SlackBuild index fcf32905..98cbd218 100755 --- a/wayland/qtile/SlackBuild +++ b/wayland/qtile/SlackBuild @@ -41,6 +41,7 @@ python3 ./setup.py install --root=$PKG cat < $PKG$PREFIX/bin/start_qtile.sh #!/bin/bash +set -e export QT_QPA_PLATFORMTHEME=qt5ct export QT_QPA_PLATFORM=wayland-egl @@ -64,7 +65,14 @@ export XDG_CURRENT_DESKTOP=Unity # for tray ? [ -e $HOME/.profile ] && . $HOME/.profile -exec qtile start -b wayland +unset DISPLAY + +export XDG_RUNTIME_DIR=/tmp/xdg-runtime-\$(id -u) +mkdir -p \$XDG_RUNTIME_DIR + +export LIBSEAT_BACKEND=logind + +exec dbus-run-session qtile start -b wayland EOF chmod +x $PKG$PREFIX/bin/start_qtile.sh diff --git a/wayland/sway/SlackBuild b/wayland/sway/SlackBuild index 7c4ec47d..a84aef3b 100755 --- a/wayland/sway/SlackBuild +++ b/wayland/sway/SlackBuild @@ -77,6 +77,7 @@ chmod +s $PKG$PREFIX/bin/sway cat < $PKG$PREFIX/bin/start_sway.sh #!/bin/bash +set -e export QT_QPA_PLATFORMTHEME=qt5ct export QT_QPA_PLATFORM=wayland-egl @@ -103,6 +104,13 @@ export XDG_CURRENT_DESKTOP=Unity # for tray ? [ -e $HOME/.profile ] && . $HOME/.profile +unset DISPLAY + +export XDG_RUNTIME_DIR=/tmp/xdg-runtime-\$(id -u) +mkdir -p \$XDG_RUNTIME_DIR + +export LIBSEAT_BACKEND=logind + exec dbus-run-session sway EOF chmod +x $PKG$PREFIX/bin/start_sway.sh From 4a8faf6333cf14aec0060533b1d6e7f6c1e451f5 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Wed, 13 Jul 2022 14:39:54 +0200 Subject: [PATCH 2/5] [sway] FIX and update start_sway.sh script --- wayland/sway/SlackBuild | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/wayland/sway/SlackBuild b/wayland/sway/SlackBuild index a84aef3b..75637557 100755 --- a/wayland/sway/SlackBuild +++ b/wayland/sway/SlackBuild @@ -83,6 +83,10 @@ export QT_QPA_PLATFORMTHEME=qt5ct export QT_QPA_PLATFORM=wayland-egl export QT_WAYLAND_FORCE_DPI=physical export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +export QT_AUTO_SCREEN_SCALE_FACTOR=0 +export QT_AUTO_SCREEN_SCALE_FACTOR=0 +#export QT_FONT_DPI=161 +export QT_SCALE_FACTOR=2 export SAL_USE_VCLPLUGIN=gtk3 @@ -91,26 +95,40 @@ export MOZ_DBUS_REMOTE=1 export _JAVA_AWT_WM_NONREPARENTING=1 -# export GDK_BACKEND=wayland -export CLUTTER_BACKEND=gdk - -export SDL_VIDEODRIVER=wayland +export GDK_BACKEND=wayland +export CLUTTER_BACKEND=wayland #export XDG_CURRENT_DESKTOP=sway -export XDG_CURRENT_DESKTOP=Unity # for tray ? +export XDG_CURRENT_DESKTOP=Unity # for waybar's tray +export XDG_SESSION_TYPE=wayland -# Décommenter s'il n'y a pas de curseur souris visible -# export WLR_NO_HARDWARE_CURSORS=1 +export NO_AT_BRIDGE=1 +export \$(gnome-keyring-daemon --start --components=ssh) -[ -e $HOME/.profile ] && . $HOME/.profile +# java fix +export _JAVA_AWT_WM_NONREPARENTING=1 + +export ECORE_EVAS_ENGINE=wayland_egl +export ELM_ENGINE=wayland_egl + +# SDL [https://www.reddit.com/r/swaywm/comments/s8kiz6/common_swaywayland_fixes_for_steam_games/] +export SDL_DYNAMIC_API=/usr/lib64/libSDL2.so +export SDL_VIDEODRIVER=wayland + +#[ -e \$HOME/.profile ] && . \$HOME/.profile unset DISPLAY export XDG_RUNTIME_DIR=/tmp/xdg-runtime-\$(id -u) mkdir -p \$XDG_RUNTIME_DIR +chmod 0700 \$XDG_RUNTIME_DIR export LIBSEAT_BACKEND=logind +# Décommenter s'il n'y a pas de curseur souris visible +#export WLR_NO_HARDWARE_CURSORS=1 + +export SWAYSOCK=/run/user/\$(id -u)/sway-ipc.\$(id -u).\$(pgrep -x sway).sock exec dbus-run-session sway EOF chmod +x $PKG$PREFIX/bin/start_sway.sh From 9e407f0b27334242d24ceb214bec59eb77850f14 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Wed, 13 Jul 2022 14:41:23 +0200 Subject: [PATCH 3/5] [sway] duplicated lines --- wayland/sway/SlackBuild | 3 --- 1 file changed, 3 deletions(-) diff --git a/wayland/sway/SlackBuild b/wayland/sway/SlackBuild index 75637557..44dc9357 100755 --- a/wayland/sway/SlackBuild +++ b/wayland/sway/SlackBuild @@ -84,7 +84,6 @@ export QT_QPA_PLATFORM=wayland-egl export QT_WAYLAND_FORCE_DPI=physical export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 export QT_AUTO_SCREEN_SCALE_FACTOR=0 -export QT_AUTO_SCREEN_SCALE_FACTOR=0 #export QT_FONT_DPI=161 export QT_SCALE_FACTOR=2 @@ -93,8 +92,6 @@ export SAL_USE_VCLPLUGIN=gtk3 export MOZ_ENABLE_WAYLAND=1 export MOZ_DBUS_REMOTE=1 -export _JAVA_AWT_WM_NONREPARENTING=1 - export GDK_BACKEND=wayland export CLUTTER_BACKEND=wayland From 5e973d350776bb98de0c7647638194dc9af39335 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Wed, 13 Jul 2022 14:44:17 +0200 Subject: [PATCH 4/5] [sway] start_sway.sh adjustments --- wayland/sway/SlackBuild | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/wayland/sway/SlackBuild b/wayland/sway/SlackBuild index 44dc9357..14356807 100755 --- a/wayland/sway/SlackBuild +++ b/wayland/sway/SlackBuild @@ -95,10 +95,6 @@ export MOZ_DBUS_REMOTE=1 export GDK_BACKEND=wayland export CLUTTER_BACKEND=wayland -#export XDG_CURRENT_DESKTOP=sway -export XDG_CURRENT_DESKTOP=Unity # for waybar's tray -export XDG_SESSION_TYPE=wayland - export NO_AT_BRIDGE=1 export \$(gnome-keyring-daemon --start --components=ssh) @@ -109,13 +105,14 @@ export ECORE_EVAS_ENGINE=wayland_egl export ELM_ENGINE=wayland_egl # SDL [https://www.reddit.com/r/swaywm/comments/s8kiz6/common_swaywayland_fixes_for_steam_games/] -export SDL_DYNAMIC_API=/usr/lib64/libSDL2.so +export SDL_DYNAMIC_API=/usr/lib\$(uname -m | grep -o 64)/libSDL2.so export SDL_VIDEODRIVER=wayland #[ -e \$HOME/.profile ] && . \$HOME/.profile -unset DISPLAY - +#export XDG_CURRENT_DESKTOP=sway +export XDG_CURRENT_DESKTOP=Unity # for waybar's tray +export XDG_SESSION_TYPE=wayland export XDG_RUNTIME_DIR=/tmp/xdg-runtime-\$(id -u) mkdir -p \$XDG_RUNTIME_DIR chmod 0700 \$XDG_RUNTIME_DIR @@ -125,6 +122,8 @@ export LIBSEAT_BACKEND=logind # Décommenter s'il n'y a pas de curseur souris visible #export WLR_NO_HARDWARE_CURSORS=1 +unset DISPLAY # avoid wlr error + export SWAYSOCK=/run/user/\$(id -u)/sway-ipc.\$(id -u).\$(pgrep -x sway).sock exec dbus-run-session sway EOF From e3b2de013ea4b8c16a3dabc041979a2042606743 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Wed, 13 Jul 2022 16:15:03 +0200 Subject: [PATCH 5/5] [sway] remove suid hack --- wayland/sway/SlackBuild | 3 --- 1 file changed, 3 deletions(-) diff --git a/wayland/sway/SlackBuild b/wayland/sway/SlackBuild index 14356807..392608ae 100755 --- a/wayland/sway/SlackBuild +++ b/wayland/sway/SlackBuild @@ -72,9 +72,6 @@ cd build/ meson install --destdir=$PKG cd ../ -# https://github.com/swaywm/sway/wiki/Running-Sway-without-systemd -chmod +s $PKG$PREFIX/bin/sway - cat < $PKG$PREFIX/bin/start_sway.sh #!/bin/bash set -e