git: 0872da015336 - main - x11/cinnamon: unbreak build with Meson 0.61.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 25 Jan 2022 12:26:34 UTC
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0872da015336ffb678af591f882d1549c2b62c42 commit 0872da015336ffb678af591f882d1549c2b62c42 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-01-25 12:23:08 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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