* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2015-09-28 14:28 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2015-09-28 14:28 UTC (permalink / raw
To: gentoo-commits
commit: 927765d9bc6d359f7dfe130a3c55c4721938e0ea
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 14:27:40 2015 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Mon Sep 28 14:27:40 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=927765d9
app-admin/conky: Version bump.
Fixes bug 557500. Thanks to Aaron W. Swenson for the report.
Package-Manager: portage-2.2.20.1
app-admin/conky/Manifest | 1 +
app-admin/conky/conky-1.10.0.ebuild | 178 +++++++++++++++++++++++++
app-admin/conky/files/conky-1.10.0-cmake.patch | 11 ++
app-admin/conky/metadata.xml | 9 +-
4 files changed, 197 insertions(+), 2 deletions(-)
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index bf4df4e..e064cbf 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1 +1,2 @@
+DIST conky-1.10.0.tar.gz 342584 SHA256 f392f3f91fcc37f04ff65d53957512e4d81b7b9b36394acb5ecaefe92623f8eb SHA512 08664c2c736c078848e4864f7a2df5ed536e683da6aa482cf003c675b03c274802cfd27127adb3d99145fe6c4103cc06046b40322383beafc4ca2e7e811b5caf WHIRLPOOL 03f8f80b483c8db09096a10a8d95b20372cbd5fb3e284b9bcd072c4ec1a2a4f76335eb5e8016a3e6793f295c143c71268e65fb5e50fdea0b3e6ce187830a6c46
DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a
diff --git a/app-admin/conky/conky-1.10.0.ebuild b/app-admin/conky/conky-1.10.0.ebuild
new file mode 100644
index 0000000..d6660ea
--- /dev/null
+++ b/app-admin/conky/conky-1.10.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils libtool cmake-utils linux-info
+
+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="~amd64 ~ppc ~x86"
+IUSE="apcupsd audacious cmus curl debug eve hddtemp ical iconv imlib iostats
+ ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
+ ncurses nvidia +portmon rss 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? ( media-video/nvidia-settings )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ x11-libs/libX11
+ x11-libs/libXdamage
+ 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:= )
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+ 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}
+ "
+
+CONFIG_CHECK=IPV6
+
+DOCS=( README TODO ChangeLog NEWS AUTHORS )
+
+pkg_setup() {
+ use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-cmake.patch"
+
+ # Allow user patches #478482
+ # Only run autotools if user patched something
+ epatch_user && eautoreconf || elibtoolize
+}
+
+src_configure() {
+ local mycmakeargs
+
+ if use X; then
+ mycmakeargs="-DBUILD_X11=ON"
+ mycmakeargs="${mycmakeargs} -DOWN_WINDOW=ON"
+ mycmakeargs="${mycmakeargs} -DBUILD_XDAMAGE=ON"
+ mycmakeargs="${mycmakeargs} -DBUILD_XDBE=ON"
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build truetype XFT)"
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build imlib IMLIB2)"
+ mycmakeargs="${mycmakeargs} -DBUILD_XSHAPE=ON"
+ mycmakeargs="${mycmakeargs} -DBUILD_ARGB=ON"
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-cairo LUA_CAIRO)"
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-imlib LUA_IMLIB2)"
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-rsvg LUA_RSVG)"
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build nvidia)"
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build audacious)"
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_build xmms2)"
+ else
+ mycmakeargs="-DBUILD_X11=OFF"
+ mycmakeargs="${mycmakeargs} -DBUILD_NVIDIA=OFF"
+ mycmakeargs="${mycmakeargs} -DBUILD_LUA_CAIRO=OFF"
+ mycmakeargs="${mycmakeargs} -DBUILD_LUA_IMLIB2=OFF"
+ mycmakeargs="${mycmakeargs} -DBUILD_LUA_RSVG=OFF"
+ mycmakeargs="${mycmakeargs} -DBUILD_AUDACIOUS=OFF"
+ mycmakeargs="${mycmakeargs} -DBUILD_XMMS2=OFF"
+ fi
+
+ mycmakeargs="${mycmakeargs}
+ $(cmake-utils_use_build apcupsd)
+ $(cmake-utils_use_build debug)
+ $(cmake-utils_use_build cmus)
+ $(cmake-utils_use_build curl)
+ $(cmake-utils_use_build eve)
+ $(cmake-utils_use_build hddtemp)
+ $(cmake-utils_use_build iostats)
+ $(cmake-utils_use_build ical)
+ $(cmake-utils_use_build iconv)
+ $(cmake-utils_use_build ipv6)
+ $(cmake-utils_use_build irc)
+ $(cmake-utils_use_build math)
+ $(cmake-utils_use_build moc)
+ $(cmake-utils_use_build mpd)
+ $(cmake-utils_use_build mysql)
+ $(cmake-utils_use_build ncurses)
+ $(cmake-utils_use_build portmon PORT_MONITORS)
+ $(cmake-utils_use_build rss)
+ $(cmake-utils_use_build thinkpad IBM)
+ $(cmake-utils_use_build weather-metar WEATHER_METAR)
+ $(cmake-utils_use_build weather-xoap WEATHER_XOAP)
+ $(cmake-utils_use_build webserver HTTP)
+ $(cmake-utils_use_build wifi WLAN)
+ -DBUILD_BUILTIN_CONFIG=ON
+ -DBUILD_OLD_CONFIG=ON
+ -DBUILD_I18N=ON
+ -DMAINTAINER_MODE=ON
+ -DBUILD_AUDACIOUS_LEGACY=OFF
+ -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
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}."
+ elog "To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf"
+ elog "and edit it to your liking."
+ elog
+ elog "There are pretty html docs available at the conky homepage"
+ elog "or in ${ROOT%/}/usr/share/doc/${PF}/html."
+ elog
+ elog "Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+ elog
+ fi
+}
diff --git a/app-admin/conky/files/conky-1.10.0-cmake.patch b/app-admin/conky/files/conky-1.10.0-cmake.patch
new file mode 100644
index 0000000..4f9d276
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.0-cmake.patch
@@ -0,0 +1,11 @@
+--- cmake/Docbook.cmake 2014-06-21 09:51:44.857916287 +0200
++++ cmake/Docbook.cmake.new 2014-06-21 09:53:37.251924303 +0200
+@@ -72,7 +72,7 @@
+ COMMAND ${APP_XSLTPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html
+
+ COMMAND ${APP_DB2X_XSLTPROC} -s man ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml -o ${FIL}.mxml
+- COMMAND ${APP_DB2X_MANXML} ${FIL}.mxml --output-dir ${CMAKE_CURRENT_SOURCE_DIR}
++ COMMAND ${APP_DB2X_MANXML} ${FIL}.mxml --encoding=UTF8 --output-dir ${CMAKE_CURRENT_SOURCE_DIR}
+ COMMAND ${APP_XSLTPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html
+ COMMAND ${APP_MAN} -P '${APP_LESS} -is' ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.1 > ${CMAKE_SOURCE_DIR}/README
+ COMMAND ${APP_SED} -i "s/[[:cntrl:]]\\[[0-9]*m//g" ${CMAKE_SOURCE_DIR}/README
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 81d6ebe..3a6465d 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -17,11 +17,15 @@
<use>
<flag name="apcupsd">enable support for <pkg>sys-power/apcupsd</pkg></flag>
<flag name="audacious">enable monitoring of music played by <pkg>media-sound/audacious</pkg></flag>
+ <flag name="cmus">enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag>
<flag name="eve">enable support for the eve-online skill monitor</flag>
+ <flag name="ical">enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag>
<flag name="iostats">enable support for per-task I/O statistics</flag>
+ <flag name="irc">enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag>
<flag name="lua">enable if you want Lua scripting support</flag>
- <flag name="lua-cairo">enable if you want Lua Cairo bindings for Conky (also enables lua support)</flag>
- <flag name="lua-imlib">enable if you want Lua Imlib2 bindings for Conky (also enables lua and imlib support)</flag>
+ <flag name="lua-cairo">enable if you want Lua Cairo bindings</flag>
+ <flag name="lua-imlib">enable if you want Lua Imlib2 bindings</flag>
+ <flag name="lua-rsvg">enable if you want Lua RSVG bindings</flag>
<flag name="math">enable support for glibc's libm math library</flag>
<flag name="moc">enable monitoring of music played by <pkg>media-sound/moc</pkg></flag>
<flag name="mpd">enable monitoring of music controlled by <pkg>media-sound/mpd</pkg></flag>
@@ -31,6 +35,7 @@
<flag name="thinkpad">enable support for IBM/Lenovo notebooks</flag>
<flag name="weather-metar">enable support for metar weather service</flag>
<flag name="weather-xoap">enable support for metar and xoap weather service</flag>
+ <flag name="webserver">enable support to act as a webserver serving conkys output using <pkg>net-libs/libmicrohttpd</pkg></flag>
<flag name="xmms2">enable monitoring of music played by <pkg>media-sound/xmms2</pkg></flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2015-11-18 17:14 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2015-11-18 17:14 UTC (permalink / raw
To: gentoo-commits
commit: 1cd39e035be1286af924eea3da17a5d36dd9aad8
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 17:13:42 2015 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 17:13:42 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cd39e03
app-admin/conky: Add patch to build with >=cmake-3.4.0.
Also fixes epatch_user which failed in any case, because still
trying to run eautoreconf.
Thanks to Casey Webster for the report and the patches.
Package-Manager: portage-2.2.20.1
app-admin/conky/conky-1.10.0.ebuild | 6 ++---
.../conky/files/conky-1.10.0-includefiles.patch | 29 ++++++++++++++++++++++
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/app-admin/conky/conky-1.10.0.ebuild b/app-admin/conky/conky-1.10.0.ebuild
index cc1ba4a..b20f331 100644
--- a/app-admin/conky/conky-1.10.0.ebuild
+++ b/app-admin/conky/conky-1.10.0.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit autotools eutils libtool cmake-utils linux-info
+inherit eutils cmake-utils linux-info
DESCRIPTION="An advanced, highly configurable system monitor for X"
HOMEPAGE="https://github.com/brndnmtthws/conky"
@@ -77,10 +77,10 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${P}-cmake.patch"
+ epatch "${FILESDIR}/${P}-includefiles.patch"
# Allow user patches #478482
- # Only run autotools if user patched something
- epatch_user && eautoreconf || elibtoolize
+ epatch_user
}
src_configure() {
diff --git a/app-admin/conky/files/conky-1.10.0-includefiles.patch b/app-admin/conky/files/conky-1.10.0-includefiles.patch
new file mode 100644
index 0000000..9480720
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.0-includefiles.patch
@@ -0,0 +1,29 @@
+--- a/cmake/ConkyPlatformChecks.cmake
++++ b/cmake/ConkyPlatformChecks.cmake
+@@ -22,7 +22,7 @@
+
+ include(FindPkgConfig)
+ include(CheckFunctionExists)
+-include(CheckIncludeFile)
++include(CheckIncludeFiles)
+ include(CheckSymbolExists)
+
+ # Check for some headers
+@@ -119,7 +119,7 @@ if(BUILD_HTTP)
+ endif(BUILD_HTTP)
+
+ if(BUILD_NCURSES)
+- check_include_file(ncurses.h NCURSES_H)
++ check_include_files(ncurses.h NCURSES_H)
+ find_library(NCURSES_LIB NAMES ncurses)
+ if(NOT NCURSES_H OR NOT NCURSES_LIB)
+ message(FATAL_ERROR "Unable to find ncurses library")
+@@ -167,7 +167,7 @@ endif(BUILD_PORT_MONITORS)
+
+ # Check for iconv
+ if(BUILD_ICONV)
+- check_include_file(iconv.h HAVE_ICONV_H)
++ check_include_files(iconv.h HAVE_ICONV_H)
+ find_library(ICONV_LIBRARY NAMES iconv)
+ if(NOT ICONV_LIBRARY)
+ # maybe iconv() is provided by libc
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2016-02-19 16:56 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2016-02-19 16:56 UTC (permalink / raw
To: gentoo-commits
commit: ba6473341f414f64c355302901890f5b3d9d752d
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 16:55:08 2016 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 16:55:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba647334
app-admin/conky: Add patch to build with wifi support.
This fixes bug #573502. Thanks to Stanislav Nikitin for the report
and Till Schäfer for testing the patch.
Package-Manager: portage-2.2.26
app-admin/conky/conky-1.10.1.ebuild | 2 ++
app-admin/conky/files/conky-1.10.1-includewlan.patch | 13 +++++++++++++
2 files changed, 15 insertions(+)
diff --git a/app-admin/conky/conky-1.10.1.ebuild b/app-admin/conky/conky-1.10.1.ebuild
index 86a87b8..be3ce3f 100644
--- a/app-admin/conky/conky-1.10.1.ebuild
+++ b/app-admin/conky/conky-1.10.1.ebuild
@@ -76,6 +76,8 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}/${P}-includewlan.patch"
+
# Allow user patches #478482
epatch_user
}
diff --git a/app-admin/conky/files/conky-1.10.1-includewlan.patch b/app-admin/conky/files/conky-1.10.1-includewlan.patch
new file mode 100644
index 0000000..82b09a7
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.1-includewlan.patch
@@ -0,0 +1,13 @@
+diff -Naur a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
+--- a/cmake/ConkyPlatformChecks.cmake 2015-11-18 20:47:45.000000000 +0500
++++ b/cmake/ConkyPlatformChecks.cmake 2016-01-31 20:04:58.036144590 +0500
+@@ -141,7 +141,8 @@
+ endif(BUILD_MYSQL)
+
+ if(BUILD_WLAN)
+- check_include_file(iwlib.h IWLIB_H -D_GNU_SOURCE)
++ set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
++ check_include_files(iwlib.h IWLIB_H -D_GNU_SOURCE)
+ if(NOT IWLIB_H)
+ message(FATAL_ERROR "Unable to find iwlib.h")
+ endif(NOT IWLIB_H)
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2016-05-18 17:55 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2016-05-18 17:55 UTC (permalink / raw
To: gentoo-commits
commit: 4cf3735ecef4972862e5994ab7988a9aee8c703b
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 17:54:32 2016 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Wed May 18 17:54:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf3735e
app-admin/conky: Fixes bug #562154. Fix building ncurses with USE=tinfo.
Thanks to Nicholas O'Connor for the report and Laurent Georget for the
patch.
Package-Manager: portage-2.2.28
app-admin/conky/conky-1.10.1.ebuild | 3 +-
.../conky/files/conky-1.10.1-ncurses-tinfo.patch | 35 ++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/app-admin/conky/conky-1.10.1.ebuild b/app-admin/conky/conky-1.10.1.ebuild
index dfa1c6c..13967b6 100644
--- a/app-admin/conky/conky-1.10.1.ebuild
+++ b/app-admin/conky/conky-1.10.1.ebuild
@@ -76,7 +76,8 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}/${P}-includewlan.patch"
+ epatch "${FILESDIR}/${P}-includewlan.patch" \
+ "${FILESDIR}/${P}-ncurses-tinfo.patch"
# Allow user patches #478482
epatch_user
diff --git a/app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch b/app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch
new file mode 100644
index 0000000..a603959
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch
@@ -0,0 +1,35 @@
+From dbf26f0a42a7f46d363abb150192bfcd1ccb204b Mon Sep 17 00:00:00 2001
+From: Laurent Georget <laurent@lgeorget.eu>
+Date: Sat, 14 May 2016 19:38:55 +0200
+Subject: [PATCH] Fix the `symbol stdscr not found` compilation error (#254)
+
+The compilation fails when the symbols of terminfo are not present in
+the libncurses.so. This can happen when the terminfo library libtinfo.so
+is compiled separately. Using pkg_config is the correct approach to
+handle all cases.
+---
+ cmake/ConkyPlatformChecks.cmake | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
+index 05d8bbd..f19ac24 100644
+--- a/cmake/ConkyPlatformChecks.cmake
++++ b/cmake/ConkyPlatformChecks.cmake
+@@ -119,12 +119,12 @@ if(BUILD_HTTP)
+ endif(BUILD_HTTP)
+
+ if(BUILD_NCURSES)
+- check_include_files(ncurses.h NCURSES_H)
+- find_library(NCURSES_LIB NAMES ncurses)
+- if(NOT NCURSES_H OR NOT NCURSES_LIB)
++ pkg_check_modules(NCURSES ncurses)
++ if(NOT NCURSES_FOUND)
+ message(FATAL_ERROR "Unable to find ncurses library")
+- endif(NOT NCURSES_H OR NOT NCURSES_LIB)
+- set(conky_libs ${conky_libs} ${NCURSES_LIB})
++ endif(NOT NCURSES_FOUND)
++ set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
++ set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
+ endif(BUILD_NCURSES)
+
+ if(BUILD_MYSQL)
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2016-09-10 10:08 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2016-09-10 10:08 UTC (permalink / raw
To: gentoo-commits
commit: d8f3459654138b9a74cb2100d99957f7892c1e21
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 10:08:05 2016 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 10:08:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f34596
app-admin/conky: Fix build without X11. Bug #592252.
Thanks to Toralf Förster for the report.
Package-Manager: portage-2.2.28
app-admin/conky/conky-1.10.4.ebuild | 2 ++
app-admin/conky/files/conky-1.10.4-x11-build.patch | 31 ++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/app-admin/conky/conky-1.10.4.ebuild b/app-admin/conky/conky-1.10.4.ebuild
index a660756..ab4f014 100644
--- a/app-admin/conky/conky-1.10.4.ebuild
+++ b/app-admin/conky/conky-1.10.4.ebuild
@@ -74,6 +74,8 @@ CONFIG_CHECK=~IPV6
DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+PATCHES=( "${FILESDIR}"/${P}-x11-build.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
diff --git a/app-admin/conky/files/conky-1.10.4-x11-build.patch b/app-admin/conky/files/conky-1.10.4-x11-build.patch
new file mode 100644
index 00000000..eb113a4
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.4-x11-build.patch
@@ -0,0 +1,31 @@
+From 178015a9495b7d40031ed7459e4f6b6731633a7c Mon Sep 17 00:00:00 2001
+From: shizeeg <shizeeque@gmail.com>
+Date: Thu, 8 Sep 2016 18:24:29 +0300
+Subject: [PATCH] Fix build without X11 (#317)
+
+---
+ src/conky.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/conky.cc b/src/conky.cc
+index 0a812fc..4c5da94 100644
+--- a/src/conky.cc
++++ b/src/conky.cc
+@@ -1404,6 +1404,9 @@ static void draw_string(const char *s)
+
+ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
+ {
++#ifndef BUILD_X11
++ static int cur_x, cur_y; /* current x and y for drawing */
++#endif
+ #ifdef BUILD_X11
+ int font_h = 0;
+ int cur_y_add = 0;
+@@ -1934,6 +1937,7 @@ static void draw_text(void)
+
+ static void draw_stuff(void)
+ {
++ static int text_offset_x, text_offset_y; /* offset for start position */
+ text_offset_x = text_offset_y = 0;
+ #ifdef BUILD_IMLIB2
+ cimlib_render(text_start_x, text_start_y, window.width, window.height);
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2017-02-18 12:38 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2017-02-18 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 27080607b7f95e83e09389efda65feeec2c06424
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 12:37:22 2017 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 12:38:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27080607
app-admin/conky: Fix bug #609304.
Thanks to Pavel Labath for the patch.
Package-Manager: portage-2.3.3
app-admin/conky/conky-1.10.6-r1.ebuild | 185 +++++++++++++++++++++
.../conky/files/conky-1.10.6-new_graph-oor.patch | 35 ++++
2 files changed, 220 insertions(+)
diff --git a/app-admin/conky/conky-1.10.6-r1.ebuild b/app-admin/conky/conky-1.10.6-r1.ebuild
new file mode 100644
index 0000000000..43228b1663
--- /dev/null
+++ b/app-admin/conky/conky-1.10.6-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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}-new_graph-oor.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_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=ON
+ -DBUILD_I18N=ON
+ -DMAINTAINER_MODE=OFF
+ -DRELEASE=ON
+ -DBUILD_BMPX=OFF
+ -DDOC_PATH=/usr/share/doc/${PF}
+ )
+ # -DMAINTAINER_MODE=OFF disables building documentation and fixes bug #486270
+
+ 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
+}
diff --git a/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch b/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch
new file mode 100644
index 0000000000..18091702f6
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch
@@ -0,0 +1,35 @@
+From 2600d01373ce04b34f698f3887e90a35c77bda61 Mon Sep 17 00:00:00 2001
+From: labath <pavelo@centrum.sk>
+Date: Tue, 31 Jan 2017 01:31:09 +0000
+Subject: [PATCH] Fix an out-of-range error in new_graph (#356)
+
+The code was multiplying the index with the size of the element, and
+then adding it to the typed pointer (resulting in a double
+multiplication and an OOB access).
+
+Replace the buggy code with a slightly safer c++ alternative.
+---
+ src/specials.cc | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/specials.cc b/src/specials.cc
+index ee941eb..73bd2a2 100644
+--- a/src/specials.cc
++++ b/src/specials.cc
+@@ -519,14 +519,12 @@ void new_graph(struct text_object *obj, char *buf, int buf_max_size, double val)
+ DBGP("reallocing graph from %d to %d", s->graph_allocated, s->graph_width);
+ if (!s->graph) {
+ /* initialize */
+- memset(graph, 0, s->graph_width * sizeof(double));
++ std::fill_n(graph, s->graph_width, 0.0);
+ s->scale = 100;
+ } else {
+ if (s->graph_width > s->graph_allocated) {
+ /* initialize the new region */
+- memset(graph + (s->graph_allocated * sizeof(double)), 0,
+- (s->graph_width - s->graph_allocated) *
+- sizeof(double));
++ std::fill(graph + s->graph_allocated, graph + s->graph_width, 0.0);
+ }
+ }
+ s->graph = graph;
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2017-11-18 11:31 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2017-11-18 11:31 UTC (permalink / raw
To: gentoo-commits
commit: 556e6f84b755f0ef2481d4f51f910ba3d81177b5
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 11:31:16 2017 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 11:31:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=556e6f84
app-admin/conky: Fix bug 610444:
Thanks to Daniel Campbell for the report and patch.
Package-Manager: Portage-2.3.13, Repoman-2.3.3
app-admin/conky/conky-1.10.6-r2.ebuild | 1 +
app-admin/conky/files/conky-1.10.6-fix-text-shades.patch | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/app-admin/conky/conky-1.10.6-r2.ebuild b/app-admin/conky/conky-1.10.6-r2.ebuild
index 266ec099c3d..2f866b42728 100644
--- a/app-admin/conky/conky-1.10.6-r2.ebuild
+++ b/app-admin/conky/conky-1.10.6-r2.ebuild
@@ -76,6 +76,7 @@ DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
PATCHES=(
"${FILESDIR}"/${P}-new_graph-oor.patch
"${FILESDIR}"/${P}-gcc-7.patch
+ "${FILESDIR}"/${P}-fix-text-shades.patch
)
DISABLE_AUTOFORMATTING="yes"
diff --git a/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch b/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch
new file mode 100644
index 00000000000..70b0c52d2a1
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch
@@ -0,0 +1,12 @@
+--- a/src/conky.cc 2017-02-21 18:00:40.157275779 -0800
++++ b/src/conky.cc 2017-02-21 18:05:16.137077877 -0800
+@@ -1930,7 +1930,9 @@
+
+ static void draw_stuff(void)
+ {
++#ifndef BUILD_X11
+ static int text_offset_x, text_offset_y; /* offset for start position */
++#endif
+ text_offset_x = text_offset_y = 0;
+ #ifdef BUILD_IMLIB2
+ cimlib_render(text_start_x, text_start_y, window.width, window.height);
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2017-11-26 14:27 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2017-11-26 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 973e2cb50a1c195a16e10fc543ee7d662e0ac024
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 14:27:22 2017 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 14:27:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=973e2cb5
app-admin/conky: Fix cpu hotplug patch. Bug 556480.
Thanks to Bug Bugs for noticing.
Package-Manager: Portage-2.3.13, Repoman-2.3.3
app-admin/conky/Manifest | 2 +-
app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index e9ded135a75..2ee703460a6 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,2 +1,2 @@
DIST conky-1.10.4.tar.gz 365145 SHA256 ed61ffb3be9fd24965d40401c7d54553e732038f3da2e03454915779384f59b4 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c WHIRLPOOL 6ca2a043dbc20aaff94bd0c05367b535cd71819543d76dd9a90b79417e2ebb0462c9203901f4e26e887bc249388ec041e0f76dcccf24a88fed9ce4bb532af558
-DIST conky-1.10.6.tar.gz 365669 SHA256 4c80982960b2a72e3e33cef33347c97b9239ed110d9584da4e7f17f28faf60ca SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9 WHIRLPOOL 65a43baf0ec1b5e298a81a062d2aa511488026baf440a470eecc89d15aac010d0f89f86b60a16040ae1941fedbdb46f9aed82431a79f59b7f97439f148b9c5f5
+DIST conky-1.10.6.tar.gz 365669 BLAKE2B 4f072b950083a1352904e9fbc2de016dbb3af93291e308ad2db799381f14880da4e32fa1da5ea1dab568bb782352c249d6200d581916ef3174e222f7a8294cc1 SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9
diff --git a/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
index 16adbd8a690..00e1003617e 100644
--- a/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
+++ b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
@@ -15,7 +15,7 @@ index 664ddf5e..63b3ea40 100644
} else {
idx = 0;
}
-+ if (idx >= info.cpu_count) {
++ if (idx > info.cpu_count) {
+ continue;
+ }
sscanf(buf, stat_template, &(cpu[idx].cpu_user),
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2018-01-19 16:45 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2018-01-19 16:45 UTC (permalink / raw
To: gentoo-commits
commit: b8e69adc2f725caba099ede2a1c0dea1954196a2
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 16:45:13 2018 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 16:45:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8e69adc
app-admin/conky: Version bump.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-admin/conky/Manifest | 1 +
app-admin/conky/conky-1.10.7.ebuild | 192 +++++++++++++++++++++
.../conky/files/conky-1.10.7-cpu-hotplug.patch | 13 ++
3 files changed, 206 insertions(+)
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 78025ccd5c2..dfd7445295a 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -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
diff --git a/app-admin/conky/conky-1.10.7.ebuild b/app-admin/conky/conky-1.10.7.ebuild
new file mode 100644
index 00000000000..dd949080819
--- /dev/null
+++ b/app-admin/conky/conky-1.10.7.ebuild
@@ -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
+}
diff --git a/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch b/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch
new file mode 100644
index 00000000000..18394828105
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch
@@ -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),
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2018-03-11 12:45 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2018-03-11 12:45 UTC (permalink / raw
To: gentoo-commits
commit: 90fd8959023db84ccf85a639c45a2b03b67c5d6e
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 11 12:45:00 2018 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sun Mar 11 12:45:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90fd8959
app-admin/conky: Fix bug #648090.
This adds a patch to switch back to using pkg-config for the detection
of ncurses instead of FindCurses provided by cmake as it does not
handle cases with separate tinfo.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-admin/conky/conky-1.10.8.ebuild | 2 ++
.../conky/files/conky-1.10.8-use-pkgconfig.patch | 34 ++++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/app-admin/conky/conky-1.10.8.ebuild b/app-admin/conky/conky-1.10.8.ebuild
index 2679d661162..e46eaaa3096 100644
--- a/app-admin/conky/conky-1.10.8.ebuild
+++ b/app-admin/conky/conky-1.10.8.ebuild
@@ -73,6 +73,8 @@ CONFIG_CHECK=~IPV6
DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+PATCHES=( "${FILESDIR}"/${P}-use-pkgconfig.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
diff --git a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
new file mode 100644
index 00000000000..97e6bd02323
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
@@ -0,0 +1,34 @@
+Reversed patch
+
+From abd0be51a00444d3be6b213e0926675e5a4e5ed3 Mon Sep 17 00:00:00 2001
+From: Brenden Matthews <brenden@diddyinc.com>
+Date: Tue, 23 Jan 2018 12:56:06 -0500
+Subject: [PATCH] Use FindCurses instead of pkg_check_modules.
+
+This should resolve #217.
+---
+ cmake/ConkyPlatformChecks.cmake | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
+index c5b39b2f..19ec7b9b 100644
+--- a/cmake/ConkyPlatformChecks.cmake
++++ b/cmake/ConkyPlatformChecks.cmake
+@@ -129,12 +129,12 @@ if(BUILD_HTTP)
+ endif(BUILD_HTTP)
+
+ if(BUILD_NCURSES)
++ pkg_check_modules(NCURSES ncurses)
++ if(NOT NCURSES_FOUND)
+- include(FindCurses)
+- if(NOT CURSES_FOUND)
+ message(FATAL_ERROR "Unable to find ncurses library")
++ endif(NOT NCURSES_FOUND)
++ set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
++ set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
+- endif(NOT CURSES_FOUND)
+- set(conky_libs ${conky_libs} ${CURSES_LIBRARIES})
+- set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR})
+ endif(BUILD_NCURSES)
+
+ if(BUILD_MYSQL)
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2019-03-08 22:00 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2019-03-08 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 8c91c428816870e50fe6704b94cfc01f2f0a80f3
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 8 21:59:54 2019 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 21:59:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c91c428
app-admin/conky: Revision bump to conky-1.10.8-r6.
Install tcp-portmon library. Fixes bug #675914. Thanks to jorgicio for the
report.
Pin lua to slot 0 and 5.1.
Add subslot operator for libical.
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-admin/conky/conky-1.10.8-r6.ebuild | 184 +++++++++++++++++++++++
app-admin/conky/files/conky-1.10.8-portmon.patch | 15 ++
2 files changed, 199 insertions(+)
diff --git a/app-admin/conky/conky-1.10.8-r6.ebuild b/app-admin/conky/conky-1.10.8-r6.ebuild
new file mode 100644
index 00000000000..e44e22636d2
--- /dev/null
+++ b/app-admin/conky/conky-1.10.8-r6.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 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 webserver wifi X xmms2"
+
+COMMON_DEPEND="
+ 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] )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ x11-libs/libXfixes
+ x11-libs/libXext
+ 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? ( dev-db/mysql-connector-c )
+ 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 )
+ webserver? ( net-libs/libmicrohttpd )
+ || ( dev-lang/lua:0 dev-lang/lua:5.1 )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ 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="
+ ${COMMON_DEPEND}
+ app-text/docbook2X
+"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-use-pkgconfig.patch
+ "${FILESDIR}"/${P}-libical-3.patch
+ "${FILESDIR}"/${P}-portmon.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_XMMS2=$(usex xmms2)
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=OFF
+ -DBUILD_NVIDIA=OFF
+ -DBUILD_LUA_CAIRO=OFF
+ -DBUILD_LUA_IMLIB2=OFF
+ -DBUILD_LUA_RSVG=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_HTTP=$(usex webserver)
+ -DBUILD_WEATHER_METAR=$(usex weather-metar)
+ -DBUILD_WLAN=$(usex wifi)
+ -DBUILD_BUILTIN_CONFIG=ON
+ -DBUILD_OLD_CONFIG=ON
+ -DBUILD_I18N=ON
+ -DMAINTAINER_MODE=ON
+ -DRELEASE=ON
+ -DBUILD_AUDACIOUS=OFF
+ -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
+}
diff --git a/app-admin/conky/files/conky-1.10.8-portmon.patch b/app-admin/conky/files/conky-1.10.8-portmon.patch
new file mode 100644
index 00000000000..b2f5b2b1c08
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-portmon.patch
@@ -0,0 +1,15 @@
+--- conky-1.10.8/src/CMakeLists.txt 2019-03-08 22:42:25.952357096 +0100
++++ conky-1.10.8/src/CMakeLists.txt 2019-03-08 22:42:07.776357462 +0100
+@@ -223,3 +223,12 @@
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ )
++
++if(BUILD_PORT_MONITORS)
++ install(TARGETS
++ tcp-portmon
++ RUNTIME DESTINATION bin
++ LIBRARY DESTINATION lib64
++ ARCHIVE DESTINATION lib64
++)
++endif(BUILD_PORT_MONITORS)
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2019-03-09 7:32 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2019-03-09 7:32 UTC (permalink / raw
To: gentoo-commits
commit: 6cd4ecbd35b4860a5703828e3fe23969eb9fc2ec
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 07:32:31 2019 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 07:32:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cd4ecbd
app-admin/conky: Revision bump to conky-1.10.8-r7.
Fix library install path for portmon patch.
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-admin/conky/conky-1.10.8-r7.ebuild | 184 +++++++++++++++++++++++
app-admin/conky/files/conky-1.10.8-portmon.patch | 19 ++-
2 files changed, 196 insertions(+), 7 deletions(-)
diff --git a/app-admin/conky/conky-1.10.8-r7.ebuild b/app-admin/conky/conky-1.10.8-r7.ebuild
new file mode 100644
index 00000000000..e44e22636d2
--- /dev/null
+++ b/app-admin/conky/conky-1.10.8-r7.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 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 webserver wifi X xmms2"
+
+COMMON_DEPEND="
+ 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] )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ x11-libs/libXfixes
+ x11-libs/libXext
+ 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? ( dev-db/mysql-connector-c )
+ 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 )
+ webserver? ( net-libs/libmicrohttpd )
+ || ( dev-lang/lua:0 dev-lang/lua:5.1 )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ 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="
+ ${COMMON_DEPEND}
+ app-text/docbook2X
+"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-use-pkgconfig.patch
+ "${FILESDIR}"/${P}-libical-3.patch
+ "${FILESDIR}"/${P}-portmon.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_XMMS2=$(usex xmms2)
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=OFF
+ -DBUILD_NVIDIA=OFF
+ -DBUILD_LUA_CAIRO=OFF
+ -DBUILD_LUA_IMLIB2=OFF
+ -DBUILD_LUA_RSVG=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_HTTP=$(usex webserver)
+ -DBUILD_WEATHER_METAR=$(usex weather-metar)
+ -DBUILD_WLAN=$(usex wifi)
+ -DBUILD_BUILTIN_CONFIG=ON
+ -DBUILD_OLD_CONFIG=ON
+ -DBUILD_I18N=ON
+ -DMAINTAINER_MODE=ON
+ -DRELEASE=ON
+ -DBUILD_AUDACIOUS=OFF
+ -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
+}
diff --git a/app-admin/conky/files/conky-1.10.8-portmon.patch b/app-admin/conky/files/conky-1.10.8-portmon.patch
index b2f5b2b1c08..bce3853c2b0 100644
--- a/app-admin/conky/files/conky-1.10.8-portmon.patch
+++ b/app-admin/conky/files/conky-1.10.8-portmon.patch
@@ -1,15 +1,20 @@
---- conky-1.10.8/src/CMakeLists.txt 2019-03-08 22:42:25.952357096 +0100
-+++ conky-1.10.8/src/CMakeLists.txt 2019-03-08 22:42:07.776357462 +0100
-@@ -223,3 +223,12 @@
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+--- conky-1.10.8/src/CMakeLists.txt 2019-03-09 08:24:26.315879386 +0100
++++ conky-1.10.8/src/CMakeLists.txt 2019-03-09 08:24:38.555878656 +0100
+@@ -220,6 +220,15 @@
+ install(TARGETS
+ conky
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/conky
++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/conky
)
+
+if(BUILD_PORT_MONITORS)
+ install(TARGETS
+ tcp-portmon
+ RUNTIME DESTINATION bin
-+ LIBRARY DESTINATION lib64
-+ ARCHIVE DESTINATION lib64
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/conky
++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/conky
+)
+endif(BUILD_PORT_MONITORS)
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2020-08-06 15:10 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2020-08-06 15:10 UTC (permalink / raw
To: gentoo-commits
commit: 8ed09d7c40c3ac74314039fc9fd90b4805b140cd
Author: Jan Seeger <jan.seeger <AT> thenybble <DOT> de>
AuthorDate: Wed Aug 5 13:44:04 2020 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Thu Aug 6 15:10:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ed09d7c
app/admin-conky-1.10.8-r10: Patched crash on virtual Pulseaudio sinks
Using upstream commits
https://github.com/brndnmtthws/conky/commit/2a7226d89331f7d5d0abf0b9aff6d75435dd3a2d and
https://github.com/brndnmtthws/conky/commit/ddf8a0f58f3110e31ec4c44ecff838d2b231f6f3. Added missing
braces for multi-line macro, added version bumped ebuild.
Signed-off-by: Jan Seeger <jan.seeger <AT> thenybble.de>
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
app-admin/conky/conky-1.10.8-r10.ebuild | 186 +++++++++++++++++++++
.../conky/files/conky-1.10.8-virtual-sinks.patch | 49 ++++++
2 files changed, 235 insertions(+)
diff --git a/app-admin/conky/conky-1.10.8-r10.ebuild b/app-admin/conky/conky-1.10.8-r10.ebuild
new file mode 100644
index 00000000000..d84975354f0
--- /dev/null
+++ b/app-admin/conky/conky-1.10.8-r10.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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 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 webserver wifi X xmms2"
+
+COMMON_DEPEND="
+ 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] )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ x11-libs/libXfixes
+ x11-libs/libXext
+ 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? ( dev-db/mysql-connector-c )
+ 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 )
+ webserver? ( net-libs/libmicrohttpd )
+ || ( dev-lang/lua:0 dev-lang/lua:5.1 )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ 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="
+ ${COMMON_DEPEND}
+ app-text/docbook2X
+"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-use-pkgconfig.patch
+ "${FILESDIR}"/${P}-libical-3.patch
+ "${FILESDIR}"/${P}-portmon.patch
+ "${FILESDIR}"/${P}-clang.patch
+ "${FILESDIR}"/${P}-virtual-sinks.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_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_XMMS2=$(usex xmms2)
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=OFF
+ -DBUILD_NVIDIA=OFF
+ -DBUILD_LUA_CAIRO=OFF
+ -DBUILD_LUA_IMLIB2=OFF
+ -DBUILD_LUA_RSVG=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_HTTP=$(usex webserver)
+ -DBUILD_WEATHER_METAR=$(usex weather-metar)
+ -DBUILD_WLAN=$(usex wifi)
+ -DBUILD_BUILTIN_CONFIG=ON
+ -DBUILD_OLD_CONFIG=ON
+ -DBUILD_I18N=ON
+ -DMAINTAINER_MODE=ON
+ -DRELEASE=ON
+ -DBUILD_AUDACIOUS=OFF
+ -DBUILD_BMPX=OFF
+ -DDOC_PATH=/usr/share/doc/${PF}
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_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
+}
diff --git a/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch b/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch
new file mode 100644
index 00000000000..c0198ccc4ec
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch
@@ -0,0 +1,49 @@
+From 8221ba62045012abf8a4443de20f17a0a8fc1288 Mon Sep 17 00:00:00 2001
+From: Jan Seeger <jan.seeger@thenybble.de>
+Date: Wed, 5 Aug 2020 15:39:20 +0200
+Subject: Fixed crash on virtual sinks.
+
+Taken from upstream commits
+https://github.com/brndnmtthws/conky/commit/ddf8a0f58f3110e31ec4c44ecff838d2b231f6f3 and
+https://github.com/brndnmtthws/conky/commit/2a7226d89331f7d5d0abf0b9aff6d75435dd3a2d.
+
+Signed-off-by: Jan Seeger <jan.seeger@thenybble.de>
+---
+ src/pulseaudio.cc | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/pulseaudio.cc b/src/pulseaudio.cc
+index 93226c1b..af814bd6 100644
+--- a/src/pulseaudio.cc
++++ b/src/pulseaudio.cc
+@@ -53,8 +53,13 @@ void pa_sink_info_callback(pa_context *c, const pa_sink_info *i, int eol, void *
+ pdr->sink_mute = i->mute;
+ pdr->sink_card = i->card;
+ pdr->sink_index = i->index;
+- pdr->sink_active_port_name.assign(i->active_port->name);
+- pdr->sink_active_port_description.assign(i->active_port->description);
++ if (i->active_port != nullptr) {
++ pdr->sink_active_port_name.assign(i->active_port->name);
++ pdr->sink_active_port_description.assign(i->active_port->description);
++ } else {
++ pdr->sink_active_port_name.erase();
++ pdr->sink_active_port_name.erase();
++ }
+ pdr->sink_volume = round_to_int(100.0f * (float)pa_cvolume_avg(&(i->volume)) / (float)PA_VOLUME_NORM);
+ pa_threaded_mainloop_signal(pulseaudio->mainloop, 0);
+ }
+@@ -224,9 +229,10 @@ void init_pulseaudio(struct text_object *obj) {
+ return;
+ }
+
+- if(pulseaudio->result.sink_card!=(uint32_t)-1)
++ if(pulseaudio->result.sink_card!=(uint32_t)-1) {
+ PULSEAUDIO_WAIT(pa_context_get_card_info_by_index(pulseaudio->context, pulseaudio->result.sink_card,
+ pa_card_info_callback, &pulseaudio->result));
++ }
+
+ // get notification when something changes in PA
+ pa_context_set_subscribe_callback(pulseaudio->context, subscribe_cb, &pulseaudio->result);
+--
+2.26.2
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2021-01-13 14:56 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2021-01-13 14:56 UTC (permalink / raw
To: gentoo-commits
commit: f3dd9a7af575a192da8c557d1259d362b773cb95
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 14:56:18 2021 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 14:56:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3dd9a7a
app-admin/conky: Fix bug #762163.
Thanks to Duncan for the report.
Closes: https://bugs.gentoo.org/762163
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
app-admin/conky/conky-1.11.6-r2.ebuild | 3 ++-
app-admin/conky/files/conky-1.11.6-ipv6.patch | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/app-admin/conky/conky-1.11.6-r2.ebuild b/app-admin/conky/conky-1.11.6-r2.ebuild
index fb7f8a7087d..827e39e3097 100644
--- a/app-admin/conky/conky-1.11.6-r2.ebuild
+++ b/app-admin/conky/conky-1.11.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -78,6 +78,7 @@ DOCS=( README.md AUTHORS )
PATCHES=(
"${FILESDIR}"/${P}-fpermissive.patch
+ "${FILESDIR}"/${P}-ipv6.patch
)
DISABLE_AUTOFORMATTING="yes"
diff --git a/app-admin/conky/files/conky-1.11.6-ipv6.patch b/app-admin/conky/files/conky-1.11.6-ipv6.patch
new file mode 100644
index 00000000000..65066270a75
--- /dev/null
+++ b/app-admin/conky/files/conky-1.11.6-ipv6.patch
@@ -0,0 +1,22 @@
+Fix no-ipv6
+From https://github.com/brndnmtthws/conky/issues/1033#issue-748414180
+
+diff '--color=auto' -aur a/src/linux.cc b/src/linux.cc
+--- a/src/linux.cc 2019-08-12 14:53:54.000000000 -0700
++++ b/src/linux.cc 2020-11-22 18:44:04.394329722 -0700
+@@ -667,6 +667,7 @@
+ }
+ }
+
++#ifdef BUILD_IPV6
+ void update_ipv6_net_stats() {
+ FILE *file;
+ char v6addr[33];
+@@ -731,6 +732,7 @@
+
+ fclose(file);
+ }
++#endif /* BUILD_IPV6 */
+
+ /**
+ * Parses information from /proc/net/dev and stores them in ???
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/
@ 2021-03-25 15:14 Daniel Pielmeier
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Pielmeier @ 2021-03-25 15:14 UTC (permalink / raw
To: gentoo-commits
commit: d45ea00b8514645bc07215085677ec5f25c708ae
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 15:13:14 2021 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 15:13:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45ea00b
app-admin/conky: Fix bug #766704.
Thanks to Alex Efros for the report.
Closes: https://bugs.gentoo.org/766704
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
app-admin/conky/conky-1.12.1-r1.ebuild | 194 +++++++++++++++++++++
.../conky/files/conky-1.12.1-network-speed.patch | 36 ++++
2 files changed, 230 insertions(+)
diff --git a/app-admin/conky/conky-1.12.1-r1.ebuild b/app-admin/conky/conky-1.12.1-r1.ebuild
new file mode 100644
index 00000000000..d07d5d164cf
--- /dev/null
+++ b/app-admin/conky/conky-1.12.1-r1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake linux-info lua-single readme.gentoo-r1 xdg
+
+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 bundled-toluapp cmus curl doc 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 webserver wifi X xinerama xmms2"
+
+COMMON_DEPEND="
+ cmus? ( media-sound/cmus )
+ curl? ( net-misc/curl )
+ ical? ( dev-libs/libical:= )
+ iconv? ( virtual/libiconv )
+ imlib? ( media-libs/imlib2[X] )
+ irc? ( net-libs/libircclient )
+ lua-cairo? ( x11-libs/cairo[X] )
+ lua-imlib? ( media-libs/imlib2[X] )
+ lua-rsvg? ( gnome-base/librsvg )
+ mysql? ( dev-db/mysql-connector-c )
+ ncurses? ( sys-libs/ncurses:= )
+ nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+ pulseaudio? ( media-sound/pulseaudio )
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+ systemd? ( sys-apps/systemd )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ wifi? ( net-wireless/wireless-tools )
+ weather-metar? ( net-misc/curl )
+ webserver? ( net-libs/libmicrohttpd )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXext
+ )
+ xinerama? ( x11-libs/libXinerama )
+ xmms2? ( media-sound/xmms2 )
+ ${LUA_DEPS}
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ 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="
+ ${COMMON_DEPEND}
+ doc? ( app-text/docbook2X dev-libs/libxslt )
+"
+
+REQUIRED_USE="
+ imlib? ( X )
+ lua-cairo? ( X bundled-toluapp )
+ lua-imlib? ( X bundled-toluapp )
+ lua-rsvg? ( X bundled-toluapp )
+ nvidia? ( X )
+ truetype? ( X )
+ xinerama? ( X )
+"
+
+CONFIG_CHECK="~IPV6"
+
+DOCS=( README.md AUTHORS )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.11.6-ipv6.patch
+ "${FILESDIR}"/${P}-network-speed.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 when built with USE=doc.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+ use ipv6 && linux-info_pkg_setup
+
+ lua-single_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ xdg_environment_reset
+
+ 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_ARGB=yes
+ -DBUILD_X11=yes
+ -DBUILD_XDAMAGE=yes
+ -DBUILD_XDBE=yes
+ -DBUILD_XSHAPE=yes
+ -DOWN_WINDOW=yes
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=no
+ )
+ fi
+
+ mycmakeargs+=(
+ -DBUILD_APCUPSD=$(usex apcupsd)
+ -DBUILD_AUDACIOUS=no
+ -DBUILD_BUILTIN_CONFIG=yes
+ -DBUILD_CMUS=$(usex cmus)
+ -DBUILD_CURL=$(usex curl)
+ -DBUILD_DOCS=$(usex doc)
+ -DBUILD_HDDTEMP=$(usex hddtemp)
+ -DBUILD_HTTP=$(usex webserver)
+ -DBUILD_I18N=yes
+ -DBUILD_IBM=$(usex thinkpad)
+ -DBUILD_ICAL=$(usex ical)
+ -DBUILD_ICONV=$(usex iconv)
+ -DBUILD_IMLIB2=$(usex imlib)
+ -DBUILD_IOSTATS=$(usex iostats)
+ -DBUILD_IPV6=$(usex ipv6)
+ -DBUILD_IRC=$(usex irc)
+ -DBUILD_JOURNAL=$(usex systemd)
+ -DBUILD_LUA_CAIRO=$(usex lua-cairo)
+ -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+ -DBUILD_LUA_RSVG=$(usex lua-rsvg)
+ -DBUILD_MATH=$(usex math)
+ -DBUILD_MOC=$(usex moc)
+ -DBUILD_MPD=$(usex mpd)
+ -DBUILD_MYSQL=$(usex mysql)
+ -DBUILD_NCURSES=$(usex ncurses)
+ -DBUILD_NVIDIA=$(usex nvidia)
+ -DBUILD_OLD_CONFIG=yes
+ -DBUILD_PORT_MONITORS=$(usex portmon)
+ -DBUILD_PULSEAUDIO=$(usex pulseaudio)
+ -DBUILD_RSS=$(usex rss)
+ -DBUILD_WEATHER_METAR=$(usex weather-metar)
+ -DBUILD_WLAN=$(usex wifi)
+ -DBUILD_XFT=$(usex truetype)
+ -DBUILD_XINERAMA=$(usex xinerama)
+ -DBUILD_XMMS2=$(usex xmms2)
+ -DDOC_PATH=/usr/share/doc/${PF}
+ -DMAINTAINER_MODE=no
+ -DRELEASE=yes
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_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
+
+ xdg_pkg_postinst
+}
diff --git a/app-admin/conky/files/conky-1.12.1-network-speed.patch b/app-admin/conky/files/conky-1.12.1-network-speed.patch
new file mode 100644
index 00000000000..46a7615c589
--- /dev/null
+++ b/app-admin/conky/files/conky-1.12.1-network-speed.patch
@@ -0,0 +1,36 @@
+From 415c730133476d6652f479242b0638496b5f673b Mon Sep 17 00:00:00 2001
+From: Steven Xu <stevenxxiu@gmail.com>
+Date: Tue, 23 Mar 2021 20:12:52 +1100
+Subject: [PATCH] fix: update `update last_update_time` earlier, so the network
+ speed is correctly displayed, otherwise the speed shown is much lower than
+ the actual speed (resolves #863)
+
+---
+ src/conky.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/conky.cc b/src/conky.cc
+index b116b2bed..af5602c5b 100644
+--- a/src/conky.cc
++++ b/src/conky.cc
+@@ -766,6 +766,12 @@ static void generate_text() {
+ * some info.mem entries */
+ update_stuff();
+
++ /* Update `last_update_time` before `generate_text_internal()`, as the latter
++ * calls `evaluate()` -> `update_net_stats()`, which needs `last_update_time`
++ * to be set correctly. If this is not done, than the network speed being
++ * shown will be much lower than the actual speed.*/
++ last_update_time = current_update_time;
++
+ /* populate the text buffer; generate_text_internal() iterates through
+ * global_root_object (an instance of the text_object struct) and calls
+ * any callbacks that were set on startup by construct_text_object(). */
+@@ -822,7 +828,6 @@ static void generate_text() {
+ if (next_update_time < time || next_update_time > time + ui) {
+ next_update_time = time - fmod(time, ui) + ui;
+ }
+- last_update_time = current_update_time;
+ total_updates++;
+ }
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-03-25 15:14 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-18 12:38 [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/ Daniel Pielmeier
-- strict thread matches above, loose matches on Subject: below --
2021-03-25 15:14 Daniel Pielmeier
2021-01-13 14:56 Daniel Pielmeier
2020-08-06 15:10 Daniel Pielmeier
2019-03-09 7:32 Daniel Pielmeier
2019-03-08 22:00 Daniel Pielmeier
2018-03-11 12:45 Daniel Pielmeier
2018-01-19 16:45 Daniel Pielmeier
2017-11-26 14:27 Daniel Pielmeier
2017-11-18 11:31 Daniel Pielmeier
2016-09-10 10:08 Daniel Pielmeier
2016-05-18 17:55 Daniel Pielmeier
2016-02-19 16:56 Daniel Pielmeier
2015-11-18 17:14 Daniel Pielmeier
2015-09-28 14:28 Daniel Pielmeier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox