diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-24 19:58:07 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-24 19:58:07 +0000 |
commit | 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch) | |
tree | da76713365257a445f3ae3b95470917f59d46728 /sys-process/htop | |
parent | 4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff) |
gentoo resync : 24.02.2018
Diffstat (limited to 'sys-process/htop')
-rw-r--r-- | sys-process/htop/Manifest | 2 | ||||
-rw-r--r-- | sys-process/htop/files/htop-2.1.0-sysmacros.patch | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest index b28cb647d276..5f5364b2be29 100644 --- a/sys-process/htop/Manifest +++ b/sys-process/htop/Manifest @@ -1,5 +1,5 @@ AUX htop-2.0.2-tinfo.patch 3655 BLAKE2B 505aacb774b54e4c7d9238942ff74cc96d0f5c93c7b74e9531e41e2ffa994b4d475b16620b65b824c28da2856294ef7fcd3562d9c318d4adbcc30bb512431b0f SHA512 33273ddcb89e955ef499854fb9361b65bafa83cce8e91f4ef62dd70fc29e58e169148c957d9cd0c5a123b9e5fe66f838212c8066bff12ada38c430087d02b210 -AUX htop-2.1.0-sysmacros.patch 1070 BLAKE2B 66dbe1cd52dcd972a2d9a9cd927ef0fd16e77c95b9c00b6953620a02e7af32d16d3e92ee7620f7dd39c9eb465575b82817fb57ea348fa55767886aeff1a2cca6 SHA512 e84be1b866209f0eef4f62021725757c57bdad3ef99aab79c4ce3d6f48d1c6dab1189d37681f91b929c091f76311dba9aba0388b61c7253a9fa5f1e939e2df0b +AUX htop-2.1.0-sysmacros.patch 1124 BLAKE2B 4fa3ef919eb6e814d2bab2b749edd36a805a7b3369c311cc6a4b0aae8da7b15c14aa3e3b7ff6f8b9ce9426c06942b96e31ee7e370ed6bac08f5ff8f67654aaed SHA512 08c24d7c720059b25acf6c107c53f47b1253f49fed4734af2ede1886b2f193a0fe76814b552862faea7ea11478ee3431463b8778be4240515cfb225681fb4340 DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb EBUILD htop-2.0.2.ebuild 1390 BLAKE2B d38a5264ba9f0f2c8467f3dc2ad61440c50945a2ae2b8782879e93084b405253899a8430aff263181b9b11bc74376d8a9f087bcbf4e29908e3c9bdd607cf8d6d SHA512 82e5bc99fe341b7492f219193fb74c241ba035455e0faae7cea42635a99069c6d195157d8bb6e13277483e47d5df37a579dcf57c0a6e0a33ec31d983b9b9f5c7 diff --git a/sys-process/htop/files/htop-2.1.0-sysmacros.patch b/sys-process/htop/files/htop-2.1.0-sysmacros.patch index 08f023b442e5..63677dd35fa9 100644 --- a/sys-process/htop/files/htop-2.1.0-sysmacros.patch +++ b/sys-process/htop/files/htop-2.1.0-sysmacros.patch @@ -1,28 +1,30 @@ -From 25c50af220c2de4542b440b7470a644caf2a3b65 Mon Sep 17 00:00:00 2001 +From 7fd09c08b5b50e5c0a2aebb66072deda4ac503fb Mon Sep 17 00:00:00 2001 From: Lars Wendler <polynomial-c@gentoo.org> Date: Mon, 5 Feb 2018 16:02:19 +0100 Subject: [PATCH] Add <sys/sysmacros.h> to two files. -Future glibc releases will no longer include sysmacros implicitly. +>=glibc-2.28 will no longer include sysmacros implicitly. --- - Process.c | 1 + + Process.c | 3 +++ linux/LinuxProcessList.c | 1 + - 2 files changed, 2 insertions(+) + 2 files changed, 4 insertions(+) diff --git a/Process.c b/Process.c -index 1836080..5122afb 100644 +index 2ff778d..e135c60 100644 --- a/Process.c +++ b/Process.c -@@ -19,6 +19,7 @@ in the source distribution for its full text. +@@ -19,6 +19,9 @@ in the source distribution for its full text. #include <sys/param.h> #include <sys/stat.h> #include <sys/types.h> -+#include <sys/sysmacros.h> ++#ifdef HAVE_SYS_SYSMACROS_H ++# include <sys/sysmacros.h> /* for major, minor */ ++#endif #include <unistd.h> #include <stdlib.h> #include <signal.h> diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c -index 6f2631a..7522fb1 100644 +index c8ba89d..fb95440 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -25,6 +25,7 @@ in the source distribution for its full text. @@ -34,5 +36,5 @@ index 6f2631a..7522fb1 100644 #ifdef HAVE_DELAYACCT -- -2.16.1 +2.16.2 |