View | Details | Raw Unified | Return to bug 257329
Collapse All | Expand All

(-)b/x11-wm/hikari/Makefile (-2 / +1 lines)
Lines 1-6 Link Here
1
PORTNAME=	hikari
1
PORTNAME=	hikari
2
DISTVERSION=	2.3.0
2
DISTVERSION=	2.3.2
3
PORTREVISION=	1
4
CATEGORIES=	x11-wm
3
CATEGORIES=	x11-wm
5
MASTER_SITES=	https://hikari.acmelabs.space/releases/
4
MASTER_SITES=	https://hikari.acmelabs.space/releases/
6
5
(-)b/x11-wm/hikari/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1618057416
1
TIMESTAMP = 1626901745
2
SHA256 (hikari-2.3.0.tar.gz) = 8577ea568d2a41b0dc7b2fae784446778e3ddd5b9563576c9756dfbf7b9435d2
2
SHA256 (hikari-2.3.2.tar.gz) = 9e8f135b4b31ae1267ae4fdf0c25932b62aeaf1e6642e1dc67471b9863107ecb
3
SIZE (hikari-2.3.0.tar.gz) = 1021952
3
SIZE (hikari-2.3.2.tar.gz) = 1022093
(-)a/x11-wm/hikari/files/patch-wlroots-0.14 (-42 lines)
Removed Link Here
1
src/server.c:14:10: fatal error: 'wlr/types/wlr_gtk_primary_selection.h' file not found
2
#include <wlr/types/wlr_gtk_primary_selection.h>
3
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4
src/view.c:812:47: error: no member named 'subsurfaces' in 'struct wlr_surface'
5
  wl_list_for_each (wlr_subsurface, &surface->subsurfaces, parent_link) {
6
                                     ~~~~~~~  ^
7
8
--- src/server.c.orig	2021-04-09 17:37:23 UTC
9
+++ src/server.c
10
@@ -11,7 +11,6 @@
11
 #include <wlr/types/wlr_compositor.h>
12
 #include <wlr/types/wlr_data_control_v1.h>
13
 #include <wlr/types/wlr_data_device.h>
14
-#include <wlr/types/wlr_gtk_primary_selection.h>
15
 #include <wlr/types/wlr_input_device.h>
16
 #include <wlr/types/wlr_keyboard.h>
17
 #include <wlr/types/wlr_output_layout.h>
18
@@ -610,7 +609,6 @@ setup_selection(struct hikari_server *server)
19
 {
20
   wlr_data_control_manager_v1_create(server->display);
21
 
22
-  wlr_gtk_primary_selection_device_manager_create(server->display);
23
   wlr_primary_selection_v1_device_manager_create(server->display);
24
 
25
   server->seat = wlr_seat_create(server->display, "seat0");
26
--- src/view.c.orig	2021-04-09 17:37:23 UTC
27
+++ src/view.c
28
@@ -809,7 +809,13 @@ hikari_view_map(struct hikari_view *view, struct wlr_s
29
   wl_signal_add(&surface->events.new_subsurface, &view->new_subsurface);
30
 
31
   struct wlr_subsurface *wlr_subsurface;
32
-  wl_list_for_each (wlr_subsurface, &surface->subsurfaces, parent_link) {
33
+  wl_list_for_each (wlr_subsurface, &surface->subsurfaces_below, parent_link) {
34
+    struct hikari_view_subsurface *subsurface =
35
+        (struct hikari_view_subsurface *)malloc(
36
+            sizeof(struct hikari_view_subsurface));
37
+    hikari_view_subsurface_init(subsurface, view, wlr_subsurface);
38
+  }
39
+  wl_list_for_each (wlr_subsurface, &surface->subsurfaces_above, parent_link) {
40
     struct hikari_view_subsurface *subsurface =
41
         (struct hikari_view_subsurface *)malloc(
42
             sizeof(struct hikari_view_subsurface));

Return to bug 257329