[arch-commits] Commit in sparkleshare/repos/community-any (3 files)

[Balló György]

    Date: Monday, September 10, 2018 @ 12:46:15
  Author: bgyorgy
Revision: 379204

archrelease: copy trunk to community-any

Added:
  sparkleshare/repos/community-any/0001-Use-gtk-status-icon-by-default.patch
    (from rev 379203, sparkleshare/trunk/0001-Use-gtk-status-icon-by-default.patch)
  sparkleshare/repos/community-any/PKGBUILD
    (from rev 379203, sparkleshare/trunk/PKGBUILD)
Deleted:
  sparkleshare/repos/community-any/PKGBUILD

-------------------------------------------+
 0001-Use-gtk-status-icon-by-default.patch |   48 ++++++++++++++++
 PKGBUILD                                  |   82 +++++++++++++++-------------
 2 files changed, 92 insertions(+), 38 deletions(-)

Copied: sparkleshare/repos/community-any/0001-Use-gtk-status-icon-by-default.patch (from rev 379203, sparkleshare/trunk/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:15 UTC (rev 379204)
@@ -0,0 +1,48 @@
+From 12e9870bf9f41391f8de165d43196cb5b0cd5eee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+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
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-10 12:46:09 UTC (rev 379203)
+++ PKGBUILD	2018-09-10 12:46:15 UTC (rev 379204)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Jarek Sedlacek <JarekSedlacek at gmail.com>
-# Contributor: Erdbeerkaese <erdbeerkaese underscore arch at gmail dot com>
-
-pkgname=sparkleshare
-_pkgname=SparkleShare
-pkgver=3.28
-pkgrel=1
-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')
-makedepends=(git meson)
-_commit=3176efc8c38f5effba780aa9bbc0b1d5a313129a  # tags/3.28
-source=("git+https://github.com/hbons/SparkleShare.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $_pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $_pkgname
-  # Fix build
-  sed -i '/post-install.sh/d' meson.build
-}
-
-build() {
-  arch-meson $_pkgname build
-  ninja -C build
-}
-
-package() {
-  DESTDIR="$pkgdir" ninja -C build install
-}

Copied: sparkleshare/repos/community-any/PKGBUILD (from rev 379203, sparkleshare/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-09-10 12:46:15 UTC (rev 379204)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jarek Sedlacek <JarekSedlacek at gmail.com>
+# Contributor: Erdbeerkaese <erdbeerkaese underscore arch at gmail dot com>
+
+pkgname=sparkleshare
+_pkgname=SparkleShare
+pkgver=3.28
+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-lfs' 'openssh' 'gvfs')
+makedepends=(git meson)
+_commit=3176efc8c38f5effba780aa9bbc0b1d5a313129a  # tags/3.28
+source=("git+https://github.com/hbons/SparkleShare.git#commit=$_commit"
+        "0001-Use-gtk-status-icon-by-default.patch")
+sha256sums=('SKIP'
+            '748a4aa153689d59aa6145eb91b863d8f7668fcb901a7773befd44afd1f904d9')
+
+pkgver() {
+  cd $_pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+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() {
+  arch-meson $_pkgname build
+  ninja -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+}