gnome-settings-daemon: update to 42.2

This commit is contained in:
oreo639 2022-03-23 17:06:44 -07:00 committed by Michal Vasilek
parent de7712de89
commit 6fdc56fd0a
2 changed files with 4 additions and 41 deletions

View File

@ -1,38 +0,0 @@
From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001
From: Marvin Schmidt <marv@exherbo.org>
Date: Wed, 26 Jan 2022 23:08:58 +0100
Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
---
plugins/power/meson.build | 1 -
plugins/wacom/meson.build | 1 -
2 files changed, 2 deletions(-)
diff --git a/plugins/power/meson.build b/plugins/power/meson.build
index 69e619f2..014bb6da 100644
--- a/plugins/power/meson.build
+++ b/plugins/power/meson.build
@@ -76,7 +76,6 @@ if host_is_linux
)
i18n.merge_file(
- policy,
input: policy_in,
output: policy,
po_dir: po_dir,
diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
index d8dd0ec7..c00323d4 100644
--- a/plugins/wacom/meson.build
+++ b/plugins/wacom/meson.build
@@ -7,7 +7,6 @@ policy_in = configure_file(
)
i18n.merge_file(
- policy,
input: policy_in,
output: policy,
po_dir: po_dir,
--
GitLab

View File

@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
version=41.0
revision=2
version=42.2
revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@ -18,8 +18,9 @@ short_desc="GNOME settings daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
checksum=9c449714aa8ec1271c0db5137df3458195943f05ccd0ac8935d93397770bab00
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then