From nobody Tue Jan 25 12:26:34 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 4CD1B1974CE2; Tue, 25 Jan 2022 12:26:37 +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 4JjmLM2lSYz3KH0; Tue, 25 Jan 2022 12:26:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643113595; 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=OorSeAacab6fDBAlSmQhz6OETlQBg70YTc4OxstEzvs=; b=XzQXaPGh1PEaLFut++iISAUj0XbfmxuJ1NKQadsK8dq9bBBEx+GGR0a7Xr89qMcrueIrRX EMOvoC1f2MOYc7G5AIsnxmx/02vBIMY0q5onbIVBUKBQ447huv+Q0ZrK9EDEQh/7DtpAo8 v6Tq+xsFBNNJoY0qMNeqMyX3gFeUwjFIt9AaZB+RSqgx260PkCDGFdRvfaubdQ8bDhpI1/ eC0E2y/igPT8VmrLnfmvxqia3JsOZSk+7XZEAPm7S5SR9T84cFSczRDBBoSKXdPIb70ByK q1vdjx20cNa6/wq/l7y38VrRICXSVlanf5rOItf9d9lkAeLJRiqzjVejbUfzYw== 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 BB2761571; Tue, 25 Jan 2022 12:26:34 +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 20PCQYf2013319; Tue, 25 Jan 2022 12:26:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20PCQYf9013318; Tue, 25 Jan 2022 12:26:34 GMT (envelope-from git) Date: Tue, 25 Jan 2022 12:26:34 GMT Message-Id: <202201251226.20PCQYf9013318@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: 0872da015336 - main - x11/cinnamon: unbreak build with Meson 0.61.0 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: 0872da015336ffb678af591f882d1549c2b62c42 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643113595; 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=OorSeAacab6fDBAlSmQhz6OETlQBg70YTc4OxstEzvs=; b=jMnWmT8eaNBNDEBf8dcqe6H2QKtfQfbDKJlZHnQv2yHGDZE9+7IqJ8dTXnHf+UCbxhivTj JZHHaELeHpfjUcHu7aexvCgdBeCXPV0p1csDbfQukRGqqwSOSxKux6Dl7dLIdIle6Icied CUNZQ6Htg50HElE9LEtjcIISzb6VXhqgUTIBxAgm8Rn+gvX+1jW+G6f1sJr/bXohbRggHR yXVqtuyUmCh+HE0eWl4Gn9U8Tdb0L3TpxAW2IPa5cI5ZF1rlUsX4724lUwS9K9gcUfgWYH Hed7PERs2QKAdGNV6QFxjyHlJDA5LSlYWsxIWyhojsFjtlnh/WMzhsjgGagmkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643113595; a=rsa-sha256; cv=none; b=rTAPuVC/e6jS90iveTxuKcl0ZjqhMvvAj+lCVNUPI89dfLxf80y3V79CH7l6c665lfz+dm bpethjvcbYrK+JqrzdzbM7dX/YRNv7cO6G4ZqU4Q7S8Bfs6AiditE49i5O4ykVkLmA+Z9L q4wHaiRTrVUd70qkaI2K+Cx2HC15WDbRqC4PQ/mZx3TyT49XNUzdeI+tTEWNFTBnAv71h1 d54KcUPfm/QfIC3IHJCGVZpZ0qnudCn3K6nEZyvskT6LhzvKm7qNe1PFX3J7HJHwfdVSOY IZQiIdIXbKLmqW7bPMBgUg89kIkP1QQTRx4v1Et+CF9tHe5yvVwHEy0iw7nMBA== 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=0872da015336ffb678af591f882d1549c2b62c42 commit 0872da015336ffb678af591f882d1549c2b62c42 Author: Jan Beich AuthorDate: 2022-01-25 12:23:08 +0000 Commit: Jan Beich CommitDate: 2022-01-25 12:25:51 +0000 x11/cinnamon: unbreak build with Meson 0.61.0 docs/reference/cinnamon-js/meson.build:11:6: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget] but should have been array[Dependency | SharedLibrary | StaticLibrary] PR: 260943 Reported by: antoine (via exp-run) Regressed by: https://github.com/mesonbuild/meson/commit/566c2c9a9c98 --- x11/cinnamon/Makefile | 1 + x11/cinnamon/distinfo | 2 ++ 2 files changed, 3 insertions(+) diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile index cb83a000d091..e1fae6d192e8 100644 --- a/x11/cinnamon/Makefile +++ b/x11/cinnamon/Makefile @@ -8,6 +8,7 @@ DIST_SUBDIR= gnome PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 8fc2df08b40a.patch:-p1 # https://github.com/linuxmint/cinnamon/pull/10489 +PATCHFILES+= aa0bf5b13078.patch:-p1 # https://github.com/linuxmint/cinnamon/pull/10606 MAINTAINER= gnome@FreeBSD.org COMMENT= Fork of GNOME Shell with layout similar to GNOME 2 diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo index 6933bb4da618..3d39a3b530ee 100644 --- a/x11/cinnamon/distinfo +++ b/x11/cinnamon/distinfo @@ -3,3 +3,5 @@ SHA256 (gnome/linuxmint-cinnamon-4.8.6_GH0.tar.gz) = 00f82253f44c694c379e29959aa SIZE (gnome/linuxmint-cinnamon-4.8.6_GH0.tar.gz) = 2378117 SHA256 (gnome/8fc2df08b40a.patch) = b8e0624acaa6c29bba532bf4a9de7f762686b3090827ac926583df92a64f117f SIZE (gnome/8fc2df08b40a.patch) = 1332 +SHA256 (gnome/aa0bf5b13078.patch) = 82e482496063ab479759b9561f56b18a72578c32af7fbc1237d8566d39a63227 +SIZE (gnome/aa0bf5b13078.patch) = 1573