temp/evince: fix build with Meson 0.60 (MR 3155)

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Newbyte 2022-05-25 08:07:55 +02:00 committed by Oliver Smith
parent b265acd927
commit c4838be834
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 55 additions and 1 deletions

View file

@ -0,0 +1,52 @@
From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001
From: r-value <i@rvalue.moe>
Date: Wed, 17 Nov 2021 18:22:45 +0800
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
---
backend/meson.build | 1 -
data/meson.build | 1 -
meson.build | 1 -
3 files changed, 3 deletions(-)
diff --git a/backend/meson.build b/backend/meson.build
index e44c1d6d7..ab3df9acf 100644
--- a/backend/meson.build
+++ b/backend/meson.build
@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends
)
i18n.merge_file(
- appstream,
input: appstream_in,
output: appstream,
po_dir: po_dir,
diff --git a/data/meson.build b/data/meson.build
index 8a308b853..afc302098 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -15,7 +15,6 @@ foreach desktop: desktops
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/meson.build b/meson.build
index 34c86661f..f74efb3c4 100644
--- a/meson.build
+++ b/meson.build
@@ -492,7 +492,6 @@ install_headers(
appdata = ev_namespace + '.appdata.xml'
i18n.merge_file(
- appdata,
input: appdata + '.in',
output: appdata,
po_dir: po_dir,
--
GitLab

View file

@ -2,7 +2,7 @@
pkgname=evince
pkgver=9999_git20211009
_pkgver=41.2
pkgrel=0
pkgrel=1
pkgdesc="simple document viewer for GTK+"
url="https://wiki.gnome.org/Apps/Evince"
arch="all !s390x !mips !mips64" # Limited by adwaita-icon-theme needing librsvg
@ -23,6 +23,7 @@ _purism_patches="https://source.puri.sm/Librem5/evince/-/raw/$_purism_commit/deb
# Order is important "toolbar-Allow-to-toggle" must go before "toolbar-Allow-hiding"
source="https://download.gnome.org/sources/evince/${_pkgver%.*}/evince-$_pkgver.tar.xz
0001-data-List-compatible-form-factors.patch
0002-remove-incorrect-args-for-i18n.merge_file.patch
$_purism_patches/properties-view-Reduce-the-label-width-chars.patch
$_purism_patches/toolbar-Allow-to-toggle-the-sidebar-button.patch
$_purism_patches/toolbar-Allow-hiding-zoom-annotation-and-page-widgets.patch
@ -74,6 +75,7 @@ doc() {
sha512sums="
6ea6b823ee9742b3a666c9d68993e057a032e4a841edbf16c7c4bccf38b5af13295bcbee0ad0bc8fab11d76186294917dff3bbe40ba271e1a550b6a562a67f0f evince-41.2.tar.xz
a00c1c11b94bf2035051e1e0319016ddaec74c2b7156b6c2b94e7b45e73174bc3612b50006bd14baa7f7da9dc80c96eb944395226856eb3234902f4886668c18 0001-data-List-compatible-form-factors.patch
d66898c917eb34a042cdbad58e9122678372479228340180269e0f479f8743ddc83f59c7ea2a813fc2662dd2ff1b9da9dd194e1a879885d054dec5c5fd1b2877 0002-remove-incorrect-args-for-i18n.merge_file.patch
f13c96ec09cb7d63796ce7f5e3fae0dc997ae654450dc627cbb8ab24faca78d07ac466118e0b57d533e909071adc0b8634a85ed51d7137ab8ff60ea8478ab81b properties-view-Reduce-the-label-width-chars.patch
90e44a422258822fb303dd5985d1757507e99ee9631c217b66820cb4683db487f51cfd9b0577971c37f81086217a4b1a15663652c76a831099f293f85048bd64 toolbar-Allow-to-toggle-the-sidebar-button.patch
0331cb2dfc3ad09fbf41aaff09f0ea0742fbd9e9736797f7f37e13d7bfa1f54504897252a07f2e75983f5706f8421b593037f254fc2179afc007a6380f88ac36 toolbar-Allow-hiding-zoom-annotation-and-page-widgets.patch