Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6cacceffe827eba6bedf1a316ff9f7ef94ff02e2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6cacceffe827eba6bedf1a316ff9f7ef94ff02e2)
  • Date: Sun, 10 Sep 2023 04:29:43 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

wm-addons/tabbed/DETAILS | 5 +++++
wm-addons/tabbed/HISTORY | 4 ++++
wm-addons/tabbed/PREPARE | 4 +++-
wm-addons/tabbed/PRE_BUILD | 13 +++++++++++++
wm-addons/tabbed/separator_xr.patch | 36
++++++++++++++++++++++++++++++++++++
5 files changed, 61 insertions(+), 1 deletion(-)

New commits:
commit 6cacceffe827eba6bedf1a316ff9f7ef94ff02e2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

tabbed: add separator patch

diff --git a/wm-addons/tabbed/DETAILS b/wm-addons/tabbed/DETAILS
index dddb181..1cf72a0 100755
--- a/wm-addons/tabbed/DETAILS
+++ b/wm-addons/tabbed/DETAILS
@@ -23,6 +23,11 @@ if [[ $TABBED_XRESOURCES == "signal-reloading" ]]; then

SOURCE5_URL[0]=https://tools.suckless.org/${SPELL}/patches/xresources-with-reload-signal/${SOURCE5}

SOURCE5_HASH=sha512:86807eb0767633445c08e9398b72a6bd6e97e1aad7b9efd764f02bbddaa0f23198389632629d851bbf354a73ea60f92195c4165fcfc3f77a47a97099bcc741c3
fi
+if [[ $TABBED_SEPARATOR == y ]]; then
+ SOURCE6=${SPELL}-separator-20230128-41e2b8f.diff
+
SOURCE6_URL[0]=https://tools.suckless.org/${SPELL}/patches/separator/${SOURCE6}
+
SOURCE6_HASH=sha512:0c6c73ac0c3ed9cee1fbef794689832460fb93ae62cfc5b9b5945bb2e4d0089791c4e73b9b0048e47c8dc9922dee0eedd8af455c1d8b121efe350eb01f63b87c
+fi
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://tools.suckless.org/tabbed";
LICENSE[0]="MIT/X"
diff --git a/wm-addons/tabbed/HISTORY b/wm-addons/tabbed/HISTORY
index 2df4ea8..97baaa4 100644
--- a/wm-addons/tabbed/HISTORY
+++ b/wm-addons/tabbed/HISTORY
@@ -1,3 +1,7 @@
+2023-09-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: added separator patch
+ * separator_xr.patch: added, to fix build with separator+xresources
+
2023-09-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.7
* DEPENDS: added missing dependencies
diff --git a/wm-addons/tabbed/PREPARE b/wm-addons/tabbed/PREPARE
index 8cf32ac..6085dad 100755
--- a/wm-addons/tabbed/PREPARE
+++ b/wm-addons/tabbed/PREPARE
@@ -4,4 +4,6 @@ config_query TABBED_AUTOHIDE "Apply tabbed autohide patch?" n
&&
config_query_list TABBED_XRESOURCES "Apply tabbed xresources patch?" \
none \
original \
- signal-reloading
+ signal-reloading &&
+
+config_query TABBED_SEPARATOR "Apply tabbed separator patch?" n
diff --git a/wm-addons/tabbed/PRE_BUILD b/wm-addons/tabbed/PRE_BUILD
index 89db13f..3543579 100755
--- a/wm-addons/tabbed/PRE_BUILD
+++ b/wm-addons/tabbed/PRE_BUILD
@@ -29,3 +29,16 @@ if [[ $TABBED_XRESOURCES == "signal-reloading" ]]; then

patch -p1 < "${SOURCE_CACHE}/${SOURCE5}" || return 1
fi
+
+if [[ $TABBED_SEPARATOR == y ]]; then
+ verify_file 6 &&
+
+ if [[ $TABBED_XRESOURCES == "original" ]]; then
+ cat "${SOURCE_CACHE}/${SOURCE6}" > "${SOURCE_DIRECTORY}/${SOURCE6}" &&
+ patch -p0 < "${SPELL_DIRECTORY}/separator_xr.patch" &&
+
+ patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE6}" || return 1
+ else
+ patch -p1 < "${SOURCE_CACHE}/${SOURCE6}" || return 1
+ fi
+fi
diff --git a/wm-addons/tabbed/separator_xr.patch
b/wm-addons/tabbed/separator_xr.patch
new file mode 100644
index 0000000..5706780
--- /dev/null
+++ b/wm-addons/tabbed/separator_xr.patch
@@ -0,0 +1,36 @@
+--- tabbed-separator-20230128-41e2b8f.diff.orig 2023-09-07
07:45:44.579137418 -0700
++++ tabbed-separator-20230128-41e2b8f.diff 2023-09-07 07:50:36.390309833
-0700
+@@ -10,18 +10,24 @@
+
+ diff --git a/config.def.h b/config.def.h
+ index 51bb13d..6936f95 100644
+---- a/config.def.h
++--- a/config.def.h.orig
+ +++ b/config.def.h
+-@@ -14,6 +14,7 @@ static const char titletrim[] = "...";
+- static const int tabwidth = 200;
+- static const Bool foreground = True;
+- static Bool urgentswitch = False;
+-+static const int separator = 4;
+-
++@@ -14,6 +14,7 @@
++ static int tabwidth = 200;
++ static int focusnew = 1;
++ static int urgentswitch = 0;
+++static int separator = 4;
++
+ /*
+ * Where to place a new tab when it is opened. When npisrelative is True,
+-diff --git a/tabbed.c b/tabbed.c
+-index eafe28a..1c38725 100644
++@@ -50,6 +51,7 @@
++ { "tabwidth", INTEGER, &tabwidth},
++ { "focusnew", INTEGER, &focusnew},
++ { "urgentswitch", INTEGER, &urgentswitch},
+++ { "separator", INTEGER, &separator},
++ { "newposition", INTEGER, &newposition},
++ { "npisrelative", INTEGER, &npisrelative},
++ };
+ --- a/tabbed.c
+ +++ b/tabbed.c
+ @@ -381,10 +381,16 @@ drawtext(const char *text, XftColor col[ColLast])



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6cacceffe827eba6bedf1a316ff9f7ef94ff02e2), Vlad Glagolev, 09/10/2023

Archive powered by MHonArc 2.6.24.

Top of Page