diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-18 09:41:15 +0000 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-19 07:09:38 +0000 |
| commit | 1352ad4a3faa9c54e7d38a7b9215ede62c35d586 (patch) | |
| tree | c5199d1c7593c5377995572084d51238e2d0cd9c | |
| parent | e158b4f85236bcb5d9ff03917e33ee1d0e034f2f (diff) | |
| download | aports-1352ad4a3faa9c54e7d38a7b9215ede62c35d586.tar.bz2 aports-1352ad4a3faa9c54e7d38a7b9215ede62c35d586.tar.xz | |
community/gnome-books: add upstream patch to fix starting w/o XDG_DOCUMENTS_DIR
| -rw-r--r-- | community/gnome-books/504b66f6cec4b7a7bb46ca7a3b27a47ffb6a424b.patch | 33 | ||||
| -rw-r--r-- | community/gnome-books/APKBUILD | 8 |
2 files changed, 38 insertions, 3 deletions
diff --git a/community/gnome-books/504b66f6cec4b7a7bb46ca7a3b27a47ffb6a424b.patch b/community/gnome-books/504b66f6cec4b7a7bb46ca7a3b27a47ffb6a424b.patch new file mode 100644 index 0000000000..ea8ecd632e --- /dev/null +++ b/community/gnome-books/504b66f6cec4b7a7bb46ca7a3b27a47ffb6a424b.patch @@ -0,0 +1,33 @@ +Upstream: Yes, https://gitlab.gnome.org/GNOME/gnome-books/-/commit/504b66f6cec4b7a7bb46ca7a3b27a47ffb6a424b +From 504b66f6cec4b7a7bb46ca7a3b27a47ffb6a424b Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Fri, 20 Sep 2019 12:31:35 +0200 +Subject: [PATCH] overview: Handle unset documents xdg-user-dir + +Don't crash if the documents xdg-user-dir is unset on badly installed +systems. + +JS ERROR: Exception in callback for signal: window-mode-changed: Error: Argument 'path' (type filename) may not be null +_addSecondaryLabel@resource:///org/gnome/Books/js/overview.js:308:23 + +Closes: #39 +--- + src/overview.js | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/overview.js b/src/overview.js +index 18a51f1a..a1b0d246 100644 +--- a/src/overview.js ++++ b/src/overview.js +@@ -305,6 +305,8 @@ const EmptyResultsBox = new Lang.Class({ + let docsPath, docsUrl; + + docsPath = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DOCUMENTS); ++ if (!docsPath) ++ docsPath = GLib.get_home_dir(); + docsUrl = Gio.file_new_for_path(docsPath).get_uri(); + useMarkup = true; + /* translators: %s is the location of the Documents folder.*/ +-- +2.24.1 + diff --git a/community/gnome-books/APKBUILD b/community/gnome-books/APKBUILD index b81988511e..3960f7af87 100644 --- a/community/gnome-books/APKBUILD +++ b/community/gnome-books/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=gnome-books pkgver=3.34.0 -pkgrel=6 +pkgrel=7 pkgdesc="GNOME Ebook Manager" url="https://wiki.gnome.org/Apps/Books" arch="all !s390x" # missing gjs @@ -12,7 +12,8 @@ makedepends="meson gjs-dev evince-dev gnome-desktop-dev gtk+3.0-dev glib-dev gobject-introspection-dev tracker-dev webkit2gtk-dev libgepub-dev librsvg" checkdepends="appstream-glib desktop-file-utils" subpackages="$pkgname-lang $pkgname-doc" -source="https://download.gnome.org/sources/gnome-books/${pkgver%.*}/gnome-books-$pkgver.tar.xz" +source="https://download.gnome.org/sources/gnome-books/${pkgver%.*}/gnome-books-$pkgver.tar.xz + 504b66f6cec4b7a7bb46ca7a3b27a47ffb6a424b.patch" build() { meson \ @@ -33,4 +34,5 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="634dcd7e26ede955e8700335fcd04ab4bd40d083d251846f66a46dac49b7525e011b31de0b60585ed643d04798e472f4fbd69c872cdeed7fa36bcc445ff03016 gnome-books-3.34.0.tar.xz" +sha512sums="634dcd7e26ede955e8700335fcd04ab4bd40d083d251846f66a46dac49b7525e011b31de0b60585ed643d04798e472f4fbd69c872cdeed7fa36bcc445ff03016 gnome-books-3.34.0.tar.xz +c8f2a22cd2226d531cb9a39edab133444583647f1e2ab940de08d05bb1816ad356229164a2adac10bb5f02ef663f7124b211f2cfb00670a148f396c075d02222 504b66f6cec4b7a7bb46ca7a3b27a47ffb6a424b.patch" |