diff --git a/Cargo.lock b/Cargo.lock index 0a080fdb..2cb4600e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,6 +31,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "bytemuck" version = "1.13.1" @@ -62,7 +68,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_lex", "indexmap", "strsim", @@ -220,12 +226,11 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" dependencies = [ "hermit-abi 0.3.1", - "io-lifetimes", "rustix", "windows-sys", ] @@ -254,7 +259,7 @@ dependencies = [ [[package]] name = "libwayshot" -version = "0.1.0" +version = "0.1.2" dependencies = [ "image", "log", @@ -267,9 +272,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "log" @@ -317,7 +322,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset", @@ -379,7 +384,7 @@ version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", @@ -415,22 +420,21 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] [[package]] name = "rustix" -version = "0.37.20" +version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" dependencies = [ - "bitflags", + "bitflags 2.3.3", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", @@ -508,7 +512,7 @@ version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "nix", "wayland-backend", "wayland-scanner", @@ -520,7 +524,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fefbeb8a360abe67ab7c2efe1d297a1a50ee011f5460791bc18870c26bb84e2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-backend", "wayland-client", "wayland-scanner", @@ -532,7 +536,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-backend", "wayland-client", "wayland-protocols", @@ -563,7 +567,7 @@ dependencies = [ [[package]] name = "wayshot" -version = "1.2.2" +version = "1.3.0" dependencies = [ "clap", "env_logger", @@ -617,9 +621,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", 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/flake.lock b/flake.lock index b7660898..3fdf883f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1687793116, - "narHash": "sha256-6xRgZ2E9r/BNam87vMkHJ/0EPTTKzeNwhw3abKilEE4=", + "lastModified": 1688221086, + "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4e0807d2142d17f463b26a8b796b3fe20a3011", + "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825", "type": "github" }, "original": { 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