forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
- Loading branch information
Showing
3 changed files
with
206 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
DIST conky-1.10.4.tar.gz 365145 BLAKE2B 60f6f53ef67a9958d4dd4c3f1ab53886235927ed457ad3e98d2f6f61568a14baa7cd2afa0d3ddde9ed5e16aae17891213d906f49c308269f678adf37ea627329 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c | ||
DIST conky-1.10.6.tar.gz 365669 BLAKE2B 4f072b950083a1352904e9fbc2de016dbb3af93291e308ad2db799381f14880da4e32fa1da5ea1dab568bb782352c249d6200d581916ef3174e222f7a8294cc1 SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9 | ||
DIST conky-1.10.7.tar.gz 371881 BLAKE2B f1a1dd0d67efe1658d3a3da7ddb121c31ae34c347f7bce7fcecb57d7311ddcf80fb391055fefb92fd235b702c3e5b17362821565aba7a911931542ea714d8d76 SHA512 4da501c7c7613e8b9b26a691a1c0118c05cec818e944d4a30e250ecba26956d6f3103ec5731f082a095173dbfe0713137ded92043cc4c1eb3821c0943f1744f4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,192 @@ | ||
# Copyright 1999-2018 Gentoo Foundation | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=6 | ||
|
||
inherit cmake-utils linux-info readme.gentoo-r1 | ||
|
||
DESCRIPTION="An advanced, highly configurable system monitor for X" | ||
HOMEPAGE="https://github.com/brndnmtthws/conky" | ||
SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" | ||
|
||
LICENSE="GPL-3 BSD LGPL-2.1 MIT" | ||
SLOT="0" | ||
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" | ||
IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc | ||
lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses | ||
nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax | ||
weather-metar weather-xoap webserver wifi X xmms2" | ||
|
||
DEPEND_COMMON=" | ||
X? ( | ||
imlib? ( media-libs/imlib2[X] ) | ||
lua-cairo? ( | ||
>=dev-lua/toluapp-1.0.93 | ||
x11-libs/cairo[X] ) | ||
lua-imlib? ( | ||
>=dev-lua/toluapp-1.0.93 | ||
media-libs/imlib2[X] ) | ||
lua-rsvg? ( | ||
>=dev-lua/toluapp-1.0.93 | ||
gnome-base/librsvg ) | ||
nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) | ||
truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) | ||
x11-libs/libX11 | ||
x11-libs/libXdamage | ||
x11-libs/libXinerama | ||
x11-libs/libXfixes | ||
x11-libs/libXext | ||
audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) | ||
xmms2? ( media-sound/xmms2 ) | ||
) | ||
cmus? ( media-sound/cmus ) | ||
curl? ( net-misc/curl ) | ||
eve? ( net-misc/curl dev-libs/libxml2 ) | ||
ical? ( dev-libs/libical ) | ||
iconv? ( virtual/libiconv ) | ||
irc? ( net-libs/libircclient ) | ||
mysql? ( >=virtual/mysql-5.0 ) | ||
ncurses? ( sys-libs/ncurses:= ) | ||
pulseaudio? ( media-sound/pulseaudio ) | ||
rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) | ||
systemd? ( sys-apps/systemd ) | ||
wifi? ( net-wireless/wireless-tools ) | ||
weather-metar? ( net-misc/curl ) | ||
weather-xoap? ( dev-libs/libxml2 net-misc/curl ) | ||
webserver? ( net-libs/libmicrohttpd ) | ||
>=dev-lang/lua-5.1.4-r8:0 | ||
" | ||
RDEPEND=" | ||
${DEPEND_COMMON} | ||
apcupsd? ( sys-power/apcupsd ) | ||
hddtemp? ( app-admin/hddtemp ) | ||
moc? ( media-sound/moc ) | ||
nano-syntax? ( app-editors/nano ) | ||
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) | ||
" | ||
DEPEND=" | ||
${DEPEND_COMMON} | ||
app-text/docbook2X | ||
" | ||
|
||
CONFIG_CHECK=~IPV6 | ||
|
||
DOCS=( README.md TODO ChangeLog NEWS AUTHORS ) | ||
|
||
PATCHES=( | ||
"${FILESDIR}"/${P}-cpu-hotplug.patch | ||
) | ||
|
||
DISABLE_AUTOFORMATTING="yes" | ||
DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}. | ||
To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf | ||
and edit it to your liking. | ||
There are pretty html docs available at the conky homepage | ||
or in ${ROOT%/}/usr/share/doc/${PF}/html. | ||
Also see https://wiki.gentoo.org/wiki/Conky/HOWTO" | ||
|
||
pkg_setup() { | ||
use ipv6 && linux-info_pkg_setup | ||
} | ||
|
||
src_prepare() { | ||
cmake-utils_src_prepare | ||
|
||
sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \ | ||
cmake/ConkyPlatformChecks.cmake || die | ||
} | ||
|
||
src_configure() { | ||
local mycmakeargs | ||
|
||
if use X; then | ||
mycmakeargs=( | ||
-DBUILD_X11=ON | ||
-DOWN_WINDOW=ON | ||
-DBUILD_XDAMAGE=ON | ||
-DBUILD_XINERAMA=ON | ||
-DBUILD_XDBE=ON | ||
-DBUILD_XFT=$(usex truetype) | ||
-DBUILD_IMLIB2=$(usex imlib) | ||
-DBUILD_XSHAPE=ON | ||
-DBUILD_ARGB=ON | ||
-DBUILD_LUA_CAIRO=$(usex lua-cairo) | ||
-DBUILD_LUA_IMLIB2=$(usex lua-imlib) | ||
-DBUILD_LUA_RSVG=$(usex lua-rsvg) | ||
-DBUILD_NVIDIA=$(usex nvidia) | ||
-DBUILD_AUDACIOUS=$(usex audacious) | ||
-DBUILD_XMMS2=$(usex xmms2) | ||
) | ||
else | ||
mycmakeargs=( | ||
-DBUILD_X11=OFF | ||
-DBUILD_NVIDIA=OFF | ||
-DBUILD_LUA_CAIRO=OFF | ||
-DBUILD_LUA_IMLIB2=OFF | ||
-DBUILD_LUA_RSVG=OFF | ||
-DBUILD_AUDACIOUS=OFF | ||
-DBUILD_XMMS2=OFF | ||
) | ||
fi | ||
|
||
mycmakeargs+=( | ||
-DBUILD_APCUPSD=$(usex apcupsd) | ||
-DBUILD_CMUS=$(usex cmus) | ||
-DBUILD_CURL=$(usex curl) | ||
-DBUILD_EVE=$(usex eve) | ||
-DBUILD_HDDTEMP=$(usex hddtemp) | ||
-DBUILD_IOSTATS=$(usex iostats) | ||
-DBUILD_ICAL=$(usex ical) | ||
-DBUILD_ICONV=$(usex iconv) | ||
-DBUILD_IPV6=$(usex ipv6) | ||
-DBUILD_IRC=$(usex irc) | ||
-DBUILD_MATH=$(usex math) | ||
-DBUILD_MOC=$(usex moc) | ||
-DBUILD_MPD=$(usex mpd) | ||
-DBUILD_MYSQL=$(usex mysql) | ||
-DBUILD_NCURSES=$(usex ncurses) | ||
-DBUILD_PORT_MONITORS=$(usex portmon) | ||
-DBUILD_PULSEAUDIO=$(usex pulseaudio) | ||
-DBUILD_RSS=$(usex rss) | ||
-DBUILD_JOURNAL=$(usex systemd) | ||
-DBUILD_IBM=$(usex thinkpad) | ||
-DBUILD_WEATHER_METAR=$(usex weather-metar) | ||
-DBUILD_WEATHER_XOAP=$(usex weather-xoap) | ||
-DBUILD_HTTP=$(usex webserver) | ||
-DBUILD_WLAN=$(usex wifi) | ||
-DBUILD_BUILTIN_CONFIG=ON | ||
-DBUILD_OLD_CONFIG=OFF | ||
-DBUILD_I18N=ON | ||
-DMAINTAINER_MODE=ON | ||
-DRELEASE=ON | ||
-DBUILD_BMPX=OFF | ||
-DDOC_PATH=/usr/share/doc/${PF} | ||
) | ||
|
||
cmake-utils_src_configure | ||
} | ||
|
||
src_install() { | ||
cmake-utils_src_install | ||
|
||
if use vim-syntax; then | ||
insinto /usr/share/vim/vimfiles/ftdetect | ||
doins "${S}"/extras/vim/ftdetect/conkyrc.vim | ||
|
||
insinto /usr/share/vim/vimfiles/syntax | ||
doins "${S}"/extras/vim/syntax/conkyrc.vim | ||
fi | ||
|
||
if use nano-syntax; then | ||
insinto /usr/share/nano/ | ||
doins "${S}"/extras/nano/conky.nanorc | ||
fi | ||
|
||
readme.gentoo_create_doc | ||
} | ||
|
||
pkg_postinst() { | ||
readme.gentoo_print_elog | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff -Naur conky-1.10.7_old/src/linux.cc conky-1.10.7/src/linux.cc | ||
--- conky-1.10.7_old/src/linux.cc 2018-01-19 16:59:14.158830825 +0100 | ||
+++ conky-1.10.7/src/linux.cc 2018-01-19 16:59:44.796144615 +0100 | ||
@@ -923,6 +923,9 @@ | ||
} else { | ||
idx = 0; | ||
} | ||
+ if (idx > info.cpu_count) { | ||
+ continue; | ||
+ } | ||
sscanf(buf, stat_template, &(cpu[idx].cpu_user), | ||
&(cpu[idx].cpu_nice), &(cpu[idx].cpu_system), | ||
&(cpu[idx].cpu_idle), &(cpu[idx].cpu_iowait), |