From 4b1fc9140e0fe2ea2374ab65314cfc43fe00519b Mon Sep 17 00:00:00 2001 From: Shinyzenith Date: Mon, 3 Jul 2023 12:36:30 +0530 Subject: [PATCH] [rel] Tag release 1.3.0 wayshot and 0.1.2 libwayshot * AUR: * Removed bin pkgbuild as I am no longer intersted in maintaining it. * Removed git pkgbuild as I am no longer the maintainer of said package. Signed-off-by: Shinyzenith --- Cargo.lock | 4 ++-- README.md | 2 +- contrib/PKGBUILD/bin/PKGBUILD | 23 ----------------------- contrib/PKGBUILD/git/PKGBUILD | 31 ------------------------------- libwayshot/Cargo.toml | 2 +- wayshot/Cargo.toml | 11 ++--------- wayshot/build.rs | 4 ++-- wayshot/docs | 1 + 8 files changed, 9 insertions(+), 69 deletions(-) delete mode 100644 contrib/PKGBUILD/bin/PKGBUILD delete mode 100644 contrib/PKGBUILD/git/PKGBUILD create mode 120000 wayshot/docs diff --git a/Cargo.lock b/Cargo.lock index 0a080fdb..96d0785b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -254,7 +254,7 @@ dependencies = [ [[package]] name = "libwayshot" -version = "0.1.0" +version = "0.1.2" dependencies = [ "image", "log", @@ -563,7 +563,7 @@ dependencies = [ [[package]] name = "wayshot" -version = "1.2.2" +version = "1.3.0" dependencies = [ "clap", "env_logger", diff --git a/README.md b/README.md index 38bb525d..1642d716 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

- + diff --git a/contrib/PKGBUILD/bin/PKGBUILD b/contrib/PKGBUILD/bin/PKGBUILD deleted file mode 100644 index 08e562bc..00000000 --- a/contrib/PKGBUILD/bin/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# Maintainer: Aakash Sen Sharma -pkgname=wayshot-bin -_pkgname=wayshot -pkgver=1.2.2 -pkgrel=2 -pkgdesc="A screenshot tool for wlroots compositors." -url="https://github.com/waycrate/wayshot" -license=('BSD') -arch=('x86_64') -optdepends=('slurp: for area selection') -makedepends=('scdoc' 'rust') -provides=('wayshot-bin') -conflicts=('wayshot-git' 'wayshot-musl-git') -source=("$_pkgname-bin::$url/releases/download/$pkgver/$_pkgname" - "$_pkgname-src::git+https://git.sr.ht/~shinyzenith/$_pkgname" - ) -sha256sums=('SKIP' - 'SKIP' - ) - -package() { - install -Dm 755 $_pkgname-bin "$pkgdir/usr/bin/$_pkgname" -} diff --git a/contrib/PKGBUILD/git/PKGBUILD b/contrib/PKGBUILD/git/PKGBUILD deleted file mode 100644 index bd78e968..00000000 --- a/contrib/PKGBUILD/git/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Aakash Sharma -pkgname='wayshot-git' -_pkgname="wayshot" -pkgver=1.1.9.98.g538caac -pkgrel=1 -arch=('x86_64') -url="https://git.sr.ht/~shinyzenith/wayshot" -pkgdesc="A screenshot tool for wlroots compositors." -license=('BSD') -optdepends=('slurp: for area selection') -makedepends=('rustup' 'git' 'scdoc') -conflicts=('wayshot-bin' 'wayshot-musl-git') -source=("$_pkgname::git+https://git.sr.ht/~shinyzenith/$_pkgname") -sha256sums=('SKIP') - -build(){ - cd "$_pkgname" - cargo build --release -} - -package() { - cd "$_pkgname" - install -Dm 755 ./target/release/wayshot "$pkgdir/usr/bin/wayshot" - install -Dm 644 ./docs/wayshot.1.gz "$pkgdir/usr/share/man/man1/wayshot.1.gz" - install -Dm 644 ./docs/wayshot.7.gz "$pkgdir/usr/share/man/man7/wayshot.7.gz" -} - -pkgver() { - cd $_pkgname - echo "$(grep '^version =' Cargo.toml|head -n1|cut -d\" -f2|cut -d\- -f1).$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)" -} diff --git a/libwayshot/Cargo.toml b/libwayshot/Cargo.toml index a9d226cc..a49e9073 100644 --- a/libwayshot/Cargo.toml +++ b/libwayshot/Cargo.toml @@ -5,7 +5,7 @@ keywords = ["screenshot", "wayland", "wlroots", "wayshot"] license = "BSD-2-Clause" repository = "https://git.sr.ht/~shinyzenith/wayshot" name = "libwayshot" -version = "0.1.0" +version = "0.1.2" edition = "2021" [dependencies] diff --git a/wayshot/Cargo.toml b/wayshot/Cargo.toml index 41bcffc7..8c3c4126 100644 --- a/wayshot/Cargo.toml +++ b/wayshot/Cargo.toml @@ -8,14 +8,7 @@ keywords = ["screenshot", "wayland", "wlroots"] license = "BSD-2-Clause" name = "wayshot" repository = "https://git.sr.ht/~shinyzenith/wayshot" -version = "1.2.2" -exclude = [ - "CODE_OF_CONDUCT.md", - "CONTRIBUTING.md", - "contrib/*", - "docs/assets/*", - "release.sh", -] +version = "1.3.0" [build-dependencies] flate2 = "1.0.26" @@ -29,7 +22,7 @@ log = "0.4.19" wayland-client = "0.30.2" wayland-protocols = { version = "0.30.0", features=["client", "unstable"] } -libwayshot = { path = "../libwayshot" } +libwayshot = { version="0.1.2", path = "../libwayshot" } image = { version = "0.24", default-features = false, features = ["jpeg", "png", "pnm"] } diff --git a/wayshot/build.rs b/wayshot/build.rs index b13452af..14152acb 100644 --- a/wayshot/build.rs +++ b/wayshot/build.rs @@ -20,7 +20,7 @@ fn main() { } // We just append "out" so it's easy to find all the scdoc output later in line 38. - let man_pages: Vec<(String, String)> = read_and_replace_by_ext("../docs", ".scd", ".out"); + let man_pages: Vec<(String, String)> = read_and_replace_by_ext("./docs", ".scd", ".out"); for man_page in man_pages { let output = OpenOptions::new() .write(true) @@ -35,7 +35,7 @@ fn main() { // Gzipping the man pages let scdoc_output_files: Vec<(String, String)> = - read_and_replace_by_ext("../docs", ".out", ".gz"); + read_and_replace_by_ext("./docs", ".out", ".gz"); for scdoc_output in scdoc_output_files { let mut input = BufReader::new(File::open(scdoc_output.0).unwrap()); let output = OpenOptions::new() diff --git a/wayshot/docs b/wayshot/docs new file mode 120000 index 00000000..a9594bfe --- /dev/null +++ b/wayshot/docs @@ -0,0 +1 @@ +../docs \ No newline at end of file