conky-irc: 1.12.2-17 -> 1.15.0-1

1 files changed, 38 insertions, 9 deletions

diff --git a/conky-irc/PKGBUILD b/conky-irc/PKGBUILD
index c6208c775..b92b6381e 100644
--- a/conky-irc/PKGBUILD
+++ b/conky-irc/PKGBUILD
@@ -6,21 +6,35 @@
 # Contributor: Partha Chowdhury <kira.laucas@gmail.com>
 
 pkgname=conky-irc
-pkgver=1.12.2
+pkgver=1.15.0
 provides=("conky=${pkgver}")
 conflicts=('conky')
-pkgrel=17
+_gitcommit=70d7d5c796e3e84e674705ffc6aaf7a0d6c5b109
+pkgrel=1
 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-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)
+makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git' 'catch2' 'pandoc' 'python-yaml' 'python-jinja')
+_pinned_dependencies=(
+  'glibc>=2.31'
+  'imlib2=1.9.1'
+  'libcurl.so=4'
+  'libircclient.so=1'
+  'libncursesw.so=6'
+  'libpulse.so=0'
+  'libsystemd.so=0'
+  'libxdamage=1.1.6'
+  'libxft=2.3.7'
+  'libxinerama=1.1.5'
+  'libxml2=2.10.3'
+  'libXNVCtrl.so=0'
+  'lua=5.4.4'
+  'wireless_tools=30.pre9'
+)
+depends=('glib2' "${_pinned_dependencies[@]}")
 optdepends=('mounted')
-source=("git+https://github.com/brndnmtthws/conky.git#tag=52e5aa53b4c76973519a770949dc8bdca0145325?signed"
+source=("git+https://github.com/brndnmtthws/conky.git#commit=${_gitcommit}?signed"
         'MAX_SP.patch')
 sha512sums=('SKIP'
             '1ea39f88b5f2620fc0c4485cc16645dbad91f97be17b4b13a732205dde6265d621c7f2bc92be33b65f9db2815312beb42b516ddebbba90cfe947104e1a410a52')
@@ -28,14 +42,28 @@ validpgpkeys=(
   'EB2E847572A71BE20F59AFBEB49ABB7270D9D4FD' # Brenden Matthews
 )
 
+pkgver() {
+  cd "${srcdir}/${pkgname%-irc}"
+  git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  cd "${srcdir}/${pkgname%-irc}"
+  rm -r tests/catch2
+  ln -s /usr/include/catch2 tests
+  patch -p1 -i ../MAX_SP.patch
+}
+
 build() {
   cd "${srcdir}/${pkgname%-irc}"
 
   cmake \
     -B build \
     -D CMAKE_BUILD_TYPE=Release \
+    -D CMAKE_CXX_FLAGS="$CXXFLAGS -ffat-lto-objects" \
     -D MAINTAINER_MODE=ON \
     -D BUILD_DOCS=ON \
+    -D BUILD_EXTRAS=ON \
     -D BUILD_WLAN=ON \
     -D BUILD_XDBE=ON \
     -D BUILD_XSHAPE=ON \
@@ -46,6 +74,7 @@ build() {
     -D BUILD_WEATHER_METAR=ON \
     -D BUILD_PULSEAUDIO=ON \
     -D BUILD_JOURNAL=ON \
+    -D BUILD_IRC=ON \
     -D CMAKE_INSTALL_PREFIX=/usr \
     -Wno-dev \
     -S .
@@ -57,6 +86,6 @@ package() {
   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 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
 }