diff options
| -rw-r--r-- | desktop/gnome-weather/4be71525f07189e97720688472172604879d49a5.patch | 26 | ||||
| -rw-r--r-- | desktop/gnome-weather/gnome-weather.SlackBuild | 4 |
2 files changed, 30 insertions, 0 deletions
diff --git a/desktop/gnome-weather/4be71525f07189e97720688472172604879d49a5.patch b/desktop/gnome-weather/4be71525f07189e97720688472172604879d49a5.patch new file mode 100644 index 0000000000000..3f285a1e52083 --- /dev/null +++ b/desktop/gnome-weather/4be71525f07189e97720688472172604879d49a5.patch @@ -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 + diff --git a/desktop/gnome-weather/gnome-weather.SlackBuild b/desktop/gnome-weather/gnome-weather.SlackBuild index ababf88e019b5..7bf10b2780a02 100644 --- a/desktop/gnome-weather/gnome-weather.SlackBuild +++ b/desktop/gnome-weather/gnome-weather.SlackBuild @@ -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" \ |