- update to i3status 2.9
http://permalink.gmane.org/gmane.comp.window-managers.i3.announce/11
This commit is contained in:
jasper
parent
5e91600570
commit
485313ccf7
@ -1,11 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.32 2014/03/09 20:03:43 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.33 2015/04/02 14:27:20 jasper Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= ${APM_ARCHS}
|
||||
|
||||
COMMENT= generate a statusbar for use with i3/xmobar/dzen2
|
||||
|
||||
DISTNAME= i3status-2.8
|
||||
REVISION= 0
|
||||
DISTNAME= i3status-2.9
|
||||
CATEGORIES= x11 sysutils
|
||||
|
||||
HOMEPAGE= http://i3wm.org/i3status/
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (i3status-2.8.tar.bz2) = qwbF3UVDVOb8ZDVAgmFhFQgrcNw5BjYbzloCvrD4B/4=
|
||||
SIZE (i3status-2.8.tar.bz2) = 40422
|
||||
SHA256 (i3status-2.9.tar.bz2) = QusJUAxiX8rJpxJaKee/UyykuFQJQkGO4yU6oV5eneM=
|
||||
SIZE (i3status-2.9.tar.bz2) = 46615
|
||||
|
||||
@ -1,20 +1,14 @@
|
||||
$OpenBSD: patch-i3status_conf,v 1.12 2014/01/30 13:19:40 jasper Exp $
|
||||
$OpenBSD: patch-i3status_conf,v 1.13 2015/04/02 14:27:20 jasper Exp $
|
||||
|
||||
Adjust config file to be reasonably useful on OpenBSD out of the box.
|
||||
|
||||
--- i3status.conf.orig Sun Jan 5 12:34:06 2014
|
||||
+++ i3status.conf Thu Jan 30 14:00:30 2014
|
||||
@@ -1,49 +1,46 @@
|
||||
# i3status configuration file.
|
||||
# see "man i3status" for documentation.
|
||||
--- i3status.conf.orig Sun Mar 22 18:03:23 2015
|
||||
+++ i3status.conf Mon Mar 23 11:04:23 2015
|
||||
@@ -7,43 +7,45 @@
|
||||
# If the above line is not correctly displayed, fix your editor first!
|
||||
|
||||
-# It is important that this file is edited as UTF-8.
|
||||
-# The following line should contain a sharp s:
|
||||
-# ß
|
||||
-# If the above line is not correctly displayed, fix your editor first!
|
||||
-
|
||||
general {
|
||||
+ output_format = "i3bar"
|
||||
+ output_format = "i3bar"
|
||||
colors = true
|
||||
interval = 5
|
||||
}
|
||||
@ -23,8 +17,8 @@ Adjust config file to be reasonably useful on OpenBSD out of the box.
|
||||
order += "disk /"
|
||||
-order += "run_watch DHCP"
|
||||
-order += "run_watch VPN"
|
||||
-order += "wireless wlan0"
|
||||
-order += "ethernet eth0"
|
||||
-order += "wireless _first_"
|
||||
-order += "ethernet _first_"
|
||||
+order += "wireless iwn0"
|
||||
+order += "ethernet em0"
|
||||
order += "battery 0"
|
||||
@ -34,7 +28,7 @@ Adjust config file to be reasonably useful on OpenBSD out of the box.
|
||||
+order += "cpu_temperature acpitz0"
|
||||
+order += "volume master"
|
||||
|
||||
-wireless wlan0 {
|
||||
-wireless _first_ {
|
||||
- format_up = "W: (%quality at %essid) %ip"
|
||||
+cpu_temperature cpu0 {
|
||||
+ format = "C: %degrees C"
|
||||
@ -50,7 +44,7 @@ Adjust config file to be reasonably useful on OpenBSD out of the box.
|
||||
format_down = "W: down"
|
||||
}
|
||||
|
||||
-ethernet eth0 {
|
||||
-ethernet _first_ {
|
||||
- # if you use %speed, i3status requires root privileges
|
||||
+ethernet em0 {
|
||||
format_up = "E: %ip (%speed)"
|
||||
@ -73,7 +67,7 @@ Adjust config file to be reasonably useful on OpenBSD out of the box.
|
||||
tztime local {
|
||||
format = "%Y-%m-%d %H:%M:%S"
|
||||
}
|
||||
@@ -54,4 +51,8 @@ load {
|
||||
@@ -54,4 +56,8 @@ load {
|
||||
|
||||
disk "/" {
|
||||
format = "%avail"
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
$OpenBSD: patch-src_print_battery_info_c,v 1.11 2014/03/12 07:56:52 jasper Exp $
|
||||
|
||||
From 52814295a0b3a0785631256e9e2dc6b8139e2be8 Mon Sep 17 00:00:00 2001
|
||||
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
|
||||
Date: Mon, 10 Mar 2014 09:22:47 +0000
|
||||
Subject: For the %percentage display of batteries, drop the leading '0' for values < 10.
|
||||
|
||||
--- src/print_battery_info.c.orig Sun Jan 5 12:34:07 2014
|
||||
+++ src/print_battery_info.c Wed Mar 12 08:55:26 2014
|
||||
@@ -284,7 +284,8 @@ void print_battery_info(yajl_gen json_gen, char *buffe
|
||||
}
|
||||
|
||||
(void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status));
|
||||
- (void)snprintf(percentagebuf, sizeof(percentagebuf), "%02d%%", apm_info.battery_life);
|
||||
+ /* integer_battery_capacity is implied as battery_life is already in whole numbers. */
|
||||
+ (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.00d%%", apm_info.battery_life);
|
||||
|
||||
if (status == CS_DISCHARGING && low_threshold > 0) {
|
||||
if (strncmp(threshold_type, "percentage", strlen(threshold_type)) == 0
|
||||
23
x11/i3status/patches/patch-src_print_disk_info_c
Normal file
23
x11/i3status/patches/patch-src_print_disk_info_c
Normal file
@ -0,0 +1,23 @@
|
||||
$OpenBSD: patch-src_print_disk_info_c,v 1.3 2015/04/02 14:27:20 jasper Exp $
|
||||
|
||||
Properly guard a Linux-only header
|
||||
|
||||
--- src/print_disk_info.c.orig Mon Mar 23 11:07:26 2015
|
||||
+++ src/print_disk_info.c Mon Mar 23 11:07:33 2015
|
||||
@@ -3,7 +3,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
-#include <mntent.h>
|
||||
#include <stdint.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/statvfs.h>
|
||||
@@ -11,6 +10,8 @@
|
||||
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (__OpenBSD__) || defined(__DragonFly__)
|
||||
#include <sys/param.h>
|
||||
#include <sys/mount.h>
|
||||
+#else
|
||||
+#include <mntent.h>
|
||||
#endif
|
||||
#include <yajl/yajl_gen.h>
|
||||
#include <yajl/yajl_version.h>
|
||||
Loading…
Reference in New Issue
Block a user