pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/btop
Module Name: pkgsrc
Committed By: fox
Date: Sun Dec 28 02:25:17 UTC 2025
Modified Files:
pkgsrc/sysutils/btop: Makefile PLIST distinfo
pkgsrc/sysutils/btop/patches: patch-Makefile
Removed Files:
pkgsrc/sysutils/btop/patches: patch-src_btop.cpp
patch-src_netbsd_btop__collect.cpp
Log Message:
sysutils/btop: Update to 1.4.6
- Remove the upstreamed patches.
- Update required GCC to 14.
- Fix permissions for the files.
Changes since 1.4.5:
## v1.4.6
References | Description | Author(s)
--- | --- | ---
#1272 | Skip 'H' and 'HX' suffix in AMD cpu name trimming | @ramdomPTM
#1268 | feature: add process renice functionality | @goddamnparticle
#1285 | Revert "Use /sys/dev/block/MAJOR:MINOR instead of /sys/block/NAME for disk I/O" #1270 | @deckstose
#1277 | feat: Introduce cpu frequency display modes | @emiliopedrollo
#1282 | Fix CPU frequency detection for LoongArch CPUs | @Twopic2
#1275 | fix arrow keys that send 'O' instead of '[' | @vandabbin
#1251 | OpenBSD: battery: add support for watthour and watts sensors | @shtrophic
#1208 | Add Gotham theme | @jrebs
#1291 | Fix macOS deadlocks and race conditions in collector threads #1292 | @kuzmeech
#1296 | fix: btop crash on arm cpu | @emiliopedrollo @zenofile
#984 | Added ability to set which gpu vendors to enable | @thedustinmiller
#1274 | added tree toggle of expand/collapse for children of process | @irabrine
#1300 | Use right key codes to match f1 and f2 keys | @vandabbin
#1305 | Handle missing SMC gracefully on macOS | @achille
#1309 | Fix redraw in proc list when changing sort order | @vandabbin
#1304 | Fix load average and GPU watts leaking past box border | @vandabbin
#1220 | feat: respect effective cpus from cgroup | @deckstose
#1218 | feat: display container engine | @deckstose
#1315 | feat: raise cpp standard to c++23 | @deckstose
d0cbaf7 | Add configuration toggle for terminal synchronization | @aristocratos
#1306 | Implement feat Process list pausing | @vandabbin
#1322 | flip name, command, and user sorting | @vandabbin
#1334 | fix tty theme for pause banner | @vandabbin
#1325 | test: add test harness with ctest | @deckstose
#1339 | fix: skip first argument of argv | @AlvaroParker
#1357 | feat: add --themes-dir flag | @adeci
#1359 | fix: don't over-/underflow when parsing --update argument | @yinghao-w
#1362 | fix segfault on musl systems | @v1cont
#1363 | Pass only static duration strings to Config::set in Config::apply_preset | @yinghao-w
#1366 | fix: cpu per-thread totals not reaching 100% | @Tom94
#1367 | Fix: Align boxes when Cpu bottom and Gpu on | @yinghao-w
#1372 | Minor fixes and improvements for NetBSD | @fraggerfox
#1377 | Fixed GPU rendering | @TheSovietPancakes
#1379 | Fix: Always collect GPU data when cpu_graph_lower = "Auto" | @yinghao-w
#1393 | Fix: humanized units shortening | @yinghao-w
#1401 | Feat: add mouse dragging of scrollbar | @yinghao-w
#1399 | feat: add cli option to dump default config | @deckstose
e969f43 | Added "save_config_on_exit" option to configuration | @aristocratos
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/btop/Makefile \
pkgsrc/sysutils/btop/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/btop/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/btop/patches/patch-Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/btop/patches/patch-src_btop.cpp \
pkgsrc/sysutils/btop/patches/patch-src_netbsd_btop__collect.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/btop/Makefile
diff -u pkgsrc/sysutils/btop/Makefile:1.7 pkgsrc/sysutils/btop/Makefile:1.8
--- pkgsrc/sysutils/btop/Makefile:1.7 Wed Oct 15 23:22:28 2025
+++ pkgsrc/sysutils/btop/Makefile Sun Dec 28 02:25:17 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2025/10/15 23:22:28 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2025/12/28 02:25:17 fox Exp $
-DISTNAME= btop-1.4.5
-PKGREVISION= 2
+DISTNAME= btop-1.4.6
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GITHUB:=aristocratos/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -11,6 +10,10 @@ HOMEPAGE= https://github.com/aristocrato
COMMENT= Colorful TTY resource monitor
LICENSE= apache-2.0
+# gcc 10 support was removed from the code base.
+# https://github.com/aristocratos/btop/pull/1106
+GCC_REQD+= 14
+
TOOL_DEPENDS+= lowdown-[0-9]*:../../textproc/lowdown
USE_LANGUAGES= c c++
@@ -31,6 +34,10 @@ SUBST_FILES.themes+= src/btop.cpp
SUBST_STAGE.themes= pre-configure
SUBST_MESSAGE.themes= Fixing hardcoded paths to themes.
+post-extract:
+ # Fix permission issues.
+ ${CHMOD} -R go-w ${WRKSRC}
+
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../mk/atomic64.mk"
.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/sysutils/btop/distinfo
diff -u pkgsrc/sysutils/btop/distinfo:1.7 pkgsrc/sysutils/btop/distinfo:1.8
--- pkgsrc/sysutils/btop/distinfo:1.7 Sat Oct 18 07:48:43 2025
+++ pkgsrc/sysutils/btop/distinfo Sun Dec 28 02:25:17 2025
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.7 2025/10/18 07:48:43 wiz Exp $
+$NetBSD: distinfo,v 1.8 2025/12/28 02:25:17 fox Exp $
-BLAKE2s (btop-1.4.5.tar.gz) = fc3729f7eb9c9b339c6521f938e2196afff3239d529d2dbf6b6e093cc0fa47cd
-SHA512 (btop-1.4.5.tar.gz) = 36e278c832d984e5d882dcf861855945edc31dd00cbe0a6c16b09de42b2416d865585985e999302a470068037fdecca754c8ee9e25940c9ae1df5196893f93a8
-Size (btop-1.4.5.tar.gz) = 1250099 bytes
-SHA1 (patch-Makefile) = f6d33e9460dd3d227043738a2cfc158b293a34fe
-SHA1 (patch-src_btop.cpp) = a85b0fea001b233914ca757ba736ad4a50381ba6
-SHA1 (patch-src_netbsd_btop__collect.cpp) = f8eb343ae32c4b6e5c9d3ea712471c74d1edfb68
+BLAKE2s (btop-1.4.6.tar.gz) = ae739c01ad6a5d0d5c0cf7a648c9c7b280c38566ba01dda8bd1a49da8fcb8c49
+SHA512 (btop-1.4.6.tar.gz) = b57c9cc6a5602d57b230ff7296dc2b80876d189a0e8410458c308d7946241392708bd96e777d749a43110d1bcb147e26f4f8d9f99bfaa5828c42c3de7b1dea7e
+Size (btop-1.4.6.tar.gz) = 1261873 bytes
+SHA1 (patch-Makefile) = 7cec0d616dd445ad139f0868141d15d1687bf402
Index: pkgsrc/sysutils/btop/PLIST
diff -u pkgsrc/sysutils/btop/PLIST:1.2 pkgsrc/sysutils/btop/PLIST:1.3
--- pkgsrc/sysutils/btop/PLIST:1.2 Sun May 11 10:18:07 2025
+++ pkgsrc/sysutils/btop/PLIST Sun Dec 28 02:25:17 2025
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2025/05/11 10:18:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/12/28 02:25:17 fox Exp $
bin/btop
man/man1/btop.1
share/applications/btop.desktop
-share/btop/README.md
share/btop/themes/HotPurpleTrafficLight.theme
share/btop/themes/adapta.theme
share/btop/themes/adwaita-dark.theme
@@ -16,6 +15,7 @@ share/btop/themes/everforest-dark-medium
share/btop/themes/everforest-light-medium.theme
share/btop/themes/flat-remix-light.theme
share/btop/themes/flat-remix.theme
+share/btop/themes/gotham.theme
share/btop/themes/greyscale.theme
share/btop/themes/gruvbox_dark.theme
share/btop/themes/gruvbox_dark_v2.theme
@@ -38,5 +38,6 @@ share/btop/themes/tokyo-night.theme
share/btop/themes/tokyo-storm.theme
share/btop/themes/tomorrow-night.theme
share/btop/themes/whiteout.theme
+share/doc/btop/README.md
share/icons/hicolor/48x48/apps/btop.png
share/icons/hicolor/scalable/apps/btop.svg
Index: pkgsrc/sysutils/btop/patches/patch-Makefile
diff -u pkgsrc/sysutils/btop/patches/patch-Makefile:1.2 pkgsrc/sysutils/btop/patches/patch-Makefile:1.3
--- pkgsrc/sysutils/btop/patches/patch-Makefile:1.2 Sat Oct 18 07:48:43 2025
+++ pkgsrc/sysutils/btop/patches/patch-Makefile Sun Dec 28 02:25:17 2025
@@ -1,39 +1,14 @@
-$NetBSD: patch-Makefile,v 1.2 2025/10/18 07:48:43 wiz Exp $
+$NetBSD: patch-Makefile,v 1.3 2025/12/28 02:25:17 fox Exp $
-Revert off color changes when done.
Fix the man page path.
---- Makefile.orig 2025-09-19 20:29:22.000000000 +0000
+--- Makefile.orig 2025-12-26 15:53:24.000000000 +0000
+++ Makefile
-@@ -297,28 +297,28 @@ distclean: clean
- @test -e lib/rocm_smi_lib/build && rm -rf lib/rocm_smi_lib/build || true
-
- install:
-- @printf "\033[1;92mInstalling binary to: \033[1;97m$(DESTDIR)$(PREFIX)/bin/btop\n"
-+ @printf "\033[1;92mInstalling binary to: \033[1;97m$(DESTDIR)$(PREFIX)/bin/btop\033[0m\n"
- @mkdir -p $(DESTDIR)$(PREFIX)/bin
- @cp -p $(TARGETDIR)/btop $(DESTDIR)$(PREFIX)/bin/btop
- @chmod 755 $(DESTDIR)$(PREFIX)/bin/btop
-- @printf "\033[1;92mInstalling doc to: \033[1;97m$(DESTDIR)$(PREFIX)/share/btop\n"
-+ @printf "\033[1;92mInstalling doc to: \033[1;97m$(DESTDIR)$(PREFIX)/share/btop\033[0m\n"
- @mkdir -p $(DESTDIR)$(PREFIX)/share/btop
- @cp -p README.md $(DESTDIR)$(PREFIX)/share/btop
- @printf "\033[1;92mInstalling themes to: \033[1;97m$(DESTDIR)$(PREFIX)/share/btop/themes\033[0m\n"
- @cp -pr themes $(DESTDIR)$(PREFIX)/share/btop
-- @printf "\033[1;92mInstalling desktop entry to: \033[1;97m$(DESTDIR)$(PREFIX)/share/applications/btop.desktop\n"
-+ @printf "\033[1;92mInstalling desktop entry to: \033[1;97m$(DESTDIR)$(PREFIX)/share/applications/btop.desktop\033[0m\n"
- @mkdir -p $(DESTDIR)$(PREFIX)/share/applications/
- @cp -p btop.desktop $(DESTDIR)$(PREFIX)/share/applications/btop.desktop
-- @printf "\033[1;92mInstalling PNG icon to: \033[1;97m$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/btop.png\n"
-+ @printf "\033[1;92mInstalling PNG icon to: \033[1;97m$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/btop.png\033[0m\n"
- @mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
- @cp -p Img/icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/btop.png
-- @printf "\033[1;92mInstalling SVG icon to: \033[1;97m$(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg\n"
-+ @printf "\033[1;92mInstalling SVG icon to: \033[1;97m$(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg\033[0m\n"
+@@ -317,9 +317,9 @@ install:
@mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
@cp -p Img/icon.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg
ifneq ($(wildcard btop.1),)
-- @printf "\033[1;92mInstalling man page to: \033[1;97m$(DESTDIR)$(PREFIX)/share/man/man1/btop.1\n"
+- @printf "\033[1;92mInstalling man page to: \033[1;97m$(DESTDIR)$(PREFIX)/share/man/man1/btop.1\033[0m\n"
- @mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
- @cp -p btop.1 $(DESTDIR)$(PREFIX)/share/man/man1/btop.1
+ @printf "\033[1;92mInstalling man page to: \033[1;97m$(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1/btop.1\033[0m\n"
@@ -42,7 +17,7 @@ Fix the man page path.
endif
#? Set SUID bit for btop as $SU_USER in $SU_GROUP
-@@ -347,8 +347,8 @@ uninstall:
+@@ -348,8 +348,8 @@ uninstall:
@rm -rfv $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/btop.png
@printf "\033[1;91mRemoving: \033[1;97m$(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg\033[0m\n"
@rm -rfv $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg
Home |
Main Index |
Thread Index |
Old Index