From 628705456ab365871b1190c0f32310a901f7e9c0 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Thu, 25 Aug 2022 13:22:56 +0200 Subject: [PATCH 1/3] [sway] slim down starter script --- wayland/sway/SlackBuild | 97 +++++++++++------------------------- xap/i3status-rust/SlackBuild | 4 +- 2 files changed, 32 insertions(+), 69 deletions(-) diff --git a/wayland/sway/SlackBuild b/wayland/sway/SlackBuild index 392608ae..3e4c4469 100755 --- a/wayland/sway/SlackBuild +++ b/wayland/sway/SlackBuild @@ -19,38 +19,35 @@ REPOSITORY=/home/installs/SlackBuilds/_repositories/$PRGNAM PREFIX=/usr # nettoyage préalable -rm -fr $PKG $TMP/$PRGNAM +rm -fr "$PKG" "$TMP/$PRGNAM" -mkdir -p $PKG +mkdir -p "$PKG" # mise en place -[ ! -e $REPOSITORY ] && git clone https://github.com/${GITHUB_REPO} $REPOSITORY -cd $REPOSITORY +[ ! -e "$REPOSITORY" ] && git clone https://github.com/${GITHUB_REPO} "$REPOSITORY" +cd "$REPOSITORY" || exit 1 git pull --all -cp -R $REPOSITORY $TMP/ +cp -R "$REPOSITORY" $TMP/ -cd $TMP/$PRGNAM/ +cd "$TMP/$PRGNAM/" || exit 1 case $VERSION in trunk) VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" ;; latest) VERSION=$(git for-each-ref --sort=taggerdate --format '%(tag)' | tail -n1) - git checkout $VERSION + git checkout "$VERSION" ;; *) - git checkout $VERSION + git checkout "$VERSION" ;; esac -for p in $CWD/patches/*.patch; do - git am $p +for p in "$CWD"/patches/*.patch; do + git am "$p" done -# Slackware ships meson 0.59.4 and won't move to 0.60.x for the time being -# sed -i 's|0.60|0.59|' meson.build # -current now has 0.62.x - meson setup \ --prefix /usr \ --mandir /usr/man/ \ @@ -68,78 +65,44 @@ meson setup \ build/ ninja -C build/ -cd build/ -meson install --destdir=$PKG +cd build/ || exit 1 +meson install --destdir="$PKG" cd ../ -cat < $PKG$PREFIX/bin/start_sway.sh +cat < "$PKG$PREFIX/bin/start_sway.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 QT_AUTO_SCREEN_SCALE_FACTOR=0 -#export QT_FONT_DPI=161 -export QT_SCALE_FACTOR=2 +# avoid wlr error +unset DISPLAY -export SAL_USE_VCLPLUGIN=gtk3 +# Uncomment if mouse pointer is invisible +#export WLR_NO_HARDWARE_CURSORS=1 -export MOZ_ENABLE_WAYLAND=1 -export MOZ_DBUS_REMOTE=1 - -export GDK_BACKEND=wayland -export CLUTTER_BACKEND=wayland - -export NO_AT_BRIDGE=1 -export \$(gnome-keyring-daemon --start --components=ssh) - -# 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/lib\$(uname -m | grep -o 64)/libSDL2.so -export SDL_VIDEODRIVER=wayland - -#[ -e \$HOME/.profile ] && . \$HOME/.profile - -#export XDG_CURRENT_DESKTOP=sway -export XDG_CURRENT_DESKTOP=Unity # for waybar's tray -export XDG_SESSION_TYPE=wayland +export SWAYSOCK=/run/user/\$(id -u)/sway-ipc.\$(id -u).\$(pgrep -x sway).sock 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 - -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 -chmod +x $PKG$PREFIX/bin/start_sway.sh +chmod +x "$PKG$PREFIX/bin/start_sway.sh" -sed -i 's|Exec=sway|Exec=/usr/bin/start_sway.sh|' $PKG$PREFIX/share/wayland-sessions/sway.desktop +sed -i 's|Exec=sway|Exec=/usr/bin/start_sway.sh|' "$PKG$PREFIX/share/wayland-sessions/sway.desktop" -mkdir -p $PKG$PREFIX/doc/$PRGNAM -cp LICENSE *.md $PKG$PREFIX/doc/$PRGNAM/ +mkdir -p "$PKG$PREFIX/doc/$PRGNAM" +cp 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 {} \; +cd "$PKG" || exit 1 +chown -R root:root ./* +[ -d "$PKG$PREFIX/man" ] && find "$PKG$PREFIX/man" -name "*.?" -type f -exec gzip -9 {} \; # embaumement -mkdir -p $PKG/install +mkdir -p "$PKG/install" -cat < $PKG/install/slack-desc +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 '|' @@ -162,5 +125,5 @@ $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 +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/xap/i3status-rust/SlackBuild b/xap/i3status-rust/SlackBuild index 16d72236..1a59b9b9 100755 --- a/xap/i3status-rust/SlackBuild +++ b/xap/i3status-rust/SlackBuild @@ -48,8 +48,8 @@ cp -R files/* $PKG$PREFIX/share/$PRGNAM mkdir -p $PKG$PREFIX/doc/$PRGNAM cp -R doc/ examples/ LICENSE *.md $PKG$PREFIX/doc/$PRGNAM -mkdir -p $PKG$PREFIX/man -cp man/i3status-rs.1 $PKG$PREFIX/man +mkdir -p $PKG$PREFIX/man/man1 +cp man/i3status-rs.1 $PKG$PREFIX/man/man1 [ -d $PKG$PREFIX/man ] && find $PKG$PREFIX/man -exec gzip -9 {} \; # correction From db043bd5814a32b9b5bbfa7fd6da5902a59c5fa0 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Tue, 30 Aug 2022 13:44:05 +0200 Subject: [PATCH 2/3] [sway] add logging to start script --- wayland/sway/SlackBuild | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wayland/sway/SlackBuild b/wayland/sway/SlackBuild index 3e4c4469..f19a4c0a 100755 --- a/wayland/sway/SlackBuild +++ b/wayland/sway/SlackBuild @@ -73,6 +73,12 @@ cat < "$PKG$PREFIX/bin/start_sway.sh" #!/bin/bash set -e +LOGFILE=/tmp/wsession-errors +true > \$LOGFILE +exec \&> \$LOGFILE +set -x +echo "sway Starting: \$( date )" + # avoid wlr error unset DISPLAY From 913f78b130549b1e752b537d95cc3c16a9044388 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Wed, 7 Sep 2022 16:23:46 +0200 Subject: [PATCH 3/3] add back fonts/terminus-font-otb/SlackBuild Signed-off-by: Gwenhael Le Moine --- fonts/terminus-font-otb/SlackBuild | 85 ++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 fonts/terminus-font-otb/SlackBuild diff --git a/fonts/terminus-font-otb/SlackBuild b/fonts/terminus-font-otb/SlackBuild new file mode 100755 index 00000000..efa6b98e --- /dev/null +++ b/fonts/terminus-font-otb/SlackBuild @@ -0,0 +1,85 @@ +#!/bin/bash + +# Copyright 2013, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# otb conversion by Gwh 2020 + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=$(basename $CWD) +VERSION=${VERSION:-$(ls /usr/doc/ | grep terminus-font | rev | cut -d- -f1 | rev)} +BUILD=${BUILD:-1} +TAG=${TAG:-gwh} + +TMP=${TMP:-/tmp/$TAG} +PKG=$TMP/package-$PKGNAM +OUTPUT=${OUTPUT:-/tmp} + +rm -rf $PKG + +mkdir -p $PKG/usr/share/fonts/misc/ +cd $PKG/usr/share/fonts/misc/ + +for i in /usr/share/fonts/misc/ter-u*; do + f=$(echo $(basename $i) | sed 's|\.gz$||') + zcat $i > $f + fonttosfnt -o "${f/pcf/otb}" "$f" + rm $f +done + +chmod 0644 $PKG/usr/share/fonts/misc/* + +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------------------------------------------------------| +$PKGNAM: $PKGNAM (a clean fixed width font) +$PKGNAM: +$PKGNAM: OTB format addition to the official terminus-font package. +$PKGNAM: +$PKGNAM: +$PKGNAM: +$PKGNAM: +$PKGNAM: Homepage: http://$PKGNAM.sourceforge.net +$PKGNAM: https://github.com/archlinux/svntogit-community/tree/packages/terminus-font-otb/trunk +$PKGNAM: +$PKGNAM: +EOF + +cat < $PKG/install/doinst.sh +#!/bin/sh +# Update the X font indexes: +if [ -x /usr/bin/mkfontdir -o -x /usr/X11R6/bin/mkfontdir ]; then + mkfontdir usr/share/fonts/misc 2> /dev/null +fi +if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f 2> /dev/null +fi +EOF + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-noarch-$BUILD$TAG.txz