42.2-1: version update

3 files changed, 11 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d8e578022106..7175427454f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = evince-no-gnome
 	pkgdesc = Document viewer, no gnome dependencies
-	pkgver = 41.3
-	pkgrel = 3
+	pkgver = 42.2
+	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Evince
 	arch = i686
 	arch = x86_64
@@ -9,7 +9,6 @@ pkgbase = evince-no-gnome
 	makedepends = texlive-bin
 	makedepends = docbook-xsl
 	makedepends = python
-	makedepends = gtk-doc
 	makedepends = git
 	makedepends = meson
 	makedepends = ninja
@@ -38,9 +37,7 @@ pkgbase = evince-no-gnome
 	conflicts = libevdocument3.so
 	conflicts = libevview3.so
 	options = !emptydirs
-	source = git+https://gitlab.gnome.org/GNOME/evince.git#commit=08780f527ac0306f527c48ea6cc77a7b2c6c5fa8
-	source = 0001-meson_appstream_remove.patch
+	source = git+https://gitlab.gnome.org/GNOME/evince.git#commit=05d656cb835704339375f8e514d694b1201fe686
 	sha256sums = SKIP
-	sha256sums = fd296c5eb2095ae071600896f680020d331b50901dd42c2087f30bf4a0487434
 
 pkgname = evince-no-gnome
diff --git a/0001-meson_appstream_remove.patch b/0001-meson_appstream_remove.patch
deleted file mode 100644
index fc276b125a16..000000000000
--- a/0001-meson_appstream_remove.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 5da540651486..71078e994e0d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,44 +5,36 @@
 
 pkgname=evince-no-gnome
 _pkgname=evince
-pkgver=41.3
-pkgrel=3
+pkgver=42.2
+pkgrel=1
 pkgdesc="Document viewer, no gnome dependencies"
 url="https://wiki.gnome.org/Apps/Evince"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 't1lib' 'dconf' 'libsynctex' 'gsettings-desktop-schemas' 'libarchive' 'gst-plugins-base-libs' 'gspell' 'libhandy')
-makedepends=('texlive-bin' 'docbook-xsl' 'python' 'gtk-doc' 'git' 'meson' 'ninja' 'appstream-glib' yelp-tools)
+makedepends=('texlive-bin' 'docbook-xsl' 'python' 'git' 'meson' 'ninja' 'appstream-glib' yelp-tools)
 optdepends=('texlive-bin: DVI support'
             'gvfs: for session saving and bookmarking')
 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"
-        "0001-meson_appstream_remove.patch")
-sha256sums=('SKIP'
-            'fd296c5eb2095ae071600896f680020d331b50901dd42c2087f30bf4a0487434')
+_commit=05d656cb835704339375f8e514d694b1201fe686 # tags/42.2^0
+source=("git+https://gitlab.gnome.org/GNOME/evince.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $_pkgname
   git describe --tags | sed 's/-/+/g'
 }
 
-prepare() {
-  cd $_pkgname
-  for p in ${srcdir}/*.patch; do
-      patch -Np1 -i "$p"
-  done
-}
-
 build() {
     arch-meson "$_pkgname" build \
         -D ps=enabled \
         -D nautilus=false \
         -D introspection=false \
         -D thumbnail_cache=disabled \
-        -D keyring=disabled
+        -D keyring=disabled \
+        -D gtk_doc=false
     meson compile -C build
 }