diff --git a/net-im/coyim/Makefile b/net-im/coyim/Makefile index 8c4bd38b817f..b10da5400eef 100644 --- a/net-im/coyim/Makefile +++ b/net-im/coyim/Makefile @@ -1,60 +1,60 @@ PORTNAME= coyim DISTVERSIONPREFIX= v DISTVERSION= 0.3.11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MAINTAINER= fox@FreeBSD.org COMMENT= Safe and secure by default chat client LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 USES= gnome go pkgconfig USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls USE_GITHUB= yes GH_ACCOUNT= coyim GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} GO_BUILDFLAGS= -tags ${GTK_BUILD_TAG} SUB_LIST= PORTNAME=${PORTNAME} PLIST_FILES= bin/coyim \ share/applications/coyim.desktop \ share/pixmaps/coyim.png GTK_VERSION= "$$(pkg-config --modversion gtk+-3.0 | ${TR} . _ | cut -d '_' -f 1-2)" GTK_BUILD_TAG= gtk_${GTK_VERSION} COYIM_ICON= coyim.png COYIM_ICON_SRC= ${WRKSRC}/build/mac-bundle/coy.iconset/icon_32x32@2x.png COYIM_DESKTOP= ${WRKSRC}/build/coyim.desktop pre-build: cd ${WRKSRC} && ${SH} ./gen_version_file.sh ${DISTVERSIONPREFIX}${DISTVERSION} post-build: @${REINPLACE_CMD} -e '/^#/d' \ -e '/^$$/d' \ ${COYIM_DESKTOP} ${ECHO_CMD} "Exec=${PREFIX}/bin/coyim" >> ${COYIM_DESKTOP} ${ECHO_CMD} "Icon=${COYIM_ICON}" >> ${COYIM_DESKTOP} post-install: ${INSTALL_DATA} ${COYIM_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${INSTALL_DATA} ${COYIM_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${COYIM_ICON} .include diff --git a/net-im/coyim/files/patch-vendor_github.com_gotk3_gotk3_gtk_accel.go b/net-im/coyim/files/patch-vendor_github.com_gotk3_gotk3_gtk_accel.go new file mode 100644 index 000000000000..60ca114c7f5f --- /dev/null +++ b/net-im/coyim/files/patch-vendor_github.com_gotk3_gotk3_gtk_accel.go @@ -0,0 +1,22 @@ +Remove the missing accel_flags field to prevent build failure. + +XXX: Investigate this further. + +--- vendor/github.com/gotk3/gotk3/gtk/accel.go.orig 2021-04-07 12:07:51 UTC ++++ vendor/github.com/gotk3/gotk3/gtk/accel.go +@@ -244,7 +244,6 @@ func (v *AccelKey) native() *C.struct__GtkAccelKey { + var val C.struct__GtkAccelKey + val.accel_key = C.guint(v.key) + val.accel_mods = C.GdkModifierType(v.mods) +- val.accel_flags = v.flags + return &val + } + +@@ -253,7 +252,6 @@ func wrapAccelKey(obj *C.struct__GtkAccelKey) *AccelKe + + v.key = uint(obj.accel_key) + v.mods = gdk.ModifierType(obj.accel_mods) +- v.flags = uint16(obj.accel_flags) + + return &v + }