From cf9d741caa6a33393cae266570b4a9dab1653fe7 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 12 Feb 2023 19:18:47 +0100 Subject: [PATCH] sway: 1.8 -> 1.8.1 --- sway/.signature | 8 ++++---- sway/6249.patch | 16 ++++++++-------- sway/Pkgfile | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sway/.signature b/sway/.signature index 546bf49e3..f339312a0 100644 --- a/sway/.signature +++ b/sway/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+IKXGN4OP7zwsU0yRE2h9krqyHd57bVt+YCO+1TvOASWyNH3cdXOZPhucW0sfEtYC5rBDHSziA93bnCNOBLvgs= -SHA256 (Pkgfile) = adda552a197cf7dfb3f4586606ed334c79ede62cffc3e36e097611643b19dcf6 +RWSagIOpLGJF31dr6xxDfXYjbBCrkmokT3t5fSahUL4+BpZOT9PnRnX+4lcULpPEcdDfbkG1/3qf1ydKXTEFOR7B1xZn98XgmwA= +SHA256 (Pkgfile) = 693cf70fa298bf3fb354226e6133d55f3627c3701ef7a3c4cf310ec6ca797386 SHA256 (.footprint) = 76cf242dac27363a8a964536eda5e54f00953e79380ee493090ca249bd688920 -SHA256 (sway-1.8.tar.gz) = fae0422bca8f528027f77e3a7bbea2be0498bba2ad3f0d22554ff8827e37f04e -SHA256 (6249.patch) = c32823efff2406c5cdd583310aa22a80020397df294231e509cf1b4dc6a45265 +SHA256 (sway-1.8.1.tar.gz) = e9f575761342fc8fe0cfeea80c90f32ddfa8c543572fec179f40922346f47dff +SHA256 (6249.patch) = 3a512fa276369c0ae6e2b4592576803008bdc8b52a20e01694360f771ac2d1f8 diff --git a/sway/6249.patch b/sway/6249.patch index 71fa1f6fa..4d148fff0 100644 --- a/sway/6249.patch +++ b/sway/6249.patch @@ -1,4 +1,4 @@ -From ce789fe3f752e94d7f73f39106bfac5339b6bf7e Mon Sep 17 00:00:00 2001 +From 2f304ef0532a45d00b2ec2c7fc63adef0aec7607 Mon Sep 17 00:00:00 2001 From: Felix Weilbach Date: Sun, 30 May 2021 20:45:01 +0200 Subject: [PATCH] Tray: Implement dbusmenu @@ -92,10 +92,10 @@ index 0000000000..dc90f6e571 + +#endif diff --git a/include/swaybar/tray/item.h b/include/swaybar/tray/item.h -index c02a558237..0e25cae318 100644 +index 73937a0cc2..9a4a00ff66 100644 --- a/include/swaybar/tray/item.h +++ b/include/swaybar/tray/item.h -@@ -17,6 +17,7 @@ struct swaybar_pixmap { +@@ -18,6 +18,7 @@ struct swaybar_pixmap { struct swaybar_sni_slot { struct wl_list link; // swaybar_sni::slots struct swaybar_sni *sni; @@ -103,7 +103,7 @@ index c02a558237..0e25cae318 100644 const char *prop; const char *type; void *dest; -@@ -47,6 +48,7 @@ struct swaybar_sni { +@@ -48,6 +49,7 @@ struct swaybar_sni { char *icon_theme_path; // non-standard KDE property struct wl_list slots; // swaybar_sni_slot::link @@ -302,7 +302,7 @@ index e5f1811eb0..fef1ee778f 100644 swaybar_deps = [ diff --git a/swaybar/render.c b/swaybar/render.c -index 95f6e5be4d..da3e3bd0fd 100644 +index ccf3656378..2385a2f46d 100644 --- a/swaybar/render.c +++ b/swaybar/render.c @@ -160,6 +160,7 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color, @@ -323,7 +323,7 @@ index 95f6e5be4d..da3e3bd0fd 100644 return HOTSPOT_PROCESS; diff --git a/swaybar/tray/dbusmenu.c b/swaybar/tray/dbusmenu.c new file mode 100644 -index 0000000000..ed74e04029 +index 0000000000..8821cacaec --- /dev/null +++ b/swaybar/tray/dbusmenu.c @@ -0,0 +1,1367 @@ @@ -1428,8 +1428,8 @@ index 0000000000..ed74e04029 + dbusmenu->output = output; + dbusmenu->seat = seat; + dbusmenu->serial = serial; -+ dbusmenu->x = x; -+ dbusmenu->y = y; ++ dbusmenu->x = seat->pointer.x; ++ dbusmenu->y = seat->pointer.y; + dbusmenu->bar = output->bar; + + swaybar_dbusmenu_setup(dbusmenu); diff --git a/sway/Pkgfile b/sway/Pkgfile index e5f139192..8f4b5f0f9 100644 --- a/sway/Pkgfile +++ b/sway/Pkgfile @@ -5,8 +5,8 @@ # Optional: gdk-pixbuf scdoc seatd name=sway -version=1.8 -release=2 +version=1.8.1 +release=1 source=(https://github.com/swaywm/sway/archive/$version/$name-$version.tar.gz 6249.patch)