tb/contrib
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

sway: 1.7-rc3 -> 1.7

Browse Source
This commit is contained in:
Tim Biermann 2022-01-23 00:56:40 +01:00
parent 3c99f93105
commit df3492f21d
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sway/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF37Qnh/82jJbn1EaoZUJlng7koPcijUMHVlYLHKcPkk14hUE9x1ICKQGnWYCEqoD80B/GQc75saov/wWJe6JjQgE= RWSagIOpLGJF37N8/tc41H5I6QHnlxnNiMS/xiuX8wFuhbgwBgr1vqrnRRuwijAK04FJc0z+H42ebq6WWKl3cIdD0fdlR9FVgAc=
SHA256 (Pkgfile) = edde57f0e8f5979d2832022c2cc0ba8b964a3f8f9752808b4745743be2aae5c0 SHA256 (Pkgfile) = 1262be0d2421643a18b9a5e391275eef3f3d2e06215d4a874fed02b0cdf9a5d7
SHA256 (.footprint) = 76cf242dac27363a8a964536eda5e54f00953e79380ee493090ca249bd688920 SHA256 (.footprint) = 76cf242dac27363a8a964536eda5e54f00953e79380ee493090ca249bd688920
SHA256 (sway-1.7-rc3.tar.gz) = 929d7ac1d6694cb1093d8de990cbd0226cc72d885d8073e8a270b7985e3a6a4d SHA256 (sway-1.7.tar.gz) = 0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
SHA256 (6249.patch) = 24fd8235405b82c163a260311b79936aefac3bef451fe314b1bf692038bf407a SHA256 (6249.patch) = 9e3337c5eeca5458caa445595ed8b6dd714c26fa48deeb8346dd6629f2076cb2

26
sway/6249.patch
View File

@ -1,4 +1,4 @@
From f65c7d9164ef18b21752259272ef6f43e1df4d2b Mon Sep 17 00:00:00 2001 From 6f87a58c87e1da3d0a2071ee9ec15a35123a0c5b Mon Sep 17 00:00:00 2001
From: Felix Weilbach <felix.weilbach@t-online.de> From: Felix Weilbach <felix.weilbach@t-online.de>
Date: Sun, 30 May 2021 20:45:01 +0200 Date: Sun, 30 May 2021 20:45:01 +0200
Subject: [PATCH 1/5] Tray: Implement dbusmenu Subject: [PATCH 1/5] Tray: Implement dbusmenu
@ -258,10 +258,10 @@ index 9feb3cd2d0..86abe93235 100644
swaybar_deps = [ swaybar_deps = [
diff --git a/swaybar/render.c b/swaybar/render.c diff --git a/swaybar/render.c b/swaybar/render.c
index de468b4f19..e3133a422c 100644 index dcde6b9e48..ecc10502ec 100644
--- a/swaybar/render.c --- a/swaybar/render.c
+++ b/swaybar/render.c +++ b/swaybar/render.c
@@ -158,8 +158,14 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color, @@ -159,8 +159,14 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color,
} }
static enum hotspot_event_handling block_hotspot_callback( static enum hotspot_event_handling block_hotspot_callback(
@ -278,7 +278,7 @@ index de468b4f19..e3133a422c 100644
struct i3bar_block *block = data; struct i3bar_block *block = data;
struct status_line *status = output->bar->status; struct status_line *status = output->bar->status;
return i3bar_block_send_click(status, block, x, y, return i3bar_block_send_click(status, block, x, y,
@@ -294,7 +300,7 @@ static uint32_t render_status_block(struct render_context *ctx, @@ -297,7 +303,7 @@ static uint32_t render_status_block(struct render_context *ctx,
} else if (strncmp(block->align, "right", 5) == 0) { } else if (strncmp(block->align, "right", 5) == 0) {
offset = x_pos + width - text_width; offset = x_pos + width - text_width;
} else if (strncmp(block->align, "center", 6) == 0) { } else if (strncmp(block->align, "center", 6) == 0) {
@ -287,7 +287,7 @@ index de468b4f19..e3133a422c 100644
} }
double text_y = height / 2.0 - text_height / 2.0; double text_y = height / 2.0 - text_height / 2.0;
cairo_move_to(cairo, offset, (int)floor(text_y)); cairo_move_to(cairo, offset, (int)floor(text_y));
@@ -322,7 +328,7 @@ static uint32_t render_status_block(struct render_context *ctx, @@ -327,7 +333,7 @@ static uint32_t render_status_block(struct render_context *ctx,
} }
cairo_set_source_u32(cairo, color); cairo_set_source_u32(cairo, color);
if (config->sep_symbol) { if (config->sep_symbol) {
@ -296,7 +296,7 @@ index de468b4f19..e3133a422c 100644
double sep_y = height / 2.0 - sep_height / 2.0; double sep_y = height / 2.0 - sep_height / 2.0;
cairo_move_to(cairo, offset, (int)floor(sep_y)); cairo_move_to(cairo, offset, (int)floor(sep_y));
choose_text_aa_mode(ctx, color); choose_text_aa_mode(ctx, color);
@@ -331,7 +337,7 @@ static uint32_t render_status_block(struct render_context *ctx, @@ -336,7 +342,7 @@ static uint32_t render_status_block(struct render_context *ctx,
} else { } else {
cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE); cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
cairo_set_line_width(cairo, 1); cairo_set_line_width(cairo, 1);
@ -305,7 +305,7 @@ index de468b4f19..e3133a422c 100644
cairo_line_to(cairo, x_pos + sep_block_width / 2, height - margin); cairo_line_to(cairo, x_pos + sep_block_width / 2, height - margin);
cairo_stroke(cairo); cairo_stroke(cairo);
} }
@@ -593,8 +599,14 @@ static uint32_t render_binding_mode_indicator(struct render_context *ctx, @@ -598,8 +604,14 @@ static uint32_t render_binding_mode_indicator(struct render_context *ctx,
} }
static enum hotspot_event_handling workspace_hotspot_callback( static enum hotspot_event_handling workspace_hotspot_callback(
@ -322,7 +322,7 @@ index de468b4f19..e3133a422c 100644
if (button != BTN_LEFT) { if (button != BTN_LEFT) {
return HOTSPOT_PROCESS; return HOTSPOT_PROCESS;
} }
@@ -659,7 +671,8 @@ static uint32_t render_workspace_button(struct render_context *ctx, @@ -664,7 +676,8 @@ static uint32_t render_workspace_button(struct render_context *ctx,
double text_y = height / 2.0 - text_height / 2.0; double text_y = height / 2.0 - text_height / 2.0;
cairo_set_source_u32(cairo, box_colors.text); cairo_set_source_u32(cairo, box_colors.text);
@ -1684,7 +1684,7 @@ index 0000000000..e8c6480b2a
+ return false; + return false;
+} +}
diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c
index 19f4beacaa..247eab33cc 100644 index 0cb5ee9dfe..ae4b7ee2db 100644
--- a/swaybar/tray/item.c --- a/swaybar/tray/item.c
+++ b/swaybar/tray/item.c +++ b/swaybar/tray/item.c
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
@ -1768,7 +1768,7 @@ index 19f4beacaa..247eab33cc 100644
} else { } else {
sway_log(SWAY_DEBUG, "but it doesn't exist"); sway_log(SWAY_DEBUG, "but it doesn't exist");
From d3768e479c3f138aaa52ef7ef5994547a13df1c3 Mon Sep 17 00:00:00 2001 From 5301928efd439c6dbf1a1cc7ab2e2433063f986b Mon Sep 17 00:00:00 2001
From: Felix Weilbach <felix.weilbach@t-online.de> From: Felix Weilbach <felix.weilbach@t-online.de>
Date: Wed, 15 Sep 2021 21:55:34 +0200 Date: Wed, 15 Sep 2021 21:55:34 +0200
Subject: [PATCH 2/5] fixup! don't scroll workspaces Subject: [PATCH 2/5] fixup! don't scroll workspaces
@ -1829,7 +1829,7 @@ index e8c6480b2a..739cf4c5a9 100644
uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x, uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x,
wl_fixed_t surface_y) { wl_fixed_t surface_y) {
From 44f947aa9bb1cf36ef384f64867fcdfc89258573 Mon Sep 17 00:00:00 2001 From ceaec64ce5ab802e430dbde8edac2ee0a73e86b3 Mon Sep 17 00:00:00 2001
From: Felix Weilbach <felix.weilbach@t-online.de> From: Felix Weilbach <felix.weilbach@t-online.de>
Date: Wed, 15 Sep 2021 22:44:28 +0200 Date: Wed, 15 Sep 2021 22:44:28 +0200
Subject: [PATCH 3/5] fixup! close submenus Subject: [PATCH 3/5] fixup! close submenus
@ -1873,7 +1873,7 @@ index 739cf4c5a9..f8f31cf6b3 100644
} else if (in_hotspot && !item->submenu) { } else if (in_hotspot && !item->submenu) {
close_child_menus(menu); close_child_menus(menu);
From d1a87205af0830a31fa993e4e956623bb3e59340 Mon Sep 17 00:00:00 2001 From 15a5a5a2eb46a6c7a6e3660500285e856b5c3645 Mon Sep 17 00:00:00 2001
From: Felix Weilbach <felix.weilbach@t-online.de> From: Felix Weilbach <felix.weilbach@t-online.de>
Date: Wed, 15 Sep 2021 23:00:49 +0200 Date: Wed, 15 Sep 2021 23:00:49 +0200
Subject: [PATCH 4/5] fixup! Only set focused menu when pointer enters Subject: [PATCH 4/5] fixup! Only set focused menu when pointer enters
@ -1900,7 +1900,7 @@ index f8f31cf6b3..f389097a93 100644
struct png_stream { struct png_stream {
From 5c7aa54af364850c03d6f7aee8b486e53572a682 Mon Sep 17 00:00:00 2001 From a5bb9654acfdb3bf9fb1714f0f6f1aa5fcec8835 Mon Sep 17 00:00:00 2001
From: Felix Weilbach <felix.weilbach@t-online.de> From: Felix Weilbach <felix.weilbach@t-online.de>
Date: Thu, 16 Sep 2021 19:42:46 +0200 Date: Thu, 16 Sep 2021 19:42:46 +0200
Subject: [PATCH 5/5] fixup! handle also pointer axis when using tray Subject: [PATCH 5/5] fixup! handle also pointer axis when using tray

2
sway/Pkgfile
View File

@ -5,7 +5,7 @@
# Optional: gdk-pixbuf scdoc seatd # Optional: gdk-pixbuf scdoc seatd
name=sway name=sway
version=1.7-rc3 version=1.7
release=1 release=1
source=(https://github.com/swaywm/sway/archive/$version/$name-$version.tar.gz source=(https://github.com/swaywm/sway/archive/$version/$name-$version.tar.gz
6249.patch) 6249.patch)