git: af6c7436966d - main - x11/nwg-dock-hyprland: update to 0.4.7

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Wed, 23 Jul 2025 14:35:26 UTC
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=af6c7436966d1a731bf099fdf8355400248dca3a

commit af6c7436966d1a731bf099fdf8355400248dca3a
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2025-07-23 14:33:56 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-07-23 14:35:20 +0000

    x11/nwg-dock-hyprland: update to 0.4.7
    
    While here:
    - update license to MIT
    - switch to GO_MODULE
    - put list of installed files in pkg-plist
    
    Changelog:
    - https://github.com/nwg-piotr/nwg-dock-hyprland/releases/tag/v0.4.4
    - https://github.com/nwg-piotr/nwg-dock-hyprland/releases/tag/v0.4.5
    - https://github.com/nwg-piotr/nwg-dock-hyprland/releases/tag/v0.4.6
    - https://github.com/nwg-piotr/nwg-dock-hyprland/releases/tag/v0.4.7
    
    Reported by:    Repology
---
 x11/nwg-dock-hyprland/Makefile           | 34 +++++++++++---------------------
 x11/nwg-dock-hyprland/distinfo           | 24 +++++-----------------
 x11/nwg-dock-hyprland/files/patch-go.mod | 14 -------------
 x11/nwg-dock-hyprland/pkg-plist          | 10 ++++++++++
 4 files changed, 26 insertions(+), 56 deletions(-)

diff --git a/x11/nwg-dock-hyprland/Makefile b/x11/nwg-dock-hyprland/Makefile
index 76172d0f9960..a51830f0f88f 100644
--- a/x11/nwg-dock-hyprland/Makefile
+++ b/x11/nwg-dock-hyprland/Makefile
@@ -1,45 +1,33 @@
 PORTNAME=	nwg-dock-hyprland
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.3
-PORTREVISION=	6
-CATEGORIES=	x11
+DISTVERSION=	0.4.7
+CATEGORIES=	x11 wayland
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	GTK3-based dock for Hyprland
 WWW=		https://github.com/nwg-piotr/nwg-dock-hyprland
 
-LICENSE=	AGPLv3 MIT
-LICENSE_COMB=	multi
-LICENSE_FILE_AGPLv3=	${WRKSRC_diamondburned_gotk4_pkg}/LICENSE.md
-LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
 
 USES=		gnome go:modules pkgconfig
-USE_GITHUB=	yes
+
 USE_GNOME=	cairo gdkpixbuf gtk30
-GH_ACCOUNT=	nwg-piotr
-GH_TUPLE=	KarpelesLab:weak:v0.1.1:karpeleslab_weak/vendor/github.com/KarpelesLab/weak \
-		allan-simon:go-singleinstance:d0997106ab37:allan_simon_go_singleinstance/vendor/github.com/allan-simon/go-singleinstance \
-		diamondburned:gotk4-layer-shell:6efa9f6dc438:diamondburned_gotk4_layer_shell_pkg/vendor/github.com/diamondburned/gotk4-layer-shell \
-		diamondburned:gotk4:v0.3.1:diamondburned_gotk4_pkg/vendor/github.com/diamondburned/gotk4 \
-		go4org:unsafe-assume-no-moving-gc:b99613f794b6:go4org_unsafe_assume_no_moving_gc/vendor/go4.org/unsafe/assume-no-moving-gc \
-		golang:sync:v0.10.0:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:v0.29.0:golang_sys/vendor/golang.org/x/sys \
-		sirupsen:logrus:v1.9.3:sirupsen_logrus/vendor/github.com/sirupsen/logrus
+
+GO_MODULE=	github.com/nwg-piotr/nwg-dock-hyprland
 CGO_LDFLAGS+=	-Wl,--as-needed # harfbuzz, freetype2
-PLIST_FILES=	bin/${PORTNAME}
-PORTDATA=	images *.css
 
 post-patch:
 # Respect PREFIX for *.desktop
-	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
+	@${REINPLACE_CMD} -e 's|/usr/share|${DATADIR:H}|' \
 		${WRKSRC}/tools.go
 
 post-install:
 # Based on install from WRKSRC/Makefile
-	@${CP} -p ${WRKSRC}/config/*.css ${WRKSRC}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" \
-		${STAGEDIR}${DATADIR})
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/config/* ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} images ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/x11/nwg-dock-hyprland/distinfo b/x11/nwg-dock-hyprland/distinfo
index dcf734fd1204..df8668eae3af 100644
--- a/x11/nwg-dock-hyprland/distinfo
+++ b/x11/nwg-dock-hyprland/distinfo
@@ -1,19 +1,5 @@
-TIMESTAMP = 1736472099
-SHA256 (nwg-piotr-nwg-dock-hyprland-v0.4.3_GH0.tar.gz) = e2335966bd4314b17534a492ae62b15484a501d3a52889e535836a74a46c2b7e
-SIZE (nwg-piotr-nwg-dock-hyprland-v0.4.3_GH0.tar.gz) = 23010
-SHA256 (KarpelesLab-weak-v0.1.1_GH0.tar.gz) = a8b6b241e8b72c95132497864c59a559fb35f6ae4b296c299e563a12a3a16fbe
-SIZE (KarpelesLab-weak-v0.1.1_GH0.tar.gz) = 3484
-SHA256 (allan-simon-go-singleinstance-d0997106ab37_GH0.tar.gz) = f8cee874873fe9fc1a81e8a7ca83df85c57aa86279c09cb8cba10d5feb7ed295
-SIZE (allan-simon-go-singleinstance-d0997106ab37_GH0.tar.gz) = 2819
-SHA256 (diamondburned-gotk4-layer-shell-6efa9f6dc438_GH0.tar.gz) = b49b2b22708aa7da4b3dfef86cfe6da5eae10413de1357cd560543505da567a3
-SIZE (diamondburned-gotk4-layer-shell-6efa9f6dc438_GH0.tar.gz) = 24347
-SHA256 (diamondburned-gotk4-v0.3.1_GH0.tar.gz) = 1aea32fc2026aa0d3b2ad429eff2900d826a7a1dddceb2649d4d4114fe86feca
-SIZE (diamondburned-gotk4-v0.3.1_GH0.tar.gz) = 3311686
-SHA256 (go4org-unsafe-assume-no-moving-gc-b99613f794b6_GH0.tar.gz) = 92c41675053bbd8fb47ba69e2688c8e51910891a5dbb96b4fc9a8cc3576fba80
-SIZE (go4org-unsafe-assume-no-moving-gc-b99613f794b6_GH0.tar.gz) = 2616
-SHA256 (golang-sync-v0.10.0_GH0.tar.gz) = 2a7b7c36a89b444213ec3237a21dd1ca6ed351adf423666cc6bf853711a13f3d
-SIZE (golang-sync-v0.10.0_GH0.tar.gz) = 18099
-SHA256 (golang-sys-v0.29.0_GH0.tar.gz) = 7bac3e0a686a05d0e86ca110917b45f60553d6c146dba8a4cdafb911486428e7
-SIZE (golang-sys-v0.29.0_GH0.tar.gz) = 1519988
-SHA256 (sirupsen-logrus-v1.9.3_GH0.tar.gz) = cfa48a647a28c1f12fb6a9b672bc4d88b6407ff05aedcf23ce939d342646acce
-SIZE (sirupsen-logrus-v1.9.3_GH0.tar.gz) = 50320
+TIMESTAMP = 1753279215
+SHA256 (go/x11_nwg-dock-hyprland/nwg-dock-hyprland-v0.4.7/v0.4.7.mod) = 118e6045c229af285c324547e54fff23518a3239d5f23dac41433f2f3da73f4b
+SIZE (go/x11_nwg-dock-hyprland/nwg-dock-hyprland-v0.4.7/v0.4.7.mod) = 549
+SHA256 (go/x11_nwg-dock-hyprland/nwg-dock-hyprland-v0.4.7/v0.4.7.zip) = fcde2b156d61e6a9ed675212dbf9c7ac0f54d7a5ad27333ebbb7a91e5f1f9ecd
+SIZE (go/x11_nwg-dock-hyprland/nwg-dock-hyprland-v0.4.7/v0.4.7.zip) = 32930
diff --git a/x11/nwg-dock-hyprland/files/patch-go.mod b/x11/nwg-dock-hyprland/files/patch-go.mod
deleted file mode 100644
index 36f3e193747e..000000000000
--- a/x11/nwg-dock-hyprland/files/patch-go.mod
+++ /dev/null
@@ -1,14 +0,0 @@
-Drop after lang/go122 appears (switch to USES=go:1.22,modules)
-
-github.com/nwg-piotr/nwg-dock-hyprland: cannot compile Go 1.22 code
-
---- go.mod.orig	2024-08-30 23:04:22 UTC
-+++ go.mod
-@@ -1,6 +1,6 @@ module nwg-dock-hyprland
- module nwg-dock-hyprland
- 
--go 1.23
-+go 1.21
- 
- require (
- 	github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
diff --git a/x11/nwg-dock-hyprland/pkg-plist b/x11/nwg-dock-hyprland/pkg-plist
new file mode 100644
index 000000000000..2289fad9be04
--- /dev/null
+++ b/x11/nwg-dock-hyprland/pkg-plist
@@ -0,0 +1,10 @@
+bin/nwg-dock-hyprland
+%%DATADIR%%/images/grid.svg
+%%DATADIR%%/images/icon-missing.svg
+%%DATADIR%%/images/task-empty-vertical.svg
+%%DATADIR%%/images/task-empty.svg
+%%DATADIR%%/images/task-multiple-vertical.svg
+%%DATADIR%%/images/task-multiple.svg
+%%DATADIR%%/images/task-single-vertical.svg
+%%DATADIR%%/images/task-single.svg
+%%DATADIR%%/style.css