mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-18 03:23:20 -04:00
Merge updates from master
This commit is contained in:
@@ -1 +1 @@
|
||||
DIST cpufetch-1.05.tar.gz 2787010 BLAKE2B 3366635f1fd7a47979631aba92c3e7bdcfb66e71d446e2ac5b4361c47c4ba3054866d9a48ca4d81bfd580b49f7ba9e79e46616e216685dfad2e4e133b71274e0 SHA512 ec303e292ddc928e5cf2c81e0b38fd0853e1a3ffb9a20413e09677ec91777806c4774a0a6d618adde4f13328c930ce35a80e679609438542486999ab9e1308b4
|
||||
DIST cpufetch-1.06.tar.gz 2833392 BLAKE2B 552a4aec946da7ad70e92357b323582b29d81bd7eede6937809353b7f6e3008ef92bbc33f7ca8a24e6625d9f0145519113c3ef58ca4eb13782b90278e5242ba1 SHA512 ee907372608bed6af713f5e071e08a96c86cf0c7aeff1a7bf8511c2b03804d71e63d23e7aa409c2a7da5a0cf198a8a419e26210174f052c36bffa56135609d07
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -1,10 +1,13 @@
|
||||
https://bugs.gentoo.org/924006
|
||||
Respect CFLAGS and LDFLAGS.
|
||||
diff --git a/Makefile b/Makefile
|
||||
index a4e5d13..2eb98c4 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -24,17 +24,17 @@ ifneq ($(OS),Windows_NT)
|
||||
@@ -30,17 +30,17 @@ ifneq ($(OS),Windows_NT)
|
||||
HEADERS += $(SRC_DIR)freq/freq.h
|
||||
CFLAGS += -pthread
|
||||
endif
|
||||
endif
|
||||
- CFLAGS += -DARCH_X86 -std=c99 -fstack-protector-all
|
||||
+ CFLAGS += -DARCH_X86 -std=c99
|
||||
else ifeq ($(arch), $(filter $(arch), ppc64le ppc64 ppcle ppc))
|
||||
@@ -15,23 +18,23 @@ Respect CFLAGS and LDFLAGS.
|
||||
+ CFLAGS += -DARCH_PPC -std=gnu99 -Wno-language-extension-token
|
||||
else ifeq ($(arch), $(filter $(arch), arm aarch64_be aarch64 arm64 armv8b armv8l armv7l armv6l))
|
||||
SRC_DIR=src/arm/
|
||||
SOURCE += $(COMMON_SRC) $(SRC_DIR)midr.c $(SRC_DIR)uarch.c $(SRC_COMMON)soc.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
|
||||
HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
|
||||
SOURCE += $(COMMON_SRC) $(SRC_DIR)midr.c $(SRC_DIR)uarch.c $(SRC_COMMON)soc.c $(SRC_DIR)soc.c $(SRC_COMMON)pci.c $(SRC_DIR)udev.c sve.o
|
||||
HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_COMMON)pci.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
|
||||
- CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99 -fstack-protector-all
|
||||
+ CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99
|
||||
|
||||
os := $(shell uname -s)
|
||||
ifeq ($(os), Darwin)
|
||||
@@ -45,7 +45,7 @@ ifneq ($(OS),Windows_NT)
|
||||
SRC_DIR=src/riscv/
|
||||
SOURCE += $(COMMON_SRC) $(SRC_DIR)riscv.c $(SRC_DIR)uarch.c $(SRC_COMMON)soc.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
|
||||
HEADERS += $(COMMON_HDR) $(SRC_DIR)riscv.h $(SRC_DIR)uarch.h $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_DIR)udev.h $(SRC_DIR)socs.h
|
||||
- CFLAGS += -DARCH_RISCV -Wno-unused-parameter -std=c99 -fstack-protector-all
|
||||
+ CFLAGS += -DARCH_RISCV -Wno-unused-parameter -std=c99
|
||||
# Check if the compiler supports -march=armv8-a+sve. We will use it (if supported) to compile SVE detection code later
|
||||
is_sve_flag_supported := $(shell $(CC) -march=armv8-a+sve -c $(SRC_DIR)sve.c -o sve_test.o 2> /dev/null && echo 'yes'; rm -f sve_test.o)
|
||||
@@ -56,7 +56,7 @@ ifneq ($(OS),Windows_NT)
|
||||
SRC_DIR=src/riscv/
|
||||
SOURCE += $(COMMON_SRC) $(SRC_DIR)riscv.c $(SRC_DIR)uarch.c $(SRC_COMMON)soc.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
|
||||
HEADERS += $(COMMON_HDR) $(SRC_DIR)riscv.h $(SRC_DIR)uarch.h $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_DIR)udev.h $(SRC_DIR)socs.h
|
||||
- CFLAGS += -DARCH_RISCV -Wno-unused-parameter -std=c99 -fstack-protector-all
|
||||
+ CFLAGS += -DARCH_RISCV -Wno-unused-parameter -std=c99
|
||||
else
|
||||
# Error lines should not be tabulated because Makefile complains about it
|
||||
$(warning Unsupported arch detected: $(arch). See https://github.com/Dr-Noob/cpufetch#1-support)
|
||||
@@ -65,7 +65,6 @@ else
|
||||
@@ -76,7 +76,6 @@ else
|
||||
OUTPUT=cpufetch.exe
|
||||
endif
|
||||
|
||||
@@ -39,7 +42,7 @@ Respect CFLAGS and LDFLAGS.
|
||||
all: $(OUTPUT)
|
||||
|
||||
debug: CFLAGS += -g -O0
|
||||
@@ -78,19 +77,19 @@ strict: CFLAGS += -O2 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
|
||||
@@ -89,22 +88,22 @@ strict: CFLAGS += -O2 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
|
||||
strict: $(OUTPUT)
|
||||
|
||||
freq_nov.o: Makefile $(SRC_DIR)freq/freq_nov.c $(SRC_DIR)freq/freq_nov.h $(SRC_DIR)freq/freq.h
|
||||
@@ -54,6 +57,10 @@ Respect CFLAGS and LDFLAGS.
|
||||
- $(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx512f -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
|
||||
+ $(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -c -mavx512f -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
|
||||
|
||||
sve.o: Makefile $(SRC_DIR)sve.c $(SRC_DIR)sve.h
|
||||
- $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SVE_FLAGS) -c $(SRC_DIR)sve.c -o $@
|
||||
+ $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SVE_FLAGS) $(LDFLAGS) -c $(SRC_DIR)sve.c -o $@
|
||||
|
||||
$(OUTPUT): Makefile $(SOURCE) $(HEADERS)
|
||||
ifeq ($(GIT_VERSION),"")
|
||||
- $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
|
||||
@@ -1 +1 @@
|
||||
DIST azpainter-v3.0.10.tar.bz2 993607 BLAKE2B 91b9fa07fdedd9126a0729d82afc8d425b81f232a540986465dc27b9b764d68d1b50fd1f3293a338e86804eb32a24a536ed757cd45444acbd193bd826988f80d SHA512 5c37347b674a61bb940c63a26d8e96dcbc8784fb1dac751f338f327f10dd6c240011d11e43a8096636f79de3cf8e9c58d1f72653ad5ca3ffbc67620925bb0bf1
|
||||
DIST azpainter-v3.0.11.tar.bz2 993850 BLAKE2B d1aa9bd210d3a59a1310a121c129ff69f6c77724ebbb5688102ff778fa961f362c4bcb206e3acb9c1ff70d2617fb904b1dd1ced44235fcf890af984b83c5d5ba SHA512 07d04582dab0315b7c1c1d9bc6b95ce117340bfedbd09a46926c23d2c01752462f4173f150b1a1c713e118cd6ae50d19f4ac28ed691fb0d089c7d300cc86bad9
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
https://bugs.gentoo.org/937497
|
||||
https://github.com/Chatterino/chatterino2/commit/f36c73019db582fd3fec32099b75060f27cfd98f
|
||||
--- a/src/common/SignalVector.hpp
|
||||
+++ b/src/common/SignalVector.hpp
|
||||
@@ -155,7 +155,7 @@ class SignalVector
|
||||
decltype(auto) operator[](size_t index)
|
||||
{
|
||||
assertInGuiThread();
|
||||
- return this->items[index];
|
||||
+ return this->items_[index];
|
||||
}
|
||||
|
||||
auto empty()
|
||||
@@ -1,2 +1,2 @@
|
||||
DIST bibata-xcursors-2.0.2.tar.gz 96043910 BLAKE2B 38495942a40fd252a8d96e585b0da1b858ef702b6df806d9fdaafddb497df15ffef599801806161ae3108e4b80236503b9190ab021b82e476fa548fcc47dd68e SHA512 192cdd81c9ab0dc7d8acd1e20454f6c954ce1af031d083a5c8a22a1f28a101667e0c30eecb84a626cf843cc47068bf728726277bc0b56df757dff96d002aea98
|
||||
DIST bibata-xcursors-2.0.3.tar.gz 95694863 BLAKE2B 68344c46d07982351e36267e8ade471b8fb25895d7d799f2ff5aab88f79d23671105a869d9a029a8ea10bc76e753e2dce576c780901017f9a8255f389f31f6a8 SHA512 fe05f908e2bf16c0072a34f4fd2233ed2bf03740b1ea7ab30ce4be43810fc5dec47844af532ff3c52b6cc75318a3653599f44b48e88623b9250787ba1c7982f1
|
||||
DIST bibata-xcursors-2.0.7.tar.xz 21862160 BLAKE2B fe54a775968ea77657cdffe79a08d6a7c56c019d196424c0eb125535e725f7790186ba37a8ed4f9eefac92355939b5e8f5e1e4a9578b8cd0430438c1db5074c9 SHA512 b1e9dff650895168e5de31e0581089b7c123379461490a949bb596c0453317a7b3224452aa6f36a28b70ca4ae440e97d08121ef430d7012f32137381720d095b
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
# Copyright 2022 Gentoo Authors
|
||||
# Copyright 2022-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DESCRIPTION="Opensource, compact, and material-designed cursor set"
|
||||
HOMEPAGE="https://github.com/ful1e5/Bibata_Cursor"
|
||||
SRC_URI="https://github.com/ful1e5/Bibata_Cursor/releases/download/v${PV}/Bibata.tar.gz -> ${P}.tar.gz"
|
||||
SRC_URI="https://github.com/ful1e5/Bibata_Cursor/releases/download/v${PV}/Bibata.tar.xz -> ${P}.tar.xz"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
@@ -16,6 +16,6 @@ KEYWORDS="~amd64 ~x86"
|
||||
RDEPEND="x11-libs/libXcursor"
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/cursors/xorg-x11
|
||||
doins -r Bibata-{Modern,Original}-{Amber,Classic,Ice}
|
||||
insinto /usr/share/icons
|
||||
doins -r Bibata-{Modern,Original}-{Amber,Classic,Ice}{,-Right}
|
||||
}
|
||||
Reference in New Issue
Block a user