[PR PATCH] swaylock: update to 1.7.

[PR PATCH] swaylock: update to 1.7.

[mhmdanas]

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

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

https://github.com/mhmdanas/void-packages swaylock-1.7
https://github.com/void-linux/void-packages/pull/40967

swaylock: update to 1.7.
<!-- 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, (ARCH-LIBC)
- 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/40967.patch is attached

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

From 01e39f52064f61a5f7d360ad027a9b33f5e902c9 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 8 Dec 2022 00:20:26 +0000
Subject: [PATCH] swaylock: update to 1.7.

---
 .../fix-shm_unlink-undefined-reference.patch  | 29 +++++++++++++++++++
 srcpkgs/swaylock/template                     |  4 +--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch

diff --git a/srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch b/srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch
new file mode 100644
index 000000000000..e155d7f85ca8
--- /dev/null
+++ b/srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch
@@ -0,0 +1,29 @@
+From d9e71c87c7af8687750901d71409140f1bd181bd Mon Sep 17 00:00:00 2001
+From: nerdopolis <bluescreen_avenger@verizon.net>
+Date: Sun, 27 Nov 2022 18:46:05 -0500
+Subject: [PATCH] Fix build on Debian Stable
+
+---
+ meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index ace7c933..13548b74 100644
+--- a/meson.build
++++ b/meson.build
+@@ -47,6 +47,7 @@ fish_comp = dependency('fish', required: false)
+ libpam = cc.find_library('pam', required: get_option('pam'))
+ crypt = cc.find_library('crypt', required: not libpam.found())
+ math = cc.find_library('m')
++rt = cc.find_library('rt')
+ 
+ git = find_program('git', required: false)
+ scdoc = find_program('scdoc', required: get_option('man-pages'))
+@@ -112,6 +113,7 @@ dependencies = [
+ 	client_protos,
+ 	gdk_pixbuf,
+ 	math,
++	rt,
+ 	xkbcommon,
+ 	wayland_client,
+ ]
diff --git a/srcpkgs/swaylock/template b/srcpkgs/swaylock/template
index 5908bfe376af..3388c23bf395 100644
--- a/srcpkgs/swaylock/template
+++ b/srcpkgs/swaylock/template
@@ -1,6 +1,6 @@
 # Template file for 'swaylock'
 pkgname=swaylock
-version=1.6
+version=1.7
 revision=1
 build_style=meson
 conf_files="/etc/pam.d/swaylock"
@@ -12,7 +12,7 @@ maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=b9181e15d8166bba3a29dabb392cfe94568e4ceb358d388a812cd28c3f61bbe3
+checksum=4c4d3c3ed838c085feb0b237b9aaaabdf66cbc05e2b034b2cb5c552957e620d6
 
 post_install() {
 	vlicense LICENSE

Re: [PR REVIEW] swaylock: update to 1.7.

[mhmdanas]

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/40967#discussion_r1042805633

Comment:
Taken from https://github.com/swaywm/swaylock/commit/d9e71c87c7af8687750901d71409140f1bd181bd. Should I change the commit message? Should I also note that this patch should be removed on the next release, and if so, how?

Re: [PR REVIEW] swaylock: update to 1.7.

[mhmdanas]

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/40967#discussion_r1042805633

Comment:
Taken from https://github.com/swaywm/swaylock/commit/d9e71c87c7af8687750901d71409140f1bd181bd.

Should I change the commit message? Should I also note that this patch should be removed on the next release, and if so, how?

Re: [PR REVIEW] swaylock: update to 1.7.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40967#discussion_r1045478981

Comment:
fine as is

Re: [PR REVIEW] swaylock: update to 1.7.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40967#discussion_r1045479401

Comment:
```suggestion
distfiles="https://github.com/swaywm/swaylock/archive/${version}.tar.gz"
```

Re: [PR PATCH] [Updated] swaylock: update to 1.7.

[mhmdanas]

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

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages swaylock-1.7
https://github.com/void-linux/void-packages/pull/40967

swaylock: update to 1.7.
<!-- 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, (ARCH-LIBC)
- 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/40967.patch is attached

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

From bd74e91445fa520acf9c7d9918d7f222fc95755c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 8 Dec 2022 00:20:26 +0000
Subject: [PATCH] swaylock: update to 1.7.

---
 .../fix-shm_unlink-undefined-reference.patch  | 29 +++++++++++++++++++
 srcpkgs/swaylock/template                     |  6 ++--
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch

diff --git a/srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch b/srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch
new file mode 100644
index 000000000000..e155d7f85ca8
--- /dev/null
+++ b/srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch
@@ -0,0 +1,29 @@
+From d9e71c87c7af8687750901d71409140f1bd181bd Mon Sep 17 00:00:00 2001
+From: nerdopolis <bluescreen_avenger@verizon.net>
+Date: Sun, 27 Nov 2022 18:46:05 -0500
+Subject: [PATCH] Fix build on Debian Stable
+
+---
+ meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index ace7c933..13548b74 100644
+--- a/meson.build
++++ b/meson.build
+@@ -47,6 +47,7 @@ fish_comp = dependency('fish', required: false)
+ libpam = cc.find_library('pam', required: get_option('pam'))
+ crypt = cc.find_library('crypt', required: not libpam.found())
+ math = cc.find_library('m')
++rt = cc.find_library('rt')
+ 
+ git = find_program('git', required: false)
+ scdoc = find_program('scdoc', required: get_option('man-pages'))
+@@ -112,6 +113,7 @@ dependencies = [
+ 	client_protos,
+ 	gdk_pixbuf,
+ 	math,
++	rt,
+ 	xkbcommon,
+ 	wayland_client,
+ ]
diff --git a/srcpkgs/swaylock/template b/srcpkgs/swaylock/template
index 5908bfe376af..1675363faf95 100644
--- a/srcpkgs/swaylock/template
+++ b/srcpkgs/swaylock/template
@@ -1,6 +1,6 @@
 # Template file for 'swaylock'
 pkgname=swaylock
-version=1.6
+version=1.7
 revision=1
 build_style=meson
 conf_files="/etc/pam.d/swaylock"
@@ -11,8 +11,8 @@ short_desc="Screen locker for Wayland"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=b9181e15d8166bba3a29dabb392cfe94568e4ceb358d388a812cd28c3f61bbe3
+distfiles="https://github.com/swaywm/swaylock/archive/${version}.tar.gz"
+checksum=4c4d3c3ed838c085feb0b237b9aaaabdf66cbc05e2b034b2cb5c552957e620d6
 
 post_install() {
 	vlicense LICENSE

Re: [PR PATCH] [Merged]: swaylock: update to 1.7.

[classabbyamp]

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

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

swaylock: update to 1.7.
https://github.com/void-linux/void-packages/pull/40967

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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->