upgpkg: 0.16.2-1

3 files changed, 79 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6316c20b2b03..1b29ddf790a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
 pkgbase = clipcat
-	pkgdesc = Clipcat is a clipboard manager written in Rust Programming Language.
-	pkgver = 0.5.0
-	pkgrel = 2
+	pkgdesc = A clipboard manager written in Rust Programming Language
+	pkgver = 0.16.2
+	pkgrel = 1
 	url = https://github.com/xrelkd/clipcat
-	arch = any
-	license = GPL3
-	depends = libxcb
-	depends = python
-	depends = rust
-	depends = protobuf
-	depends = llvm
-	depends = clang
-	source = clipcat.tgz::https://github.com/xrelkd/clipcat/archive/v0.5.0.tar.gz
-	sha256sums = 6fb974784485f475082e7ba19a4ddcf25d55f4555011e11205c9862d1c5253bb
+	arch = x86_64
+	license = GPL-3.0-only
+	makedepends = cargo
+	makedepends = libgit2
+	makedepends = protobuf
+	depends = gcc-libs
+	depends = glibc
+	source = clipcat-0.16.2.tar.gz::https://github.com/xrelkd/clipcat/archive/refs/tags/v0.16.2.tar.gz
+	sha256sums = e784ec4a3799fa003e2d298477d8a627d1e02fdb147136fb245fdf87d34b96d3
 
 pkgname = clipcat
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..f71c635dafda
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index 75eec35b9b85..fa36aef0545d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,69 @@
-# Maintainer:  Po-An,Yang(Antonio) <yanganto gmail.com>
-
-set -u
-pkgname='clipcat'
-pkgver=0.5.0
-pkgrel='2'
-pkgdesc='Clipcat is a clipboard manager written in Rust Programming Language.'
-arch=('any')
-url='https://github.com/xrelkd/clipcat'
-license=('GPL3')
-depends=('libxcb' 'python' 'rust' 'protobuf' 'llvm' 'clang')
-source=("${pkgname}.tgz::https://github.com/xrelkd/clipcat/archive/v${pkgver}.tar.gz")
-sha256sums=('6fb974784485f475082e7ba19a4ddcf25d55f4555011e11205c9862d1c5253bb')
+# Maintainer: Carl Smedstad <carl.smedstad at protonmail dot com>
+# Contributor:  Po-An,Yang(Antonio) <yanganto gmail.com>
 
-package() {
-  set -u
-  cd ${srcdir}/${pkgname}-${pkgver}
-  cargo build --all-features --release
-  install -Dm755 target/release/clipcatctl "$pkgdir/usr/bin/clipcatctl"
-  install -Dm755 target/release/clipcatd "$pkgdir/usr/bin/clipcatd"
-  install -Dm755 target/release/clipcat-menu "$pkgdir/usr/bin/clipcat-menu"
-  install -Dm755 target/release/clipcat-notify "$pkgdir/usr/bin/clipcat-notify"
+pkgname=clipcat
+pkgver=0.16.2
+pkgrel=1
+pkgdesc="A clipboard manager written in Rust Programming Language"
+arch=(x86_64)
+url="https://github.com/xrelkd/clipcat"
+license=(GPL-3.0-only)
+depends=(
+  gcc-libs
+  glibc
+)
+makedepends=(
+  cargo
+  libgit2
+  protobuf
+)
+
+source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz")
+sha256sums=('e784ec4a3799fa003e2d298477d8a627d1e02fdb147136fb245fdf87d34b96d3')
+
+_archive="$pkgname-$pkgver"
+
+prepare() {
+  cd "$_archive"
+
+  export RUSTUP_TOOLCHAIN=stable
+  cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
+}
+
+build() {
+  cd "$_archive"
 
-  mkdir -p $pkgdir/usr/share/zsh/site-functions/
-  install -Dm644 completions/zsh/site-functions/* $pkgdir/usr/share/zsh/site-functions/
+  export RUSTUP_TOOLCHAIN=stable
+  export CARGO_TARGET_DIR=target
+  cargo build --frozen --release --all-features
+}
+
+check() {
+  cd "$_archive"
+
+  export RUSTUP_TOOLCHAIN=stable
+  cargo test --frozen --all-features -- \
+    --skip test_x11_clipboard \
+    --skip test_x11_primary
+}
+
+package() {
+  cd "$_archive"
 
-  mkdir -p $pkgdir/usr/share/bash-completion/completions/
-  install -Dm644 completions/bash-completion/completions/* $pkgdir/usr/share/bash-completion/completions/
+  install -Dm755 -t "$pkgdir/usr/bin" \
+    target/release/clipcat-menu \
+    target/release/clipcat-notify \
+    target/release/clipcatctl \
+    target/release/clipcatd
 
-  mkdir -p $pkgdir/usr/share/fish/completions/
-  install -Dm644 completions/fish/completions/* $pkgdir/usr/share/fish/completions/
+  for cmd in clipcatd clipcatctl clipcat-menu clipcat-notify; do
+    "$pkgdir/usr/bin/$cmd" completions bash > "$cmd.bash"
+    "$pkgdir/usr/bin/$cmd" completions zsh > "$cmd.zsh"
+    "$pkgdir/usr/bin/$cmd" completions fish > "$cmd.fish"
+    install -Dm644 "$cmd.bash" "$pkgdir/usr/share/bash-completion/completions/$cmd"
+    install -Dm644 "$cmd.zsh" "$pkgdir/usr/share/zsh/site-functions/_$cmd"
+    install -Dm644 "$cmd.fish" "$pkgdir/usr/share/fish/completions/$cmd.fish"
+  done
 
-  set +u
+  install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" ./*.md
 }
-set +u