From 530a62676287abeefb5838d6f03559092d9ad736 Mon Sep 17 00:00:00 2001 From: joborun Date: Fri, 22 Dec 2023 20:01:22 +0200 Subject: [PATCH] upg conky conky11 --- conky/PKGBUILD | 99 ++++++++++++++++++++---------------------------- conky/clean | 2 +- conky/deps | 30 ++++++++------- conky/time | 6 +-- conky11/PKGBUILD | 15 ++++---- meson/PKGBUILD | 1 + 6 files changed, 69 insertions(+), 84 deletions(-) diff --git a/conky/PKGBUILD b/conky/PKGBUILD index 8ae5e2a..90e8278 100644 --- a/conky/PKGBUILD +++ b/conky/PKGBUILD @@ -1,57 +1,28 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -# Based on AUR pkgname=conky-lua-archers -# Maintainer : Yiannis A Ginis -# Contributor : Spyros Stathopoulos -# Contributor : Chris Sakalis -# based on AUR: conky-lua-archers-git pkgname=conky -pkgver=1.18.1 +pkgver=1.19.6 pkgrel=01 -pkgdesc="A free, light-weight system monitor for X with lua enabled for Arch based distros" +pkgdesc="A free, light-weight system monitor for X with lua enabled" url="https://github.com/brndnmtthws/conky" -replaces=('torsmo' 'conky-lua' 'conky-lua-arch' 'conky-lua-archers-git') +replaces=('torsmo' 'conky-lua' 'conky-lua-arch' 'conky-lua-archers-git' 'conky-cli') provides=("conky=${pkgver}") -conflicts=('conky-lua' 'conky-lua-arch' 'conky-lua-nv' 'conky-lua-archers-git' 'conky-lua-archers') -## Note: after discovering the following running error on our previous edition -## 'E: pyAlsaAudio in not available' -## we decided to add 'python-pyalsa' as make and run dependency -## the error is gone now -## ... end of note -depends=( - 'alsa-lib' - 'cairo' - 'curl' - 'glib2' - 'imlib2' - 'librsvg' - 'libxdamage' - 'libxft' - 'libxinerama' - 'libxml2' -# 'libxnvctrl' - 'lua' - 'lua51' - 'python-pyalsa' - 'tolua++' -# 'wireless_tools' -) -makedepends=( - 'cmake' - 'docbook2x' - 'docbook-xml' - 'docbook-xsl' - 'git' - 'perl-xml-libxml' - 'perl-xml-sax-expat' - 'python-pyalsa' -) +conflicts=('conky-lua' 'conky-lua-arch' 'conky-lua-nv' 'conky-lua-archers-git' 'conky-lua-archers' 'conky-cli') +makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git' 'catch2' 'python-yaml' 'python-jinja' + 'xorgproto' 'libx11' 'libxdamage' 'libxext' 'libxft' 'libxinerama' 'wayland' 'wayland-protocols' + 'librsvg' 'cairo') +depends=('curl' 'lua' 'libxml2') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/brndnmtthws/${pkgname}/archive/refs/tags/v${pkgver}.tar.gz") + #source=("https://github.com/brndnmtthws/${pkgname}/archive/v${pkgver}.tar.gz") -source=("git+$url.git#commit=a21a8f7d26f07f1dc5c144be2120e8bc6721159f") # refs/tags/v1.18.1 +#source=("git+$url.git#commit=$_commit?signed") # refs/tags/v1.18.3 +#source=("git+$url.git#commit=$_commit") # refs/tags/v1.18.3 + options=('strip' '!emptydirs') #pkgver() { @@ -60,13 +31,17 @@ options=('strip' '!emptydirs') #} prepare() { - cd ${srcdir}/${pkgname} - mkdir -p build/ # as @afaikifreedom recommended + cd ${srcdir}/${pkgname}-${pkgver} + mkdir -p build/ +# Unbundle catch2 to fix build with glibc 2.35 + rm -r tests/catch2 + ln -s /usr/include/catch2 tests } build() { - cd ${srcdir}/${pkgname} + cd ${srcdir}/${pkgname}-${pkgver} cmake \ + -B build \ -D CMAKE_BUILD_TYPE=MinSizeRelease \ -D CMAKE_INSTALL_PREFIX=/usr \ -D MAINTAINER_MODE=OFF \ @@ -74,6 +49,8 @@ build() { -D BUILD_APCUPSD=OFF \ -D BUILD_ARGB=ON \ -D BUILD_CURL=ON \ + -D BUILD_EXTRAS=ON \ + -D BUILD_HDDTEMP=OFF \ -D BUILD_I18N=OFF \ -D BUILD_IBM=OFF \ -D BUILD_IMLIB2=ON \ @@ -86,35 +63,41 @@ build() { -D BUILD_MPD=OFF \ -D BUILD_NVIDIA=OFF \ -D BUILD_OLD_CONFIG=ON \ + -D BUILD_PORT_MONITORS=OFF \ -D BUILD_PULSEAUDIO=OFF \ -D BUILD_WLAN=OFF \ -D BUILD_X11=ON \ + -D BUILD_WAYLAND=ON \ -D BUILD_XDAMAGE=ON \ -D BUILD_XDBE=ON \ -D BUILD_XFT=ON \ -D BUILD_XINERAMA=ON \ -D DEFAULTNETDEV=eth0 \ - -D OWN_WINDOW=ON + -D OWN_WINDOW=ON \ + -Wno-dev \ + -S . - make + make -C build } package() { - cd ${srcdir}/${pkgname} - make DESTDIR=${pkgdir} install - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - install -D -m644 LICENSE.BSD ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.BSD -# install -D -m644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim - install -D -m644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim + cd ${srcdir}/${pkgname}-${pkgver} + make -C build DESTDIR="${pkgdir}" install + install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}" +# install -Dm 644 build/extras/vim/syntax/conkyrc.vim -t "${pkgdir}"/usr/share/vim/vimfiles/syntax + install -Dm 644 extras/vim/ftdetect/conkyrc.vim -t "${pkgdir}"/usr/share/vim/vimfiles/ftdetect } #---- arch license gpg-key & sha256sums ---- arch=(x86_64) -license=('GPL3' 'BSD') +license=('BSD-3-Clause' 'GPL-3.0-or-later') -sha256sums=(SKIP) # conky.git +#validpgpkeys=(AF310802C8EFA20499CF3556137B7AC2BDFD8DF0) # Brenden Matthews +#validpgpkeys=(EB2E847572A71BE20F59AFBEB49ABB7270D9D4FD) # Brenden Matthews -## ddebf36fcd03be6665c7a4d1a349a07c2f67ce663c32c95a88838ec8cb084d2b conky-1.18.1-01-x86_64.pkg.tar.lz +sha256sums=(1bf5868da44056badd4718a3c8dcc6905f7118a9f86e785b354a8ecdb157a59e) # conky-1.19.6.tar.gz + +## 126514a3bdcd3cca4c7a6adfe87de218daf3030856f610926ecd04a236beec14 conky-1.19.6-01-x86_64.pkg.tar.lz diff --git a/conky/clean b/conky/clean index 0514b8d..f86173c 100644 --- a/conky/clean +++ b/conky/clean @@ -1 +1 @@ -rm -rf {src,pkg,v1.*gz,conky} +rm -rf {src,pkg,conky-*tar.gz} diff --git a/conky/deps b/conky/deps index 02a2235..3b62914 100644 --- a/conky/deps +++ b/conky/deps @@ -1,20 +1,22 @@ -alsa-lib -cairo -imlib2 -librsvg -libxdamage -libxft -libxinerama lua -lua51 -tolua++ +libxml2 cmake docbook2x -docbook-xml docbook-xsl -perl-xml-libxml -perl-xml-sax-expat +man-db git -python-pyalsa - +catch2 +python-yaml +python-jinja +xorgproto +libx11 +libxdamage +libxext +libxft +libxinerama +wayland +wayland-protocols +cairo +librsvg +imlib2 diff --git a/conky/time b/conky/time index bb4ec96..50cf10f 100644 --- a/conky/time +++ b/conky/time @@ -1,6 +1,6 @@ -real 1m6.300s -user 0m51.440s -sys 0m4.274s +real 1m28.505s +user 1m21.140s +sys 0m10.606s diff --git a/conky11/PKGBUILD b/conky11/PKGBUILD index a72d155..bc6b938 100644 --- a/conky11/PKGBUILD +++ b/conky11/PKGBUILD @@ -3,19 +3,14 @@ # Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" #-----------------------------------------| DESCRIPTION |--------------------------------------- -# Based on AUR pkgname=conky-lua-archers -# Maintainer : Yiannis A Ginis -# Contributor : Spyros Stathopoulos -# Contributor : Chris Sakalis pkgname=conky11 _pkgname=conky pkgver=1.11.3 -pkgrel=01 +pkgrel=02 pkgdesc="A free, light-weight system monitor for X with lua enabled for Arch based distros - minimalist Joborun version" -arch=(x86_64) url="https://github.com/brndnmtthws/conky" -replaces=('torsmo' 'conky-lua' 'conky-lua-arch' 'conky-lua-archers-git' 'conky') +#replaces=('torsmo' 'conky-lua' 'conky-lua-arch' 'conky-lua-archers-git' 'conky') provides=("conky=${pkgver}") conflicts=('conky-lua' 'conky-lua-arch' 'conky-lua-nv' 'conky-lua-archers-git' 'conky-lua-archers' 'conky') @@ -104,9 +99,13 @@ package() { install -D -m644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL3' 'BSD') sha256sums=(0140e749537d4d05bf33fbac436e54756faa26021e16f2bca418e9eeea724eb4) # v1.11.3.tar.gz +## 2477cbc03e577798282f7d80597c374b6a671f53324b8a52142dba6b6aa4f436 conky11-1.11.3-02-x86_64.pkg.tar.lz + diff --git a/meson/PKGBUILD b/meson/PKGBUILD index e238840..5f3dc4f 100644 --- a/meson/PKGBUILD +++ b/meson/PKGBUILD @@ -109,3 +109,4 @@ sha256sums=(4ba253ef60e454e23234696119cbafa082a0aead0bd3bbf6991295054795f5dc # ## 76a6aade2c15e3ee77d22943c7391fcd70f70eda6b5d48dad32368e75f400d1e meson-1.3.0-02-x86_64.pkg.tar.lz +##