mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
gnome-base/dconf-editor: fix build with meson-0.61
Closes: https://bugs.gentoo.org/831746 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
@@ -27,6 +27,10 @@ BDEPEND="
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/meson-0.61.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
vala_src_prepare
|
||||
xdg_src_prepare
|
||||
|
||||
36
gnome-base/dconf-editor/files/meson-0.61.patch
Normal file
36
gnome-base/dconf-editor/files/meson-0.61.patch
Normal file
@@ -0,0 +1,36 @@
|
||||
https://bugs.gentoo.org/831746
|
||||
https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/21
|
||||
|
||||
From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Fri, 21 Jan 2022 22:22:58 +0100
|
||||
Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
|
||||
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
editor/meson.build | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/editor/meson.build b/editor/meson.build
|
||||
index 4c89ab99..0eb3bb1a 100644
|
||||
--- a/editor/meson.build
|
||||
+++ b/editor/meson.build
|
||||
@@ -1,7 +1,6 @@
|
||||
desktop = dconf_editor_namespace + '.desktop'
|
||||
|
||||
i18n.merge_file (
|
||||
- desktop,
|
||||
type: 'desktop',
|
||||
input: desktop + '.in',
|
||||
output: desktop,
|
||||
@@ -26,7 +25,6 @@ configure_file(
|
||||
appdata = dconf_editor_namespace + '.appdata.xml'
|
||||
|
||||
i18n.merge_file(
|
||||
- appdata,
|
||||
input: appdata + '.in',
|
||||
output: appdata,
|
||||
po_dir: po_dir,
|
||||
--
|
||||
GitLab
|
||||
|
||||
Reference in New Issue
Block a user