[gentoo-commits] repo/gentoo:master commit in: x11-misc/i3status/files/, x11-misc/i3status/
commit: 24a600548e1e48cd2683ba9b9f80f5411e82a70d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jun 20 12:26:24 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jun 20 12:37:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a60054
x11-misc/i3status: drop 2.13-r1
Bug: https://bugs.gentoo.org/908383
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/i3status/Manifest | 1 -
...01-Extend-battery-handling-on-OpenBSD-351.patch | 98 -
...-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch | 33 --
...ly-compile-pulse.c-only-when-using-pulsea.patch | 56 --
...4-battery-include-sys-sysctl.h-on-OpenBSD.patch | 26 -
...disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch | 56 --
...NetBSD-include-sys-socket.h-for-AF_INET-6.patch | 24 -
...udio-an-optional-dependency-follow-best-p.patch | 119 -
x11-misc/i3status/i3status-2.13-r1.ebuild | 68
9 files changed, 481 deletions(-)
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index 56f072db9c04..3b335da31c78 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -1,2 +1 @@
-DIST i3status-2.13.tar.bz2 201409 BLAKE2B
e087d69e2df3ae9348cb55739023b2164dfa3543551d173b138c72e574714069d8397716b95e92c4315aa538ea31b33aa73532d6d0f75bbc38d7db54e1f665bc
SHA512
6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2
DIST i3status-2.14.tar.xz 68900 BLAKE2B
e85019c2a95d50b6bd4adc6bc9dafb85c3a3d8cdaa93602a9c2af54e6818a4e58ad26f47e2c85b38744c12c08f52c4b5c1216e6f3215f8ee2f4152b42a547905
SHA512
10a1235cc314f5fc4dde4e1369a30f49118c95271f636c5803caa52d94d99ad8565b89fcd602d0c8aa7c830a79d3a3bb08e5ac8123cf07cfddc8ef0126b10f80
diff --git
a/x11-misc/i3status/files/0001-Extend-battery-handling-on-OpenBSD-351.patch
b/x11-misc/i3status/files/0001-Extend-battery-handling-on-OpenBSD-351.patch
deleted file mode 100644
index 32a0358b4211..
--- a/x11-misc/i3status/files/0001-Extend-battery-handling-on-OpenBSD-351.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 3a51673c05142b99f8db6a0bd9b8e4b806efeb72 Mon Sep 17 00:00:00 2001
-From: Jasper Lievisse Adriaanse
-Date: Mon, 8 Jul 2019 17:53:25 +0200
-Subject: [PATCH 1/7] Extend battery handling on OpenBSD (#351)
-
-If acpibat watts value is not available, try current (for batteries
-that report in amps), then convert to watts.
-
-originally submitted by @jcs
- src/print_battery_info.c | 47 ++--
- 1 file changed, 45 insertions(+), 2 deletions(-)
-
-diff --git a/src/print_battery_info.c b/src/print_battery_info.c
-index 1c51624..e2a790c 100644
a/src/print_battery_info.c
-+++ b/src/print_battery_info.c
-@@ -20,6 +20,8 @@
- #include
- #include
- #include
-+#include
-+#include
- #endif
-
- #if defined(__DragonFly__)
-@@ -31,6 +33,7 @@
- #include
- #include
- #include
-+#include
- #endif
-
- #if defined(__NetBSD__)
-@@ -269,11 +272,16 @@ static bool slurp_battery_info(struct battery_info
*batt_info, yajl_gen json_gen
- #elif defined(__OpenBSD__)
- /*
-* We're using apm(4) here, which is the interface to acpi(4) on
amd64/i386 and
-- * the generic interface on macppc/sparc64/zaurus, instead of using
sysctl(3) and
-- * probing acpi(4) devices.
-+ * the generic interface on macppc/sparc64/zaurus. Machines that have
ACPI
-+ * battery sensors gain some extra information.
-*/
- struct apm_power_info apm_info;
-+struct sensordev sensordev;
-+struct sensor sensor;
-+size_t sdlen, slen;
- int apm_fd;
-+int dev, mib[5] = {CTL_HW, HW_SENSORS, 0, 0, 0};
-+int volts = 0;
-
- apm_fd = open("/dev/apm", O_RDONLY);
- if (apm_fd < 0) {
-@@ -311,6 +319,41 @@ static bool slurp_battery_info(struct battery_info
*batt_info, yajl_gen json_gen
- if (batt_info->status != CS_CHARGING) {
- batt_info->seconds_remaining = apm_info.minutes_left * 60;
- }
-+
-+/* If acpibat* are present, check sensors for data not present via APM. */
-+batt_info->present_rate = 0;
-+sdlen = sizeof(sensordev);
-+slen = sizeof(sensor);
-+
-+for (dev = 0;; dev++) {
-+mib[2] = dev;
-+if (sysctl(mib, 3, &sensordev, &sdlen, NULL, 0) == -1) {
-+break;
-+}
-+/* 'path' is the node within the full path */
-+if (BEGINS_WITH(sensordev.xname, "acpibat")) {
-+/* power0 */
-+mib[3] = SENSOR_WATTS;
-+mib[4] = 0;
-+if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) {
-+/* try current0 */
-+mib[3] = SENSOR_AMPS;
-+if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1)
-+continue;
-+volts = sensor.value;
-+
-+/* we also need current
[gentoo-commits] repo/gentoo:master commit in: x11-misc/i3status/files/
commit: 4097ed2f371ed7a3afab0ace3b70162c91a561c8 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Thu Aug 10 17:48:05 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Aug 13 11:29:19 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4097ed2f x11-misc/i3status: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/5383 .../i3status/files/i3status-2.10-pulseaudio.patch | 46 -- 1 file changed, 46 deletions(-) diff --git a/x11-misc/i3status/files/i3status-2.10-pulseaudio.patch b/x11-misc/i3status/files/i3status-2.10-pulseaudio.patch deleted file mode 100644 index 991ce036cd4..000 --- a/x11-misc/i3status/files/i3status-2.10-pulseaudio.patch +++ /dev/null @@ -1,46 +0,0 @@ -Make dependency on pulseaudio optional. - -It's unfortunately not upstreamable. See: - -https://github.com/i3/i3status/pull/43 -https://bugs.gentoo.org/show_bug.cgi?id=570786 - a/Makefile -+++ b/Makefile -@@ -49,6 +49,10 @@ ifeq ($(OS),NetBSD) - LIBS+=-lprop - endif - -+ifeq ($(OS),OpenBSD) -+LIBS+=-lpthread -+endif -+ - # This probably applies for any pkgsrc based system - ifneq (, $(filter $(OS), NetBSD DragonFly)) - CFLAGS+=-I/usr/pkg/include/ -@@ -70,9 +74,12 @@ CFLAGS += -idirafter yajl-fallback - OBJS:=$(wildcard src/*.c *.c) - OBJS:=$(OBJS:.c=.o) - --ifeq ($(OS),OpenBSD) -+PULSE ?= 1 -+ifeq ($(PULSE),0) - OBJS:=$(filter-out src/pulse.o, $(OBJS)) --LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread -+LIBS:=$(filter-out -lpulse, $(LIBS)) -+else -+CPPFLAGS+=-DPULSE - endif - - src/%.o: src/%.c include/i3status.h a/src/print_volume.c -+++ b/src/print_volume.c -@@ -60,7 +60,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * - free(instance); - } - --#ifndef __OpenBSD__ -+#if !defined(__OpenBSD__) && defined(PULSE) - /* Try PulseAudio first */ - - /* If the device name has the format "pulse[:N]" where N is the
[gentoo-commits] repo/gentoo:master commit in: x11-misc/i3status/files/, x11-misc/i3status/
commit: 0b13c2ccf2270ed02b7b35eb8ad92c15a9a0b2c6
Author: Kacper Kowalik gentoo org>
AuthorDate: Sat Jan 21 15:58:48 2017 +
Commit: Kacper Kowalik gentoo org>
CommitDate: Sat Jan 21 15:58:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b13c2cc
x11-misc/i3status: version bump, drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-misc/i3status/Manifest | 3 +-
.../i3status/files/i3status-2.11-pulseaudio.patch | 42 ++
.../{i3status-2.8.ebuild => i3status-2.11.ebuild} | 19 ++
x11-misc/i3status/i3status-2.9.ebuild | 40 -
4 files changed, 55 insertions(+), 49 deletions(-)
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index edddeac..5accdbd 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -1,4 +1,3 @@
DIST i3status-2.10.tar.bz2 53684 SHA256
daf5d07611b054a43da1a3d28850b05e2dbdbd6d25fd5e25ede98bb1b66e2791 SHA512
a514331d83458de15b548686d423b38a7a9198a7a31ca3001f3f136e4b873617c397a0073bb10b44fa8613bc12ed4fa4e384d099d31122a8afbd0df5de2e9c85
WHIRLPOOL
8f585e208a0764e1caf43aa99bb401261f84e7fc7973aa1448a752710e8997dd3492e686a65b2318a3d30534f6073a7e207cb366f5852a0ce63e8a86f709ccbc
+DIST i3status-2.11.tar.bz2 54970 SHA256
98db7e730f0ce908eb656ac10d713ae6a885676621391d54f00b719752f18c5f SHA512
37d2549649178122fab7411a3c714ae041d9c726c140002ec6ccd1a4f2e28af618ca28af9aa3bc45d0cafda0b25dd438c9ed4c3739ddcc0511e19305657730f0
WHIRLPOOL
d676b9a66139778dcfe5ea6418bd60ebf89afe3dbce0a14d34f6d46ec52ccf0900727c4727e8fd6f03e6d0466af07f69f00a6da0b6e997bbdf9d57dbe2a8f7bc
DIST i3status-2.7.tar.bz2 37594 SHA256
073f4e5de3bc5afc1f23c52ea52e2aa4b90ca8a012f28ba2c5fac3c33474a632 SHA512
7db6aded37e131c75e99f939102ac3b953817456921eec6b9054b6c4e0855f8d1f20638cbcd0f0b18ad24201041a01ade98c4d4cde6ff14bb11508454b8d3062
WHIRLPOOL
3bc2b599cda1d0f9e5442f03dc4e8700f84172c45d193b502f2894420c9be4a5c93022d199a718864a34c8fbbd6dc9d0d911c4c484a826fa4640514418e2f887
-DIST i3status-2.8.tar.bz2 40422 SHA256
ab06c5dd454354e6fc64354082616115082b70dc3906361bce5a02beb0f807fe SHA512
b1e3dbc480660a96a662ccb996769203fae22448f8801cabb56c339ba63ac84d30018c897e2ecac23f513cfe9d9a7d9200a351a2e6b10a42c1929c28e8e22c02
WHIRLPOOL
8845a10bcdfd68336439c92197629b5e426e474dcfe68fd9cc11b7097476c32337c360429b344fdbe03e70d8b47c5eefd3f489bf2b78fd1df3f2f091a568
-DIST i3status-2.9.tar.bz2 46615 SHA256
42eb09500c625fcac9a7125a29e7bf532ca4b8540942418ee3253aa15e5e9de3 SHA512
67d026fcb4cc2a8af39cc268c962d49c4d3f2473bad92d99fa7fba876235ac83471663b318f890e9d7d3e9e06897286d693d352e686376a3a4876f253f309cb6
WHIRLPOOL
1a94da2c5d3bc4585908367b14ca1b18fada2a0d3c93a231969e6b92586a66bbcf5f67b0952bc6535e44f2e3ef1f66f000b55049b586821697f4fb26783da6cf
diff --git a/x11-misc/i3status/files/i3status-2.11-pulseaudio.patch
b/x11-misc/i3status/files/i3status-2.11-pulseaudio.patch
new file mode 100644
index ..2447f16
--- /dev/null
+++ b/x11-misc/i3status/files/i3status-2.11-pulseaudio.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index 3084ae7..7ea1964 100644
+--- a/Makefile
b/Makefile
+@@ -58,6 +57,10 @@ ifeq ($(OS),NetBSD)
+ LIBS+=-lprop
+ endif
+
++ifeq ($(OS),OpenBSD)
++LIBS+=-lpthread
++endif
++
+ # This probably applies for any pkgsrc based system
+ ifneq (, $(filter $(OS), NetBSD DragonFly))
+ CFLAGS+=-I/usr/pkg/include/
+@@ -79,9 +82,12 @@ CFLAGS += -idirafter yajl-fallback
+ OBJS:=$(sort $(wildcard src/*.c *.c))
+ OBJS:=$(OBJS:.c=.o)
+
+-ifeq ($(OS),OpenBSD)
++PULSE ?= 1
++ifeq ($(PULSE),0)
+ OBJS:=$(filter-out src/pulse.o, $(OBJS))
+ LIBS:=$(filter-out -lpulse, $(LIBS))
++else
++CPPFLAGS+=-DPULSE
+ endif
+
+ src/%.o: src/%.c include/i3status.h
+diff --git a/src/print_volume.c b/src/print_volume.c
+index 51e84f3..9e015c0 100644
+--- a/src/print_volume.c
b/src/print_volume.c
+@@ -61,7 +61,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const
char *fmt, const char *
+ free(instance);
+ }
+
+-#ifndef __OpenBSD__
++#if !defined(__OpenBSD__) && defined(PULSE)
+ /* Try PulseAudio first */
+
+ /* If the device name has the format "pulse[:N]" where N is the
diff --git a/x11-misc/i3status/i3status-2.8.ebuild
b/x11-misc/i3status/i3status-2.11.ebuild
similarity index 68%
rename from x11-misc/i3status/i3status-2.8.ebuild
rename to x11-misc/i3status/i3status-2.11.ebuild
index b594bbd..67aa8db 100644
--- a/x11-misc/i3status/i3status-2.8.ebuild
+++ b/x11-misc/i3status/i3status-2.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-inherit toolchain-funcs versionator fcaps
+inherit eutils toolchain-funcs fcaps
DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
HOMEPAGE="http://i3wm.org/i3status/";
@@ -13,21 +13,26 @@ SRC_URI="http://i3wm.org/${PN}/${P}.tar.
