stalonetray: => 0.8.4

8 files changed, 93 insertions, 7 deletions

diff --git a/wm-addons/stalonetray/BUILD b/wm-addons/stalonetray/BUILD
new file mode 100755
index 0000000000..ec4a42b6bd
--- /dev/null
+++ b/wm-addons/stalonetray/BUILD
@@ -0,0 +1,5 @@
+OPTS="${STALONETRAY_OPTS} ${OPTS}" &&
+
+default_build &&
+
+make stalonetrayrc.sample
diff --git a/wm-addons/stalonetray/CONFIGURE b/wm-addons/stalonetray/CONFIGURE
new file mode 100755
index 0000000000..9ef0026bf3
--- /dev/null
+++ b/wm-addons/stalonetray/CONFIGURE
@@ -0,0 +1,23 @@
+config_query_option STALONETRAY_OPTS "Enable native KDE tray icons support?" y \
+                                     "--enable-native-kde" \
+                                     "--disable-native-kde" &&
+
+config_query_option STALONETRAY_OPTS "Enable debugging output/checks?" y \
+                                     "--enable-debug" \
+                                     "--disable-debug" &&
+
+config_query_option STALONETRAY_OPTS "Enable full event trace (debug)?" y \
+                                     "--enable-events-trace" \
+                                     "--disable-events-trace" &&
+
+config_query_option STALONETRAY_OPTS "Delay sending of embedding confirmation (debug)" y \
+                                     "--enable-embedding-confirmation-delay" \
+                                     "--disable-embedding-confirmation-delay" &&
+
+config_query_option STALONETRAY_OPTS "Use xprop/xwininfo to dump icon window info?" n \
+                                     "--enable-dump-win-info" \
+                                     "--disable-dump-win-info" &&
+
+config_query_option STALONETRAY_OPTS "Use non-portable hack to exit gracefuly on signal?" n \
+                                     "--enable-graceful-exit" \
+                                     "--disable-graceful-exit"
diff --git a/wm-addons/stalonetray/DEPENDS b/wm-addons/stalonetray/DEPENDS
index b555ae0d45..d2398f4642 100755
--- a/wm-addons/stalonetray/DEPENDS
+++ b/wm-addons/stalonetray/DEPENDS
@@ -1 +1,16 @@
-depends libx11
+depends libx11 &&
+depends libice &&
+depends libsm &&
+
+optional_depends libxpm "" "" "for XPM background support" &&
+
+optional_depends libxslt "" "" "to build documentation" &&
+
+if is_depends_enabled ${SPELL} libxslt; then
+  depends docbook-xsl
+fi &&
+
+if list_find "${STALONETRAY_OPTS}" "--enable-dump-win-info"; then
+  depends xprop &&
+  depends xwininfo
+fi
diff --git a/wm-addons/stalonetray/DETAILS b/wm-addons/stalonetray/DETAILS
index baaf9ea651..3a39e7946d 100755
--- a/wm-addons/stalonetray/DETAILS
+++ b/wm-addons/stalonetray/DETAILS
@@ -1,13 +1,13 @@
            SPELL=stalonetray
-         VERSION=0.8.1
-          SOURCE="${SPELL}-${VERSION}.tar.bz2"
-   SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:e8b15f3f1e4a9073ba92ca628e79e9add26965ad0686a30c63cf14eb03de1d234550dfbd50a22f05771bded8f7c64da093cda5b44c38e91f2a837c50c901144b
+         VERSION=0.8.4
+          SOURCE=${SPELL}-${VERSION}.tar.gz
+   SOURCE_URL[0]=https://github.com/kolbusa/${SPELL}/archive/v${VERSION}.tar.gz
+     SOURCE_HASH=sha512:3afdeb7794171f490c5eca631c574003a00bbed863b9caf4024e1b064772d3c24ea3836f280eeab1d50def67928f4d08d3d375047f43bcc39f16a3250015ff2b
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="http://stalonetray.sourceforge.net"
+        WEB_SITE=https://kolbusa.github.io/stalonetray/
       LICENSE[0]=GPL
          ENTERED=20070228
-           SHORT="a stand-alone freedesktop.org and KDE system tray"
+           SHORT="STAnd aLONE TRAY (notification area) implementation for X11"
 cat << EOF
 Stalonetray is a stand-alone freedesktop.org and KDE system tray (notification
 area) for X Window System/X11 (e.g. X.Org or XFree 86). It has full XEMBED
diff --git a/wm-addons/stalonetray/HISTORY b/wm-addons/stalonetray/HISTORY
index e9c8a2b90a..240b6e534d 100644
--- a/wm-addons/stalonetray/HISTORY
+++ b/wm-addons/stalonetray/HISTORY
@@ -1,3 +1,13 @@
+2022-07-28 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 0.8.4; updated website, source, source URL,
+	  short desc
+	* DEPENDS: added missing dependencies
+	* CONFIGURE: added, for config options
+	* BUILD: added, for STALONETRAY_OPTS
+	* PRE_BUILD: added, for autoreconf
+	* configure.patch: added, to fix configure options handling
+	* docbook.patch: added, to detect our dockbook-xsl paths
+
 2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
 	* DETAILS: remove SOURCEFORGE_URL usage (automated)
 
diff --git a/wm-addons/stalonetray/PRE_BUILD b/wm-addons/stalonetray/PRE_BUILD
new file mode 100755
index 0000000000..740297a3a9
--- /dev/null
+++ b/wm-addons/stalonetray/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p0 < "${SPELL_DIRECTORY}/dockbook.patch" &&
+patch -p0 < "${SPELL_DIRECTORY}/configure.patch" &&
+
+autoreconf -fi
diff --git a/wm-addons/stalonetray/configure.patch b/wm-addons/stalonetray/configure.patch
new file mode 100644
index 0000000000..20dbd70820
--- /dev/null
+++ b/wm-addons/stalonetray/configure.patch
@@ -0,0 +1,15 @@
+--- configure.ac.orig	2022-07-28 11:20:11.897161907 -0700
++++ configure.ac	2022-07-28 11:28:03.634734282 -0700
+@@ -102,10 +102,10 @@
+     [ac_cv_events_trace="yes"])
+ AC_ARG_ENABLE(embedding-confirmation-delay,
+     [  --enable-embedding-confirmation-delay  delay sending of embedding confirmation (debug)],
+-    [
++    [AS_IF([test "x$enableval" != xno],
+         AC_DEFINE(DELAY_EMBEDDING_CONFIRMATION, 1, [delay sending of embedding confirmation])
+         LDFLAGS="$LDFLAGS -lpthread"
+-    ],
++    )],
+     [])
+ AC_ARG_ENABLE(dump-win-info,
+     [  --enable-dump-win-info  use xprop/xwininfo to dump icon window info],
diff --git a/wm-addons/stalonetray/dockbook.patch b/wm-addons/stalonetray/dockbook.patch
new file mode 100644
index 0000000000..ceea2f234e
--- /dev/null
+++ b/wm-addons/stalonetray/dockbook.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2021-02-07 07:41:52.000000000 -0800
++++ configure.ac	2022-07-28 09:18:08.638682461 -0700
+@@ -177,7 +177,7 @@
+ AC_DEFUN([AX_CHECK_DOCBOOK], [
+     XSLTPROC_FLAGS=--nonet
+     DOCBOOK_ROOT=
+-    for i in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/xml/docbook/stylesheet/docbook-xs /usr/share/sgml/docbook/xsl-stylesheets/ /usr/local/share/xsl/docbook;
++    for i in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/xml/docbook/stylesheet/docbook-xs /usr/share/sgml/docbook/xsl-stylesheets/ /usr/local/share/xsl/docbook /usr/share/xml/docbook/xsl-stylesheets-1.78;
+     do
+         if test -d "$i"; then
+             DOCBOOK_ROOT=$i