diff --git a/dot_local/share/packages/conky-lua/PKGBUILD b/dot_local/share/packages/conky-lua/PKGBUILD index a936cc4..0b6fe43 100644 --- a/dot_local/share/packages/conky-lua/PKGBUILD +++ b/dot_local/share/packages/conky-lua/PKGBUILD @@ -3,7 +3,7 @@ pkgname=conky-lua _pkgname=conky -pkgver=1.11.3 +pkgver=1.19.2 pkgrel=1 pkgdesc='Lightweight system monitor for X, with Lua support enabled' url='http://github.com/brndnmtthws/conky' @@ -25,7 +25,7 @@ conflicts=('conky') backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf') source=("https://github.com/brndnmtthws/${_pkgname}/archive/v${pkgver}.tar.gz" "longerpid.patch") -sha1sums=('73b607f5d7235ef4c44912b6c6b082dc1cf314e6' +sha1sums=('821de1cee3e686f07fb43070b5b2fd6e1b3a9498' '26d0fa6d090fcdab05c76ca8bf8e339462929415') prepare() { @@ -34,7 +34,7 @@ prepare() { sed -i "s/\(CMAKE_C_FLAGS\) \"\(.*\)\"/\1 \"\2 ${CFLAGS}\"/" cmake/ConkyBuildOptions.cmake sed -i "s/\(CMAKE_CXX_FLAGS\) \"\(.*\)\"/\1 \"\2 ${CXXFLAGS}\"/" cmake/ConkyBuildOptions.cmake ## enable longer pids - patch --strip=2 --input=${srcdir}/longerpid.patch + # patch --strip=2 --input=${srcdir}/longerpid.patch } build() { @@ -44,7 +44,7 @@ build() { -D CMAKE_INSTALL_PREFIX=/usr \ -D MAINTAINER_MODE=OFF \ -D BUILD_APCUPSD=OFF \ - -D BUILD_ARGB=OFF \ + -D BUILD_ARGB=ON \ -D BUILD_BUILTIN_CONFIG=OFF \ -D BUILD_CMUS=OFF \ -D BUILD_CURL=OFF \ @@ -82,7 +82,6 @@ package() { cd "${srcdir}/${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 LICENSE.BSD ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.BSD - install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim + # install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim } diff --git a/dot_local/share/packages/conky-lua/longerpid.patch b/dot_local/share/packages/conky-lua/longerpid.patch deleted file mode 100644 index 406659d..0000000 --- a/dot_local/share/packages/conky-lua/longerpid.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --unified --recursive --text src/conky-1.11.5/src/top.cc src.new/conky-1.11.5/src/top.cc ---- src/conky-1.11.5/src/top.cc 2019-08-12 17:53:54.000000000 -0400 -+++ src.new/conky-1.11.5/src/top.cc 2020-02-06 13:42:03.645192303 -0500 -@@ -542,7 +542,7 @@ - } - - PRINT_TOP_GENERATOR(cpu, (unsigned int)7, "%6.2f", amount) --PRINT_TOP_GENERATOR(pid, (unsigned int)6, "%5i", pid) -+PRINT_TOP_GENERATOR(pid, (unsigned int)8, "%7i", pid) - PRINT_TOP_GENERATOR(uid, (unsigned int)6, "%5i", uid) - PRINT_TOP_HR_GENERATOR(mem_res, rss, 1) - PRINT_TOP_HR_GENERATOR(mem_vsize, vsize, 1)