git: 501557fb79bb - main - sysutils/gnome-settings-daemon: fix comparison with Meson option
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 Nov 2021 14:46:56 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=501557fb79bb1b36da5732ad5dbd76fd3e3ef81f
commit 501557fb79bb1b36da5732ad5dbd76fd3e3ef81f
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-11-03 14:41:52 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-11-03 14:46:38 +0000
sysutils/gnome-settings-daemon: fix comparison with Meson option
meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e5983
PR: 259080
Reported by: antoine (via exp-run)
Regressed by: https://github.com/mesonbuild/meson/commit/a6c9a151d3ce
---
sysutils/gnome-settings-daemon/Makefile | 3 +++
sysutils/gnome-settings-daemon/distinfo | 2 ++
2 files changed, 5 insertions(+)
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 96f58e0cbd45..b1b5f7c425f6 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -6,6 +6,9 @@ CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
+PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
+PATCHFILES+= 28e28e9e5983.patch:-p1 # meson >= 0.60
+
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 3 settings daemon
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 3fba159fe54b..e010b89864ed 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,3 +1,5 @@
TIMESTAMP = 1620259243
SHA256 (gnome/gnome-settings-daemon-3.38.2.tar.xz) = 32c3d516cce1115ef08ef25f3a718d163b7b333b9068ccf2a6806ddcf21dd78c
SIZE (gnome/gnome-settings-daemon-3.38.2.tar.xz) = 1439328
+SHA256 (gnome/28e28e9e5983.patch) = e12a423f16d68e6fd7fe9c2953b77c25aef85ca39d757f5e6debd53f266e0292
+SIZE (gnome/28e28e9e5983.patch) = 909