gnu: gnome-2048: Fix build.
* gnu/packages/patches/gnome-2048-fix-positional-argument.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/games.scm (gnome-2048)[source]<patches>: Use it here.master
parent
e86851ccb3
commit
d7e489d6e0
|
@ -1256,6 +1256,7 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
|
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
|
||||||
%D%/packages/patches/gmp-faulty-test.patch \
|
%D%/packages/patches/gmp-faulty-test.patch \
|
||||||
%D%/packages/patches/gnash-fix-giflib-version.patch \
|
%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-control-center-libexecdir.patch \
|
||||||
%D%/packages/patches/gnome-online-miners-tracker-3.patch \
|
%D%/packages/patches/gnome-online-miners-tracker-3.patch \
|
||||||
%D%/packages/patches/gnome-settings-daemon-gc.patch \
|
%D%/packages/patches/gnome-settings-daemon-gc.patch \
|
||||||
|
|
|
@ -1835,7 +1835,9 @@ destroying an ancient book using a special wand.")
|
||||||
"gnome-2048-" version ".tar.xz"))
|
"gnome-2048-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"))))
|
"0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"))
|
||||||
|
(patches
|
||||||
|
(search-patches "gnome-2048-fix-positional-argument.patch"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:glib-or-gtk? #t
|
`(#:glib-or-gtk? #t
|
||||||
|
|
|
@ -0,0 +1,36 @@
|
||||||
|
From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jan Beich <jbeich@FreeBSD.org>
|
||||||
|
Date: Sun, 23 Jan 2022 10:49:07 +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/meson.build:19:0: ERROR: Function does not take positional arguments.
|
||||||
|
data/meson.build:39:0: ERROR: Function does not take positional arguments.
|
||||||
|
---
|
||||||
|
data/meson.build | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/data/meson.build b/data/meson.build
|
||||||
|
index 33f73ca..8974a63 100644
|
||||||
|
--- a/data/meson.build
|
||||||
|
+++ b/data/meson.build
|
||||||
|
@@ -17,7 +17,6 @@ install_data(
|
||||||
|
|
||||||
|
# Desktop file
|
||||||
|
desktop_file = i18n.merge_file(
|
||||||
|
- 'desktop-file',
|
||||||
|
input: 'org.gnome.TwentyFortyEight.desktop.in',
|
||||||
|
output: 'org.gnome.TwentyFortyEight.desktop',
|
||||||
|
install: true,
|
||||||
|
@@ -37,7 +36,6 @@ endif
|
||||||
|
|
||||||
|
# AppData file
|
||||||
|
appdata_file = i18n.merge_file(
|
||||||
|
- 'appdata-file',
|
||||||
|
input: 'org.gnome.TwentyFortyEight.appdata.xml.in',
|
||||||
|
output: 'org.gnome.TwentyFortyEight.appdata.xml',
|
||||||
|
install: true,
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
Reference in New Issue