summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2022-05-09 23:16:28 +0200
committer Matteo Bernardini2022-07-02 07:31:43 +0200
commit5c38670f1f2e0b2720f44f7d62788be60fbb4106 (patch)
treeb5c8aab16961bdf44411f45eb20e848c6c3e7719
parent09029cfd6e379e05106b2adbe352bc8230c26673 (diff)
downloadslackbuilds-zathura.tar.gz
office/zathura: Fix build with meson >= 0.60.x.zathura
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--office/zathura/meson-0.60.patch31
-rw-r--r--office/zathura/zathura.SlackBuild2
2 files changed, 33 insertions, 0 deletions
diff --git a/office/zathura/meson-0.60.patch b/office/zathura/meson-0.60.patch
new file mode 100644
index 0000000000..e1e8260e66
--- /dev/null
+++ b/office/zathura/meson-0.60.patch
@@ -0,0 +1,31 @@
+From c6ec5044c5ff843979050bfb81742d14740bb656 Mon Sep 17 00:00:00 2001
+From: Sebastian Ramacher <sebastian@ramacher.at>
+Date: Sat, 30 Oct 2021 15:41:25 +0200
+Subject: [PATCH] Fix build with meson 0.60
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 4fd602eb..464ff3af 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -19,7 +19,7 @@ endif
+ i18n = import('i18n')
+ podir = join_paths(meson.project_source_root(), 'po')
+
+-desktop = i18n.merge_file('desktop',
++desktop = i18n.merge_file(
+ input: 'org.pwmt.zathura.desktop.in',
+ output: 'org.pwmt.zathura.desktop',
+ install: true,
+@@ -28,7 +28,7 @@ desktop = i18n.merge_file('desktop',
+ type: 'desktop'
+ )
+
+-appdata = i18n.merge_file('appdata',
++appdata = i18n.merge_file(
+ input: 'org.pwmt.zathura.appdata.xml.in',
+ output: 'org.pwmt.zathura.appdata.xml',
+ install: true,
diff --git a/office/zathura/zathura.SlackBuild b/office/zathura/zathura.SlackBuild
index 61c24d49df..ed15569418 100644
--- a/office/zathura/zathura.SlackBuild
+++ b/office/zathura/zathura.SlackBuild
@@ -90,6 +90,8 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
fixperms
+patch -p1 < $CWD/meson-0.60.patch
+
mkdir build
cd build
CFLAGS="$SLKCFLAGS" \