summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorxiota2023-11-08 13:47:04 -0800
committerxiota2023-11-08 13:49:00 -0800
commitc6f4f82b0c6788a878cdeddd70c7d2e9159546f4 (patch)
tree7918cb6e217fc1008f160308ba85c7fb8bb75c74
parentdae96dad7654c13ecb50b7a7592da5cf8ff3982e (diff)
downloadaur-c6f4f82b0c6788a878cdeddd70c7d2e9159546f4.tar.gz
2.1.0.r14
Update url Add pkgver to provides
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD33
2 files changed, 24 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index be855118e668..3e041b78b426 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
pkgbase = zxing-cpp-git
pkgdesc = A C++ library to decode QRCode
- pkgver = 2.1.0.r14.g81b405ba
+ pkgver = 2.1.0.r80.gb15819d6
pkgrel = 1
- url = https://github.com/nu-book/zxing-cpp
+ url = https://github.com/zxing-cpp/zxing-cpp
arch = x86_64
license = Apache
checkdepends = gtest
makedepends = cmake
makedepends = git
depends = gcc-libs
- provides = zxing-cpp
+ provides = zxing-cpp=2.1.0
conflicts = zxing-cpp
- source = zxing-cpp::git+https://github.com/nu-book/zxing-cpp
+ source = zxing-cpp::git+https://github.com/zxing-cpp/zxing-cpp.git
sha256sums = SKIP
pkgname = zxing-cpp-git
diff --git a/PKGBUILD b/PKGBUILD
index 5caaea561f01..cf722ec6b5bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,12 @@
_pkgname="zxing-cpp"
pkgname="$_pkgname-git"
-pkgver=2.1.0.r14.g81b405ba
+pkgver=2.1.0.r80.gb15819d6
pkgrel=1
pkgdesc="A C++ library to decode QRCode"
-arch=(x86_64)
-url="https://github.com/nu-book/zxing-cpp"
+url="https://github.com/zxing-cpp/zxing-cpp"
license=('Apache')
-
-provides=('zxing-cpp')
-conflicts=('zxing-cpp')
+arch=(x86_64)
depends=(
gcc-libs
@@ -24,20 +21,30 @@ checkdepends=(
gtest
)
-source=("$_pkgname"::"git+$url")
+provides=("$_pkgname=${pkgver%%.r*}")
+conflicts=("$_pkgname")
+
+_pkgsrc="$_pkgname"
+source=("$_pkgname"::"git+$url.git")
sha256sums=('SKIP')
pkgver() {
- cd "$srcdir/$_pkgname"
+ cd "$_pkgsrc"
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- cmake -B build -S "$_pkgname" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=None \
- -DBUILD_EXAMPLES=OFF \
+ local _cmake_options=(
+ -B build
+ -S "$_pkgsrc"
+ -DCMAKE_INSTALL_PREFIX='/usr'
+ -DCMAKE_BUILD_TYPE=None
+ -DBUILD_EXAMPLES=OFF
-DBUILD_UNIT_TESTS=ON
+ -Wno-dev
+ )
+
+ cmake "${_cmake_options[@]}"
cmake --build build
}
@@ -46,5 +53,5 @@ check() {
}
package() {
- DESTDIR="$pkgdir" cmake --install build
+ DESTDIR="${pkgdir:?}" cmake --install build
}