Date: Thu, 12 Nov 2020 03:03:26 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554928 - head/x11/xnee Message-ID: <202011120303.0AC33QQ4037035@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Thu Nov 12 03:03:26 2020 New Revision: 554928 URL: https://svnweb.freebsd.org/changeset/ports/554928 Log: - Make enums anonymous to fix the build with -fno-common (Clang 11, GCC 10) - Undeprecate, give maintainership to new volunteer, amend USE_XORG list PR: 251060 Modified: head/x11/xnee/Makefile Modified: head/x11/xnee/Makefile ============================================================================== --- head/x11/xnee/Makefile Thu Nov 12 01:18:38 2020 (r554927) +++ head/x11/xnee/Makefile Thu Nov 12 03:03:26 2020 (r554928) @@ -7,20 +7,14 @@ PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= GNU -MAINTAINER= ports@FreeBSD.org +MAINTAINER= zab@zltech.eu COMMENT= X11 events recorder and player LICENSE= GPLv3 -# Fix build with -fno-common (llvm 11) -CFLAGS+= -fcommon - -DEPRECATED= Unmaintained and dead upstream, does not build with -fno-common (llvm 11) -EXPIRATION_DATE=2021-04-01 - GNU_CONFIGURE= yes USES= gmake pathfix xorg -USE_XORG= xtst +USE_XORG= x11 xtst CONFIGURE_ARGS= --enable-cli --disable-doc --disable-xinput2 @@ -54,8 +48,22 @@ post-patch: s|$$(libgnomeui_LIBS)||g' ${WRKSRC}/gnee/src/Makefile.in @${REINPLACE_CMD} -e \ 's|src test|src|g' ${WRKSRC}/libxnee/Makefile.in + @${REINPLACE_CMD} -E 's,} (${_ENUM_NAMES:ts|}),},' \ + ${WRKSRC}/libxnee/include/libxnee/xnee.h \ + ${WRKSRC}/libxnee/include/libxnee/xnee_grab.h \ + ${WRKSRC}/libxnee/include/libxnee/xnee_internal.h \ + ${WRKSRC}/libxnee/include/libxnee/xnee_window.h + @${REINPLACE_CMD} -e \ + 's|^xnee_option_t|extern &|' ${WRKSRC}/cnee/src/cnee_demo.c post-install: ${INSTALL_DATA} ${WRKSRC}/doc/xnee.info ${STAGEDIR}${PREFIX}/${INFO_PATH} + +# We must trim the names from enums below to build with -fno-common +_ENUM_NAMES= _bool_string_values _cont_proc_commands _return_values \ + _xnee_grab_modes _xnee_protocol_data_numbers \ + _xnee_replay_backend _xnee_resolution_states \ + xnee_data_types xnee_grab_modifiers_control xnee_mode \ + xnee_option_type xnee_override_display xnee_window_types .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011120303.0AC33QQ4037035>