diff options
| author | Bob Funk <bobfunk11@gmail.com> | 2023-02-10 04:43:03 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-02-11 09:30:37 +0700 |
| commit | fafd362e6b82d18bb5151995683da992b4ff1a26 (patch) | |
| tree | 151eb37700f4ac5783bbd4e39ec2d8b0a288c14c | |
| parent | ab655c568bd2ae42506c2d907e49fa532fac6092 (diff) | |
desktop/gnome-calendar: Meson patch.
Signed-off-by: bedlam <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | desktop/gnome-calendar/e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch | 25 | ||||
| -rw-r--r-- | desktop/gnome-calendar/gnome-calendar.SlackBuild | 4 |
2 files changed, 29 insertions, 0 deletions
diff --git a/desktop/gnome-calendar/e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch b/desktop/gnome-calendar/e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch new file mode 100644 index 0000000000000..02a07f12ae3b8 --- /dev/null +++ b/desktop/gnome-calendar/e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch @@ -0,0 +1,25 @@ +From e35dbc1acd03dd1751b755b6c8e1932a692ad4e1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 21 Jan 2022 21:18:39 +0100 +Subject: [PATCH] meson.build: fix meson 0.61 builds + +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + data/appdata/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/appdata/meson.build b/data/appdata/meson.build +index b5ee6540..200c3507 100644 +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,7 +1,6 @@ + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: files('org.gnome.Calendar.appdata.xml.in.in'), + output: 'org.gnome.Calendar.appdata.xml.in', +-- +GitLab + diff --git a/desktop/gnome-calendar/gnome-calendar.SlackBuild b/desktop/gnome-calendar/gnome-calendar.SlackBuild index e78aad14fb7b4..205c8e91dd71f 100644 --- a/desktop/gnome-calendar/gnome-calendar.SlackBuild +++ b/desktop/gnome-calendar/gnome-calendar.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/appdata/meson.build to fix building on newer meson versions +# that error on unused positional arguments (i.e. fix building on -current): +patch -Np1 -i $CWD/e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ |