Date: Friday, February 22, 2019 @ 13:47:18 Author: archange Revision: 435191
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 435190, ring-gnome/trunk/0001-settings-check-if-g_get_user_special_dir-fails.patch) ring-gnome/repos/community-x86_64/PKGBUILD (from rev 435190, ring-gnome/trunk/PKGBUILD) Deleted: ring-gnome/repos/community-x86_64/0001-settings-check-if-g_get_user_special_dir-fails.patch ring-gnome/repos/community-x86_64/PKGBUILD -----------------------------------------------------------+ 0001-settings-check-if-g_get_user_special_dir-fails.patch | 72 +++++------ PKGBUILD | 74 ++++++------ 2 files changed, 73 insertions(+), 73 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-02-22 13:47:10 UTC (rev 435190) +++ 0001-settings-check-if-g_get_user_special_dir-fails.patch 2019-02-22 13:47:18 UTC (rev 435191) @@ -1,36 +0,0 @@ -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 - Copied: ring-gnome/repos/community-x86_64/0001-settings-check-if-g_get_user_special_dir-fails.patch (from rev 435190, 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 2019-02-22 13:47:18 UTC (rev 435191) @@ -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 2019-02-22 13:47:10 UTC (rev 435190) +++ PKGBUILD 2019-02-22 13:47:18 UTC (rev 435191) @@ -1,37 +0,0 @@ -# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org> -# Maintainer: Bruno Pagani <archa...@archlinux.org> - -pkgname=ring-gnome -pkgver=20190103 -pkgrel=1 -epoch=3 -pkgdesc="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') -_commit=32e606106920a21da416ef365fb654b5df721098 -source=("git+https://gerrit-ring.savoirfairelinux.com/ring-client-gnome#commit=${_commit}") -sha256sums=('SKIP') - -prepare() { - mkdir -p build -} - -build() { - cd build - cmake ../ring-client-gnome \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=None - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install -} Copied: ring-gnome/repos/community-x86_64/PKGBUILD (from rev 435190, ring-gnome/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-02-22 13:47:18 UTC (rev 435191) @@ -0,0 +1,37 @@ +# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org> +# Maintainer: Bruno Pagani <archa...@archlinux.org> + +pkgname=ring-gnome +pkgver=20190215 +pkgrel=1 +epoch=3 +pkgdesc="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') +_commit=e86e9dead6af7d83c83fae2ff2883c64e1a32a08 +source=("git+https://git.ring.cx/savoirfairelinux/ring-client-gnome.git#commit=${_commit}") +sha256sums=('SKIP') + +prepare() { + mkdir -p build +} + +build() { + cd build + cmake ../ring-client-gnome \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=None + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +}