From nobody Thu Jan 27 18:14:48 2022 X-Original-To: dev-commits-ports-all@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 B79F51997C1B; Thu, 27 Jan 2022 18:14:48 +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 4Jl7zD4kPJz3R7m; Thu, 27 Jan 2022 18:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643307288; 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=W8lY2rGuSQeM5mo8QfFUkJMf4DO5HF/ok7MX6bfWfYE=; b=QUjGIzsSRxBBYeu4Gb/nyFHQpmIsnbWNkJQye2VkxCe4aNoe9CrMMTeDMJ1HTEoPme7DOn OUf/M7jCcH/uGjngkYxG6Hp/MzXebR/+w132a0vI0NZSrjByittLTsB4uxv+gr+x2Gi+w+ u/EZOxT6LJfoo4/BsbrLu1395fsAPBglPiE9UrdZpxAqcTfbm0scEoy2PAURaXuuXA6h1s vgP7m2E4QYuyiXIhrCRPl2Fuj5kXRoieCVvGcRBmCMxp2HOXGlPxa98+UWaEVf+RvWKUXf Clt+D74QtMIanPHTngsiCptwoUF6fBlA7xVuUt4FQXhHSXcMKyf/tn9PnEUSTQ== 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 77EE71B2E4; Thu, 27 Jan 2022 18:14:48 +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 20RIEmI3048583; Thu, 27 Jan 2022 18:14:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20RIEmN7048582; Thu, 27 Jan 2022 18:14:48 GMT (envelope-from git) Date: Thu, 27 Jan 2022 18:14:48 GMT Message-Id: <202201271814.20RIEmN7048582@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: fdf4519f1cb7 - main - x11-wm/picom: disable compton symlinks List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: fdf4519f1cb7625eabd1082752097dff82caa242 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643307288; 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=W8lY2rGuSQeM5mo8QfFUkJMf4DO5HF/ok7MX6bfWfYE=; b=QFtv1aHOxgNmVAUOQSRCf2GcryvwNacH3UEcq0aTOHwRlkz/3GPHHuDhdtRCQky5gB6Ynv 7a/J4nFv7yhCx/721e4uqQcqWjrD2vMxiw/OIyuSs7Pfirtg7A4Zj+eCDbL2wNBE+8lfD5 i1X3u1wApwWNHR0pMbbyMdeI1luiSeb6GJD2oWQVrg6yPP094KmlaMgdrgWCbhDesUn0SJ mshfgA+2ZMGCUMP3pGl2yx+0qzVJihShu97g+mTRsifnFfofrmmCWeIjwiX1J0locDJEDQ v9O9jDjehGgsaEQZc8U3JXhSlh1ajpeS0lTPP+n37LebHN83oFykMQ7gDs9+Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643307288; a=rsa-sha256; cv=none; b=OR6UYe0j2TR/TzWooYVpk6CPKJB5zy54CabWmc+zlIZuYFszO1Gi72figG8MKt5WuPNCrY vYfAUub7NEnxLODb8ITDt9zyBQ9O2QPJX8Yk+mQaiN1dswIJGBWqEE8SzC5zxDZJIKuCAM M3H7p4/VcR9pAXtkGqsipCzu/YyGBCgdt/qWiIk5G7eM7695c0V9rb9G7GH4i3YEa7IYmh jEUoExOMRkkByX2Ll20igRL4zg/p+9CXUNfzeLe5rWn438mDEWtulEWFQXllRDQPfXfdO/ OxtZ9L6aX4iiVoZdHPlYbnQv/QLhqqMzAYLUU+DwDqRb2I2sZlZJlYqur4c6AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fdf4519f1cb7625eabd1082752097dff82caa242 commit fdf4519f1cb7625eabd1082752097dff82caa242 Author: Jan Beich AuthorDate: 2022-01-27 17:47:59 +0000 Commit: Jan Beich CommitDate: 2022-01-27 18:14:40 +0000 x11-wm/picom: disable compton symlinks --- x11-wm/compton/Makefile | 2 -- x11-wm/picom/Makefile | 7 +++---- x11-wm/picom/distinfo | 2 ++ x11-wm/picom/pkg-plist | 5 ----- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/x11-wm/compton/Makefile b/x11-wm/compton/Makefile index 57932a4d320e..c36479c6b915 100644 --- a/x11-wm/compton/Makefile +++ b/x11-wm/compton/Makefile @@ -12,8 +12,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= xprop:x11/xprop \ xwininfo:x11/xwininfo -CONFLICTS_INSTALL= picom # bin/compton - USE_GITHUB= yes GH_ACCOUNT= chjj GH_TAGNAME= b7f43ee diff --git a/x11-wm/picom/Makefile b/x11-wm/picom/Makefile index dbfcf3fe6264..d682e360abd9 100644 --- a/x11-wm/picom/Makefile +++ b/x11-wm/picom/Makefile @@ -1,11 +1,12 @@ PORTNAME= picom DISTVERSIONPREFIX= v DISTVERSION= 8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 78223caea3f7.patch:-p1 # https://github.com/yshui/picom/pull/422 +PATCHFILES+= b74f9d761664.patch:-p1 # https://github.com/yshui/picom/pull/424 MAINTAINER= jbeich@FreeBSD.org COMMENT= Lightweight X11 compositor @@ -21,13 +22,11 @@ LIB_DEPENDS= libev.so:devel/libev \ RUN_DEPENDS= xprop:x11/xprop \ xwininfo:x11/xwininfo -CONFLICTS_INSTALL= compton # bin/compton - USES= compiler:c11 meson localbase pkgconfig xorg USE_GITHUB= yes USE_XORG= x11 xcb xext pixman GH_ACCOUNT= yshui -MESON_ARGS= -Dunittest=true +MESON_ARGS= -Dcompton=false -Dunittest=true TEST_TARGET= test OPTIONS_DEFINE= CONFIG DBUS DOCS DRM OPENGL PCRE diff --git a/x11-wm/picom/distinfo b/x11-wm/picom/distinfo index 3cd80748d6da..0dfac8f21ca1 100644 --- a/x11-wm/picom/distinfo +++ b/x11-wm/picom/distinfo @@ -3,3 +3,5 @@ SHA256 (yshui-picom-v8.2_GH0.tar.gz) = 9d0c2533985e9670ff175e717a42b5bf1a2a00ccd SIZE (yshui-picom-v8.2_GH0.tar.gz) = 242653 SHA256 (78223caea3f7.patch) = f9e32a1d348ea77343366e96111529f2cd2e78562aaf28252f9ea17c72afb7b1 SIZE (78223caea3f7.patch) = 868 +SHA256 (b74f9d761664.patch) = 7938e13e812b3125677fce2be4d50aeb1988e2244211ec6c5ff9fc42b1c18073 +SIZE (b74f9d761664.patch) = 1978 diff --git a/x11-wm/picom/pkg-plist b/x11-wm/picom/pkg-plist index 66edf3494d57..109a74ec14ca 100644 --- a/x11-wm/picom/pkg-plist +++ b/x11-wm/picom/pkg-plist @@ -1,9 +1,4 @@ -bin/compton -bin/compton-trans bin/picom bin/picom-trans @sample etc/xdg/picom.conf.sample -share/applications/compton.desktop share/applications/picom.desktop -share/icons/hicolor/48x48/apps/compton.png -share/icons/hicolor/scalable/apps/compton.svg