diff options
| author | Tasos Sahanidis | 2021-09-21 17:59:13 +0300 |
|---|---|---|
| committer | Tasos Sahanidis | 2021-09-21 17:59:13 +0300 |
| commit | 386d294074d2d3f1d49a1f345f85fb73b493cb95 (patch) | |
| tree | eb1b042b9dd2c212a2b2945d70655c12eb19d7f8 | |
| parent | 0bdce625033c590a0eab76ec1781452672c61b38 (diff) | |
| download | aur-386d294074d2d3f1d49a1f345f85fb73b493cb95.tar.gz | |
Backport quazip fix
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch | 36 |
3 files changed, 45 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = ckb-next pkgdesc = Corsair Keyboard and Mouse Input Driver, release version pkgver = 0.4.4 - pkgrel = 2 + pkgrel = 3 url = https://github.com/ckb-next/ckb-next install = ckb-next.install arch = i686 @@ -24,8 +24,10 @@ pkgbase = ckb-next conflicts = ckb-next-git source = https://github.com/ckb-next/ckb-next/archive/v0.4.4.tar.gz source = dc4dc54c5ebac7e4b455d8df35076fc044a581a7.patch + source = c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch sha256sums = 6946bd035cdbbbd2f139e543d2ca84ba422176c62c3a3665b544118dc6d618d0 sha256sums = ca662407404a0b22c3f2706f729717ab73575101247689ce80b7528fea0de87e + sha256sums = 97d56be2873f61d54518e4fa8fdc429ca48a8c5b53ed907ec9abdb08a3bbad0b pkgname = ckb-next @@ -2,7 +2,7 @@ # Contributor: Light2Yellow <oleksii.vilchanskyi@gmail.com> pkgname=ckb-next pkgver=0.4.4 -pkgrel=2 +pkgrel=3 pkgdesc="Corsair Keyboard and Mouse Input Driver, release version" arch=('i686' 'x86_64') url="https://github.com/ckb-next/ckb-next" @@ -14,9 +14,11 @@ conflicts=('ckb-git' 'ckb-git-latest' 'ckb-next-git') provides=('ckb-next') install=ckb-next.install source=("https://github.com/ckb-next/$pkgname/archive/v$pkgver.tar.gz" - 'dc4dc54c5ebac7e4b455d8df35076fc044a581a7.patch') + 'dc4dc54c5ebac7e4b455d8df35076fc044a581a7.patch' + 'c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch') sha256sums=('6946bd035cdbbbd2f139e543d2ca84ba422176c62c3a3665b544118dc6d618d0' - 'ca662407404a0b22c3f2706f729717ab73575101247689ce80b7528fea0de87e') + 'ca662407404a0b22c3f2706f729717ab73575101247689ce80b7528fea0de87e' + '97d56be2873f61d54518e4fa8fdc429ca48a8c5b53ed907ec9abdb08a3bbad0b') build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -35,6 +37,7 @@ build() { prepare() { cd "$srcdir/${pkgname}-${pkgver}" patch -p1 -i "$srcdir/dc4dc54c5ebac7e4b455d8df35076fc044a581a7.patch" + patch -p1 -i "$srcdir/c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch" } package() { diff --git a/c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch b/c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch new file mode 100644 index 000000000000..38acc23fd5a4 --- /dev/null +++ b/c2c12fc981458ca59d515dc5d9c007ea78f141ef.patch @@ -0,0 +1,36 @@ +From c2c12fc981458ca59d515dc5d9c007ea78f141ef Mon Sep 17 00:00:00 2001 +From: Tasos Sahanidis <tasos@tasossah.com> +Date: Fri, 16 Jul 2021 17:43:52 +0300 +Subject: [PATCH] Fix cmake reconfiguration with quazip 1 + +--- + cmake/modules/FindQuaZip.cmake | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake +index 2fe94c12..021ed21e 100644 +--- a/cmake/modules/FindQuaZip.cmake ++++ b/cmake/modules/FindQuaZip.cmake +@@ -20,13 +20,13 @@ + # QuaZip_LIBRARIES - List of QuaZip libraries + # QuaZip_ZLIB_INCLUDE_DIR - The include dir of zlib headers + ++# First try to find QuaZip 1.0 ++find_package(QuaZip-Qt5 QUIET) + + IF (QuaZip_LIBRARIES) + # in cache already + SET(QuaZip_FOUND TRUE) +-ELSE (QuaZip_LIBRARIES) +- # First try to find QuaZip 1.0 +- find_package(QuaZip-Qt5 QUIET) ++ELSE () + IF(QuaZip-Qt5_FOUND) + message("-- Found QuaZip: QuaZip::QuaZip") + SET(QuaZip_FOUND TRUE) +@@ -48,4 +48,4 @@ ELSE (QuaZip_LIBRARIES) + SET(QuaZip_INCLUDE_DIRS ${QuaZip_INCLUDE_DIR} ${QuaZip_ZLIB_INCLUDE_DIR}) + find_package_handle_standard_args(QuaZip DEFAULT_MSG QuaZip_LIBRARIES QuaZip_INCLUDE_DIR QuaZip_ZLIB_INCLUDE_DIR QuaZip_INCLUDE_DIRS) + ENDIF () +-ENDIF (QuaZip_LIBRARIES) ++ENDIF () |