[PR PATCH] swayimg: update to 1.9

[PR PATCH] swayimg: update to 1.9

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

There is a new pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages swayimg
https://github.com/void-linux/void-packages/pull/39452

swayimg: update to 1.9
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/39452.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-swayimg-39452.patch --]
[-- Type: text/x-diff, Size: 4196 bytes --]

From e186fcff088e74408686ee58fda4138fab522368 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
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 <adigitoleo@dissimulo.com>
+Date: Wed, 31 Aug 2022 23:07:23 +1000
+Subject: [PATCH] Fix typo in zsh completion
+
+Signed-off-by: Leon <adigitoleo@dissimulo.com>
+---
+ 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 <artemsen@gmail.com>
+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 <artemsen@gmail.com>
+---
+ 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 <sn03.general@gmail.com>"
 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
 }

Re: swayimg: update to 1.9

[subnut]

[-- Attachment #1: Type: text/plain, Size: 262 bytes --]

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/39452#issuecomment-1263200154

Comment:
Hey @classabbyamp could you please re-run the workflows for this PR? Seems like the PR failed for an un-related reason...

Re: swayimg: update to 1.9

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39452#issuecomment-1263201739

Comment:
you can force-push to re-do CI

Re: [PR PATCH] [Merged]: swayimg: update to 1.9

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]

There's a merged pull request on the void-packages repository

swayimg: update to 1.9
https://github.com/void-linux/void-packages/pull/39452

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->