From nobody Thu Sep 08 10:54:29 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MNbbp08hXz4bptt; Thu, 8 Sep 2022 10:54:30 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MNbbn6kHNz41m8; Thu, 8 Sep 2022 10:54:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662634470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Lpsu/N1FH/D4xDTQzfwwfPg8Njn/xV5vmCQaPAGbgA=; b=avEZ3QegpaatSUTT/A0nGE3sJREe5Nj7TOCw2ajrqiexXzpa2FByIxzm80iOCaV4uJpLd4 3USwlqkZoSFRtsqcTPOebCYe5LyPgqBU1JpAJOxaa8Ep4NPkL6Dzfasmcw4uyKYoOafn3m 8yDQ9Ehi4uPGS4IDwnbjEPJviLj8HdpOw8lATWKxZY81BKH6/vhVvRjhrHIOp9nAU+yeNE 3Q2D+BUG0D6FgBvFjqLTEGnQpxKYqn+RsPFq2GnmAJSUZmfpklEyyttIiNNvTMACLJ/566 sHEBScfCnkdfXB7zA+n/SWCQB1IrTsOMHapq8KmiRfXA4adNyu1g9aJR4xU3VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MNbbn5kYyzrCy; Thu, 8 Sep 2022 10:54:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 288AsTh4074118; Thu, 8 Sep 2022 10:54:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 288AsTe0074117; Thu, 8 Sep 2022 10:54:29 GMT (envelope-from git) Date: Thu, 8 Sep 2022 10:54:29 GMT Message-Id: <202209081054.288AsTe0074117@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 3fcb653641a3 - 2022Q3 - x11/kitty: Fix 12.3R (amd64,i386) build List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 3fcb653641a362989362bd78322ac5e339312ae5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662634469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Lpsu/N1FH/D4xDTQzfwwfPg8Njn/xV5vmCQaPAGbgA=; b=Y8Hd5zxEgeSYlCF5GiVvr7KkLMNUd2RROzQeZeim0T0udqwgL0DgDrQEWOTpSD/j9adIp5 bPy50McvXi+tM4Oxik6D7VqZNxTP/skWzHa3IGF6Lw2YmLInm/BHosFC9eUv7PePbPBIDH gvs6RDEkRMnmBZZtVrRwPB3cyV1U932mGsAC2utmH1X+xeKDEeyoVDYoLf2Vb+4r2ma2+w CLtbf1NGiNpiKFYmSByNoE+aPSHkTIsWrvfsPORcGcZ6GW97hoTTVozhASIeavkOrNHgVH gJolZMfLMjuvhb8btnODbGz7ehW67EMclxX7d42e7pXcYqWpuNQdVYGOaVjklQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662634469; a=rsa-sha256; cv=none; b=MIZXGzT9OuzHu9NFslVW8qrWpLaaFExvsqN3tiOVuhoc8i45HV09VLP6X+l520uEpPLHRJ FwUs52pA1wevSGeADao8aA77tUfbvdz9TChRSbvQtpohnnrxY3JY9HPBlcpTmLzD/S4zOr S8y3HEVYQL/h+Aq3hJ+jXmKJxFuqQeGcyOQZIzr8OJ0mtikLK7qlEz4iow3Auh0t5i8Ya4 DJw5LgGrGZFNgDT068A1ar3RKO+RM80kl3cU+Dsvm5w1zlu2SH9nKBabhWVyP5+1TZ2WNb I5x1O32mmCWt+PRkXh2c4xDiQrhbMweSlmepZsf+agPZ1Jxz2nH8nnu1pWHJEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=3fcb653641a362989362bd78322ac5e339312ae5 commit 3fcb653641a362989362bd78322ac5e339312ae5 Author: Nuno Teixeira AuthorDate: 2022-08-01 22:03:08 +0000 Commit: Nuno Teixeira CommitDate: 2022-09-08 10:52:36 +0000 x11/kitty: Fix 12.3R (amd64,i386) build - add LIB_DEPENDS= libepoll-shim-interpose.so:devel/libepoll-shim CPPFLAGS+= `pkg-config --cflags epoll-shim-interpose` LDFLAGS+= `pkg-config --libs epoll-shim-interpose` - add missing USES= desktop-file-utils PR: 265393 (cherry picked from commit 3cc557e6e51a495df1723777c9509925b4da5a8c) --- x11/kitty/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index 88118c0bbe89..e0002643e008 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -1,7 +1,8 @@ PORTNAME= kitty DISTVERSION= 0.25.0 +PORTREVISION= 1 CATEGORIES= x11 wayland -MASTER_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/ +MASTER_SITES= https://github.com/kovidgoyal/${PORTNAME}/releases/download/v${DISTVERSION}/ MAINTAINER= alexis.praga@free.fr COMMENT= Cross-platform, fast, featureful, GPU-based terminal emulator @@ -16,6 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \ sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \ wayland-protocols>=0:graphics/wayland-protocols LIB_DEPENDS= libdbus-1.so:devel/dbus \ + libepoll-shim-interpose.so:devel/libepoll-shim \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ @@ -26,12 +28,11 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libwayland-cursor.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon -USES= compiler:c11 cpe gettext-runtime gl gmake pkgconfig \ - python:3.5+ shebangfix tar:xz terminfo xorg -GH_ACCOUNT= kovidgoyal +USES= compiler:c11 cpe desktop-file-utils gettext-runtime gl gmake \ + pkgconfig python:3.5+ shebangfix tar:xz terminfo xorg +CPE_VENDOR= kitty_project USE_GL= gl USE_XORG= x11 xcb xcursor xi xinerama xrandr -CPE_VENDOR= kitty_project SHEBANG_FILES= build-terminfo count-lines-of-code mypy-editor-integration \ update-on-ox update-on-ubuntu @@ -40,6 +41,9 @@ SHEBANG_GLOB= *.py TEST_ENV= PATH="${STAGEDIR}${PREFIX}/bin:${PATH}" TEST_TARGET= test +CPPFLAGS+= `pkg-config --cflags epoll-shim-interpose` +LDFLAGS+= `pkg-config --libs epoll-shim-interpose` + BINARY_ALIAS= python3=${PYTHON_CMD} python=${PYTHON_CMD} INSTALL_WRKSRC= ${WRKSRC}/linux-package @@ -61,9 +65,9 @@ MAKE_ENV+= KITTY_NO_LTO=1 # ncursesw and tinfo >= 6.1 seem to be neededd .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400035 -USES+=ncurses:port +USES+= ncurses:port .else -USES+=ncurses +USES+= ncurses .endif # For librsync, we need to set header and library path