summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYiyao Yu2022-02-22 15:08:50 -0500
committerYiyao Yu2022-02-22 15:08:50 -0500
commit8c3e15d10eec0f2da9c575f59b8b149321998e0b (patch)
tree75f62d4798901f222c4205ee459abf2411c9d309
parent3af902dd28f7a9bbb4c08a54822d4ea098be8b3f (diff)
downloadaur-8c3e15d10eec0f2da9c575f59b8b149321998e0b.tar.gz
41.1.3-3: added patch for meson i18n incorrect args
-rw-r--r--.SRCINFO4
-rw-r--r--0001-meson_appstream_remove.patch37
-rw-r--r--PKGBUILD11
3 files changed, 48 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d82eae453261..d8e578022106 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = evince-no-gnome
pkgdesc = Document viewer, no gnome dependencies
pkgver = 41.3
- pkgrel = 2
+ pkgrel = 3
url = https://wiki.gnome.org/Apps/Evince
arch = i686
arch = x86_64
@@ -39,6 +39,8 @@ pkgbase = evince-no-gnome
conflicts = libevview3.so
options = !emptydirs
source = git+https://gitlab.gnome.org/GNOME/evince.git#commit=08780f527ac0306f527c48ea6cc77a7b2c6c5fa8
+ source = 0001-meson_appstream_remove.patch
sha256sums = SKIP
+ sha256sums = fd296c5eb2095ae071600896f680020d331b50901dd42c2087f30bf4a0487434
pkgname = evince-no-gnome
diff --git a/0001-meson_appstream_remove.patch b/0001-meson_appstream_remove.patch
new file mode 100644
index 000000000000..fc276b125a16
--- /dev/null
+++ b/0001-meson_appstream_remove.patch
@@ -0,0 +1,37 @@
+diff --git a/backend/meson.build b/backend/meson.build
+index e44c1d6d74f8c5659a6d2886ba21f5cea91769f5..ab3df9acfeaa7e5b5bd7929261a62ba90f400798 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 8a308b853e5413721455fe57a21cb019292134fa..afc30209833a9d7030f719c45409681b1f655e6a 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 34c86661f960e971a3211ca1008d9302a85fd511..f74efb3c409b7d1df4eb5029c6ec5182a07bef4c 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,
+
diff --git a/PKGBUILD b/PKGBUILD
index 188236c87a0d..5da540651486 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=evince-no-gnome
_pkgname=evince
pkgver=41.3
-pkgrel=2
+pkgrel=3
pkgdesc="Document viewer, no gnome dependencies"
url="https://wiki.gnome.org/Apps/Evince"
arch=('i686' 'x86_64')
@@ -19,8 +19,10 @@ provides=("$_pkgname" libev{document,view}3.so)
conflicts=("$_pkgname" libev{document,view}3.so)
options=('!emptydirs')
_commit=08780f527ac0306f527c48ea6cc77a7b2c6c5fa8 # tags/41.3^0
-source=("git+https://gitlab.gnome.org/GNOME/evince.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/evince.git#commit=$_commit"
+ "0001-meson_appstream_remove.patch")
+sha256sums=('SKIP'
+ 'fd296c5eb2095ae071600896f680020d331b50901dd42c2087f30bf4a0487434')
pkgver() {
cd $_pkgname
@@ -29,6 +31,9 @@ pkgver() {
prepare() {
cd $_pkgname
+ for p in ${srcdir}/*.patch; do
+ patch -Np1 -i "$p"
+ done
}
build() {