[arch-commits] Commit in sparkleshare/repos/community-any (5 files)
Balló György
bgyorgy at archlinux.org
Tue Dec 25 09:09:08 UTC 2018
Date: Tuesday, December 25, 2018 @ 09:09:08
Author: bgyorgy
Revision: 417900
archrelease: copy trunk to community-any
Added:
sparkleshare/repos/community-any/0001-Fix-AppStream-metadata-validation.patch
(from rev 417899, sparkleshare/trunk/0001-Fix-AppStream-metadata-validation.patch)
sparkleshare/repos/community-any/0001-Use-gtk-status-icon-by-default.patch
(from rev 417899, sparkleshare/trunk/0001-Use-gtk-status-icon-by-default.patch)
sparkleshare/repos/community-any/PKGBUILD
(from rev 417899, sparkleshare/trunk/PKGBUILD)
Deleted:
sparkleshare/repos/community-any/0001-Use-gtk-status-icon-by-default.patch
sparkleshare/repos/community-any/PKGBUILD
----------------------------------------------+
0001-Fix-AppStream-metadata-validation.patch | 40 ++++++++++
0001-Use-gtk-status-icon-by-default.patch | 96 ++++++++++++------------
PKGBUILD | 97 +++++++++++++------------
3 files changed, 141 insertions(+), 92 deletions(-)
Copied: sparkleshare/repos/community-any/0001-Fix-AppStream-metadata-validation.patch (from rev 417899, sparkleshare/trunk/0001-Fix-AppStream-metadata-validation.patch)
===================================================================
--- 0001-Fix-AppStream-metadata-validation.patch (rev 0)
+++ 0001-Fix-AppStream-metadata-validation.patch 2018-12-25 09:09:08 UTC (rev 417900)
@@ -0,0 +1,40 @@
+From e0c4e972d0b52ef71b0fafe6fb33511e429af955 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Tue, 25 Dec 2018 09:53:41 +0100
+Subject: [PATCH] Fix AppStream metadata validation
+
+---
+ .../Linux/org.sparkleshare.SparkleShare.appdata.xml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/SparkleShare/Linux/org.sparkleshare.SparkleShare.appdata.xml b/SparkleShare/Linux/org.sparkleshare.SparkleShare.appdata.xml
+index 0fcb1cd7..74c412e1 100644
+--- a/SparkleShare/Linux/org.sparkleshare.SparkleShare.appdata.xml
++++ b/SparkleShare/Linux/org.sparkleshare.SparkleShare.appdata.xml
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<component type="desktop">
++<component type="desktop-application">
+ <name>SparkleShare</name>
+ <summary>Magic self hosted Git file sync</summary>
+ <developer_name>Hylke Bons</developer_name>
+@@ -64,13 +64,13 @@
+ </screenshot>
+ </screenshots>
+
+- <id type="desktop">org.sparkleshare.SparkleShare.desktop</id>
+- <launchable id="desktop-id">org.sparkleshare.SparkleShare.desktop</launchable>
++ <id>org.sparkleshare.SparkleShare</id>
++ <launchable type="desktop-id">org.sparkleshare.SparkleShare.desktop</launchable>
+ <provides>
+ <binary>sparkleshare</binary>
+ </provides>
+
+- <metadata_licence>CC0-1.0</metadata_licence>
++ <metadata_license>CC0-1.0</metadata_license>
+ <update_contact>hi_AT_planetpeanut.uk</update_contact>
+
+ <content_rating type="oars-1.0">
+--
+2.20.1
+
Deleted: 0001-Use-gtk-status-icon-by-default.patch
===================================================================
--- 0001-Use-gtk-status-icon-by-default.patch 2018-12-25 09:09:03 UTC (rev 417899)
+++ 0001-Use-gtk-status-icon-by-default.patch 2018-12-25 09:09:08 UTC (rev 417900)
@@ -1,48 +0,0 @@
-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
-
Copied: sparkleshare/repos/community-any/0001-Use-gtk-status-icon-by-default.patch (from rev 417899, 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-12-25 09:09:08 UTC (rev 417900)
@@ -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-12-25 09:09:03 UTC (rev 417899)
+++ PKGBUILD 2018-12-25 09:09:08 UTC (rev 417900)
@@ -1,44 +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=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
-}
Copied: sparkleshare/repos/community-any/PKGBUILD (from rev 417899, sparkleshare/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-12-25 09:09:08 UTC (rev 417900)
@@ -0,0 +1,53 @@
+# 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=3
+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"
+ "0001-Fix-AppStream-metadata-validation.patch")
+sha256sums=('SKIP'
+ '748a4aa153689d59aa6145eb91b863d8f7668fcb901a7773befd44afd1f904d9'
+ 'ed63665842c4f4aa1f9c27641a4dfd9bcbaad2b23b51cf620359e4ef19b34514')
+
+pkgver() {
+ cd $_pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $_pkgname
+
+ # Fix build
+ sed -i '/post-install.sh/d' meson.build
+
+ # Fix AppStream metadata validation
+ # https://github.com/hbons/SparkleShare/pull/1882
+ patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
+
+ # Don't use legacy path for AppStream metainfo file
+ # https://github.com/hbons/SparkleShare/pull/1883
+ sed -i "s/'share', 'appdata'/'share', 'metainfo'/" SparkleShare/Linux/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
+}
More information about the arch-commits
mailing list