Date: Monday, September 10, 2018 @ 12:46:09 Author: bgyorgy Revision: 379203
upgpkg: sparkleshare 3.28-2 Use gtk status icon by default, add git-lfs to dependencies (FS#59678, FS#59712) Added: sparkleshare/trunk/0001-Use-gtk-status-icon-by-default.patch Modified: sparkleshare/trunk/PKGBUILD -------------------------------------------+ 0001-Use-gtk-status-icon-by-default.patch | 48 ++++++++++++++++++++++++++++ PKGBUILD | 14 +++++--- 2 files changed, 58 insertions(+), 4 deletions(-) Added: 0001-Use-gtk-status-icon-by-default.patch =================================================================== --- 0001-Use-gtk-status-icon-by-default.patch (rev 0) +++ 0001-Use-gtk-status-icon-by-default.patch 2018-09-10 12:46:09 UTC (rev 379203) @@ -0,0 +1,48 @@ +From 12e9870bf9f41391f8de165d43196cb5b0cd5eee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> +Date: Mon, 10 Sep 2018 14:39:26 +0200 +Subject: [PATCH] Use gtk status icon by default + +--- + SparkleShare/Linux/StatusIcon.cs | 2 +- + SparkleShare/Linux/UserInterface.cs | 8 -------- + 2 files changed, 1 insertion(+), 9 deletions(-) + +diff --git a/SparkleShare/Linux/StatusIcon.cs b/SparkleShare/Linux/StatusIcon.cs +index b64f49e5..113a41c0 100644 +--- a/SparkleShare/Linux/StatusIcon.cs ++++ b/SparkleShare/Linux/StatusIcon.cs +@@ -31,7 +31,7 @@ namespace SparkleShare { + public class StatusIcon { + + public StatusIconController Controller = new StatusIconController (); +- public static bool use_appindicator = true; ++ public static bool use_appindicator = false; + + Gtk.StatusIcon status_icon; + +diff --git a/SparkleShare/Linux/UserInterface.cs b/SparkleShare/Linux/UserInterface.cs +index 74fd5559..eac9b4ae 100644 +--- a/SparkleShare/Linux/UserInterface.cs ++++ b/SparkleShare/Linux/UserInterface.cs +@@ -92,17 +92,9 @@ namespace SparkleShare + if (args.Length > 0) + Logger.LogInfo ("Environment", "Arguments: " + string.Join (" ", args)); + +- if (Array.IndexOf (args, "--status-icon=gtk") > -1) +- StatusIcon.use_appindicator = false; +- + #if HAVE_APP_INDICATOR + if (Array.IndexOf (args, "--status-icon=appindicator") > -1) + StatusIcon.use_appindicator = true; +- #else +- if (StatusIcon.use_appindicator) { +- Console.WriteLine ("AppIndicator not installed."); +- Environment.Exit (-1); +- } + #endif + + if (StatusIcon.use_appindicator) +-- +2.18.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-09-10 12:43:42 UTC (rev 379202) +++ PKGBUILD 2018-09-10 12:46:09 UTC (rev 379203) @@ -6,16 +6,18 @@ pkgname=sparkleshare _pkgname=SparkleShare pkgver=3.28 -pkgrel=1 +pkgrel=2 pkgdesc="Collaboration and sharing tool based on git written in C Sharp" arch=('any') url="https://www.sparkleshare.org/"; license=('GPL3') -depends=('webkit2-sharp' 'notify-sharp-3' 'curl' 'git' 'openssh' 'gvfs') +depends=('webkit2-sharp' 'notify-sharp-3' 'curl' 'git-lfs' 'openssh' 'gvfs') makedepends=(git meson) _commit=3176efc8c38f5effba780aa9bbc0b1d5a313129a # tags/3.28 -source=("git+https://github.com/hbons/SparkleShare.git#commit=$_commit";) -sha256sums=('SKIP') +source=("git+https://github.com/hbons/SparkleShare.git#commit=$_commit"; + "0001-Use-gtk-status-icon-by-default.patch") +sha256sums=('SKIP' + '748a4aa153689d59aa6145eb91b863d8f7668fcb901a7773befd44afd1f904d9') pkgver() { cd $_pkgname @@ -24,8 +26,12 @@ prepare() { cd $_pkgname + # Fix build sed -i '/post-install.sh/d' meson.build + + # Use gtk status icon by default + patch -Np1 -i ../0001-Use-gtk-status-icon-by-default.patch } build() {
