From 0c4987bb0ed4f5fd97b04e01f884b352f252b0c0 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 2 Mar 2022 22:23:52 +0100 Subject: conky-irc: fix build --- conky-irc/PKGBUILD | 90 +++++++++++++++++++++--------------------------------- 1 file changed, 35 insertions(+), 55 deletions(-) (limited to 'conky-irc') diff --git a/conky-irc/PKGBUILD b/conky-irc/PKGBUILD index 0232df90d..c6208c775 100644 --- a/conky-irc/PKGBUILD +++ b/conky-irc/PKGBUILD @@ -14,69 +14,49 @@ pkgdesc='Lightweight system monitor for X - with irc-client enabled' url='https://github.com/brndnmtthws/conky' license=('BSD' 'GPL') arch=('i686' 'pentium4' 'x86_64') -makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db' 'git') -_pinned_dependencies=( - 'gcc-libs=11.2.0' - 'glibc>=2.31' - 'imlib2=1.8.0' - 'libcurl.so=4' - 'libircclient.so=1' - 'libncursesw.so=6' - 'libpulse.so=0' - 'libsystemd.so=0' - 'libx11=1.7.3.1' - 'libxdamage=1.1.5' - 'libxext=1.3.4' - 'libxfixes=6.0.0' - 'libxft=2.3.4' - 'libxinerama=1.1.4' - 'libxml2=2.9.13' - 'lua=5.4.4' - 'wireless_tools=30.pre9' -) -depends=('glib2' "${_pinned_dependencies[@]}") +makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git') +depends=( + 'glibc' 'glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft' 'imlib2' + 'libxml2' 'libpulse' 'libxnvctrl' 'systemd-libs' 'ncurses' 'curl' + libncursesw.so libXNVCtrl.so libsystemd.so libpulse.so libcurl.so) optdepends=('mounted') -source=("${pkgname%-irc}-${pkgver}.tar.gz::https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz" +source=("git+https://github.com/brndnmtthws/conky.git#tag=52e5aa53b4c76973519a770949dc8bdca0145325?signed" 'MAX_SP.patch') -sha512sums=('55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a' +sha512sums=('SKIP' '1ea39f88b5f2620fc0c4485cc16645dbad91f97be17b4b13a732205dde6265d621c7f2bc92be33b65f9db2815312beb42b516ddebbba90cfe947104e1a410a52') - -# options=('!strip' 'debug') - -prepare() { - cd "${srcdir}/${pkgname%-irc}-${pkgver}" - patch -p1 -i ../MAX_SP.patch - sed '/^#include / s,,,' -i 'src/irc.cc' - sed '/check_include_files(/ s,libircclient\.h,libircclient/libircclient.h,' -i 'cmake/ConkyPlatformChecks.cmake' -} +validpgpkeys=( + 'EB2E847572A71BE20F59AFBEB49ABB7270D9D4FD' # Brenden Matthews +) build() { - cd "${srcdir}/${pkgname%-irc}-${pkgver}" + cd "${srcdir}/${pkgname%-irc}" - cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D MAINTAINER_MODE=ON \ - -D BUILD_WLAN=ON \ - -D BUILD_XDBE=ON \ - -D BUILD_XSHAPE=ON \ - -D BUILD_IMLIB2=ON \ - -D BUILD_CURL=ON \ - -D BUILD_RSS=ON \ - -D BUILD_WEATHER_METAR=ON \ - -D BUILD_WEATHER_XOAP=ON \ - -D BUILD_PULSEAUDIO=ON \ - -D BUILD_JOURNAL=ON \ - -D BUILD_IRC=ON \ - -D CMAKE_INSTALL_PREFIX=/usr \ - . + cmake \ + -B build \ + -D CMAKE_BUILD_TYPE=Release \ + -D MAINTAINER_MODE=ON \ + -D BUILD_DOCS=ON \ + -D BUILD_WLAN=ON \ + -D BUILD_XDBE=ON \ + -D BUILD_XSHAPE=ON \ + -D BUILD_IMLIB2=ON \ + -D BUILD_CURL=ON \ + -D BUILD_RSS=ON \ + -D BUILD_NVIDIA=ON \ + -D BUILD_WEATHER_METAR=ON \ + -D BUILD_PULSEAUDIO=ON \ + -D BUILD_JOURNAL=ON \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -Wno-dev \ + -S . - make + make -C build } package() { - cd "${srcdir}/${pkgname%-irc}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - 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 + cd "${srcdir}/${pkgname%-irc}" + make -C build DESTDIR="${pkgdir}" install + install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm 644 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 } -- cgit v1.2.3-54-g00ecf