mirror of
https://github.com/SlackBuildsOrg/slackbuilds
synced 2024-09-28 15:21:00 +02:00
desktop/gnome-weather: Meson patch.
Signed-off-by: bedlam <dave@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
2c2ebd3597
commit
bf2775aec6
2 changed files with 30 additions and 0 deletions
|
@ -0,0 +1,26 @@
|
|||
From 4be71525f07189e97720688472172604879d49a5 Mon Sep 17 00:00:00 2001
|
||||
From: rvalue <i@rvalue.moe>
|
||||
Date: Fri, 17 Dec 2021 12:26:42 +0000
|
||||
Subject: [PATCH] Remove incorrect args for i18n.merge_file
|
||||
|
||||
`i18n.merge_file` has been ignoring positional arguments for a time and
|
||||
explicitly rejects with error since meson 0.60.0
|
||||
---
|
||||
data/meson.build | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index f6692b6..6981b96 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -59,7 +59,6 @@ endif
|
||||
appdata_conf = configuration_data()
|
||||
appdata_conf.set('app_id', weather_id)
|
||||
appdata = i18n.merge_file(
|
||||
- 'appdata',
|
||||
input: configure_file(
|
||||
input: '@0@.appdata.xml.in.in'.format(default_id),
|
||||
output: '@0@.appdata.xml.in'.format(default_id),
|
||||
--
|
||||
GitLab
|
||||
|
|
@ -76,6 +76,10 @@ find -L . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||
|
||||
# Patch data/meson.build to remove positional argument that causes
|
||||
# FTB with meson 0.60.0 or newer (i.e. fixes building on -current):
|
||||
patch -Np1 -i $CWD/4be71525f07189e97720688472172604879d49a5.patch
|
||||
|
||||
mkdir build
|
||||
cd build
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
|
|
Loading…
Reference in a new issue