diff --git a/x11/nwg-menu/Makefile b/x11/nwg-menu/Makefile index 46267e588643..9615f056c38f 100644 --- a/x11/nwg-menu/Makefile +++ b/x11/nwg-menu/Makefile @@ -1,44 +1,44 @@ PORTNAME= nwg-menu DISTVERSIONPREFIX= v -DISTVERSION= 0.1.6 +DISTVERSION= 0.1.7 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= MenuStart plugin to nwg-panel, also capable of working standalone WWW= https://github.com/nwg-piotr/nwg-menu LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell USES= gnome go:modules pkgconfig USE_GITHUB= yes USE_GNOME= cairo gdkpixbuf2 gtk30 GH_ACCOUNT= nwg-piotr GH_TUPLE= allan-simon:go-singleinstance:d0997106ab37:allan_simon_go_singleinstance/vendor/github.com/allan-simon/go-singleinstance \ dlasky:gotk3-layershell:5c5115f0d774:dlasky_gotk3_layershell/vendor/github.com/dlasky/gotk3-layershell \ - golang:sync:v0.8.0:golang_sync/vendor/golang.org/x/sync \ - golang:sys:v0.25.0:golang_sys/vendor/golang.org/x/sys \ + golang:sync:v0.10.0:golang_sync/vendor/golang.org/x/sync \ + golang:sys:v0.29.0:golang_sys/vendor/golang.org/x/sys \ gotk3:gotk3:ff349ae13f56:gotk3_gotk3/vendor/github.com/gotk3/gotk3 \ joshuarubin:go-sway:v1.2.0:joshuarubin_go_sway/vendor/github.com/joshuarubin/go-sway \ joshuarubin:lifecycle:v1.1.4:joshuarubin_lifecycle/vendor/github.com/joshuarubin/lifecycle \ sirupsen:logrus:v1.9.3:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ uber-go:multierr:v1.11.0:uber_go_multierr/vendor/go.uber.org/multierr CGO_LDFLAGS+= -Wl,--as-needed # harfbuzz, freetype2 PLIST_FILES= bin/${PORTNAME} PORTDATA= desktop-directories *.css post-patch: # Respect PREFIX for *.desktop and system configs @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/main.go \ ${WRKSRC}/tools.go post-install: # Based on install from WRKSRC/Makefile (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" \ ${STAGEDIR}${DATADIR}) .include diff --git a/x11/nwg-menu/distinfo b/x11/nwg-menu/distinfo index 2900e742e012..2433d48dc58b 100644 --- a/x11/nwg-menu/distinfo +++ b/x11/nwg-menu/distinfo @@ -1,21 +1,21 @@ -TIMESTAMP = 1726964134 -SHA256 (nwg-piotr-nwg-menu-v0.1.6_GH0.tar.gz) = b6ef6d3d957257788bceadb1a09c174d4db5afa93a4dc90fe1aa04723d96266b -SIZE (nwg-piotr-nwg-menu-v0.1.6_GH0.tar.gz) = 3861022 +TIMESTAMP = 1736554057 +SHA256 (nwg-piotr-nwg-menu-v0.1.7_GH0.tar.gz) = 406de41e098519fc911ca1a4d87e5bbeb05b309a29f3fd110ca738a89f59d594 +SIZE (nwg-piotr-nwg-menu-v0.1.7_GH0.tar.gz) = 3861013 SHA256 (allan-simon-go-singleinstance-d0997106ab37_GH0.tar.gz) = f8cee874873fe9fc1a81e8a7ca83df85c57aa86279c09cb8cba10d5feb7ed295 SIZE (allan-simon-go-singleinstance-d0997106ab37_GH0.tar.gz) = 2819 SHA256 (dlasky-gotk3-layershell-5c5115f0d774_GH0.tar.gz) = 9b4f0a555e5f7714930e3f592414e6fa5cb61b744a58ee79419fa89a5530af9e SIZE (dlasky-gotk3-layershell-5c5115f0d774_GH0.tar.gz) = 2374334 -SHA256 (golang-sync-v0.8.0_GH0.tar.gz) = 1872b89e8bf234d4c65edca0bf7c7fd6c414cf74a5a9e10463eb2483cf7b361f -SIZE (golang-sync-v0.8.0_GH0.tar.gz) = 18181 -SHA256 (golang-sys-v0.25.0_GH0.tar.gz) = 5d6918f3b8618819f3b3e8a2b89fb1588c1a9db1e4332732f11a6cf1acde268c -SIZE (golang-sys-v0.25.0_GH0.tar.gz) = 1506462 +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 (gotk3-gotk3-ff349ae13f56_GH0.tar.gz) = e37085985248c69a8b429e37eb2ebee31a2b0f6bbd8310dc154050985fcc6b04 SIZE (gotk3-gotk3-ff349ae13f56_GH0.tar.gz) = 279122 SHA256 (joshuarubin-go-sway-v1.2.0_GH0.tar.gz) = 3bd95f49be110b40bc005f3db157c0a8e6ccedb4e0ed48e810368f23030a1833 SIZE (joshuarubin-go-sway-v1.2.0_GH0.tar.gz) = 12933 SHA256 (joshuarubin-lifecycle-v1.1.4_GH0.tar.gz) = 512fc4ca6e4f8db0b493f47f3edffed3ce09002267b0ff0d64fa09941d4d249f SIZE (joshuarubin-lifecycle-v1.1.4_GH0.tar.gz) = 7542 SHA256 (sirupsen-logrus-v1.9.3_GH0.tar.gz) = cfa48a647a28c1f12fb6a9b672bc4d88b6407ff05aedcf23ce939d342646acce SIZE (sirupsen-logrus-v1.9.3_GH0.tar.gz) = 50320 SHA256 (uber-go-multierr-v1.11.0_GH0.tar.gz) = 8aa599cf7de733306cf8770f854f8a38e6c819b1ae4296f15e44b1e7c6698f34 SIZE (uber-go-multierr-v1.11.0_GH0.tar.gz) = 16900 diff --git a/x11/nwg-menu/files/patch-go.mod b/x11/nwg-menu/files/patch-go.mod index 8b869dcdcfab..2d7b50e370dc 100644 --- a/x11/nwg-menu/files/patch-go.mod +++ b/x11/nwg-menu/files/patch-go.mod @@ -1,14 +1,14 @@ Drop after lang/go122 appears (switch to USES=go:1.22,modules) github.com/nwg-piotr/nwg-menu: cannot compile Go 1.22 code ---- go.mod.orig 2024-08-29 23:11:28 UTC +--- go.mod.orig 2025-01-11 00:07:37 UTC +++ go.mod @@ -1,6 +1,6 @@ module github.com/nwg-piotr/nwg-menu module github.com/nwg-piotr/nwg-menu -go 1.23 +go 1.21 require ( github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37 diff --git a/x11/nwg-menu/files/patch-main.go b/x11/nwg-menu/files/patch-main.go index 47be1f4fbf57..bcc726370384 100644 --- a/x11/nwg-menu/files/patch-main.go +++ b/x11/nwg-menu/files/patch-main.go @@ -1,15 +1,15 @@ - Adapt to BSD-style shutdown ---- main.go.orig 2024-09-21 00:07:27 UTC +--- main.go.orig 2025-01-11 00:07:37 UTC +++ main.go -@@ -121,8 +121,8 @@ var cmdLogout = flag.String("cmd-logout", "swaymsg exi +@@ -122,8 +122,8 @@ var cmdLogout = flag.String("cmd-logout", "swaymsg exi var wm = flag.String("wm", "", "use swaymsg exec (with 'sway' argument) or hyprctl dispatch exec (with 'hyprland') or riverctl spawn (with 'river') to launch programs") var cmdLock = flag.String("cmd-lock", "swaylock -f -c 000000", "screen lock command") var cmdLogout = flag.String("cmd-logout", "swaymsg exit", "logout command") -var cmdRestart = flag.String("cmd-restart", "systemctl reboot", "reboot command") -var cmdShutdown = flag.String("cmd-shutdown", "systemctl -i poweroff", "shutdown command") +var cmdRestart = flag.String("cmd-restart", "shutdown -r now", "reboot command") +var cmdShutdown = flag.String("cmd-shutdown", "shutdown -p now", "shutdown command") - var debug = flag.Bool("debug", false, "Turn on Debug messages") + var debug = flag.Bool("debug", false, "turn on Debug messages") + var hover = flag.Bool("t", false, "hovering caTegories opens submenus") - func main() {