From e186fcff088e74408686ee58fda4138fab522368 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sun, 25 Sep 2022 09:40:50 +0530 Subject: [PATCH] swayimg: update to 1.9 --- .../patches/0001-fix-zsh-completion.patch | 23 +++++++++++++++++ srcpkgs/swayimg/patches/0002-fix-help.patch | 25 +++++++++++++++++++ srcpkgs/swayimg/template | 7 +++--- 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch create mode 100644 srcpkgs/swayimg/patches/0002-fix-help.patch diff --git a/srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch b/srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch new file mode 100644 index 000000000000..b9360242ee42 --- /dev/null +++ b/srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch @@ -0,0 +1,23 @@ +From e938dc5b04bb54dd3f3a89a71d46c7a53ac087bd Mon Sep 17 00:00:00 2001 +From: Leon +Date: Wed, 31 Aug 2022 23:07:23 +1000 +Subject: [PATCH] Fix typo in zsh completion + +Signed-off-by: Leon +--- + extra/zsh.completion | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extra/zsh.completion b/extra/zsh.completion +index a690528..32b159b 100644 +--- a/extra/zsh.completion ++++ b/extra/zsh.completion +@@ -8,7 +8,7 @@ _arguments \ + '(-r --recursive)'{-r,--recursive}'[read directories recursively]' \ + '(-a --all)'{-a,--all}'[open all files from the same directory]' \ + '(-m --mark)'{-m,--mark}'[enable marking mode]' \ +- '(-l --slideshow)'{-l --slideshow}'[activate slideshow mode on startup]' \ ++ '(-l --slideshow)'{-l,--slideshow}'[activate slideshow mode on startup]' \ + '(-f --fullscreen)'{-f,--fullscreen}'[show image in full screen mode]' \ + '(-s --scale=SCALE)'{-s,--scale=}'[set initial image scale]:scale:(optimal fit real)' \ + '(-b --background)'{-b,--background=}'[set image background color]:bkg:(none grid)' \ diff --git a/srcpkgs/swayimg/patches/0002-fix-help.patch b/srcpkgs/swayimg/patches/0002-fix-help.patch new file mode 100644 index 000000000000..b735d938d1ad --- /dev/null +++ b/srcpkgs/swayimg/patches/0002-fix-help.patch @@ -0,0 +1,25 @@ +From 1cbbe5e6e0cc3f7fb26055e952153c3a23bfad45 Mon Sep 17 00:00:00 2001 +From: Artem Senichev +Date: Sat, 17 Sep 2022 11:57:10 +0300 +Subject: [PATCH] Allow long option `--help` + +Fix error when `--help` is not accepted by getopt. + +Signed-off-by: Artem Senichev +--- + src/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main.c b/src/main.c +index 3939ccb..4eecd12 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -93,7 +93,7 @@ static int parse_cmdargs(int argc, char* argv[], struct config* cfg) + } + // add terminations + *short_opts_ptr = 0; +- memset(&options[(sizeof(arguments) / sizeof(arguments[0])) - 1], 0, ++ memset(&options[(sizeof(arguments) / sizeof(arguments[0]))], 0, + sizeof(struct option)); + + // parse arguments diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template index 8a7e4b052b2d..bfdc3a496d21 100644 --- a/srcpkgs/swayimg/template +++ b/srcpkgs/swayimg/template @@ -1,21 +1,22 @@ # Template file for 'swayimg' pkgname=swayimg -version=1.8 +version=1.9 revision=1 build_style=meson hostmakedepends="pkg-config wayland-devel" makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel - wayland-protocols libavif-devel giflib-devel libjpeg-turbo-devel + wayland-protocols libheif-devel giflib-devel libjpeg-turbo-devel libpng-devel librsvg-devel libwebp-devel libexif-devel" short_desc="Image viewer for Sway/Wayland" maintainer="Subhaditya Nath " license="MIT" homepage="https://github.com/artemsen/swayimg" distfiles="https://github.com/artemsen/swayimg/archive/v${version}.tar.gz" -checksum=d4b4988a673522d47c38939c3406dbb72bd213f857dd6116185cd9811b887b23 +checksum=693a23a7755ebedb144271b2b674980a1c51a2036dabcff9697c3e3c6258f108 post_install() { vcompletion extra/bash.completion bash + vcompletion extra/zsh.completion zsh vsconf extra/swayimgrc vlicense LICENSE }