diff options
author | Denis Pronin <dannftk@yandex.ru> | 2020-02-22 01:08:32 +0300 |
---|---|---|
committer | Daniel Pielmeier <billie@gentoo.org> | 2020-03-12 22:27:38 +0100 |
commit | 2a6a09f0459f11be8a9b7e24fe73972578556b61 (patch) | |
tree | 90959511681dcd52f2943c4a66c957d0415ca45d /app-admin/conky | |
parent | sci-geosciences/gpsbabel: Start preparing for 1.6.0 (diff) | |
download | gentoo-2a6a09f0459f11be8a9b7e24fe73972578556b61.tar.gz gentoo-2a6a09f0459f11be8a9b7e24fe73972578556b61.tar.bz2 gentoo-2a6a09f0459f11be8a9b7e24fe73972578556b61.zip |
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@yandex.ru>
Signed-off-by: Daniel Pielmeier <billie@gentoo.org>
Diffstat (limited to 'app-admin/conky')
-rw-r--r-- | app-admin/conky/conky-1.10.8-r9.ebuild | 185 | ||||
-rw-r--r-- | app-admin/conky/files/conky-1.10.8-clang.patch | 30 |
2 files changed, 215 insertions, 0 deletions
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 000000000000..a56768001bfc --- /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 000000000000..2fc49fa9cf25 --- /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; + } |