diff options
Diffstat (limited to 'app-admin/conky')
| -rw-r--r-- | app-admin/conky/Manifest | 13 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.10.8-r9.ebuild | 185 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.12.1.ebuild (renamed from app-admin/conky/conky-1.10.8-r10.ebuild) | 136 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.10.8-clang.patch | 30 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.10.8-fpermissive.patch | 14 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.10.8-libical-3.patch | 32 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.10.8-portmon.patch | 20 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch | 34 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.10.8-virtual-sinks.patch | 49 | ||||
| -rw-r--r-- | app-admin/conky/metadata.xml | 1 |
10 files changed, 72 insertions, 442 deletions
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index 970478bb2d9f..e8745dd0f23f 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,14 +1,7 @@ -AUX conky-1.10.8-clang.patch 773 BLAKE2B 1e1920093c8cea54190d2907f1966b66aae343f20bec111df0b6c6009f572d57912869ff879f05b55fa18ac4b40736acaeef03b0ec207baac2053937a305649c SHA512 82c7795c33256bd22575d3133ef20dc3a5cbdc4ae68ef7e6fefc3a9295d5e9f0f2d9d912122a5a22e1d6d42cbe1c40cdd3513d9bd7d08db636d96972a622c2a7 -AUX conky-1.10.8-fpermissive.patch 1081 BLAKE2B 637b91609242272617c146db05f1f6a9e6e620aef353850b2d9db329e4b643ebacada6d6239b8fda5be8e315e76cf3f457a6a57ca92e5be0ba559d84de747737 SHA512 15d53485284f27c300df8365f3ed1eae720538a8dbe0ab44b864b12b5819dcb64e0196a87b72afdab77a26ba452521050f47adfa1d9f1d61f8fc8a50e21b2cc7 -AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e32cd176d4efee3aa3816f36b782d823502a4a1cb79646995e90c9ac25d9a4bcd6f1879abe365173c3e29fc8583f213 SHA512 40cdd81f975c5198149ac62066af1a7b8eaa2c722d896d71a88663bef5bfdda17521d841a4fa8e08b5c4cc9106929385d626afcbe65709360b669b10a118f397 -AUX conky-1.10.8-portmon.patch 551 BLAKE2B 6b69ebb6c8ec194e51d616f487ab8d736062636b12c11b1beb6ae5d599a34c2598a0bc96563fa9e01e55a7187597b78b311ce729a0bdbe3f0c7c7135372aa764 SHA512 2a793c9b297c9ff13eba4cff37af0699c30f30e58edd3c73243090d26235db45a554b9f5751878937606ac6a1bb1759edc2507372412c25ff4df613327aedc03 -AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4 -AUX conky-1.10.8-virtual-sinks.patch 2054 BLAKE2B e047348df61b00dec0de151422a891feede717007e552ffb8fde0f390c0c3208e2c03bb1a615c89f7f4bfaaa8fdb603dd0eb75b4e6bdffe718c9eb6702787c2e SHA512 fe07eb460165bba0521071e7b5c452d4dc5626c7bb8e0c559ac4b275e09e8484a21eec275cfc02ca2162b6461a4198704fd806d6ba3c72504f8d007310a60ccb AUX conky-1.11.6-fpermissive.patch 1397 BLAKE2B 8200932639a6e0366d2c1426747d7de3939f21791c3a252cbe67f336555a9dc98e050114c5298e4d8b62e5b40f4a7a4bec82e1d38746f5a8bba5dba5295bd8c4 SHA512 e8063b7c567aa3aeae8ceab26895b124b865fe2815101d46593359d52f8ca9e830b6caaf2506e86550620df58230c507fb51f643bd0f61d92c232904f483b605 AUX conky-1.11.6-ipv6.patch 503 BLAKE2B 896cfc76a858981438cecf83db5b2b4fe32d7d6a0749524ac4c4d8dba3fd124a0b7de5d89329280b5c50e9de6cc4e182c23c2813575be6fceb97615e2acda4ca SHA512 3ea5247723676812a07d9ecc129d63cc75e51626a23c202da50bd3172403a24b93f6cbcc5c5e743a9acfe87b6d087ba510381c6157e1995b54d28a6dadbcf08a -DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a -EBUILD conky-1.10.8-r10.ebuild 4860 BLAKE2B bfa7ab46f34c8fac5a395869ad3ce175c75b748d87cabacac03a39f7d19ac904f5fd1fbb989fe4dbb6aee947b6d775c06d7941f7eecdbc566e09c17087bd7299 SHA512 b2160e9147005b2cc90020c07f8a7c4c0de7641a88f87ff983e573d24d52edd04ab3cefcea96cceb6579a48e021975248cb8f066b9137542def3c801ba57b587 -EBUILD conky-1.10.8-r9.ebuild 4777 BLAKE2B 42eff9a8b3bb93f1620b301c6b4c313415c39ca4c4f9c81ee860fd15314ab4d12b2a1cbc1b58b58cd533f6dd9c69ce45a527a6e00c337aae9108ed73f9729b08 SHA512 612d3d918499ad3c51816256fb826d432e45be4634cd810d623a26a3138e7feef80639fb98206a8f590ab37f4a90e08bc3352627f5fce2abda0579f75f551d65 +DIST conky-1.12.1.tar.gz 2404597 BLAKE2B 9e751844db9d1c90990b1e7dd5d9731330244f6ee772a7403e3520636f2ac930ccf3219e65da970d63396512cf843d4f8137854781fdf3c797fe910a8edb872d SHA512 897c6b83528809aa2e33e15b9ad6644d8cf36f4cff93f014811754f982c13180001b972b2b145b607de8d865c2af9a425ab50246065f537e14be75da5631593a EBUILD conky-1.11.6-r2.ebuild 4790 BLAKE2B c72c8455185a0125cf63262d97b7fcbf95fb7469eda6bd64a6a436d3b99128ed77987d6e9be6c456c07ea31f2f4b959e545e5a4e501947912ce4e63cf0109f65 SHA512 70dabc73ad704df62433683df9ae7b8ec38abf4dca63a76f7f32a580b1cbff3d02c1dbbb14486dbcd60b9780226a9625948843c0eadefda3581e429fcc54adf4 -MISC metadata.xml 2469 BLAKE2B 15947c03593a9d5215a9c1dd142458aeb84f61c77a669bbfa4abe256c94e28650516a0226350323f56bbc225c5edc5e9b9e3310d7957e072b6701e77e40623ce SHA512 75e2d5bd8f4848779c03fd983d995d8216f4bc35ca1d3af47cf004d1d43e36c2924523d286e13ea82c720a51a63d91e03af795e6c31471af71716b4c5ce46c4e +EBUILD conky-1.12.1.ebuild 4713 BLAKE2B 935332c40b024b6df71ac99880c13553057c9df4bd8201363cf931d05e51873c1d01ea3b9622fb2bd59e9e7019a5c3353a12db78dedf58497424478b17613474 SHA512 67fabdf98833dc4f24134ec00f8c05693fd74f255c2678ab0d43d6e6fff5845b10e173e4cf67da7c1362d9e3e0d1fd2943ca8ef168329193cb9313f753ed973f +MISC metadata.xml 2395 BLAKE2B 1bfdb9319bfa35d0e29edca04bf9f8fe7acba3d6cb9910fba7f632ff35a642cbdfd34cf0e18047eaa851808551f0c91614cbf814609de0c4b6d5cf656909d264 SHA512 4471b583a8fda5692eb18412ab579c1bcc37aff56009fa024ca257862df8ba93f788d3f001d7b9b74307e327f9deac27a2674f6ef48f8273940c2ea88d575813 diff --git a/app-admin/conky/conky-1.10.8-r9.ebuild b/app-admin/conky/conky-1.10.8-r9.ebuild deleted file mode 100644 index 3a8ea98b8989..000000000000 --- a/app-admin/conky/conky-1.10.8-r9.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# 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 -) - -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/conky-1.10.8-r10.ebuild b/app-admin/conky/conky-1.12.1.ebuild index 66c0ffbf31c9..4534b4f27330 100644 --- a/app-admin/conky/conky-1.10.8-r10.ebuild +++ b/app-admin/conky/conky-1.12.1.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake linux-info readme.gentoo-r1 +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" @@ -12,41 +14,40 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. 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" +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=" - 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 ) + 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 ) - || ( dev-lang/lua:0 dev-lang/lua:5.1 ) + 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} @@ -58,39 +59,44 @@ RDEPEND=" " DEPEND=" ${COMMON_DEPEND} - app-text/docbook2X + doc? ( app-text/docbook2X dev-libs/libxslt ) " -CONFIG_CHECK="~IPV6" +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 ) +" -DOCS=( README.md TODO ChangeLog NEWS AUTHORS ) +CONFIG_CHECK="~IPV6" -PATCHES=( - "${FILESDIR}"/${P}-use-pkgconfig.patch - "${FILESDIR}"/${P}-libical-3.patch - "${FILESDIR}"/${P}-portmon.patch - "${FILESDIR}"/${P}-clang.patch - "${FILESDIR}"/${P}-virtual-sinks.patch - "${FILESDIR}"/${P}-fpermissive.patch -) +DOCS=( README.md AUTHORS ) 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 +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. +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 } @@ -100,64 +106,58 @@ src_configure() { 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) + -DBUILD_ARGB=yes + -DBUILD_X11=yes + -DBUILD_XDAMAGE=yes + -DBUILD_XDBE=yes + -DBUILD_XSHAPE=yes + -DOWN_WINDOW=yes ) else mycmakeargs=( - -DBUILD_X11=OFF - -DBUILD_NVIDIA=OFF - -DBUILD_LUA_CAIRO=OFF - -DBUILD_LUA_IMLIB2=OFF - -DBUILD_LUA_RSVG=OFF - -DBUILD_XMMS2=OFF + -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_EVE=$(usex eve) + -DBUILD_DOCS=$(usex doc) -DBUILD_HDDTEMP=$(usex hddtemp) - -DBUILD_IOSTATS=$(usex iostats) + -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_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 + -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 @@ -184,4 +184,6 @@ src_install() { pkg_postinst() { readme.gentoo_print_elog + + xdg_pkg_postinst } diff --git a/app-admin/conky/files/conky-1.10.8-clang.patch b/app-admin/conky/files/conky-1.10.8-clang.patch deleted file mode 100644 index 2fc49fa9cf25..000000000000 --- a/app-admin/conky/files/conky-1.10.8-clang.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- 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; - } diff --git a/app-admin/conky/files/conky-1.10.8-fpermissive.patch b/app-admin/conky/files/conky-1.10.8-fpermissive.patch deleted file mode 100644 index 42abeb831cd6..000000000000 --- a/app-admin/conky/files/conky-1.10.8-fpermissive.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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.10.8-libical-3.patch b/app-admin/conky/files/conky-1.10.8-libical-3.patch deleted file mode 100644 index 032a6d2ef263..000000000000 --- a/app-admin/conky/files/conky-1.10.8-libical-3.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 128c8cce3415839a3d19a5cb877fd77af2538d35 Mon Sep 17 00:00:00 2001 -From: Adam Majer <amajer@suse.de> -Date: Tue, 6 Mar 2018 13:46:31 +0100 -Subject: [PATCH] Add support for libical 3.x (#465) - -In libical3, deprecated icaltime_from_timet is removed -Use icaltime_from_timet_with_zone instead. This function -exists in libical 2.x so no need to change requirements ---- - src/ical.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/ical.cc b/src/ical.cc -index e4b48511..ef069124 100644 ---- a/src/ical.cc -+++ b/src/ical.cc -@@ -49,13 +49,13 @@ struct ical_event *add_event(struct ical_event *listend, icalcomponent *new_ev) - icaltimetype start; - - start = icalcomponent_get_dtstart(new_ev); -- if(icaltime_compare(start, icaltime_from_timet(time(NULL), 0)) <= 0) { -+ if(icaltime_compare(start, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) <= 0) { - icalproperty *rrule = icalcomponent_get_first_property(new_ev, ICAL_RRULE_PROPERTY); - if(rrule) { - icalrecur_iterator* ritr = icalrecur_iterator_new(icalproperty_get_rrule(rrule), start); - icaltimetype nexttime = icalrecur_iterator_next(ritr); - while (!icaltime_is_null_time(nexttime)) { -- if(icaltime_compare(nexttime, icaltime_from_timet(time(NULL), 0)) > 0) { -+ if(icaltime_compare(nexttime, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) > 0) { - start = nexttime; - break; - } diff --git a/app-admin/conky/files/conky-1.10.8-portmon.patch b/app-admin/conky/files/conky-1.10.8-portmon.patch deleted file mode 100644 index e7b17dd1119a..000000000000 --- a/app-admin/conky/files/conky-1.10.8-portmon.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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} -+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - ) -+ -+if(BUILD_PORT_MONITORS) -+ install(TARGETS -+ tcp-portmon -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} -+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} -+) -+endif(BUILD_PORT_MONITORS) 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 deleted file mode 100644 index 97e6bd02323f..000000000000 --- a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch +++ /dev/null @@ -1,34 +0,0 @@ -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) 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 deleted file mode 100644 index c0198ccc4ecf..000000000000 --- a/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch +++ /dev/null @@ -1,49 +0,0 @@ -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 - diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml index b3835daf4041..1fe89fc39f12 100644 --- a/app-admin/conky/metadata.xml +++ b/app-admin/conky/metadata.xml @@ -18,7 +18,6 @@ <flag name="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag> <flag name="bundled-toluapp">Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags</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> |