gentoo resync : 15.12.2019

4 files changed, 47 insertions, 68 deletions

diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 202cbcd441f7..10f5bfac1bd0 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,5 +1,4 @@
-DIST gnome-shell-extension-gsconnect-26.tar.gz 303823 BLAKE2B 7fd112c032d717e87c7189a5f06b97a246216fa1895bb3d837c8b53c3312eed9a6999c20db3e98112cdacc309d56021920b78ebb387c55335fba1965b86c117f SHA512 c32469bf9c1b3903979b1e354d6c214807158f35d4824b60597639084064d23d194bda91a3a1cd5a99d7fdaf2bea48ad7f4c9aad3befb55e59694d195b7d8a9a
+AUX gnome-shell-extension-gsconnect-28-silent-flag.patch 1637 BLAKE2B 9f02424b134f0cd77c00cc9dd9fae774826bcc40750a8fb053edef6b2a75d3dc92c7ef53a89abb3d2db3e6787066c7971198e909cf2d52fccb7388fae4341c2e SHA512 05a23e0aab06108e778a07ab8ed780115a157496c5c08a4676ec4d6a58bb4ecc6860682e3cae37f1b5734a8757f1e7bd3148d246518357ed85295e00a5c0c4d8
 DIST gnome-shell-extension-gsconnect-28.tar.gz 312814 BLAKE2B 217e32e799c6300764f23245c0d474b025918f78808c026175fd3262b4c463b913969290156782151828cdcb15647002e7c7b8bff926337960a78d6d98a16c77 SHA512 a806f6532e68544832dac47da1fdf23edb7625c6cac4ad7f1c1a1b0a5d69af159397bc6f2bb63a74907669db5ea192343b7d2fc8eb2992bcc6a1834cffe1fbba
-EBUILD gnome-shell-extension-gsconnect-26.ebuild 1566 BLAKE2B 565e814bf9e7a25bfe3adf4553bcac0f13fb8d19c44a3e726aff344edb2ab9a8d7b128059ad86ad446f2d52a02280d7bbf452eb8a2bb2300ef4432b78685122b SHA512 6f5e7d6d338efb0b8ef565310af1f4584bc255fbc205ccb09bf448725f4b4b410b3ef31877f0e2a5042e77b29e93108d899a402acea0cb51d3b7101453aeb7d1
-EBUILD gnome-shell-extension-gsconnect-28.ebuild 1602 BLAKE2B 9ac21cb155d7ea5d9e46cee652aa630bb9555caae64918f1ac01c74c8b8ec6dda0820f87b0b8db3bf48603de6162df29346969cd4d2fa3c2e7e6efa69b8e369c SHA512 60b58cf9ef25549bb73c44ed628e6c91bc152329c489b5b3ea6ab39630a44e447fc3a5c0f300e058e94dcfd340dca9d14b69ef95b9bf468f1e91e6818817f76a
+EBUILD gnome-shell-extension-gsconnect-28-r1.ebuild 1755 BLAKE2B ccb6adf109422ac08ad98687c0cd2be59867c71da65bd8fced4108183427704ccdcc8f385eb99effd93185a43c9c2bde67f3c7a7793779b6d1ffa73c28e879e5 SHA512 177bc30496d31b870394d8de33ed59dc60944f580ca3060538be71411817cdff6fe873aea396d833b27c36dd40af20203e2f7030252663ff4000cf8e42affce0
 MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-28-silent-flag.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-28-silent-flag.patch
new file mode 100644
index 000000000000..444642ee3c72
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-28-silent-flag.patch
@@ -0,0 +1,39 @@
+From 1811528ca72a2b83924bc717c424f1301bf17c30 Mon Sep 17 00:00:00 2001
+From: Andy Holmes <andrew.g.r.holmes@gmail.com>
+Date: Sun, 1 Dec 2019 16:39:41 -0800
+Subject: [PATCH] Notification Plugin: ignore the `silent` flag entirely
+
+Upstream kdeconnect-android is tagging many notifications as `silent`,
+causing them to never be shown. Since we already handle duplicates in
+the Shell, we ignore that flag for now.
+
+closes #720
+---
+ src/service/plugins/notification.js | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/service/plugins/notification.js b/src/service/plugins/notification.js
+index b31a828ba..45ed2050c 100644
+--- a/src/service/plugins/notification.js
++++ b/src/service/plugins/notification.js
+@@ -135,16 +135,16 @@ var Plugin = GObject.registerClass({
+ 
+     /**
+      * Handle an incoming notification or closed report.
++     *
++     * FIXME: upstream kdeconnect-android is tagging many notifications as
++     *        `silent`, causing them to never be shown. Since we already handle
++     *        duplicates in the Shell, we ignore that flag for now.
+      */
+     _handleNotification(packet) {
+         // A report that a remote notification has been dismissed
+         if (packet.body.hasOwnProperty('isCancel')) {
+             this.device.hideNotification(packet.body.id);
+ 
+-        // A silent notification; silence it by aborting the icon transfer
+-        } else if (packet.body.hasOwnProperty('silent') && packet.body.silent) {
+-            this.device.rejectTransfer(packet);
+-
+         // A normal, remote notification
+         } else {
+             this.receiveNotification(packet);
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-26.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-26.ebuild
deleted file mode 100644
index 07ce36aab439..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-26.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils meson readme.gentoo-r1
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nautilus"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.48
-	>=gnome-base/gnome-shell-3.28
-	gnome-base/gvfs
-	|| ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks )
-	|| ( media-libs/libcanberra media-libs/gsound )
-	nautilus? (
-		dev-python/nautilus-python
-		gnome-base/nautilus[introspection] )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	>=dev-util/meson-0.49.0
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-src_configure() {
-	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
-	meson_src_configure \
-		-Dnemo=false \
-		$(meson_use nautilus)
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28-r1.ebuild
index 00b71ce55d36..1f8bf0739bf0 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus"
 
 COMMON_DEPEND="dev-libs/glib:2"
@@ -35,6 +35,11 @@ DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="For knowing more about how to do the setup, please visit:
 https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
 
+PATCHES=(
+	# Fix WhastApp notifications, https://github.com/andyholmes/gnome-shell-extension-gsconnect/issues/720
+	"${FILESDIR}/${P}-silent-flag.patch"
+)
+
 src_configure() {
 	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
 	# https://bugs.gentoo.org/694388