ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gnome-dictionary: Fix build.

Browse source 
* gnu/packages/patches/gnome-dictionary-meson-i18n.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/gnome.scm (gnome-dictionary): Use it here.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Fixes: gnome-dictionary-40.0: fails configure <https://bugs.gnu.org/63687>
This commit is contained in:
raingloom 2023-09-16 14:03:11 +02:00 committed by Liliana Marie Prikler
parent e4fdf062dc
commit 0dc83ce53b
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
3 changed files with 56 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1306,6 +1306,7 @@ dist_patch_DATA = \
%D%/packages/patches/gnash-fix-giflib-version.patch \
%D%/packages/patches/gnome-2048-fix-positional-argument.patch \
%D%/packages/patches/gnome-control-center-libexecdir.patch \
%D%/packages/patches/gnome-dictionary-meson-i18n.patch \
%D%/packages/patches/gnome-online-miners-tracker-3.patch \
%D%/packages/patches/gnome-settings-daemon-gc.patch \
%D%/packages/patches/gnome-session-support-elogind.patch \

4
gnu/packages/gnome.scm
View file

@ -10497,7 +10497,9 @@ (define-public gnome-dictionary
name "-" version ".tar.xz"))
(sha256
(base32
"1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"))))
"1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"))
(patches
(search-patches "gnome-dictionary-meson-i18n.patch"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t

52
gnu/packages/patches/gnome-dictionary-meson-i18n.patch Normal file
View file

@ -0,0 +1,52 @@
From 71933f6586475b36c70ef325373fe6d50c7a034f Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 11:13:54 +0000
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.
data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments.
data/meson.build:6:5: ERROR: Function does not take positional arguments.
data/meson.build:49:5: ERROR: Function does not take positional arguments.
---
data/appdata/meson.build | 2 +-
data/meson.build | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
index 1dc4ed7..e44a58e 100644
--- a/data/appdata/meson.build
+++ b/data/appdata/meson.build
@@ -1,6 +1,6 @@
appdata_conf = configuration_data()
appdata_conf.set('application_id', application_id)
-i18n.merge_file('appdata',
+appdata_file = i18n.merge_file(
input: configure_file(
input: 'org.gnome.Dictionary.appdata.xml.in.in',
output: 'org.gnome.Dictionary.appdata.xml.in',
diff --git a/data/meson.build b/data/meson.build
index 660e6b8..7ec7251 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -3,7 +3,7 @@ subdir('appdata')
desktop_conf = configuration_data()
desktop_conf.set('icon', application_id)
desktop_conf.set('application_id', application_id)
-i18n.merge_file('desktop',
+desktop_file = i18n.merge_file(
input: configure_file(
input: 'org.gnome.Dictionary.desktop.in.in',
output: 'org.gnome.Dictionary.desktop.in',
@@ -45,7 +45,7 @@ sources = [
]
foreach s: sources
- i18n.merge_file('sources',
+ i18n.merge_file(
input: '@0@.in'.format(s),
output: s,
install: true,
--
2.41.0