Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d80da22d874b0f8f180a22894b60f47c457da130)

Chronological Thread  
    < 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 (d80da22d874b0f8f180a22894b60f47c457da130)
  • Date: Sun, 3 Sep 2023 06:04:15 +0000
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

wm-addons/tabbed/CONFIGURE | 4 ++++
wm-addons/tabbed/DEPENDS | 8 +++++++-
wm-addons/tabbed/DETAILS | 34 +++++++++++++++++++++++++++-------
wm-addons/tabbed/HISTORY | 8 ++++++++
wm-addons/tabbed/INSTALL | 7 ++++++-
wm-addons/tabbed/PREPARE | 7 +++++++
wm-addons/tabbed/PRE_BUILD | 31 +++++++++++++++++++++++++++++++
wm-addons/tabbed/alpha.patch | 28 ++++++++++++++++++++++++++++
8 files changed, 118 insertions(+), 9 deletions(-)

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

tabbed: => 0.7

diff --git a/wm-addons/tabbed/CONFIGURE b/wm-addons/tabbed/CONFIGURE
new file mode 100755
index 0000000..890ac23
--- /dev/null
+++ b/wm-addons/tabbed/CONFIGURE
@@ -0,0 +1,4 @@
+message "tabbed does not use a config file, you might want to customize it
now" &&
+message "Your custom config will be saved to
${INSTALL_ROOT}/usr/share/doc/tabbed/" &&
+
+config_query TABBED_CONFIG "Do you wish to use a custom config.def.h?" n
diff --git a/wm-addons/tabbed/DEPENDS b/wm-addons/tabbed/DEPENDS
index fdb96c3..868e5bb 100755
--- a/wm-addons/tabbed/DEPENDS
+++ b/wm-addons/tabbed/DEPENDS
@@ -1 +1,7 @@
-depends libx11
+depends libx11 &&
+depends libxft &&
+depends fontconfig &&
+
+if [[ $TABBED_ALPHA == y ]]; then
+ depends libxrender
+fi
diff --git a/wm-addons/tabbed/DETAILS b/wm-addons/tabbed/DETAILS
index bfe6c6a..dddb181 100755
--- a/wm-addons/tabbed/DETAILS
+++ b/wm-addons/tabbed/DETAILS
@@ -1,15 +1,35 @@
SPELL=tabbed
- VERSION=0.6
+ VERSION=0.7
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://dl.suckless.org/tools/${SOURCE}
-
SOURCE_HASH=sha512:bcad873251be6b5de21311531e8d24330003b42790cb94d559a0d1be45408b3e0722c14e7c7f2cefd0717fd2a2d7a100fa08fc4e10e7bb669935909602286553
+ SOURCE_URL[0]=https://dl.suckless.org/tools/${SOURCE}
+
SOURCE_HASH=sha512:770420935fd152e10bef59e29eeb8125ee181993691c6c5f03baf311bd685c2b5f0ded13854b3715cc60d0f1ae99eceacd3e6cb7e4008c34917ae55c38b436a7
+if [[ $TABBED_ALPHA == y ]]; then
+ SOURCE2=alpha.diff
+ SOURCE2_URL[0]=https://tools.suckless.org/${SPELL}/patches/alpha/${SOURCE2}
+
SOURCE2_HASH=sha512:80b265f66484380d98afd36cad59419a58f1bc1beeb93bf82a859ca34e9bf3b14e4d28739a8418c193a34a04bff5aa5c067f6c16c4675ef3b66d28d9fa77a9c2
+fi
+if [[ $TABBED_AUTOHIDE == y ]]; then
+ SOURCE3=${SPELL}-autohide-20201222-dabf6a2.diff
+
SOURCE3_URL[0]=https://tools.suckless.org/${SPELL}/patches/autohide/${SOURCE3}
+
SOURCE3_HASH=sha512:81b8041d95585e4979ff4bbcad0eb9e140ab793ed1ccf173de94a4ead4cfd6ae3ef589159bd8831cbe73c120838c94a249929932c71455730ab2f2b53fa255c5
+fi
+if [[ $TABBED_XRESOURCES == "original" ]]; then
+ SOURCE4=${SPELL}-xresources-20230128-41e2b8f.diff
+
SOURCE4_URL[0]=https://tools.suckless.org/${SPELL}/patches/xresources/${SOURCE4}
+
SOURCE4_HASH=sha512:5462f81a70a0b275a959cd6970da5c8d567561e6b5b05bbfad9393ae1d0c05bc2159506abec2fde0be6a07ac730f1bfcad2aa44cd80ff57ff6b2c685813f5dda
+fi
+if [[ $TABBED_XRESOURCES == "signal-reloading" ]]; then
+ SOURCE5=${SPELL}-xresources-signal-reloading-20220622-014eabf.diff
+
SOURCE5_URL[0]=https://tools.suckless.org/${SPELL}/patches/xresources-with-reload-signal/${SOURCE5}
+
SOURCE5_HASH=sha512:86807eb0767633445c08e9398b72a6bd6e97e1aad7b9efd764f02bbddaa0f23198389632629d851bbf354a73ea60f92195c4165fcfc3f77a47a97099bcc741c3
+fi
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://tools.suckless.org/tabbed";
+ WEB_SITE="https://tools.suckless.org/tabbed";
LICENSE[0]="MIT/X"
ENTERED=20100308
KEYWORDS=""
- SHORT="Simple generic tabbed fronted to xembed aware
applications."
+ SHORT="simple generic tabbed frontend to xembed-aware
applications"
cat << EOF
-Originally designed for surf but also usable with many other application,
-i.e. uzbl, urxvt and xterm.
+Originally designed for surf but also usable with many other applications,
+i.e. st, uzbl, urxvt and xterm.
EOF
diff --git a/wm-addons/tabbed/HISTORY b/wm-addons/tabbed/HISTORY
index 3bd5413..2df4ea8 100644
--- a/wm-addons/tabbed/HISTORY
+++ b/wm-addons/tabbed/HISTORY
@@ -1,3 +1,11 @@
+2023-09-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7
+ * DEPENDS: added missing dependencies
+ * PREPARE: added, for patch configuration
+ * CONFIGURE: added, to configure tabbed
+ * PRE_BUILD: added, to apply patches
+ * alpha.patch: added
+
2015-01-11 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.6

diff --git a/wm-addons/tabbed/INSTALL b/wm-addons/tabbed/INSTALL
index 84b2df1..979748e 100755
--- a/wm-addons/tabbed/INSTALL
+++ b/wm-addons/tabbed/INSTALL
@@ -1 +1,6 @@
-make install PREFIX=/usr
+make PREFIX="${INSTALL_ROOT}/usr" install
+
+if [[ $TABBED_CONFIG == y ]]; then
+ mkdir -p ${INSTALL_ROOT}/usr/share/doc/tabbed &&
+ cp config.def.h ${INSTALL_ROOT}/usr/share/doc/tabbed/
+fi
diff --git a/wm-addons/tabbed/PREPARE b/wm-addons/tabbed/PREPARE
new file mode 100755
index 0000000..8cf32ac
--- /dev/null
+++ b/wm-addons/tabbed/PREPARE
@@ -0,0 +1,7 @@
+config_query TABBED_ALPHA "Apply tabbed alpha patch?" n &&
+config_query TABBED_AUTOHIDE "Apply tabbed autohide patch?" n &&
+
+config_query_list TABBED_XRESOURCES "Apply tabbed xresources patch?" \
+ none \
+ original \
+ signal-reloading
diff --git a/wm-addons/tabbed/PRE_BUILD b/wm-addons/tabbed/PRE_BUILD
new file mode 100755
index 0000000..89db13f
--- /dev/null
+++ b/wm-addons/tabbed/PRE_BUILD
@@ -0,0 +1,31 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+sedit "/xembed.1/d" Makefile &&
+
+if [[ $TABBED_ALPHA == y ]]; then
+ verify_file 2 &&
+
+ cat "${SOURCE_CACHE}/${SOURCE2}" > "${SOURCE_DIRECTORY}/${SOURCE2}" &&
+ patch -p0 < "${SPELL_DIRECTORY}/alpha.patch" &&
+
+ patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE2}" || return 1
+fi &&
+
+if [[ $TABBED_AUTOHIDE == y ]]; then
+ verify_file 3 &&
+
+ patch -p1 < "${SOURCE_CACHE}/${SOURCE3}" || return 1
+fi &&
+
+if [[ $TABBED_XRESOURCES == "original" ]]; then
+ verify_file 4 &&
+
+ patch -p1 < "${SOURCE_CACHE}/${SOURCE4}" || return 1
+fi &&
+
+if [[ $TABBED_XRESOURCES == "signal-reloading" ]]; then
+ verify_file 5 &&
+
+ patch -p1 < "${SOURCE_CACHE}/${SOURCE5}" || return 1
+fi
diff --git a/wm-addons/tabbed/alpha.patch b/wm-addons/tabbed/alpha.patch
new file mode 100644
index 0000000..3c477b3
--- /dev/null
+++ b/wm-addons/tabbed/alpha.patch
@@ -0,0 +1,28 @@
+--- alpha.diff.orig 2018-11-11 01:33:48.000000000 -0800
++++ alpha.diff 2023-09-02 22:03:54.867402531 -0700
+@@ -5,9 +5,9 @@
+ @@ -9,7 +9,7 @@ MANPREFIX = ${PREFIX}/share/man
+
+ # includes and libs
+- INCS = -I. -I/usr/include -I/usr/include/freetype2
+--LIBS = -L/usr/lib -lc -lX11 -lfontconfig -lXft
+-+LIBS = -L/usr/lib -lc -lX11 -lfontconfig -lXft -lXrender
++ INCS = -I. -I/usr/include -I$(X11INC) -I${FREETYPEINC}
++-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${FREETYPELIBS}
+++LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXrender ${FREETYPELIBS}
+
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
+@@ -33,9 +33,9 @@
+ - DefaultDepth(dpy, screen));
+ + dc.drawable = XCreatePixmap(dpy, win, ww, wh,
+ + 32);
+- if (sel > -1)
+- resize(sel, ww, wh - bh);
+- XSync(dpy, False);
++
++ if (!obh && (wh <= bh)) {
++ obh = bh;
+ @@ -399,7 +402,7 @@ drawtext(const char *text, XftColor col[ColLast])
+ ;
+ }


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

Archive powered by MHonArc 2.6.24.

Top of Page