From nobody Tue Dec 27 14:40:11 2022 X-Original-To: dev-commits-ports-main@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 4NhHPR5F6Xz2cBwZ; Tue, 27 Dec 2022 14:40:11 +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 4NhHPR3D8mz4Q7Y; Tue, 27 Dec 2022 14:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672152011; 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=Cfh99dACxpzCTZSWg6GQHpmJWN0KVkWtuBhHXBjda6Q=; b=o5abObn2WUxQm/utZFQCmOlOx0PU/8RVJ9klWGNR2MIF4B72ewLWPolJ7uvFdlmTMp8CBE 4kDctYaTC9Yalw7iQ+OkhlMyZ9qMWHcplQp6MacORoqiYXeJob3qHERUI+L1F4Q81Q+g7Y 4afUnwQOoYleGZotfl2VRR2AATcMYGYI4fAQRqfSybt7nhqLCRBG8VTuaus4CV1WsL1Tky 4tvsgw3xYYE73o0RK8B75qHfsgymZDfQ5ZMkq9m5PLnMlXlnS8ieWPtX42j+yZhPfrcQmF v6LIUTlGLAnod2kCexWUR0y1+bXQPUc60KqiBWSV9SlQQnpQK4yzUtiE0Ly9Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672152011; 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=Cfh99dACxpzCTZSWg6GQHpmJWN0KVkWtuBhHXBjda6Q=; b=LQ1GgvSomu6k+QXRUgdihHFngNCqa/hnowgCMntgvqNw16h7BrZrRIPC8EyAtAklU1mxa5 bpbSXJNitMfz1PJse+dHTqb0JEu3zy9YbwT36bW531uCoirjELnxrjPW1Oa59uRkw3hEKp MTi7/IYk0SxMBEhnafunZSqBOxFfLAjVd4HfpyifAJFPXqn7lOE0xGwQPod1b3C5fcMRFD 1IxZQCzrV/4W4cO/nQMUHb463YFsgqjRTRweGgi5fXN2fbCLJ7jfBHaUf3pvRVGxBdylcU 24lMl1KpzrXMslakrvmsCOecOw48Kz9bbwT6X3dulB5ncghkQ/r5YR9ouLUBvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672152011; a=rsa-sha256; cv=none; b=wrTTTkpb60F6PRZ0+dN4a3je8XHBZT1BfGU0mNCCtprGUpEveQthgyNiymJxY5O1LMgrYM DKcj96GfbN8GRNNdI5SNgv3B0KrvTufrAfM7W3wlq/nGT7MwvDDQLL7oaB3BA+kKhDTJn0 aowQQpn4tN3d5mD8zM7R921cV75gvCtQ9Am/R8RAI/LKszpOH7Nr9EBMAyiBkA/ruuFoq8 rbWOqAwuPwA4szqp30jz/xIZuVltmgKOv/aR6mShwT3/Vxc92QOUZAwsdXQF0MVYb1DEwC 5YHHH32W6xPDpYW1fjJJJLg9uhCUiLz62bpasMDzPx0cUYM5SED4Tmi8BD4MEQ== 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 4NhHPR1z6gzDpS; Tue, 27 Dec 2022 14:40:11 +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 2BREeBKE073617; Tue, 27 Dec 2022 14:40:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BREeBUg073611; Tue, 27 Dec 2022 14:40:11 GMT (envelope-from git) Date: Tue, 27 Dec 2022 14:40:11 GMT Message-Id: <202212271440.2BREeBUg073611@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: cbe413ca7749 - main - sysutils/conky: enable Wayland support after 481978c0272e List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbe413ca77498af1a905da67e08c7441342e9fdd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbe413ca77498af1a905da67e08c7441342e9fdd commit cbe413ca77498af1a905da67e08c7441342e9fdd Author: Jan Beich AuthorDate: 2022-12-27 09:10:12 +0000 Commit: Jan Beich CommitDate: 2022-12-27 14:35:56 +0000 sysutils/conky: enable Wayland support after 481978c0272e See out_to_wayland in conky(1) manpage or $ fgrep -A3 wayland /usr/local/share/doc/conky/config_settings.yaml - name: out_to_wayland desc: |- Open a Wayland window to display output. default: no PR: 268597 Inspired by: Alpine Linux Approved by: madpilot (maintainer) --- sysutils/conky/Makefile | 18 ++++++++++++++++-- sysutils/conky/distinfo | 2 ++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index a32033c83f21..13b30fbba7c6 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,8 +1,12 @@ PORTNAME= conky PORTVERSION= 1.16.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= sysutils +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 3fb6534eff30.patch:-p1 # https://github.com/brndnmtthws/conky/pull/1349 + MAINTAINER= madpilot@FreeBSD.org COMMENT?= Advanced, highly configurable system monitor for X11 WWW= https://github.com/brndnmtthws/conky @@ -30,11 +34,11 @@ USE_GITHUB= yes GH_ACCOUNT= brndnmtthws OPTIONS_DEFINE= APCUPSD CURL DOCS EXAMPLES IPV6 MANPAGES METAR MOC MPD \ - NCURSES RSS X11 XOAP + NCURSES RSS WAYLAND X11 XOAP OPTIONS_GROUP?= X11 OPTIONS_GROUP_X11= ARGB DOUBLE_BUFFER IMLIB2 XFT XINERAMA LUA_CAIRO LUA_IMLIB2 LUA_RSVG -OPTIONS_DEFAULT?= X11 ARGB DOUBLE_BUFFER MANPAGES XFT LUA_CAIRO +OPTIONS_DEFAULT?= X11 ARGB DOUBLE_BUFFER MANPAGES WAYLAND XFT LUA_CAIRO APCUPSD_DESC= Monitor APCUPSD APCUPSD_CMAKE_BOOL= BUILD_APCUPSD @@ -103,6 +107,16 @@ RSS_USES= gnome RSS_USE= gnome=glib20,libxml2 RSS_IMPLIES= CURL +WAYLAND_CATEGORIES= wayland +WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.13:graphics/wayland-protocols +WAYLAND_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ + libwayland-client.so:graphics/wayland \ + libfontconfig.so:x11-fonts/fontconfig +WAYLAND_USES= gnome +WAYLAND_USE= gnome=cairo,pango +WAYLAND_CMAKE_BOOL= BUILD_WAYLAND +WAYLAND_LDFLAGS= -Wl,--as-needed # pangoft2 deps: glib20, freetype2, harfbuzz + X11_USES= xorg X11_USE= xorg=x11,xext,xdamage,xfixes X11_CMAKE_BOOL= BUILD_X11 OWN_WINDOW diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index a706ee0921c5..6cb69c80010c 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1672086732 SHA256 (brndnmtthws-conky-v1.16.1_GH0.tar.gz) = a293530980bf5ec2250e6d52533cb3426de66c99477ae15430215b3e4b536593 SIZE (brndnmtthws-conky-v1.16.1_GH0.tar.gz) = 1696411 +SHA256 (3fb6534eff30.patch) = 35af04a3feac07767da999fd18544d6b5d743a25ea150ac53c0afa284a75cc75 +SIZE (3fb6534eff30.patch) = 1854