diff options
| -rw-r--r-- | desktop/gnome-screenshot/b60dad3c2536c17bd201f74ad8e40eb74385ed9f.patch | 36 | ||||
| -rw-r--r-- | desktop/gnome-screenshot/gnome-screenshot.SlackBuild | 4 | ||||
| -rw-r--r-- | desktop/gnome-screenshot/slack-desc | 4 |
3 files changed, 42 insertions, 2 deletions
diff --git a/desktop/gnome-screenshot/b60dad3c2536c17bd201f74ad8e40eb74385ed9f.patch b/desktop/gnome-screenshot/b60dad3c2536c17bd201f74ad8e40eb74385ed9f.patch new file mode 100644 index 0000000000..b21aa0490d --- /dev/null +++ b/desktop/gnome-screenshot/b60dad3c2536c17bd201f74ad8e40eb74385ed9f.patch @@ -0,0 +1,36 @@ +From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001 +From: Jack Hill <jackhill@jackhill.us> +Date: Thu, 18 Nov 2021 00:46:58 -0500 +Subject: [PATCH] meson: remove extraneous positional argument + +* data/meson.build (desktop_file) + (metainfo_file): Remove extraneous positional argument. + +Closes #186 +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd570b3..4e2e2e8 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,7 +1,6 @@ + gnome = import('gnome') + + desktop_file = i18n.merge_file( +- 'desktop', + type: 'desktop', + input: 'org.gnome.Screenshot.desktop.in', + output: 'org.gnome.Screenshot.desktop', +@@ -23,7 +22,6 @@ if desktop_file_validate.found() + endif + + metainfo_file = i18n.merge_file( +- 'appdata', + input: 'org.gnome.Screenshot.metainfo.xml.in', + output: 'org.gnome.Screenshot.metainfo.xml', + po_dir: join_paths(meson.current_source_dir(), '../po'), +-- +GitLab + diff --git a/desktop/gnome-screenshot/gnome-screenshot.SlackBuild b/desktop/gnome-screenshot/gnome-screenshot.SlackBuild index 41c2795f06..ba280385a8 100644 --- a/desktop/gnome-screenshot/gnome-screenshot.SlackBuild +++ b/desktop/gnome-screenshot/gnome-screenshot.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 to fix meson build error in newer meson versions due to +# unused positional arguments (i.e. fixes building on -current): +patch -Np1 -i $CWD/b60dad3c2536c17bd201f74ad8e40eb74385ed9f.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ diff --git a/desktop/gnome-screenshot/slack-desc b/desktop/gnome-screenshot/slack-desc index b7ec7531b4..7a23487f10 100644 --- a/desktop/gnome-screenshot/slack-desc +++ b/desktop/gnome-screenshot/slack-desc @@ -8,8 +8,8 @@ |-----handy-ruler------------------------------------------------------| gnome-screenshot: gnome-screenshot (GNOME Screenshot) gnome-screenshot: -gnome-screenshot: GNOME Screenshot is a small utility that takes a screenshot of the -gnome-screenshot: whole desktop; the currently focused window; or an area of the screen. +gnome-screenshot: GNOME Screenshot is a small utility that takes a screenshot of the +gnome-screenshot: whole desktop; the currently focused window; or an area of the screen. gnome-screenshot: gnome-screenshot: gnome-screenshot: |