Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (bbb87bf072b4b5c463b7a62008f394aad8592b64)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (bbb87bf072b4b5c463b7a62008f394aad8592b64)
  • Date: Sat, 29 Oct 2022 22:44:13 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

utils/htop/DEPENDS | 1 -
utils/htop/DETAILS | 10 +++++-----
utils/htop/HISTORY | 6 ++++++
utils/htop/PRE_BUILD | 3 ---
utils/htop/htop-2.2.0-gcc-10.patch | 27 ---------------------------
5 files changed, 11 insertions(+), 36 deletions(-)

New commits:
commit bbb87bf072b4b5c463b7a62008f394aad8592b64
Author: Conner <connerclere AT gmail.com>
Commit: Pavel Vinogradov <public AT sourcemage.org>

htop: => 3.2.1

diff --git a/utils/htop/DEPENDS b/utils/htop/DEPENDS
index 863def7..0c6b6ed 100755
--- a/utils/htop/DEPENDS
+++ b/utils/htop/DEPENDS
@@ -1,3 +1,2 @@
depends ncurses &&
-depends python &&
suggest_depends lsof "" "" "to display open files for a process (runtime)"
diff --git a/utils/htop/DETAILS b/utils/htop/DETAILS
index ad6ed67..c7978a9 100755
--- a/utils/htop/DETAILS
+++ b/utils/htop/DETAILS
@@ -1,11 +1,11 @@
SPELL=htop
- VERSION=2.2.0
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=3.2.1
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://hisham.hm/htop/releases/$VERSION/htop-$VERSION.tar.gz
- WEB_SITE=http://hisham.hm/htop/
+
SOURCE_URL[0]=http://github.com/htop-dev/htop/releases/download/$VERSION/$SPELL-$VERSION.tar.xz
+ WEB_SITE=http://htop.dev
ENTERED=20050218
-
SOURCE_HASH=sha512:ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
+
SOURCE_HASH=sha512:f412c10ebdec4fb026fb93a79a9b0b84612ad5a0d28e37f06713e6c895f70e92cbd09a8737d04f3d51102295d7a419eb2c3ec3907b96f553fda8ff3d1a2142b6
LICENSE[0]=GPL
KEYWORDS="utils"
SHORT="an interactive process viewer for Linux"
diff --git a/utils/htop/HISTORY b/utils/htop/HISTORY
index 25b7218..d737d6b 100644
--- a/utils/htop/HISTORY
+++ b/utils/htop/HISTORY
@@ -1,3 +1,9 @@
+2022-10-29 Conner Clere <connerclere AT gmail.com>
+ * PRE_BUILD: remove patch line
+ * DEPENDS: remove no longer needed python dependency
+ * DETAILS: version 3.2.1, update source location & website
+ * htop-2.2.0-gcc-10.patch: removed, no longer needed
+
2020-07-12 Florian Franzmann <bwlf AT bandrate.org>
* PRE_BUILD, htop-2.2.0-gcc-10.patch: add patch to fix linking error
with gcc 10
diff --git a/utils/htop/PRE_BUILD b/utils/htop/PRE_BUILD
index d4076b5..725228f 100755
--- a/utils/htop/PRE_BUILD
+++ b/utils/htop/PRE_BUILD
@@ -1,8 +1,5 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

-
-patch -p1 < "$SPELL_DIRECTORY/htop-2.2.0-gcc-10.patch" &&
-
sedit 's:ncursesw/curses.h:curses.h:' RichString.h &&
sedit 's:ncursesw/curses.h:curses.h:' RichString.c
diff --git a/utils/htop/htop-2.2.0-gcc-10.patch
b/utils/htop/htop-2.2.0-gcc-10.patch
deleted file mode 100644
index dc49b0b..0000000
--- a/utils/htop/htop-2.2.0-gcc-10.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/CRT.h
-+++ b/CRT.h
-@@ -140,7 +140,7 @@ extern const char **CRT_treeStr;
-
- extern int CRT_delay;
-
--int* CRT_colors;
-+extern int* CRT_colors;
-
- extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
-
-@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount;
-
- extern int CRT_scrollWheelVAmount;
-
--char* CRT_termType;
-+extern char* CRT_termType;
-
- // TODO move color scheme to Settings, perhaps?
-
- extern int CRT_colorScheme;
-
--void *backtraceArray[128];
-+extern void *backtraceArray[128];
-
- #if HAVE_SETUID_ENABLED
-



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (bbb87bf072b4b5c463b7a62008f394aad8592b64), Pavel Vinogradov, 10/29/2022

Archive powered by MHonArc 2.6.24.

Top of Page