Attachment 226604 Details for Bug 257329 – x11-wm/hikari: Update to 2.3.2

[patch] x11-wm/hikari: Update to 2.3.2

patch_hikari-2.3.2.diff (text/plain), 2.97 KB, created by Evilham on 2021-07-22 10:43:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Evilham

Created: 2021-07-22 10:43:39 UTC

Size: 2.97 KB

patch

obsolete

>diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile
>index d7c5842315b0..c830b9d8154c 100644
>--- a/x11-wm/hikari/Makefile
>+++ b/x11-wm/hikari/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	hikari
>-DISTVERSION=	2.3.0
>-PORTREVISION=	1
>+DISTVERSION=	2.3.2
> CATEGORIES=	x11-wm
> MASTER_SITES=	https://hikari.acmelabs.space/releases/
> 
>diff --git a/x11-wm/hikari/distinfo b/x11-wm/hikari/distinfo
>index 0bc26744027a..7ef3fe915956 100644
>--- a/x11-wm/hikari/distinfo
>+++ b/x11-wm/hikari/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1618057416
>-SHA256 (hikari-2.3.0.tar.gz) = 8577ea568d2a41b0dc7b2fae784446778e3ddd5b9563576c9756dfbf7b9435d2
>-SIZE (hikari-2.3.0.tar.gz) = 1021952
>+TIMESTAMP = 1626901745
>+SHA256 (hikari-2.3.2.tar.gz) = 9e8f135b4b31ae1267ae4fdf0c25932b62aeaf1e6642e1dc67471b9863107ecb
>+SIZE (hikari-2.3.2.tar.gz) = 1022093
>diff --git a/x11-wm/hikari/files/patch-wlroots-0.14 b/x11-wm/hikari/files/patch-wlroots-0.14
>deleted file mode 100644
>index 61ac93e50a2b..000000000000
>--- a/x11-wm/hikari/files/patch-wlroots-0.14
>+++ /dev/null
>@@ -1,42 +0,0 @@
>-src/server.c:14:10: fatal error: 'wlr/types/wlr_gtk_primary_selection.h' file not found
>-#include <wlr/types/wlr_gtk_primary_selection.h>
>-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>-src/view.c:812:47: error: no member named 'subsurfaces' in 'struct wlr_surface'
>-  wl_list_for_each (wlr_subsurface, &surface->subsurfaces, parent_link) {
>-                                     ~~~~~~~  ^
>-
>---- src/server.c.orig	2021-04-09 17:37:23 UTC
>-+++ src/server.c
>-@@ -11,7 +11,6 @@
>- #include <wlr/types/wlr_compositor.h>
>- #include <wlr/types/wlr_data_control_v1.h>
>- #include <wlr/types/wlr_data_device.h>
>--#include <wlr/types/wlr_gtk_primary_selection.h>
>- #include <wlr/types/wlr_input_device.h>
>- #include <wlr/types/wlr_keyboard.h>
>- #include <wlr/types/wlr_output_layout.h>
>-@@ -610,7 +609,6 @@ setup_selection(struct hikari_server *server)
>- {
>-   wlr_data_control_manager_v1_create(server->display);
>- 
>--  wlr_gtk_primary_selection_device_manager_create(server->display);
>-   wlr_primary_selection_v1_device_manager_create(server->display);
>- 
>-   server->seat = wlr_seat_create(server->display, "seat0");
>---- src/view.c.orig	2021-04-09 17:37:23 UTC
>-+++ src/view.c
>-@@ -809,7 +809,13 @@ hikari_view_map(struct hikari_view *view, struct wlr_s
>-   wl_signal_add(&surface->events.new_subsurface, &view->new_subsurface);
>- 
>-   struct wlr_subsurface *wlr_subsurface;
>--  wl_list_for_each (wlr_subsurface, &surface->subsurfaces, parent_link) {
>-+  wl_list_for_each (wlr_subsurface, &surface->subsurfaces_below, parent_link) {
>-+    struct hikari_view_subsurface *subsurface =
>-+        (struct hikari_view_subsurface *)malloc(
>-+            sizeof(struct hikari_view_subsurface));
>-+    hikari_view_subsurface_init(subsurface, view, wlr_subsurface);
>-+  }
>-+  wl_list_for_each (wlr_subsurface, &surface->subsurfaces_above, parent_link) {
>-     struct hikari_view_subsurface *subsurface =
>-         (struct hikari_view_subsurface *)malloc(
>-             sizeof(struct hikari_view_subsurface));

Flags:

contact: maintainer-approval? (ports)

Actions: View | Diff

Attachments on bug 257329: 226604