summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpyros Stathopoulos2022-07-02 23:21:00 +0100
committerSpyros Stathopoulos2022-07-02 23:21:00 +0100
commit1c8dc4ab0664c1b9b85aa2ea031415fb6b3c2366 (patch)
treea56890bd1fed5f4697c06e5e9f9350654d507f75
parent1dacbbf166f15af82e62a2ee6d332c5157fb4c00 (diff)
downloadaur-1c8dc4ab0664c1b9b85aa2ea031415fb6b3c2366.tar.gz
Use system catch2 as per the official PKGBUILD
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
2 files changed, 8 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1addca2242c9..b82f6a768c27 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = conky-lua-nv
pkgdesc = An advanced system monitor for X based on torsmo with lua and nvidia enabled
pkgver = 1.12.2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/brndnmtthws/conky
install = conky-lua-nv.install
arch = i686
@@ -16,6 +16,7 @@ pkgbase = conky-lua-nv
makedepends = cmake
makedepends = git
makedepends = man-db
+ makedepends = catch2
depends = libxml2
depends = curl
depends = cairo
@@ -43,4 +44,3 @@ pkgbase = conky-lua-nv
sha1sums = 3beb6048a7146f4a19cfdb1b994ead3ec051773b
pkgname = conky-lua-nv
-
diff --git a/PKGBUILD b/PKGBUILD
index 91ab1eaa0d51..d0031591f02b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=conky-lua-nv
_pkgname=conky
pkgver=1.12.2
-pkgrel=1
+pkgrel=2
pkgdesc="An advanced system monitor for X based on torsmo with lua and nvidia enabled"
arch=('i686' 'x86_64')
url="https://github.com/brndnmtthws/conky"
@@ -20,7 +20,7 @@ depends=('libxml2' 'curl' 'cairo' 'wireless_tools' 'libxinerama'
'libxft' 'glib2' 'libxdamage' 'imlib2' 'lua' 'librsvg'
'libxnvctrl' 'libpulse')
makedepends=('cmake' 'docbook2x' 'perl-xml-libxml' 'docbook-xml'
- 'docbook-xsl' 'cmake' 'git' 'man-db')
+ 'docbook-xsl' 'cmake' 'git' 'man-db' 'catch2')
optdepends=('nvidia: for GT4xx and newer GPUs',
'nvidia-340xx: for G8x, G9x, GT2xx GPUS',
'nvidia-304xx: for GeForce 6/7 GPUs')
@@ -33,6 +33,8 @@ prepare() {
# disable HSV gradients for now
cd ${srcdir}/${_pkgname}-${pkgver}
rm tests/test-hsv.cc
+ rm -r tests/catch2
+ ln -s /usr/include/catch2 tests
sed -i 's/set(test_srcs ${test_srcs} test-hsv.cc)//g' tests/CMakeLists.txt
}
@@ -58,7 +60,8 @@ build() {
-D BUILD_HSV_GRADIENT=OFF \
-D BUILD_TESTS=OFF \
-D CMAKE_INSTALL_PREFIX=/usr \
- .
+ -Wno-dev \
+ -S .
make