mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-19 00:21:40 +00:00
extra/conky to 1.22.0-1
This commit is contained in:
Kevin Mihelich
parent
4bc9fb419e
commit
81befdb2fc
3 changed files with 185 additions and 26 deletions
extra/conky
|
|
@ -1,12 +1,12 @@
|
|||
pkgbase = conky
|
||||
pkgdesc = Light-weight system monitor for X, Wayland, and other things, too
|
||||
pkgver = 1.21.5
|
||||
pkgver = 1.22.0
|
||||
pkgrel = 1
|
||||
url = https://github.com/brndnmtthws/conky
|
||||
arch = x86_64
|
||||
license = BSD-3-Clause
|
||||
license = GPL-3.0-or-later
|
||||
makedepends = catch2-v2
|
||||
makedepends = catch2
|
||||
makedepends = cmake
|
||||
makedepends = docbook2x
|
||||
makedepends = docbook-xsl
|
||||
|
|
@ -33,7 +33,6 @@ pkgbase = conky
|
|||
depends = libxext
|
||||
depends = libxfixes
|
||||
depends = libxft
|
||||
depends = libxi
|
||||
depends = libxinerama
|
||||
depends = libxml2
|
||||
depends = libxnvctrl
|
||||
|
|
@ -46,9 +45,12 @@ pkgbase = conky
|
|||
depends = libsystemd.so
|
||||
depends = wayland
|
||||
depends = wireless_tools
|
||||
source = git+https://github.com/brndnmtthws/conky.git#tag=v1.21.5?signed
|
||||
source = git+https://github.com/brndnmtthws/conky.git#tag=v1.22.0?signed
|
||||
source = use-system-cmake.patch
|
||||
validpgpkeys = AF310802C8EFA20499CF3556137B7AC2BDFD8DF0
|
||||
sha512sums = 740ae8fb1e81807f76aecd091a70f52a282ab88f4fde65a59345d2833e4e91c392f840b116124ce4f88436f0e95daa6e45e6d9515ed8eddef55fc6dbbe724397
|
||||
b2sums = 0343e3c78d76ae4f9f2dff5dfde0a9dcbcbb2e2204e58a9c9600f5d15a7b42087282b77686ba66db99fd41a25f43cf130a3f3c56187c9bfeaa7050b9f837b64a
|
||||
sha512sums = db1344b31e035d9f38eaceaba44f40d3f4954ae64190e1f5e0cad6b10de9a188c264720644a204c5c560e07a5838e63a261c7146d9981e17380fdd6d4a468017
|
||||
sha512sums = 5bdcef1172e53e5d4344bccf33250227f7e1e52b97e8ed95e226fb5ca2b3dde6da9607d2dd0db5d1cf69a972d315e27e534e4a9732880a3670956e8ee988120d
|
||||
b2sums = 44ab19b432550638993c10814b9f00de2bb65daff24a7e56a78e3228bd98a52c24e0853b4248cbb60ab49e79efaac4877fcf3846186b0c18deea6ae0715cce6b
|
||||
b2sums = 9ce6d4fe9ad315d5b74f19208c983c917e21c3f2475f4abe53f5df1e5258c298c64f8e26ecc97d84b1465efe6cb425ec2d7510b1ae6526479c1f2798a4f32c6d
|
||||
|
||||
pkgname = conky
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
|
||||
# Maintainer: Carl Smedstad <carsme@archlinux.org>
|
||||
# Contributor: Gaetan Bisson <bisson@archlinux.org>
|
||||
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
|
||||
# Contributor: James Rayner <james@archlinux.org>
|
||||
|
|
@ -10,7 +11,7 @@
|
|||
# - remove makedepends on pandoc, set -D BUILD_DOCS=OFF
|
||||
|
||||
pkgname=conky
|
||||
pkgver=1.21.5
|
||||
pkgver=1.22.0
|
||||
pkgrel=1
|
||||
pkgdesc='Light-weight system monitor for X, Wayland, and other things, too'
|
||||
url='https://github.com/brndnmtthws/conky'
|
||||
|
|
@ -20,7 +21,7 @@ license=(
|
|||
)
|
||||
arch=('x86_64')
|
||||
makedepends=(
|
||||
'catch2-v2'
|
||||
'catch2'
|
||||
'cmake'
|
||||
'docbook2x'
|
||||
'docbook-xsl'
|
||||
|
|
@ -46,7 +47,6 @@ depends=(
|
|||
'libxext'
|
||||
'libxfixes'
|
||||
'libxft'
|
||||
'libxi'
|
||||
'libxinerama'
|
||||
'libxml2'
|
||||
'lua'
|
||||
|
|
@ -56,23 +56,21 @@ depends=(
|
|||
'wayland'
|
||||
'wireless_tools'
|
||||
)
|
||||
source=("git+$url.git#tag=v${pkgver}?signed")
|
||||
sha512sums=('740ae8fb1e81807f76aecd091a70f52a282ab88f4fde65a59345d2833e4e91c392f840b116124ce4f88436f0e95daa6e45e6d9515ed8eddef55fc6dbbe724397')
|
||||
b2sums=('0343e3c78d76ae4f9f2dff5dfde0a9dcbcbb2e2204e58a9c9600f5d15a7b42087282b77686ba66db99fd41a25f43cf130a3f3c56187c9bfeaa7050b9f837b64a')
|
||||
source=(
|
||||
"git+$url.git#tag=v${pkgver}?signed"
|
||||
"use-system-cmake.patch"
|
||||
)
|
||||
sha512sums=('db1344b31e035d9f38eaceaba44f40d3f4954ae64190e1f5e0cad6b10de9a188c264720644a204c5c560e07a5838e63a261c7146d9981e17380fdd6d4a468017'
|
||||
'5bdcef1172e53e5d4344bccf33250227f7e1e52b97e8ed95e226fb5ca2b3dde6da9607d2dd0db5d1cf69a972d315e27e534e4a9732880a3670956e8ee988120d')
|
||||
b2sums=('44ab19b432550638993c10814b9f00de2bb65daff24a7e56a78e3228bd98a52c24e0853b4248cbb60ab49e79efaac4877fcf3846186b0c18deea6ae0715cce6b'
|
||||
'9ce6d4fe9ad315d5b74f19208c983c917e21c3f2475f4abe53f5df1e5258c298c64f8e26ecc97d84b1465efe6cb425ec2d7510b1ae6526479c1f2798a4f32c6d')
|
||||
validpgpkeys=(
|
||||
'AF310802C8EFA20499CF3556137B7AC2BDFD8DF0' # Brenden Matthews <github@brenden.brndn.io>
|
||||
)
|
||||
|
||||
pkgver() {
|
||||
cd ${pkgname}
|
||||
git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd $pkgname
|
||||
# Unbundle catch2 to fix build with glibc 2.35
|
||||
rm -r tests/catch2
|
||||
ln -s /usr/include/catch2 tests
|
||||
cd ${pkgname}
|
||||
patch -Np1 -i ../use-system-cmake.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -97,16 +95,20 @@ build() {
|
|||
-D CMAKE_INSTALL_PREFIX=/usr \
|
||||
-Wno-dev \
|
||||
-S .
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
make -C build
|
||||
check() {
|
||||
cd ${pkgname}
|
||||
ctest --test-dir build --output-on-failure
|
||||
}
|
||||
|
||||
package() {
|
||||
cd ${pkgname}
|
||||
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
|
||||
DESTDIR="${pkgdir}" cmake --install build
|
||||
install -vDm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
install -vDm 644 build/extras/vim/syntax/conkyrc.vim -t "${pkgdir}"/usr/share/vim/vimfiles/syntax
|
||||
install -vDm 644 extras/vim/ftdetect/conkyrc.vim -t "${pkgdir}"/usr/share/vim/vimfiles/ftdetect
|
||||
}
|
||||
|
||||
# vim: ts=2 sw=2 et:
|
||||
|
|
|
|||
155
extra/conky/use-system-cmake.patch
Normal file
155
extra/conky/use-system-cmake.patch
Normal file
|
|
@ -0,0 +1,155 @@
|
|||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index 76a7a8ad..c56ca705 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -14,11 +14,11 @@ if(NOT OS_DARWIN)
|
||||
list(FILTER test_srcs EXCLUDE REGEX ".*darwin.*\.cc?")
|
||||
endif()
|
||||
|
||||
-add_library(Catch2 STATIC catch2/catch_amalgamated.cpp)
|
||||
+find_package(Catch2 3 REQUIRED)
|
||||
|
||||
add_executable(test-conky test-common.cc ${test_srcs})
|
||||
target_link_libraries(test-conky
|
||||
- PRIVATE Catch2
|
||||
+ PRIVATE Catch2::Catch2WithMain
|
||||
PUBLIC conky_core
|
||||
)
|
||||
catch_discover_tests(test-conky)
|
||||
diff --git a/tests/test-algebra.cc b/tests/test-algebra.cc
|
||||
index fcd0d48f..8125fd2e 100644
|
||||
--- a/tests/test-algebra.cc
|
||||
+++ b/tests/test-algebra.cc
|
||||
@@ -1,4 +1,4 @@
|
||||
-#include "catch2/catch.hpp"
|
||||
+#include "catch2/catch_all.hpp"
|
||||
|
||||
#include <algebra.h>
|
||||
#include <config.h>
|
||||
diff --git a/tests/test-colours.cc b/tests/test-colours.cc
|
||||
index 886f13b8..edfad818 100644
|
||||
--- a/tests/test-colours.cc
|
||||
+++ b/tests/test-colours.cc
|
||||
@@ -1,4 +1,4 @@
|
||||
-#include "catch2/catch.hpp"
|
||||
+#include "catch2/catch_all.hpp"
|
||||
|
||||
#include <colours.h>
|
||||
#include <config.h>
|
||||
diff --git a/tests/test-common.cc b/tests/test-common.cc
|
||||
index 7e50ad99..64fd86d4 100644
|
||||
--- a/tests/test-common.cc
|
||||
+++ b/tests/test-common.cc
|
||||
@@ -29,7 +29,7 @@
|
||||
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do
|
||||
// this in one cpp file
|
||||
|
||||
-#include "catch2/catch.hpp"
|
||||
+#include "catch2/catch_all.hpp"
|
||||
|
||||
#include <common.h>
|
||||
#include <conky.h>
|
||||
diff --git a/tests/test-conky.cc b/tests/test-conky.cc
|
||||
index a1d841b0..97cc0d1f 100644
|
||||
--- a/tests/test-conky.cc
|
||||
+++ b/tests/test-conky.cc
|
||||
@@ -26,7 +26,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#include "catch2/catch.hpp"
|
||||
+#include "catch2/catch_all.hpp"
|
||||
#include "conky.h"
|
||||
#include "lua-config.hh"
|
||||
|
||||
diff --git a/tests/test-core.cc b/tests/test-core.cc
|
||||
index 769be768..573adaa7 100644
|
||||
--- a/tests/test-core.cc
|
||||
+++ b/tests/test-core.cc
|
||||
@@ -26,7 +26,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#include "catch2/catch.hpp"
|
||||
+#include "catch2/catch_all.hpp"
|
||||
|
||||
#include <core.h>
|
||||
|
||||
diff --git a/tests/test-darwin.cc b/tests/test-darwin.cc
|
||||
index b598706d..6396f52a 100644
|
||||
--- a/tests/test-darwin.cc
|
||||
+++ b/tests/test-darwin.cc
|
||||
@@ -26,7 +26,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#include "catch2/catch.hpp"
|
||||
+#include "catch2/catch_all.hpp"
|
||||
|
||||
#include <darwin.h>
|
||||
|
||||
diff --git a/tests/test-diskio.cc b/tests/test-diskio.cc
|
||||
index e5312834..41d4970d 100644
|
||||
--- a/tests/test-diskio.cc
|
||||
+++ b/tests/test-diskio.cc
|
||||
@@ -26,7 +26,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#include "catch2/catch.hpp"
|
||||
+#include "catch2/catch_all.hpp"
|
||||
|
||||
#include <config.h>
|
||||
#include <conky.h>
|
||||
diff --git a/tests/test-fs.cc b/tests/test-fs.cc
|
||||
index 5533f807..ab665ad5 100644
|
||||
--- a/tests/test-fs.cc
|
||||
+++ b/tests/test-fs.cc
|
||||
@@ -26,7 +26,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#include "catch2/catch.hpp"
|
||||
+#include "catch2/catch_all.hpp"
|
||||
|
||||
#include <fs.h>
|
||||
|
||||
diff --git a/tests/test-gradient.cc b/tests/test-gradient.cc
|
||||
index fee3247a..ba0228ad 100644
|
||||
--- a/tests/test-gradient.cc
|
||||
+++ b/tests/test-gradient.cc
|
||||
@@ -26,7 +26,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#include "catch2/catch.hpp"
|
||||
+#include "catch2/catch_all.hpp"
|
||||
|
||||
#include <colours.h>
|
||||
#include <conky.h>
|
||||
diff --git a/tests/test-graph.cc b/tests/test-graph.cc
|
||||
index 4478b001..4650be5b 100644
|
||||
--- a/tests/test-graph.cc
|
||||
+++ b/tests/test-graph.cc
|
||||
@@ -27,7 +27,7 @@
|
||||
*/
|
||||
|
||||
#include <tuple>
|
||||
-#include "catch2/catch.hpp"
|
||||
+#include "catch2/catch_all.hpp"
|
||||
#include "conky.h"
|
||||
#include "lua-config.hh"
|
||||
#include "specials.h"
|
||||
diff --git a/tests/test-linux.cc b/tests/test-linux.cc
|
||||
index 79ef4523..aeababf3 100644
|
||||
--- a/tests/test-linux.cc
|
||||
+++ b/tests/test-linux.cc
|
||||
@@ -26,7 +26,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#include "catch2/catch.hpp"
|
||||
+#include "catch2/catch_all.hpp"
|
||||
|
||||
#include <linux.h>
|
||||
|
||||
Loading…
Reference in a new issue