From owner-dev-commits-ports-all@freebsd.org Thu Jul 22 20:06:16 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 66B70665035; Thu, 22 Jul 2021 20:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GW3P42Y5Qz3GNb; Thu, 22 Jul 2021 20:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4106F1830D; Thu, 22 Jul 2021 20:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16MK6G8q020156; Thu, 22 Jul 2021 20:06:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16MK6GtW020155; Thu, 22 Jul 2021 20:06:16 GMT (envelope-from git) Date: Thu, 22 Jul 2021 20:06:16 GMT Message-Id: <202107222006.16MK6GtW020155@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 6ca9248904fe - 2021Q3 - x11-wm/hikari: update to 2.3.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: 6ca9248904fe3e0524bc665eb9080e2d50e83aed Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2021 20:06:16 -0000 The branch 2021Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ca9248904fe3e0524bc665eb9080e2d50e83aed commit 6ca9248904fe3e0524bc665eb9080e2d50e83aed Author: Evilham AuthorDate: 2021-07-22 10:26:15 +0000 Commit: Jan Beich CommitDate: 2021-07-22 20:06:08 +0000 x11-wm/hikari: update to 2.3.2 Changes: https://hub.darcs.net/raichoo/hikari/browse/CHANGELOG.md PR: 257329 Approved by: Alexander Sieg (maintainer) (cherry picked from commit b622b8ceaff6318908ee7990a28a8287aefefaef) --- x11-wm/hikari/Makefile | 3 +-- x11-wm/hikari/distinfo | 6 ++--- x11-wm/hikari/files/patch-wlroots-0.14 | 42 ---------------------------------- 3 files changed, 4 insertions(+), 47 deletions(-) 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 - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -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 - #include - #include --#include - #include - #include - #include -@@ -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));