Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce the 'bspwm-rounded' inside TUR :). #1323

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions tur/bspwm-rounded/bspmux.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
diff --git a/Makefile b/Makefile
index 9cbedc2..7fba2c2 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ CFLAGS += -std=c99 -pedantic -Wall -Wextra -DJSMN_STRICT
LDFLAGS ?=
LDLIBS = $(LDFLAGS) -lm -lxcb -lxcb-util -lxcb-keysyms -lxcb-icccm -lxcb-ewmh -lxcb-randr -lxcb-xinerama -lxcb-shape

-PREFIX ?= /usr/local
+PREFIX ?= /data/data/com.termux/files/usr
BINPREFIX ?= $(PREFIX)/bin
MANPREFIX ?= $(PREFIX)/share/man
DOCPREFIX ?= $(PREFIX)/share/doc/bspwm
diff --git a/src/bspwm.h b/src/bspwm.h
index 9ad0475..bba9e2e 100644
--- a/src/bspwm.h
+++ b/src/bspwm.h
@@ -32,7 +32,7 @@
#define CONFIG_HOME_ENV "XDG_CONFIG_HOME"
#define RUNTIME_DIR_ENV "XDG_RUNTIME_DIR"

-#define STATE_PATH_TPL "/tmp/bspwm%s_%i_%i-state"
+#define STATE_PATH_TPL "/data/data/com.termux/files/usr/tmp/bspwm%s_%i_%i-state"

#define ROOT_EVENT_MASK (XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY | XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_BUTTON_PRESS)
#define CLIENT_EVENT_MASK (XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_FOCUS_CHANGE)
diff --git a/src/common.h b/src/common.h
index f44eef8..6992473 100644
--- a/src/common.h
+++ b/src/common.h
@@ -25,7 +25,7 @@
#ifndef BSPWM_COMMON_H
#define BSPWM_COMMON_H

-#define SOCKET_PATH_TPL "/tmp/bspwm%s_%i_%i-socket"
+#define SOCKET_PATH_TPL "/data/data/com.termux/files/usr/tmp/bspwm%s_%i_%i-socket"
#define SOCKET_ENV_VAR "BSPWM_SOCKET"

#define FAILURE_MESSAGE "\x07"
67 changes: 67 additions & 0 deletions tur/bspwm-rounded/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
TERMUX_PKG_HOMEPAGE=https://github.com/phuhl/bspwm-rounded/tree/round_corners
TERMUX_PKG_DESCRIPTION="The received fork of BSPWM. But developed inside rounded corner workaround."
TERMUX_PKG_LICENSE="BSD 2-Clause"
TERMUX_PKG_MAINTAINER="@termux-user-repository"
TERMUX_PKG_VERSION=0.9.10
TERMUX_PKG_REVISION=6
TERMUX_PKG_SRCURL="https://github.com/phuhl/bspwm-rounded/archive/refs/tags/$TERMUX_PKG_VERSION.zip"
TERMUX_PKG_SHA256="1f2d04fa13d6bf3d19290303030ad07d4ae4bb6c7c96101120d79842e3bdca7a"
TERMUX_PKG_AUTO_UPDATE=true

if [[ ${TERMUX_PKG_UPDATE_TAG_PICK} == "latest-release-tag" ]]; then
TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag"
else
TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"
fi

TERMUX_PKG_DEPENDS="git, git-lfs, libxcb, patch, patchelf, python, python-ensurepip-wheels, python-pip, rust, rustc-dev, rustc-src, sxhkd, xcb-util, xcb-util-cursor, xcb-util-image, xcb-util-keysyms, xcb-util-renderutil, xcb-util-wm"
TERMUX_PKG_SUGGESTS="chromium, kitty, picom"
TERMUX_PKG_BUILD_DEPENDS="build-essential"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_EXTRA_MAKE_ARGS="prefix=/data/data/com.termux/files/usr"

termux_step_pre_configure() {
local TERMUX_LOCAL_DIR="${PREFIX}/opt/termux-local"

mkdir --parent --verbose --mode=755 ${TERMUX_LOCAL_DIR}
ln -sf ${TERMUX_LOCAL_DIR} ${PREFIX}/local
ln -sf ${TERMUX_LOCAL_DIR} ${HOME}/.global_local

mkdir --parent --verbose --mode=755 ${TERMUX_LOCAL_DIR}/bin
echo -e "PATH+=':/data/data/com.termux/files/usr/local/bin'" > ${PREFIX}/etc/profile.d/local-path.sh

sed -i -E '1 i\#!/data/data/com.termux/files/usr/bin/bash\' ${PREFIX}/etc/profile.d/local-path.sh
chmod --verbose 755 ${PREFIX}/etc/profile.d/local-path.sh
${PREFIX}/etc/profile.d/local-path.sh
}

termux_step_post_make_install() {
shopt -s expand_aliases
ln -sf ${PREFIX}/bin/bspwm ${PREFIX}/local/bin/bspwm-loca

echo -e "alias bspwm='bspwm-local'" > ${PREFIX}/etc/profile.d/local-alias.sh
sed -i -E '1 i\#!/data/data/com.termux/files/usr/bin/bash\' ${PREFIX}/etc/profile.d/local-alias.sh
chmod --verbose 755 ${PREFIX}/etc/profile.d/local-alias.sh
${PREFIX}/etc/profile.d/local-alias.sh

$(python3 --version | sed -E "s|[[:space:]]||g;s|Python|pip|g" | cut -d '.' -f 1) install rich cli-box python-dotenv python-decouple --upgrade
git clone --depth=1 https://github.com/ReeaoX/bsphelp.git ${HOME}/bsphelp-git

sed -i -e $'$a\\\nalias bsphelp="${HOME}/bsphelp-git/usr/bin/bin-cmd.py"' ${PREFIX}/etc/profile.d/local-alias.sh
${PREFIX}/etc/profile.d/local-alias.sh
}

termux_step_post_massage() {
local BSPWM_CONFIG_DIR="${HOME}/.config/bspwm"
local SXHKD_CONFIG_DIR="${HOME}/.config/sxhkd"

mkdir --parent --verbose --mode=755 ${BSPWM_CONFIG_DIR}
mkdir --parent --verbose --mode=755 ${SXHKD_CONFIG_DIR}

cp --recursive --force --verbose ${PREFIX}/share/doc/bspwm/examples/bspwmrc ${BSPWM_CONFIG_DIR}
cp --recursive --force --verbose ${PREFIX}/share/doc/bspwm/examples/sxhkdrc ${SXHKD_CONFIG_DIR}

chmod --verbose 755 ${BSPWM_CONFIG_DIR}/bspwmrc
chmod --verbose 755 ${SXHKD_CONFIG_DIR}/sxhkdrc
sed -i -E "s|/bin/sh|/data/data/com.termux/files/usr/bin/bash|g" ${BSPWM_CONFIG_DIR}/bspwmrc
}
Loading