[arch-commits] Commit in gnome-documents/repos/testing-x86_64 (3 files)

[Jan Steffens]

    Date: Sunday, September 9, 2018 @ 00:11:11
  Author: heftig
Revision: 334154

archrelease: copy trunk to testing-x86_64

Added:
  gnome-documents/repos/testing-x86_64/PKGBUILD
    (from rev 334153, gnome-documents/trunk/PKGBUILD)
  gnome-documents/repos/testing-x86_64/js60.diff
    (from rev 334153, gnome-documents/trunk/js60.diff)
Deleted:
  gnome-documents/repos/testing-x86_64/PKGBUILD

-----------+
 PKGBUILD  |  100 +++++++++++++++++++++++++++++++-----------------------------
 js60.diff |   28 ++++++++++++++++
 2 files changed, 80 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-09 00:10:57 UTC (rev 334153)
+++ PKGBUILD	2018-09-09 00:11:11 UTC (rev 334154)
@@ -1,48 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-documents
-pkgver=3.29.91+6+gbc9b6cc1
-pkgrel=1
-pkgdesc="A document manager application for GNOME"
-url="https://wiki.gnome.org/Apps/Documents"
-arch=(x86_64)
-license=(GPL)
-depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata tracker-miners libzapojit
-         webkit2gtk gnome-online-miners librsvg libgepub)
-makedepends=(gobject-introspection git meson yelp-tools inkscape)
-optdepends=('libreoffice-fresh: Support for Libreoffice document types')
-groups=(gnome)
-_commit=bc9b6cc1838d0c97f6ae33c0f56ec1c7d3a32b48  # master
-source=("git+https://gitlab.gnome.org/GNOME/gnome-documents.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgd.git")
-sha256sums=('SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  git submodule init
-  git config --local submodule.subprojects/libgd.url "$srcdir/libgd"
-  git submodule update
-}
-  
-
-build() {
-  arch-meson $pkgname build -D getting_started=true
-  ninja -C build
-}
-
-check() {
-  meson test -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}
-
-# vim:set ts=2 sw=2 et:

Copied: gnome-documents/repos/testing-x86_64/PKGBUILD (from rev 334153, gnome-documents/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-09-09 00:11:11 UTC (rev 334154)
@@ -0,0 +1,52 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-documents
+pkgver=3.29.91+6+gbc9b6cc1
+pkgrel=2
+pkgdesc="A document manager application for GNOME"
+url="https://wiki.gnome.org/Apps/Documents"
+arch=(x86_64)
+license=(GPL)
+depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata tracker-miners libzapojit
+         webkit2gtk gnome-online-miners librsvg libgepub)
+makedepends=(gobject-introspection git meson yelp-tools inkscape)
+optdepends=('libreoffice-fresh: Support for Libreoffice document types')
+groups=(gnome)
+_commit=bc9b6cc1838d0c97f6ae33c0f56ec1c7d3a32b48  # master
+source=("git+https://gitlab.gnome.org/GNOME/gnome-documents.git#commit=$_commit"
+        "git+https://gitlab.gnome.org/GNOME/libgd.git"
+        js60.diff)
+sha256sums=('SKIP'
+            'SKIP'
+            '26e86a8a5185f0a4b564b0f4d6658bfa63bd65f1f1a4c0ac7416e183bca4a136')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  patch -Np1 -i ../js60.diff
+
+  git submodule init
+  git config --local submodule.subprojects/libgd.url "$srcdir/libgd"
+  git submodule update
+}
+  
+
+build() {
+  arch-meson $pkgname build -D getting_started=true
+  ninja -C build
+}
+
+check() {
+  meson test -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+}
+
+# vim:set ts=2 sw=2 et:

Copied: gnome-documents/repos/testing-x86_64/js60.diff (from rev 334153, gnome-documents/trunk/js60.diff)
===================================================================
--- js60.diff	                        (rev 0)
+++ js60.diff	2018-09-09 00:11:11 UTC (rev 334154)
@@ -0,0 +1,28 @@
+diff --git i/src/evinceview.js w/src/evinceview.js
+index 60c314c5..8f01128a 100644
+--- i/src/evinceview.js
++++ w/src/evinceview.js
+@@ -315,9 +315,9 @@ var EvinceView = new Lang.Class({
+             // the following invocation to work.
+             let evDoc = this._model.get_document();
+             evDoc.find_text();
+-        } catch (e if e instanceof TypeError) {
+-            canFind = false;
+         } catch (e) {
++            if (e instanceof TypeError)
++                canFind = false;
+         }
+ 
+         this.getAction('find').enabled = (this.hasPages && canFind);
+diff --git i/src/places.js w/src/places.js
+index 220cd311..0bebbde0 100644
+--- i/src/places.js
++++ w/src/places.js
+@@ -60,7 +60,6 @@ var PlacesDialog = new Lang.Class({
+             // This is a hack to find out if evDoc implements the
+             // EvDocument.DocumentLinks interface or not.
+             docHasLinks = evDoc.has_document_links();
+-        } catch (e if e instanceof TypeError) {
+         } catch (e) {
+         }
+