* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/, app-admin/conky/files/
@ 2016-10-16 14:40 Daniel Pielmeier
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Pielmeier @ 2016-10-16 14:40 UTC (permalink / raw
To: gentoo-commits
commit: 6e1322ac311e9b9f9488260c527076e331e8fb40
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 14:39:56 2016 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 14:39:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e1322ac
app-admin/conky: Update NOAA METAR uri.
This fixes bug #592906. Thanks to Brand Huntsman for the report.
Package-Manager: portage-2.3.0
app-admin/conky/conky-1.9.0-r3.ebuild | 3 ++-
app-admin/conky/files/conky-1.9.0-update-noaa-metar-uri.patch | 11 +++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/app-admin/conky/conky-1.9.0-r3.ebuild b/app-admin/conky/conky-1.9.0-r3.ebuild
index 884c867..a1f0800 100644
--- a/app-admin/conky/conky-1.9.0-r3.ebuild
+++ b/app-admin/conky/conky-1.9.0-r3.ebuild
@@ -67,7 +67,8 @@ src_prepare() {
"${FILESDIR}/${P}-apcupsd.patch" \
"${FILESDIR}/${P}-default-graph-size.patch" \
"${FILESDIR}/${P}-diskio-dmmajor.patch" \
- "${FILESDIR}/${P}-tinfo.patch"
+ "${FILESDIR}/${P}-tinfo.patch" \
+ "${FILESDIR}/${P}-update-noaa-metar-uri.patch"
# Allow user patches #478482
epatch_user
diff --git a/app-admin/conky/files/conky-1.9.0-update-noaa-metar-uri.patch b/app-admin/conky/files/conky-1.9.0-update-noaa-metar-uri.patch
new file mode 100644
index 00000000..0dbf3d3
--- /dev/null
+++ b/app-admin/conky/files/conky-1.9.0-update-noaa-metar-uri.patch
@@ -0,0 +1,11 @@
+--- a/src/weather.c
++++ b/src/weather.c
+@@ -858,7 +858,7 @@
+ }
+ } else
+ #endif /* XOAP */
+- if (strstr(uri, "weather.noaa.gov")) {
++ if (strstr(uri, "tgftp.nws.noaa.gov")) {
+ strcat(uri, locID);
+ strcat(uri, ".TXT");
+ } else if (!strstr(uri, "localhost") && !strstr(uri, "127.0.0.1")) {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/, app-admin/conky/files/
@ 2017-11-18 11:21 Daniel Pielmeier
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Pielmeier @ 2017-11-18 11:21 UTC (permalink / raw
To: gentoo-commits
commit: bb0ea0297a040e9e4c448bfb8825071f24bf9bbb
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 11:19:52 2017 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 11:20:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0ea029
app-admin/conky: Fix buid with gcc 7 (bug 624104).
Tanks to Piotr Stachura for the report and patch.
Package-Manager: Portage-2.3.13, Repoman-2.3.3
app-admin/conky/conky-1.10.6-r2.ebuild | 5 ++++-
app-admin/conky/files/conky-1.10.6-gcc-7.patch | 11 +++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/app-admin/conky/conky-1.10.6-r2.ebuild b/app-admin/conky/conky-1.10.6-r2.ebuild
index 12ba1da0f25..39079b09ae6 100644
--- a/app-admin/conky/conky-1.10.6-r2.ebuild
+++ b/app-admin/conky/conky-1.10.6-r2.ebuild
@@ -73,7 +73,10 @@ CONFIG_CHECK=~IPV6
DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
-PATCHES=( "${FILESDIR}"/${P}-new_graph-oor.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-new_graph-oor.patch
+ "${FILESDIR}"/${P}-gcc-7.patch
+ )
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
diff --git a/app-admin/conky/files/conky-1.10.6-gcc-7.patch b/app-admin/conky/files/conky-1.10.6-gcc-7.patch
new file mode 100644
index 00000000000..6784129d39c
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.6-gcc-7.patch
@@ -0,0 +1,11 @@
+diff -Naur a/src/luamm.hh b/src/luamm.hh
+--- a/src/luamm.hh 2017-07-07 15:05:28.250032963 +0200
++++ b/src/luamm.hh 2017-07-07 15:05:43.230033134 +0200
+@@ -28,6 +28,7 @@
+ #include <exception>
+ #include <stdexcept>
+ #include <string>
++#include <functional>
+
+ #include <lua.hpp>
+
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/, app-admin/conky/files/
@ 2017-11-18 11:46 Daniel Pielmeier
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Pielmeier @ 2017-11-18 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 130b50cbf5d0e6093dfdb8fd7d60e5c9e9f999d7
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 11:45:37 2017 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 11:46:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=130b50cb
app-admin/conky: Fix bug 556480.
Thanks to devsk for the patch and report.
Package-Manager: Portage-2.3.13, Repoman-2.3.3
...nky-1.10.6-r3.ebuild => conky-1.10.6-r4.ebuild} | 1 +
.../conky/files/conky-1.10.6-cpu-hotplug.patch | 23 ++++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/app-admin/conky/conky-1.10.6-r3.ebuild b/app-admin/conky/conky-1.10.6-r4.ebuild
similarity index 99%
rename from app-admin/conky/conky-1.10.6-r3.ebuild
rename to app-admin/conky/conky-1.10.6-r4.ebuild
index 2f866b42728..0f6c02c40c0 100644
--- a/app-admin/conky/conky-1.10.6-r3.ebuild
+++ b/app-admin/conky/conky-1.10.6-r4.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
"${FILESDIR}"/${P}-new_graph-oor.patch
"${FILESDIR}"/${P}-gcc-7.patch
"${FILESDIR}"/${P}-fix-text-shades.patch
+ "${FILESDIR}"/${P}-cpu-hotplug.patch
)
DISABLE_AUTOFORMATTING="yes"
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
new file mode 100644
index 00000000000..16adbd8a690
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
@@ -0,0 +1,23 @@
+From 7d2639e9c489c34fa9673fcaee8deec46043fbf8 Mon Sep 17 00:00:00 2001
+From: Daniel Pielmeier <billie80@users.noreply.github.com>
+Date: Sat, 18 Feb 2017 16:55:35 +0100
+Subject: [PATCH] Fix SEGV in a CPU hotplug environment #127
+
+---
+ src/linux.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/linux.cc b/src/linux.cc
+index 664ddf5e..63b3ea40 100644
+--- a/src/linux.cc
++++ b/src/linux.cc
+@@ -900,6 +900,9 @@ int update_stat(void)
+ } 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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/, app-admin/conky/files/
@ 2018-01-26 17:24 Daniel Pielmeier
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Pielmeier @ 2018-01-26 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 9ff7a8daeac42eb0bf69ec536237844ca90ba8c7
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 17:24:19 2018 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 17:24:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff7a8da
app-admin/conky: Fix bug #645150.
Conky segfaults when out_to_x = false.
Thanks to pacman616 for the report.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-admin/conky/conky-1.10.7-r1.ebuild | 193 +++++++++++++++++++++
.../files/conky-1.10.7-out_to_x-segfault.patch | 49 ++++++
2 files changed, 242 insertions(+)
diff --git a/app-admin/conky/conky-1.10.7-r1.ebuild b/app-admin/conky/conky-1.10.7-r1.ebuild
new file mode 100644
index 00000000000..249fdc2045b
--- /dev/null
+++ b/app-admin/conky/conky-1.10.7-r1.ebuild
@@ -0,0 +1,193 @@
+# 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
+ "${FILESDIR}"/${P}-out_to_x-segfault.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-out_to_x-segfault.patch b/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch
new file mode 100644
index 00000000000..fef22ac46e5
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch
@@ -0,0 +1,49 @@
+From 562c7375883445acb58388ff16d9eb126b7e12a1 Mon Sep 17 00:00:00 2001
+From: Brenden Matthews <brenden@diddyinc.com>
+Date: Tue, 23 Jan 2018 13:52:11 -0500
+Subject: [PATCH] Fix segfault when out_to_x = false. (#455)
+
+This resolves #454.
+---
+ src/conky.cc | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/src/conky.cc b/src/conky.cc
+index 48256ecc..f10d08fb 100644
+--- a/src/conky.cc
++++ b/src/conky.cc
+@@ -2076,20 +2076,24 @@ static void main_loop(void)
+ sigaddset(&newmask, SIGUSR1);
+ #endif
+
++#ifdef BUILD_X11
+ #ifdef BUILD_XSHAPE
+- /* allow only decorated windows to be given mouse input */
+- int major_version, minor_version;
+- if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
+- NORM_ERR("Input shapes are not supported");
+- } else {
+- if (own_window.get(*state) &&
+- (own_window_type.get(*state) != TYPE_NORMAL ||
+- (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
+- XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
+- NULL, 0, ShapeSet, Unsorted);
++ if (out_to_x.get(*state)) {
++ /* allow only decorated windows to be given mouse input */
++ int major_version, minor_version;
++ if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
++ NORM_ERR("Input shapes are not supported");
++ } else {
++ if (own_window.get(*state) &&
++ (own_window_type.get(*state) != TYPE_NORMAL ||
++ (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
++ XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
++ NULL, 0, ShapeSet, Unsorted);
++ }
+ }
+ }
+ #endif /* BUILD_XSHAPE */
++#endif /* BUILD_X11 */
+
+ last_update_time = 0.0;
+ next_update_time = get_time() - fmod(get_time(), active_update_interval());
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/, app-admin/conky/files/
@ 2019-03-09 16:03 Daniel Pielmeier
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Pielmeier @ 2019-03-09 16:03 UTC (permalink / raw
To: gentoo-commits
commit: 51c4404292739db0377e2b25b66c55f9a5b060ef
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 16:03:38 2019 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 16:03:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c44042
app-admin/conky: Revision bump to conky-1.10.8-r8.
Fix portmon patch again to not install the libraries into subdirectories.
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../conky/{conky-1.10.8-r7.ebuild => conky-1.10.8-r8.ebuild} | 0
app-admin/conky/files/conky-1.10.8-portmon.patch | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-admin/conky/conky-1.10.8-r7.ebuild b/app-admin/conky/conky-1.10.8-r8.ebuild
similarity index 100%
rename from app-admin/conky/conky-1.10.8-r7.ebuild
rename to app-admin/conky/conky-1.10.8-r8.ebuild
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 bce3853c2b0..e7b17dd1119 100644
--- a/app-admin/conky/files/conky-1.10.8-portmon.patch
+++ b/app-admin/conky/files/conky-1.10.8-portmon.patch
@@ -6,15 +6,15 @@
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/conky
-+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/conky
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
)
+
+if(BUILD_PORT_MONITORS)
+ install(TARGETS
+ tcp-portmon
+ RUNTIME DESTINATION bin
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/conky
-+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/conky
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
+endif(BUILD_PORT_MONITORS)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/, app-admin/conky/files/
@ 2020-03-12 21:28 Daniel Pielmeier
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Pielmeier @ 2020-03-12 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 2a6a09f0459f11be8a9b7e24fe73972578556b61
Author: Denis Pronin <dannftk <AT> yandex <DOT> ru>
AuthorDate: Fri Feb 21 22:08:32 2020 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 21:27:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a6a09f0
app-admin/conky: support clang and libc++ in conky-1.10.8-r9.ebuild
provided a new patch conky-1.10.8-clang.patch
Signed-off-by: Denis Pronin <dannftk <AT> yandex.ru>
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
app-admin/conky/conky-1.10.8-r9.ebuild | 185 +++++++++++++++++++++++++
app-admin/conky/files/conky-1.10.8-clang.patch | 30 ++++
2 files changed, 215 insertions(+)
diff --git a/app-admin/conky/conky-1.10.8-r9.ebuild b/app-admin/conky/conky-1.10.8-r9.ebuild
new file mode 100644
index 00000000000..a56768001bf
--- /dev/null
+++ b/app-admin/conky/conky-1.10.8-r9.ebuild
@@ -0,0 +1,185 @@
+# 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
+ "${FILESDIR}"/${P}-clang.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-clang.patch b/app-admin/conky/files/conky-1.10.8-clang.patch
new file mode 100644
index 00000000000..2fc49fa9cf2
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-clang.patch
@@ -0,0 +1,30 @@
+--- conky-1.10.8/src/linux.cc 2018-02-07 17:16:39.000000000 +0300
++++ conky-1.10.8.new/src/linux.cc 2020-02-22 00:43:52.336620654 +0300
+@@ -37,6 +37,7 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <limits.h>
++#include <clocale>
+ #include <sys/types.h>
+ #include <sys/sysinfo.h>
+ #include <sys/stat.h>
+--- conky-1.10.8/src/luamm.cc 2020-02-22 00:57:25.847867585 +0300
++++ conky-1.10.8.new/src/luamm.cc 2020-02-22 00:59:29.820510124 +0300
+@@ -23,6 +23,8 @@
+
+ #include "luamm.hh"
+
++#include <cxxabi.h>
++
+ namespace lua {
+ namespace {
+
+@@ -57,7 +59,7 @@
+ lua_pushstring(l, e.what());
+ }
+ catch(...) {
+- lua_pushstring(l, ptr->__cxa_exception_type()->name());
++ lua_pushstring(l, abi::__cxa_current_exception_type()->name());
+ }
+ return 1;
+ }
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/, app-admin/conky/files/
@ 2020-11-02 9:50 Daniel Pielmeier
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Pielmeier @ 2020-11-02 9:50 UTC (permalink / raw
To: gentoo-commits
commit: 0fd8a8c809c4603e847267219bb1c87af93027e6
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 2 07:18:27 2020 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Mon Nov 2 09:49:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fd8a8c8
app-admin/conky: Build fix for libmicrohttpd.
Thanks to Toralf Förster for the report and Andy Getz for the patch.
Closes: https://bugs.gentoo.org/736172
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
app-admin/conky/conky-1.10.8-r10.ebuild | 1 +
app-admin/conky/conky-1.11.6-r1.ebuild | 4 +++
.../conky/files/conky-1.10.8-fpermissive.patch | 14 ++++++++++
.../conky/files/conky-1.11.6-fpermissive.patch | 31 ++++++++++++++++++++++
4 files changed, 50 insertions(+)
diff --git a/app-admin/conky/conky-1.10.8-r10.ebuild b/app-admin/conky/conky-1.10.8-r10.ebuild
index 4097461fbcc..66c0ffbf31c 100644
--- a/app-admin/conky/conky-1.10.8-r10.ebuild
+++ b/app-admin/conky/conky-1.10.8-r10.ebuild
@@ -71,6 +71,7 @@ PATCHES=(
"${FILESDIR}"/${P}-portmon.patch
"${FILESDIR}"/${P}-clang.patch
"${FILESDIR}"/${P}-virtual-sinks.patch
+ "${FILESDIR}"/${P}-fpermissive.patch
)
DISABLE_AUTOFORMATTING="yes"
diff --git a/app-admin/conky/conky-1.11.6-r1.ebuild b/app-admin/conky/conky-1.11.6-r1.ebuild
index 7ed7c4ce190..91a17200710 100644
--- a/app-admin/conky/conky-1.11.6-r1.ebuild
+++ b/app-admin/conky/conky-1.11.6-r1.ebuild
@@ -75,6 +75,10 @@ CONFIG_CHECK="~IPV6"
DOCS=( README.md AUTHORS )
+PATCHES=(
+ "${FILESDIR}"/${P}-fpermissive.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-fpermissive.patch b/app-admin/conky/files/conky-1.10.8-fpermissive.patch
new file mode 100644
index 00000000000..42abeb831cd
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-fpermissive.patch
@@ -0,0 +1,14 @@
+--- conky-1.10.8/src/conky.cc.orig 2020-08-28 13:17:22.330113596 -0400
++++ conky-1.10.8/src/conky.cc 2020-08-28 13:19:48.564891015 -0400
+@@ -478,9 +478,9 @@
+ struct MHD_Daemon *httpd;
+ static conky::simple_config_setting<bool> http_refresh("http_refresh", false, true);
+
+-int sendanswer(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) {
++MHD_Result sendanswer(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) {
+ struct MHD_Response *response = MHD_create_response_from_data(webpage.length(), (void*) webpage.c_str(), MHD_NO, MHD_NO);
+- int ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
++ MHD_Result ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
+ MHD_destroy_response(response);
+ if(cls || url || method || version || upload_data || upload_data_size || con_cls) {} //make compiler happy
+ return ret;
diff --git a/app-admin/conky/files/conky-1.11.6-fpermissive.patch b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
new file mode 100644
index 00000000000..1ac1173ba64
--- /dev/null
+++ b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
@@ -0,0 +1,31 @@
+From 16be0e1571a586168855bedb6da1ddc732b0bbf4 Mon Sep 17 00:00:00 2001
+From: Brenden Matthews <brenden@brndn.io>
+Date: Thu, 22 Oct 2020 13:02:00 -0400
+Subject: [PATCH] Build fix for libmicrohttpd.
+
+---
+ src/conky.cc | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/conky.cc b/src/conky.cc
+index 79633a40..b1743466 100644
+--- a/src/conky.cc
++++ b/src/conky.cc
+@@ -322,12 +322,13 @@ struct MHD_Daemon *httpd;
+ static conky::simple_config_setting<bool> http_refresh("http_refresh", false,
+ true);
+
+-int sendanswer(void *cls, struct MHD_Connection *connection, const char *url,
+- const char *method, const char *version, const char *upload_data,
+- size_t *upload_data_size, void **con_cls) {
++MHD_Result sendanswer(void *cls, struct MHD_Connection *connection,
++ const char *url, const char *method, const char *version,
++ const char *upload_data, unsigned long *upload_data_size,
++ void **con_cls) {
+ struct MHD_Response *response = MHD_create_response_from_buffer(
+ webpage.length(), (void *)webpage.c_str(), MHD_RESPMEM_PERSISTENT);
+- int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
++ MHD_Result ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
+ MHD_destroy_response(response);
+ if (cls || url || method || version || upload_data || upload_data_size ||
+ con_cls) {} // make compiler happy
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-11-02 9:50 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-26 17:24 [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/, app-admin/conky/files/ Daniel Pielmeier
-- strict thread matches above, loose matches on Subject: below --
2020-11-02 9:50 Daniel Pielmeier
2020-03-12 21:28 Daniel Pielmeier
2019-03-09 16:03 Daniel Pielmeier
2017-11-18 11:46 Daniel Pielmeier
2017-11-18 11:21 Daniel Pielmeier
2016-10-16 14:40 Daniel Pielmeier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox