summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO37
-rw-r--r--.nvchecker.toml7
-rw-r--r--LICENSE47
-rw-r--r--PKGBUILD67
-rw-r--r--baraction.sh82
-rw-r--r--spectrwm-no-preload2
-rw-r--r--spectrwm.install0
7 files changed, 40 insertions, 202 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7f931d246274..c4c45f5b1cc2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,25 @@
pkgbase = spectrwm
- pkgdesc = A minimalistic automatic tiling window manager that tries to stay out of the way.
- pkgver = 3.5.2
- pkgrel = 6
- url = http://www.spectrwm.org
- install = spectrwm.install
+ pkgdesc = A small, dynamic tiling and reparenting window manager for X11
+ pkgver = 3.6.0
+ pkgrel = 1
+ url = https://github.com/conformal/spectrwm
arch = x86_64
license = ISC
makedepends = libxt
- depends = dmenu
+ depends = bash
+ depends = fontconfig
+ depends = glibc
+ depends = libbsd
+ depends = libx11
+ depends = libxcb
+ depends = libxcursor
+ depends = libxft
depends = xcb-util
- depends = xcb-util-wm
depends = xcb-util-keysyms
- depends = libxrandr
- depends = libxft
- depends = libxcursor
- depends = terminus-font
- optdepends = scrot: screenshots
- optdepends = xlockmore: great screenlocker
+ depends = xcb-util-wm
replaces = scrotwm
backup = etc/spectrwm.conf
- source = https://github.com/conformal/spectrwm/archive/refs/tags/SPECTRWM_3_5_1.tar.gz
- source = LICENSE
- source = baraction.sh
- md5sums = 611604a6c4a9c7848d64ea98a0d1db16
- md5sums = a67cfe51079481e5b0eab1ad371379e3
- md5sums = 950d663692e1da56e0ac864c6c3ed80e
- sha256sums = 7fe4260208a52d9fb844291d0afe6af18887c5452df0b921ed780af7b9223f0f
- sha256sums = 1bf0c43ca1063b16f6ab784d251319081579a786f99bb86d9f6828b14abb2263
- sha256sums = 2cc2ca7105ddb3575bbdf4184d974afab8b475aab0af113242188288d7ba4504
+ source = spectrwm-3.6.0.tar.gz::https://github.com/conformal/spectrwm/archive/refs/tags/SPECTRWM_3_6_0.tar.gz
+ sha256sums = 49854c5215475d2450d2558da12a3afe9019861170ba9d556c8b403d4d66f0d1
pkgname = spectrwm
diff --git a/.nvchecker.toml b/.nvchecker.toml
new file mode 100644
index 000000000000..b59d4ce6250a
--- /dev/null
+++ b/.nvchecker.toml
@@ -0,0 +1,7 @@
+[spectrwm]
+source = "github"
+github = "conformal/spectrwm"
+use_max_tag = true
+prefix = "SPECTRWM_"
+from_pattern = "_"
+to_pattern = "."
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 24c04f3a07e2..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
- * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-/*
- * Much code and ideas taken from dwm under the following license:
- * MIT/X Consortium License
- *
- * 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
- * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * 2006-2007 Jukka Salmi <jukka at salmi dot ch>
- * 2007 Premysl Hruby <dfenze at gmail dot com>
- * 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
- * 2007 Christof Musik <christof at sendfax dot de>
- * 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
- * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com>
- * 2008 Martin Hurton <martin dot hurton at gmail dot com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
diff --git a/PKGBUILD b/PKGBUILD
index 75b84b393eb4..3db146bf8068 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,65 +1,34 @@
-# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Maintainer:
+# Contributor: Kyle Keen <keenerd@gmail.com>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
pkgname=spectrwm
-pkgver=3.5.2
-_ghver=3_5_1
-pkgrel=6
-pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way."
+pkgver=3.6.0
+_pkgver="${pkgname^^}_${pkgver//./_}"
+pkgrel=1
+pkgdesc='A small, dynamic tiling and reparenting window manager for X11'
arch=('x86_64')
-url="http://www.spectrwm.org"
-_watch="https://github.com/conformal/spectrwm/releases"
+url='https://github.com/conformal/spectrwm'
license=('ISC')
-depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor' 'terminus-font')
-replaces=('scrotwm')
+depends=('bash' 'fontconfig' 'glibc' 'libbsd' 'libx11' 'libxcb' 'libxcursor' 'libxft' 'xcb-util' 'xcb-util-keysyms' 'xcb-util-wm')
makedepends=('libxt')
-optdepends=('scrot: screenshots'
- 'xlockmore: great screenlocker')
+replaces=('scrotwm')
backup=(etc/spectrwm.conf)
-install=spectrwm.install
-
-#source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \
-source=("https://github.com/conformal/spectrwm/archive/refs/tags/SPECTRWM_${_ghver}.tar.gz" \
- LICENSE \
- baraction.sh)
-md5sums=('611604a6c4a9c7848d64ea98a0d1db16'
- 'a67cfe51079481e5b0eab1ad371379e3'
- '950d663692e1da56e0ac864c6c3ed80e')
-sha256sums=('7fe4260208a52d9fb844291d0afe6af18887c5452df0b921ed780af7b9223f0f'
- '1bf0c43ca1063b16f6ab784d251319081579a786f99bb86d9f6828b14abb2263'
- '2cc2ca7105ddb3575bbdf4184d974afab8b475aab0af113242188288d7ba4504')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/${_pkgver}.tar.gz")
+sha256sums=('49854c5215475d2450d2558da12a3afe9019861170ba9d556c8b403d4d66f0d1')
prepare() {
- cd "$srcdir/$pkgname-SPECTRWM_$_ghver"
-
- sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c
- sed -i 's/verbose_layout = false;/verbose_layout = true;/' spectrwm.c
- sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf
+ cd "${pkgname}-${_pkgver}"
+ sed -i 's|/usr/local/lib/|/usr/lib/|' spectrwm.c
}
build() {
- #cd "$srcdir/$pkgname-$pkgver/linux"
- cd "$srcdir/$pkgname-SPECTRWM_$_ghver/linux"
-
- make PREFIX="/usr"
+ cd "${pkgname}-${_pkgver}/linux"
+ make PREFIX='/usr'
}
package() {
- #cd "$srcdir/$pkgname-$pkgver"
- cd "$srcdir/$pkgname-SPECTRWM_$_ghver"
- cd linux
- make PREFIX="/usr" DESTDIR="$pkgdir" install
- install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop"
- cd ..
- install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf"
- install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh"
- mkdir -p "$pkgdir/etc/spectrwm"
- cp spectrwm_*.conf "$pkgdir/etc/spectrwm/"
- cd "$srcdir"
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh"
-
- # fix this for real in the makefile
- rm "$pkgdir/usr/bin/scrotwm"
- ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm"
+ cd "${pkgname}-${_pkgver}/linux"
+ make PREFIX='/usr' SYSCONFDIR='/etc' DESTDIR="${pkgdir}" install
+ install -Dm644 ../LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
}
diff --git a/baraction.sh b/baraction.sh
deleted file mode 100644
index 96a8a7b1a01f..000000000000
--- a/baraction.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-# baraction.sh for spectrwm status bar
-# From http://wiki.archlinux.org/index.php/Scrotwm
-
-SLEEP_SEC=5
-#loops forever outputting a line every SLEEP_SEC secs
-while :; do
-
- eval $(cat /proc/acpi/battery/BAT0/state | awk '/charging state/ {printf "BAT_CHGSTATE=%s;", $3}; /remaining capacity/ {printf "BAT_REMNG=%s;",$3}; /present rate/ {printf "BAT_RATE=%s;",$3};' -)
- eval $(cat /proc/acpi/battery/BAT0/info | awk '/present/ {printf "BAT_PRESENT=%s;", $2}; /last full capacity/ {printf "BAT_LASTFULL=%s;",$4};' -)
-
- BAT_REMNG_WH=`echo "scale=1; a=($BAT_REMNG+50)/1000; print a" | bc -l`
- BAT_RATE_W=`echo "scale=1; a=($BAT_RATE+50)/1000; print a" | bc -l`
- BCSCRIPT="scale=0; a=(100*$BAT_REMNG / $BAT_LASTFULL); print a"
- BAT_PCT=`echo $BCSCRIPT | bc -l`%
-
- case $BAT_PRESENT in
- no)
- POWER_STR="AC, NO BATTERY"
- ;;
- yes)
-
- case $BAT_CHGSTATE in
- charged)
- #on ac
- AC_STATUS="ON AC"
- TIME_REMNG="N/A"
- POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT"
- ;;
- charging)
- #on ac
- AC_STATUS="ON AC"
- BCSCRIPT="scale=1; a=(60*($BAT_LASTFULL - $BAT_REMNG) / $BAT_RATE); print a"
- TIMETOFULL_MIN=`echo $BCSCRIPT | bc -l`
- POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT C="$BAT_REMNG_WH"Wh Rate="$BAT_RATE_W"W TTF="$TIMETOFULL_MIN"min"
- ;;
- discharging)
- AC_STATUS="ON BATT"
- TIME_REMNG_MIN=`echo "scale=0; a=(60*$BAT_REMNG / $BAT_RATE); print a" | bc -l`
- TIME_REMNG_HH=`echo "scale=0; a=($BAT_REMNG / $BAT_RATE); if (a<10) {print "0"; print a} else {print a}" | bc -l`
-
- TIME_REMNG_MM=`echo "scale=0; a=($TIME_REMNG_MIN-60*$TIME_REMNG_HH); if (a<10) {print "0"; print a} else {print a}" | bc -l`
- POWER_STR="$AC_STATUS $BAT_PCT C="$BAT_REMNG_WH"Wh P="$BAT_RATE_W"W R="$TIME_REMNG_HH":"$TIME_REMNG_MM
- ;;
- *)
- POWER_STR=$BAT_CHGSTATE
- ;;
- esac
-
- ;;
- *)
- POWER_STR="error"
- ;;
- esac
-
- #spectrwm bar_print can't handle UTF-8 characters, such as degree symbol
- #Core 0: +67.0°C (crit = +100.0°C)
- eval $(sensors 2>/dev/null | sed s/[°+]//g | awk '/^Core 0/ {printf "CORE0TEMP=%s;", $3}; /^Core 1/ {printf "CORE1TEMP=%s;",$3}; /^fan1/ {printf "FANSPD=%s;",$2};' -)
- TEMP_STR="Tcpu=$CORE0TEMP,$CORE1TEMP F=$FANSPD"
-
- WLAN_ESSID=$(iwconfig wlan0 | awk -F "\"" '/wlan0/ { print $2 }')
- eval $(cat /proc/net/wireless | sed s/[.]//g | awk '/wlan0/ {printf "WLAN_QULTY=%s; WLAN_SIGNL=%s; WLAN_NOISE=%s", $3,$4,$5};' -)
- BCSCRIPT="scale=0;a=100*$WLAN_QULTY/70;print a"
- WLAN_QPCT=`echo $BCSCRIPT | bc -l`
- WLAN_POWER=`iwconfig 2>/dev/null| grep "Tx-Power"| awk {'print $4'}|sed s/Tx-Power=//`
- WLAN_STR="$WLAN_ESSID: Q=$WLAN_QPCT% S/N="$WLAN_SIGNL"/"$WLAN_NOISE"dBm T="$WLAN_POWER"dBm"
-
- CPUFREQ_STR=`echo "Freq:"$(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')`
- CPULOAD_STR="Load:$(uptime | sed 's/.*://; s/,//g')"
-
- eval $(awk '/^MemTotal/ {printf "MTOT=%s;", $2}; /^MemFree/ {printf "MFREE=%s;",$2}' /proc/meminfo)
- MUSED=$(( $MTOT - $MFREE ))
- MUSEDPT=$(( ($MUSED * 100) / $MTOT ))
- MEM_STR="Mem:${MUSEDPT}%"
-
- echo -e "$POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR"
- #alternatively if you prefer a different date format
- #DATE_STR=`date +"%H:%M %a %d %b`
- #echo -e "$DATE_STR $POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR"
-
- sleep $SLEEP_SEC
-done
diff --git a/spectrwm-no-preload b/spectrwm-no-preload
deleted file mode 100644
index 12385eddb60b..000000000000
--- a/spectrwm-no-preload
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec env -u LD_PRELOAD $@
diff --git a/spectrwm.install b/spectrwm.install
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/spectrwm.install
+++ /dev/null