Skip to content

Commit f1decdb

Browse files
committed
wayland/swaylock: update to 1.8.2
see https://github.com/swaywm/swaylock/releases/tag/v1.8.1 and https://github.com/swaywm/swaylock/releases/tag/v1.8.2 drop -D_POSIX_C_SOURCE=200809L from CFLAGS as it disables __BSD_VISIBLE which hides explicit_bzero(). cf swaywm/swaylock#402
1 parent 10f4f07 commit f1decdb

File tree

4 files changed

+24
-13
lines changed

4 files changed

+24
-13
lines changed

wayland/swaylock/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
COMMENT = screen locker for Wayland
22

3-
DISTNAME = swaylock-1.8.0
4-
SITES = https://github.com/swaywm/swaylock/releases/download/v1.8.0/
3+
DISTNAME = swaylock-1.8.2
4+
SITES = https://github.com/swaywm/swaylock/releases/download/v1.8.2/
55

66
CATEGORIES = wayland
77

wayland/swaylock/distinfo

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
SHA256 (swaylock-1.8.0.tar.gz) = ahF1RCOAuHstKGjEpTZu41khYxWNAuOn+/Ogv+B9iwA=
2-
SIZE (swaylock-1.8.0.tar.gz) = 33213
1+
SHA256 (swaylock-1.8.2.tar.gz) = zyNjVjUa8iZ5/fvhBxh6FJrKFUkVc3/bw8pWae813KM=
2+
SIZE (swaylock-1.8.2.tar.gz) = 33588

wayland/swaylock/patches/patch-main_c

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ https://github.com/swaywm/swaylock/pull/325
33
Index: main.c
44
--- main.c.orig
55
+++ main.c
6-
@@ -15,7 +15,6 @@
6+
@@ -14,7 +14,6 @@
77
#include <time.h>
88
#include <unistd.h>
99
#include <wayland-client.h>
1010
-#include <wordexp.h>
1111
#include "background-image.h"
1212
#include "cairo.h"
1313
#include "comm.h"
14-
@@ -358,23 +357,6 @@ static cairo_surface_t *select_image(struct swaylock_s
14+
@@ -319,23 +318,6 @@ static cairo_surface_t *select_image(struct swaylock_s
1515
return default_image;
1616
}
1717

@@ -35,7 +35,7 @@ Index: main.c
3535
static void load_image(char *arg, struct swaylock_state *state) {
3636
// [[<output>]:]<path>
3737
struct swaylock_image *image = calloc(1, sizeof(struct swaylock_image));
38-
@@ -408,21 +390,12 @@ static void load_image(char *arg, struct swaylock_stat
38+
@@ -369,21 +351,12 @@ static void load_image(char *arg, struct swaylock_stat
3939
}
4040
}
4141

@@ -57,7 +57,7 @@ Index: main.c
5757

5858
// Load the actual image
5959
image->cairo_surface = load_background_image(image->path);
60-
@@ -992,32 +965,57 @@ static bool file_exists(const char *path) {
60+
@@ -953,32 +926,57 @@ static bool file_exists(const char *path) {
6161
return path && access(path, R_OK) != -1;
6262
}
6363

wayland/swaylock/patches/patch-meson_build

+16-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
1+
chunk 1: POSIX_C_SOURCE hides explicit_bzero in bsdauth.c
2+
13
Index: meson.build
24
--- meson.build.orig
35
+++ meson.build
4-
@@ -24,6 +24,7 @@ add_project_arguments(
6+
@@ -13,8 +13,6 @@ project(
7+
58
cc = meson.get_compiler('c')
69

10+
-add_project_arguments('-D_POSIX_C_SOURCE=200809L', language: 'c')
11+
-
12+
add_project_arguments(cc.get_supported_arguments([
13+
'-Wno-unused-parameter',
14+
'-Wno-unused-result',
15+
@@ -23,6 +21,7 @@ add_project_arguments(cc.get_supported_arguments([
16+
]), language: 'c')
17+
718
is_freebsd = host_machine.system().startswith('freebsd')
819
+is_openbsd = host_machine.system().startswith('openbsd')
9-
1020
if is_freebsd
1121
add_project_arguments('-D_C11_SOURCE', language: 'c')
12-
@@ -36,9 +37,9 @@ xkbcommon = dependency('xkbcommon')
22+
endif
23+
@@ -34,9 +33,9 @@ xkbcommon = dependency('xkbcommon')
1324
cairo = dependency('cairo')
1425
gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf'))
1526
libpam = cc.find_library('pam', required: get_option('pam'))
@@ -21,15 +32,15 @@ Index: meson.build
2132

2233
git = find_program('git', required: false)
2334
scdoc = find_program('scdoc', required: get_option('man-pages'))
24-
@@ -88,7 +89,6 @@ dependencies = [
35+
@@ -86,7 +85,6 @@ dependencies = [
2536
cairo,
2637
gdk_pixbuf,
2738
math,
2839
- rt,
2940
xkbcommon,
3041
wayland_client,
3142
]
32-
@@ -110,12 +110,16 @@ sources = [
43+
@@ -108,12 +106,16 @@ sources = [
3344

3445
if libpam.found()
3546
sources += ['pam.c']

0 commit comments

Comments
 (0)