glade3: fix for meson 0.61

This commit is contained in:
Michal Vasilek 2022-03-09 17:20:40 +01:00
parent f07a006164
commit a8b3e99f17
2 changed files with 58 additions and 1 deletions

View file

@ -0,0 +1,57 @@
From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 20 Jan 2022 14:18:09 -0500
Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
argument
---
data/meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index 9f244566..bfbc514c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
desktop_conf.set('VERSION', glade_version)
i18n.merge_file(
- 'desktop',
type: 'desktop',
input: configure_file(
input: 'org.gnome.Glade.desktop.in.in',
@@ -18,7 +17,6 @@ i18n.merge_file(
appdata = glade_name + '.appdata.xml'
i18n.merge_file(
- 'appdata',
input: 'org.gnome.Glade.appdata.xml.in',
output: '@BASENAME@',
po_dir: po_dir,
--
GitLab
From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 20 Jan 2022 14:19:03 -0500
Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS
---
help/LINGUAS | 1 -
1 file changed, 1 deletion(-)
diff --git a/help/LINGUAS b/help/LINGUAS
index fc3cd4c3..d67e42c8 100644
--- a/help/LINGUAS
+++ b/help/LINGUAS
@@ -1,6 +1,5 @@
# please keep this list sorted alphabetically
#
-da
bg
ca
cs
--
GitLab

View file

@ -4,7 +4,7 @@ version=3.38.2
revision=1
wrksrc="glade-${version}"
build_style=meson
build_helper="gir"
build_helper="gir qemu"
configure_args="-Dgtk_doc=true -Dman=true $(vopt_bool gir introspection)"
hostmakedepends="glib-devel intltool itstool pkg-config
gjs-devel yelp-tools gettext-devel gtk-doc"