Date: Wednesday, April 18, 2018 @ 07:51:14
Author: zorun
Revision: 316850
archrelease: copy trunk to community-x86_64
Added:
ring-gnome/repos/community-x86_64/0001-settings-check-if-g_get_user_special_dir-fails.patch
(from rev 316849,
ring-gnome/trunk/0001-settings-check-if-g_get_user_special_dir-fails.patch)
ring-gnome/repos/community-x86_64/PKGBUILD
(from rev 316849, ring-gnome/trunk/PKGBUILD)
Deleted:
ring-gnome/repos/community-x86_64/PKGBUILD
-----------------------------------------------------------+
0001-settings-check-if-g_get_user_special_dir-fails.patch | 36 ++++
PKGBUILD | 93 ++++++------
2 files changed, 86 insertions(+), 43 deletions(-)
Copied:
ring-gnome/repos/community-x86_64/0001-settings-check-if-g_get_user_special_dir-fails.patch
(from rev 316849,
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
(rev 0)
+++ 0001-settings-check-if-g_get_user_special_dir-fails.patch 2018-04-18
07:51:14 UTC (rev 316850)
@@ -0,0 +1,36 @@
+From 1946b536d75fc47f16bf3accb9b18c98145280b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
+ <sebastien.b...@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.gor...@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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-18 07:50:59 UTC (rev 316849)
+++ PKGBUILD 2018-04-18 07:51:14 UTC (rev 316850)
@@ -1,43 +0,0 @@
-# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-
-pkgname=ring-gnome
-pkgver=20180414.2.2c51f89
-pkgrel=1
-epoch=3
-pkgdesc="Ring is a free and universal communication platform which preserves
the users' privacy and freedoms (GNOME client)"
-arch=("x86_64")
-url="https://ring.cx";
-license=('GPL3')
-groups=("ring")
-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")
-makedepends=('git' 'cmake')
-source=("git+https://gerrit-ring.savoirfairelinux.com/ring-client-gnome#commit=1e2dd354a324c37561500440524864d778f3b614";)
-sha256sums=('SKIP')
-
-build() {
- cd "ring-client-gnome"
-
- msg2 'Building...'
- mkdir -p build
- cd build
- cmake .. \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
- make
-}
-
-package() {
- cd "ring-client-gnome/build"
-
- msg2 'Installing...'
- make DESTDIR="$pkgdir" install
-
- msg2 'Cleaning up pkgdir...'
- find "$pkgdir" -type d -name .git -exec rm -r '{}' +
- find "$pkgdir" -type f -name .gitignore -exec rm -r '{}' +
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ring-gnome/repos/community-x86_64/PKGBUILD (from rev 316849,
ring-gnome/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-04-18 07:51:14 UTC (rev 316850)
@@ -0,0 +1,50 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+
+pkgname=ring-gnome
+pkgver=20180414.2.2c51f89
+pkgrel=2
+epoch=3
+pkgdesc="Ring is a free and universal communication platform which preserves
the users' privacy and freedoms (GNOME client)"
+arch=("x86_64")
+url="https://ring.cx";
+license=('GPL3')
+groups=("ring")
+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")
+makedepends=('git' 'cmake')
+source=("git+https://gerrit-ring.savoirfairelinux.com/ring-client-gnome#commit=1e2dd354a324c37561500440524864d778f3b614";
+ "0001-settings-check-if-g_get_user_special_dir-fails.patch")
+sha256sums=('SKIP'
+ 'f6e36863d5d4e7a6d7e5a29abb46a674186f2842dadea28ab1fd57a267b0bc5b')
+
+prepare() {
+ cd "${srcdir}/ring-client-gnome"
+ patch -p1 <
"${srcdir}/0001-settings-check-if-g_get_user_special_dir-fails.patch"
+}
+
+build() {
+ cd "ring-client-gnome"
+
+ msg2 'Building...'
+ mkdir -p build
+ cd build
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "ring-client-gnome/build"
+
+ msg2 'Installing...'
+ make DESTDIR="$pkgdir" install
+
+ msg2 'Cleaning up pkgdir...'
+ find "$pkgdir" -type d -name .git -exec rm -r '{}' +
+ find "$pkgdir" -type f -name .gitignore -exec rm -r '{}' +
+}
+
+# vim:set ts=2 sw=2 et:
