* [gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks-contrib/, x11-misc/i3blocks-contrib/files/
@ 2021-06-08 14:44 Ben Kohler
0 siblings, 0 replies; 4+ messages in thread
From: Ben Kohler @ 2021-06-08 14:44 UTC (permalink / raw
To: gentoo-commits
commit: 2ddd26f1e9849014ce2ed03415df86f055dfc7f3
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 8 14:44:22 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jun 8 14:44:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ddd26f1
x11-misc/i3blocks-contrib: fix direct gcc call
Closes: https://bugs.gentoo.org/794919
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
.../files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch | 10 ++++++++++
x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild | 7 ++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch
index da72ecd10d8..764cd4b2b73 100644
--- a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch
+++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch
@@ -10,6 +10,16 @@
$(P): $(OBJECTS)
--- a/brightness/Makefile
+++ b/brightness/Makefile
+@@ -1,6 +1,6 @@
+-CC=gcc
+-AS=as
+-LD=ld
++CC ?= gcc
++AS ?= as
++LD ?= ld
+ OBJDUMP=objdump
+ OBJCOPY=objcopy
+ SIZE=size
@@ -16,14 +16,14 @@
PRG = brightness
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
index 51f71d6cbff..88dab674b53 100644
--- a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit optfeature
+inherit optfeature toolchain-funcs
DESCRIPTION="A set of scripts for i3blocks, contributed by the community"
HOMEPAGE="https://github.com/vivien/i3blocks-contrib"
@@ -24,6 +24,11 @@ src_prepare() {
default
}
+src_compile() {
+ tc-export AR CC LD
+ default
+}
+
src_install() {
emake DESTDIR="${D}" PREFIX=/usr install
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks-contrib/, x11-misc/i3blocks-contrib/files/
@ 2023-09-27 17:56 Ben Kohler
0 siblings, 0 replies; 4+ messages in thread
From: Ben Kohler @ 2023-09-27 17:56 UTC (permalink / raw
To: gentoo-commits
commit: e6f1926d1b73035f496c7bafe11c5c1da9aba041
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 17:20:17 2023 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 17:56:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f1926d
x11-misc/i3blocks-contrib: fix clang/llvm build
Closes: https://bugs.gentoo.org/832200
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
...cks-contrib-2.0.0-fix-build-on-clang-llvm.patch | 25 ++++++++++++++++++++++
.../i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild | 5 ++++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-fix-build-on-clang-llvm.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-fix-build-on-clang-llvm.patch
new file mode 100644
index 000000000000..bf92d791df55
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-fix-build-on-clang-llvm.patch
@@ -0,0 +1,25 @@
+From 230f42f5bc5ebc44062820bde1e9e40ae0746c00 Mon Sep 17 00:00:00 2001
+From: Corentin Rondier <contact@rondier.io>
+Date: Sun, 24 Sep 2023 23:22:58 +0200
+Subject: [PATCH] cpu_usage2: fix build failures on clang/llvm
+
+Remove a non-standard suffix on a floating-point literal, causing build failures on clang/LLVM
+
+fixes #504
+---
+ cpu_usage2/cpu_usage2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cpu_usage2/cpu_usage2.c b/cpu_usage2/cpu_usage2.c
+index 72709037..483c4c81 100644
+--- a/cpu_usage2/cpu_usage2.c
++++ b/cpu_usage2/cpu_usage2.c
+@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
+ sleep(t);
+ total = get_usage(&used);
+
+- display(label, 100.0D * (used - old_used) / (total - old_total),
++ display(label, 100.0 * (used - old_used) / (total - old_total),
+ warning, critical, decimals);
+ fflush(stdout);
+ old_total = total;
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
index 2ee22731467a..8d3664dbaec5 100644
--- a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
@@ -16,7 +16,10 @@ DEPEND=""
RDEPEND=">=x11-misc/i3blocks-1.5"
BDEPEND=""
-PATCHES=( "${FILESDIR}"/${P}-respect-CFLAGS.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-respect-CFLAGS.patch
+ "${FILESDIR}"/${P}-fix-build-on-clang-llvm.patch
+)
src_prepare() {
sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks-contrib/, x11-misc/i3blocks-contrib/files/
@ 2021-06-08 12:18 Ben Kohler
0 siblings, 0 replies; 4+ messages in thread
From: Ben Kohler @ 2021-06-08 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 7f10f39477e20c0bd1951069826659a89d86eff4
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 7 15:15:22 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jun 8 12:18:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f10f394
x11-misc/i3blocks-contrib: bump to 2.0.0
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
x11-misc/i3blocks-contrib/Manifest | 1 +
.../i3blocks-contrib-2.0.0-respect-CFLAGS.patch | 58 ++++++++++++++++++++++
.../i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild | 52 +++++++++++++++++++
3 files changed, 111 insertions(+)
diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest
index 3cc417c32e8..5cebdc38823 100644
--- a/x11-misc/i3blocks-contrib/Manifest
+++ b/x11-misc/i3blocks-contrib/Manifest
@@ -1 +1,2 @@
DIST i3blocks-contrib-1.4.0_p20201127.tar.gz 738457 BLAKE2B 1db16c40323d0c191bb44c50d6a66523391adfdf9652976f78238fffe0ee50d99d3bd6fbcfd1a0eeef8308fd466a3eeda479299f462b4d4d31ae2f2bc7ea6b31 SHA512 ff09c7b8e4b630d014f0441342835dbf03642f32de6806a1204eccb6166eade190abe43b331ef72aaa3ba5a77f9690ae8c36a9ef9aa6d312ae5e543a46b99a72
+DIST i3blocks-contrib-2.0.0.tar.gz 840332 BLAKE2B e220566edea4249c25ac80dcba3e24fc37de842049ad072a14fd5003e298ec9a4b4f36cd3937682ab00355b1f1c3fc7ea795ac6593f24aed2438b465ad338d8f SHA512 30cf9297e710a2d685b275d424de817e7940a487c615e64ffaf15e0f90e937bedbd3921dfeece081e32f720b6add92c0790fa7a29e4e8f81f85c3a74cbcea835
diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch
new file mode 100644
index 00000000000..da72ecd10d8
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch
@@ -0,0 +1,58 @@
+--- a/bandwidth2/Makefile
++++ b/bandwidth2/Makefile
+@@ -1,6 +1,6 @@
+ P=bandwidth2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=c11
++CFLAGS ?= -g -Wall -Werror -O2 -std=c11
+ LDLIBS=
+
+ $(P): $(OBJECTS)
+--- a/brightness/Makefile
++++ b/brightness/Makefile
+@@ -16,14 +16,14 @@
+
+ PRG = brightness
+ INCLUDES := -Iinc
+-CFLAGS := $(INCLUDES) $(DEFS) $(WARN_LEVEL) -pipe -O0 -g3 -std=c11
++CFLAGS ?= -pipe -O0 -g3 -std=c11
+
+ debug: CFLAGS += -O0 -g3
+ debug: all
+
+ release: CFLAGS += -O2
+ release: all
+-LDFLAGS = $(LIBS) -ffunction-sections -Wl,--gc-sections
++LDFLAGS ?= -ffunction-sections -Wl,--gc-sections
+
+ SRC_C := $(wildcard *.c) $(wildcard src/*.c)
+ SRC_A := $(wildcard src/*.s)
+@@ -41,7 +41,7 @@
+
+ $(OBJ_DIR)/%.o: %.c
+ @mkdir -p $(@D)
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CFLAGS) $(INCLUDES) $(DEFS) $(WARN_LEVEL) -o $@ -c $<
+
+ $(BIN_DIR)/$(PRG): $(OBJECTS)
+ @mkdir -p $(@D)
+--- a/cpu_usage2/Makefile
++++ b/cpu_usage2/Makefile
+@@ -1,6 +1,6 @@
+ P=cpu_usage2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=gnu11
++CFLAGS ?= -g -Wall -Werror -O2 -std=gnu11
+ LDLIBS=
+
+ $(P): $(OBJECTS)
+--- a/memory2/Makefile
++++ b/memory2/Makefile
+@@ -1,6 +1,6 @@
+ P=memory2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=c11
++CFLAGS ?= -g -Wall -Werror -O2 -std=c11
+ LDLIBS=
+
+ $(P): $(OBJECTS)
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
new file mode 100644
index 00000000000..51f71d6cbff
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit optfeature
+
+DESCRIPTION="A set of scripts for i3blocks, contributed by the community"
+HOMEPAGE="https://github.com/vivien/i3blocks-contrib"
+SRC_URI="https://github.com/vivien/i3blocks-contrib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND=""
+RDEPEND="!<x11-misc/i3blocks-1.5
+ >=x11-misc/i3blocks-1.5"
+BDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-respect-CFLAGS.patch )
+
+src_prepare() {
+ sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX=/usr install
+}
+
+pkg_postinst() {
+ optfeature_header "The following deps may be required for certain ${PN} scripts:"
+ optfeature "backlight" sys-power/acpilight x11-apps/xbacklight
+ optfeature "battery{,2,bar}" sys-power/acpi
+ optfeature "colorpicker" x11-misc/grabc x11-misc/xdotool
+ optfeature "cpu_usage" app-admin/sysstat
+ optfeature "disk-io" app-admin/sysstat
+ optfeature "email" dev-python/keyring gnome-base/gnome-keyring
+ optfeature "eyedropper" media-fonts/fontawesome x11-misc/grabc x11-misc/xclip
+ optfeature "github" dev-util/github-cli media-fonts/fontawesome
+ optfeature "gpu-load" x11-drivers/nvidia-drivers app-misc/radeontop
+ optfeature "i3-focusedwindow" x11-apps/xprop
+ optfeature "kbdd_layout" x11-misc/kbdd
+ optfeature "key_light" sys-power/upower
+ optfeature "kubernetes" sys-cluster/kubectl
+ optfeature "monitor_manager" "dev-lang/python[tk] media-fonts/fontawesome x11-apps/xrandr"
+ optfeature "purpleair" app-misc/jq net-misc/curl
+ optfeature "rofi-calendar" x11-misc/rofi
+ optfeature "ssid and wlan-dbm" net-wireless/iw
+ optfeature "temperature" sys-apps/lm-sensors
+ optfeature "ytdl-mpv" "media-fonts/fontawesome media-video/mpv x11-misc/xclip net-misc/youtube-dl"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks-contrib/, x11-misc/i3blocks-contrib/files/
@ 2021-02-02 13:23 Ben Kohler
0 siblings, 0 replies; 4+ messages in thread
From: Ben Kohler @ 2021-02-02 13:23 UTC (permalink / raw
To: gentoo-commits
commit: 866d6a411c7dcf7891a11de2649b9c0751aa4bc8
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 2 13:18:42 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 13:23:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=866d6a41
x11-misc/i3blocks-contrib: respect CFLAGS
Closes: https://bugs.gentoo.org/768318
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
.../files/i3blocks-contrib-respect-CFLAGS.patch | 22 ++++++++++++++++++++++
.../i3blocks-contrib-1.4.0_p20201127.ebuild | 2 ++
2 files changed, 24 insertions(+)
diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch
new file mode 100644
index 00000000000..15d36b130db
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch
@@ -0,0 +1,22 @@
+diff -ur a/bandwidth2/Makefile b/bandwidth2/Makefile
+--- a/bandwidth2/Makefile 2021-02-02 07:03:47.002894030 -0600
++++ b/bandwidth2/Makefile 2021-02-02 07:05:21.556854777 -0600
+@@ -1,6 +1,6 @@
+ P=bandwidth2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=c11
++CFLAGS ?= -g -Wall -Werror -O2 -std=c11
+ LDLIBS=
+
+ $(P): $(OBJECTS)
+diff -ur a/cpu_usage2/Makefile b/cpu_usage2/Makefile
+--- a/cpu_usage2/Makefile 2021-02-02 07:03:47.004894029 -0600
++++ b/cpu_usage2/Makefile 2021-02-02 07:05:51.138842328 -0600
+@@ -1,6 +1,6 @@
+ P=cpu_usage2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=gnu11
++CFLAGS ?= -g -Wall -Werror -O2 -std=gnu11
+ LDLIBS=
+
+ $(P): $(OBJECTS)
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
index 01e8a293c8a..701962eefc8 100644
--- a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
@@ -19,6 +19,8 @@ RDEPEND="!<x11-misc/i3blocks-1.5
>=x11-misc/i3blocks-1.5"
BDEPEND=""
+PATCHES=( "${FILESDIR}"/${PN}-respect-CFLAGS.patch )
+
src_prepare() {
sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile
default
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-27 17:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-08 14:44 [gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks-contrib/, x11-misc/i3blocks-contrib/files/ Ben Kohler
-- strict thread matches above, loose matches on Subject: below --
2023-09-27 17:56 Ben Kohler
2021-06-08 12:18 Ben Kohler
2021-02-02 13:23 Ben Kohler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox