[arch-commits] Commit in ring-gnome/trunk (2 files)

[Bruno Pagani]

    Date: Sunday, March 17, 2019 @ 14:31:30
  Author: archange
Revision: 442384

upgpkg: ring-gnome 3:20190315-1

Also remove leftover patch

Modified:
  ring-gnome/trunk/PKGBUILD
Deleted:
  ring-gnome/trunk/0001-settings-check-if-g_get_user_special_dir-fails.patch

-----------------------------------------------------------+
 0001-settings-check-if-g_get_user_special_dir-fails.patch |   36 ------------
 PKGBUILD                                                  |    6 +-
 2 files changed, 3 insertions(+), 39 deletions(-)

Deleted: 0001-settings-check-if-g_get_user_special_dir-fails.patch
===================================================================
--- 0001-settings-check-if-g_get_user_special_dir-fails.patch	2019-03-17 14:30:48 UTC (rev 442383)
+++ 0001-settings-check-if-g_get_user_special_dir-fails.patch	2019-03-17 14:31:30 UTC (rev 442384)
@@ -1,36 +0,0 @@
-From 1946b536d75fc47f16bf3accb9b18c98145280b1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
- <sebastien.blin at savoirfairelinux.com>
-Date: Tue, 17 Apr 2018 09:47:47 -0400
-Subject: [PATCH] settings: check if g_get_user_special_dir fails
-
-g_get_user_special_dir can return a nullptr, so the string
-construction will fails badly. Must be checked or fallback to
-G_USER_DIRECTORY_DESKTOP ($HOME/Desktop)
-
-Change-Id: I04b72221f14091db2cfd880a9b35b8ab92e46ae4
-Reviewed-by: Philippe Gorley <philippe.gorley at savoirfairelinux.com>
----
- src/generalsettingsview.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/generalsettingsview.cpp b/src/generalsettingsview.cpp
-index 4c6a15a..4fa2d9c 100644
---- a/src/generalsettingsview.cpp
-+++ b/src/generalsettingsview.cpp
-@@ -248,7 +248,11 @@ general_settings_view_init(GeneralSettingsView *self)
-     auto* download_directory_variant = g_settings_get_value(priv->settings, "download-folder");
-     char* download_directory_value;
-     g_variant_get(download_directory_variant, "&s", &download_directory_value);
--    std::string default_download_dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD);
-+    std::string default_download_dir = {};
-+    if (auto* directory = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD))
-+        default_download_dir = directory;
-+    else
-+        default_download_dir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
-     auto current_value = std::string(download_directory_value);
-     if (current_value.empty()) {
-         g_settings_set_value(priv->settings, "download-folder", g_variant_new("s", default_download_dir.c_str()));
--- 
-2.17.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-17 14:30:48 UTC (rev 442383)
+++ PKGBUILD	2019-03-17 14:31:30 UTC (rev 442384)
@@ -2,7 +2,7 @@
 # Maintainer: Bruno Pagani <archange at archlinux.org>
 
 pkgname=ring-gnome
-pkgver=20190215
+pkgver=20190315
 pkgrel=1
 epoch=3
 pkgdesc="Free and universal communication platform which preserves the users’ privacy and freedoms (GNOME client)"
@@ -13,9 +13,9 @@
 depends=('libringclient' 'ring-daemon'
          'gtk3' 'dconf' 'clutter' 'clutter-gtk' 'webkit2gtk' 'qrencode'
          'qt5-base' 'gtk-update-icon-cache' 'desktop-file-utils'
-         'evolution-data-server' 'libnotify' 'libcanberra' 'libnm')
+         'libnotify' 'libcanberra' 'libnm' 'libappindicator-gtk3')
 makedepends=('git' 'cmake')
-_commit=e86e9dead6af7d83c83fae2ff2883c64e1a32a08
+_commit=2e7ba6094795f0e88e339a598e8d6899df594146
 source=("git+https://git.ring.cx/savoirfairelinux/ring-client-gnome.git#commit=${_commit}")
 sha256sums=('SKIP')