diff options
| author | Vlad Glagolev | 2018-05-24 18:50:15 -0400 |
|---|---|---|
| committer | Vlad Glagolev | 2018-05-24 18:50:15 -0400 |
| commit | 5e7171d3b331e591c6fe306b9302641a252355b8 (patch) | |
| tree | cbac0706e9ef10a722e0d59c082859cf8e0babed | |
| parent | 25d933be2dc17990b355948b581dd68bd7be1fa6 (diff) | |
conky: corrected dependencies
| -rwxr-xr-x | x11/conky/BUILD | 5 | ||||
| -rwxr-xr-x | x11/conky/CONFIGURE | 6 | ||||
| -rwxr-xr-x | x11/conky/DEPENDS | 32 | ||||
| -rw-r--r-- | x11/conky/HISTORY | 5 |
4 files changed, 34 insertions, 14 deletions
diff --git a/x11/conky/BUILD b/x11/conky/BUILD index 2e70ddfe76..1a45ad7b24 100755 --- a/x11/conky/BUILD +++ b/x11/conky/BUILD @@ -1,2 +1,7 @@ OPTS="$OPTS $CONKY_OPTS" && + +if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} LUA); then + LDFLAGS="-ltoluapp ${LDFLAGS}" +fi && + default_build diff --git a/x11/conky/CONFIGURE b/x11/conky/CONFIGURE index 49228a97b9..087e984842 100755 --- a/x11/conky/CONFIGURE +++ b/x11/conky/CONFIGURE @@ -13,4 +13,8 @@ config_query_option CONKY_OPTS 'enable support for hard disk temperature?' y \ config_query_option CONKY_OPTS 'enable support for per task IO stats?' y \ '--enable-iostats' '--disable-iostats' && config_query_option CONKY_OPTS 'enable support for IPv4 port monitoring?' y \ - '--enable-portmon' '--disable-portmon' + '--enable-portmon' '--disable-portmon' && +config_query_option CONKY_OPTS 'enable support for Music Player Daemon?' n \ + '--enable-mpd' '--disable-mpd' && +config_query_option CONKY_OPTS 'enable support for moc player?' n \ + '--enable-moc' '--disable-moc' diff --git a/x11/conky/DEPENDS b/x11/conky/DEPENDS index f6fa69ccb7..119f54c17e 100755 --- a/x11/conky/DEPENDS +++ b/x11/conky/DEPENDS @@ -27,11 +27,6 @@ optional_depends curl \ "--disable-curl" \ "for curl support" && -optional_depends mpd \ - "--enable-mpd" \ - "--disable-mpd" \ - "for Music Player Daemon support" && - optional_depends xmms2 \ "--enable-xmms2" \ "--disable-xmms2" \ @@ -57,11 +52,28 @@ optional_depends alsa-lib \ "--disable-alsa" \ "for ALSA support" && -optional_depends lua51 \ +optional_depends LUA \ "--enable-lua" \ "--disable-lua" \ "for Lua scripting support" && +config_query_option CONKY_OPTS "Enable Lua Imlib2 bindings for Conky?" n \ + "--enable-lua-imlib2" \ + "--disable-lua-imlib2" && + +if ! is_depends_enabled ${SPELL} imlib2 && list_find "${CONKY_OPTS}" "--enable-lua-imlib2"; then + depends imlib2 +fi && + +optional_depends cairo \ + "--enable-lua-cairo" \ + "--disable-lua-cairo" \ + "for Lua Cairo bindings for Conky" && + +if list_find "${CONKY_OPTS}" "--enable-lua-imlib2" || is_depends_enabled ${SPELL} cairo; then + depends tolua++ +fi && + optional_depends wireless_tools \ "--enable-wlan" \ "--disable-wlan" \ @@ -70,10 +82,4 @@ optional_depends wireless_tools \ optional_depends ncurses \ "--enable-ncurses" \ "--disable-ncurses" \ - "for TUI support" && - -optional_depends moc \ - "--enable-moc" \ - "--disable-moc" \ - "for moc player support" - + "for TUI support" diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY index 8425689349..820eae0787 100644 --- a/x11/conky/HISTORY +++ b/x11/conky/HISTORY @@ -1,3 +1,8 @@ +2018-05-24 Vlad Glagolev <stealth@sourcemage.org> + * BUILD: link with toluapp if enabled + * DEPENDS: corrected Lua dependency chain; dropped mpd/moc + optional dependencies and moved their flags to CONFIGURE + 2014-06-09 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: fix SOURCE_URL[0] * PRE_BUILD, |