From owner-svn-ports-all@freebsd.org Thu Nov 12 03:03:26 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 946A92D3A16; Thu, 12 Nov 2020 03:03:26 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CWmdB3f5fz4klP; Thu, 12 Nov 2020 03:03:26 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A13D1FB15; Thu, 12 Nov 2020 03:03:26 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AC33Q2R037036; Thu, 12 Nov 2020 03:03:26 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AC33QQ4037035; Thu, 12 Nov 2020 03:03:26 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202011120303.0AC33QQ4037035@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 12 Nov 2020 03:03:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554928 - head/x11/xnee X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/x11/xnee X-SVN-Commit-Revision: 554928 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2020 03:03:26 -0000 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