diff --git a/x11/nwg-look/Makefile b/x11/nwg-look/Makefile index 2e55c48399d4..51731b808fae 100644 --- a/x11/nwg-look/Makefile +++ b/x11/nwg-look/Makefile @@ -1,49 +1,48 @@ PORTNAME= nwg-look DISTVERSIONPREFIX= v -DISTVERSION= 0.2.6 -PORTREVISION= 1 +DISTVERSION= 0.2.7 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= GTK3 settings editor for sway and other wlroots compositors WWW= https://github.com/nwg-piotr/nwg-look LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig USES= gnome go:modules pkgconfig USE_GITHUB= yes USE_GNOME= cairo gdkpixbuf2 gtk30 GH_ACCOUNT= nwg-piotr -GH_TUPLE= golang:sys:v0.16.0:golang_sys/vendor/golang.org/x/sys \ - gotk3:gotk3:v0.6.2:gotk3_gotk3/vendor/github.com/gotk3/gotk3 \ +GH_TUPLE= golang:sys:v0.17.0:golang_sys/vendor/golang.org/x/sys \ + gotk3:gotk3:v0.6.3:gotk3_gotk3/vendor/github.com/gotk3/gotk3 \ sirupsen:logrus:v1.9.3:sirupsen_logrus/vendor/github.com/sirupsen/logrus CGO_LDFLAGS+= -Wl,--as-needed # harfbuzz, freetype2 PLIST_FILES= bin/${PORTNAME} \ ${DATADIR}/langs/en_US.json \ ${DATADIR}/langs/pl_PL.json \ ${DATADIR}/langs/ru_RU.json \ ${DATADIR}/langs/zh_CN.json \ ${DATADIR}/main.glade \ share/applications/${PORTNAME}.desktop \ share/pixmaps/${PORTNAME}.svg post-patch: # Respect PREFIX for *.glade and *.desktop @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/main.go \ ${WRKSRC}/tools.go post-install: # Based on install from WRKSRC/Makefile ${MKDIR} ${STAGEDIR}${DATADIR}/langs ${INSTALL_DATA} ${WRKSRC}/langs/* ${STAGEDIR}${DATADIR}/langs ${INSTALL_DATA} ${WRKSRC}/stuff/main.glade ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/stuff/*.desktop \ ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/stuff/*.svg \ ${STAGEDIR}${PREFIX}/share/pixmaps .include diff --git a/x11/nwg-look/distinfo b/x11/nwg-look/distinfo index f2c728b79586..af795788be69 100644 --- a/x11/nwg-look/distinfo +++ b/x11/nwg-look/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1706463157 -SHA256 (nwg-piotr-nwg-look-v0.2.6_GH0.tar.gz) = ac3cb75ece7058120a5ed6b4ec8a321af0a66b522fdc7627bbab44dc1aaac8f8 -SIZE (nwg-piotr-nwg-look-v0.2.6_GH0.tar.gz) = 23658 -SHA256 (golang-sys-v0.16.0_GH0.tar.gz) = 9c17b728aa75f4fc4743c3f5c0dccdc3b7f9ac7c12b3124b666672cc571f657e -SIZE (golang-sys-v0.16.0_GH0.tar.gz) = 1444155 -SHA256 (gotk3-gotk3-v0.6.2_GH0.tar.gz) = 7e7534e427a66fd118f0b0961b1e2369d6ae3c0b5f24227b9854e181eb4a407f -SIZE (gotk3-gotk3-v0.6.2_GH0.tar.gz) = 278186 +TIMESTAMP = 1707694992 +SHA256 (nwg-piotr-nwg-look-v0.2.7_GH0.tar.gz) = 20a7773b1bae7ae013efa359e73dcefc89bfb516d45bba4375f59c8a9216c9c3 +SIZE (nwg-piotr-nwg-look-v0.2.7_GH0.tar.gz) = 23920 +SHA256 (golang-sys-v0.17.0_GH0.tar.gz) = ac396e3c66940e34fdd1d422a9628ab2a5118249118f2a36f65082d32e709e7a +SIZE (golang-sys-v0.17.0_GH0.tar.gz) = 1446309 +SHA256 (gotk3-gotk3-v0.6.3_GH0.tar.gz) = cf233b835b1fdd23afa393d1e7483c44a57ab7729afe3a72e7ae3ded2b27a0c8 +SIZE (gotk3-gotk3-v0.6.3_GH0.tar.gz) = 278230 SHA256 (sirupsen-logrus-v1.9.3_GH0.tar.gz) = cfa48a647a28c1f12fb6a9b672bc4d88b6407ff05aedcf23ce939d342646acce SIZE (sirupsen-logrus-v1.9.3_GH0.tar.gz) = 50320 diff --git a/x11/nwg-look/files/patch-go.mod b/x11/nwg-look/files/patch-go.mod new file mode 100644 index 000000000000..35992806528a --- /dev/null +++ b/x11/nwg-look/files/patch-go.mod @@ -0,0 +1,14 @@ +Drop after lang/go122 appears (switch to USES=go:1.22,modules) + +github.com/nwg-piotr/nwg-look: cannot compile Go 1.22 code + +--- go.mod.orig 2024-02-11 23:43:12 UTC ++++ go.mod +@@ -1,6 +1,6 @@ module github.com/nwg-piotr/nwg-look + module github.com/nwg-piotr/nwg-look + +-go 1.22 ++go 1.21 + + require ( + github.com/gotk3/gotk3 v0.6.3