gentoo resync : 30.05.2020

4 files changed, 162 insertions, 0 deletions

diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 0d842a193ea1..98958bb7b3e1 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,8 +1,11 @@
 AUX gnome-shell-extension-gsconnect-28-silent-flag.patch 1637 BLAKE2B 9f02424b134f0cd77c00cc9dd9fae774826bcc40750a8fb053edef6b2a75d3dc92c7ef53a89abb3d2db3e6787066c7971198e909cf2d52fccb7388fae4341c2e SHA512 05a23e0aab06108e778a07ab8ed780115a157496c5c08a4676ec4d6a58bb4ecc6860682e3cae37f1b5734a8757f1e7bd3148d246518357ed85295e00a5c0c4d8
+AUX gnome-shell-extension-gsconnect-33-avoid-repetitions.patch 1822 BLAKE2B b8e882b30fe642ac9b4b99dabdbceff3ac45f44ca988f06f42e7509ed150fb304a813b00275cb63f61af78096b8e44e751ccfff201cdb6ed9ca7c10690e4bba1 SHA512 a2be4ed1cebf339b98fbc7c84bb44da20fccac36f7a2ef09a3986baf8a7a177462f544579a1d0b967880915284dbe26d0b108a48e0a4d49fea4de290983642d0
 AUX gnome-shell-extension-gsconnect-33-notifications-limit.patch 1506 BLAKE2B 12054a8465dfdef3fdc52f4b20b66e1607c9df0f429636e4e296a7fe473f761abd717c6f7a0be6ea0f29df1a3c66bf4f24b7b0840f1097f2b7ba3885b46559e8 SHA512 d55a3a389da36f65b435287b0571f3ab3ee661ef892c45b27f3f9d30aeec69b01f9fb2c182e8272d62a1db7df5dea46650d3cf2e094d2df0f5f9b480e0ca93ba
+AUX gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch 1317 BLAKE2B 3972f38098ead8409a5a27f2c3a5fee28ed7923d551e16827a5b65bf1b02393179312e5c5494e5d7104ea7fff50aec096e41dd7010197b2e779ff113fb7167f3 SHA512 c6262256c971826e7aa56bbddca72f3a1731a3b70e472b0c64901c834f4787e26c10d2ed177df6f4901e4b5524c1a80494bde0a5bfdc5c94e8ede9ae686037d7
 DIST gnome-shell-extension-gsconnect-28.tar.gz 312814 BLAKE2B 217e32e799c6300764f23245c0d474b025918f78808c026175fd3262b4c463b913969290156782151828cdcb15647002e7c7b8bff926337960a78d6d98a16c77 SHA512 a806f6532e68544832dac47da1fdf23edb7625c6cac4ad7f1c1a1b0a5d69af159397bc6f2bb63a74907669db5ea192343b7d2fc8eb2992bcc6a1834cffe1fbba
 DIST gnome-shell-extension-gsconnect-33.tar.gz 314704 BLAKE2B fa4f2eb6325356a058b24b92b683ca7331af30112d27060e8ee191c21a3269639da58992d53434c7121ea511ee9e07869b082f908b59e19fc2434f3c07e09624 SHA512 26ef929b9b128db0cb29fba22203a3afd500c5b1c3bac6917926a60350d271e67bb0985866f84877355c079fe4a5656b8ac5e8dae976d17d9a068cc825293bce
 EBUILD gnome-shell-extension-gsconnect-28-r1.ebuild 1755 BLAKE2B ccb6adf109422ac08ad98687c0cd2be59867c71da65bd8fced4108183427704ccdcc8f385eb99effd93185a43c9c2bde67f3c7a7793779b6d1ffa73c28e879e5 SHA512 177bc30496d31b870394d8de33ed59dc60944f580ca3060538be71411817cdff6fe873aea396d833b27c36dd40af20203e2f7030252663ff4000cf8e42affce0
 EBUILD gnome-shell-extension-gsconnect-33-r1.ebuild 1664 BLAKE2B bddb769e769f33c01755b4eeccf9e7765e525a9467c49b6ea9c14cff293305ab20f342b44acf4a4e1f159e7814d519b7ef522743714b3fa48f5fd556411f8ca4 SHA512 af81ce708d1fe19d409ccf64ef40b6acdcd02c76607565b3bfee7f097480eeedc159c58d10de4b6a8639abfb03ec19bd6ab9ccc91229afadad7f4ad7bd73732e
+EBUILD gnome-shell-extension-gsconnect-33-r2.ebuild 1844 BLAKE2B aaba98359ff79fd1cc1ec936b1cc428d245231458c0dce6bebcfb5e880d30358241d7e750569286c6af70d4d245e66af4afe36da5bc16e25d1a28250420607f5 SHA512 47c0d2c17d96dc6256e633278cfe295cde4c0e65a6940939aeed3a47909f221c00220c3905825e741bdc369cb07d74bdb8082c164837fd844a1d9c5a2eb2df04
 EBUILD gnome-shell-extension-gsconnect-33.ebuild 1536 BLAKE2B c00fffeed8cd0ac7444cc1dcb4629742da2327b058c6be3d4c9183793abeccbce7e2a6ea5aeb82053fe65b828ccd32084eb544cc496f723c9145d3c91240391c SHA512 4d9ae97e9949ea93a2fddb48184a3c5d015b3e39076ad2241c196f7f662c2b05de5017ccf761d4fbeb13ebec1b953fb540f35187e874e520cdd44e3970d38376
 MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch
new file mode 100644
index 000000000000..d7ed8780ee0b
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch
@@ -0,0 +1,51 @@
+--- a/src/shell/notification.js.orig	2020-05-14 13:57:38.781404129 +0200
++++ b/src/shell/notification.js	2020-05-14 13:57:54.335642763 +0200
+@@ -200,20 +200,27 @@
+         this._notificationPending = true;
+         let notification = this._notifications[localId];
+ 
+-        // Check if @notificationParams represents an exact repeat
+-        let repeat = (
+-            notification &&
+-            notification.title === notificationParams.title.unpack() &&
+-            notification.bannerBodyText === notificationParams.body.unpack()
+-        );
+-
+-        // If it's a repeat, we still update the metadata
+-        if (repeat) {
+-            notification.deviceId = deviceId;
+-            notification.remoteId = remoteId;
++        // Check if this is a repeat
++        if (notification) {
+             notification.requestReplyId = requestReplyId;
+ 
+-        // Device Notification
++        // Bail early If @notificationParams represents an exact repeat
++        let title = notificationParams.title.unpack();
++        let body = notificationParams.body ?
++
++        notificationParams.body.unpack() :
++        null;
++
++        if (notification.title === title &&
++            notification.bannerBodyText === body) {
++            this._notificationPending = false;
++            return;
++        }
++
++        notification.title = title;
++        notification.bannerBodyText = body;
++
++       // Device Notification
+         } else if (idMatch) {
+             notification = new NotificationDaemon.GtkNotificationDaemonNotification(this, notificationParams);
+ 
+@@ -237,7 +244,7 @@
+             this._notifications[localId] = notification;
+         }
+ 
+-        if (showBanner && !repeat)
++        if (showBanner)
+             this.notify(notification);
+         else
+             this.pushNotification(notification);
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch
new file mode 100644
index 000000000000..7301bfe11321
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch
@@ -0,0 +1,34 @@
+From 959799d934360f95a2e49223b64ffc77bba2736e Mon Sep 17 00:00:00 2001
+From: Andy Holmes <andrew.g.r.holmes@gmail.com>
+Date: Fri, 8 May 2020 21:26:19 -0700
+Subject: [PATCH] Shell Notifications: account for apps that insert newlines in
+ IDs
+
+We need to account for the totally reasonable practice of inserting
+literal newline characters in notification IDs, like WhatsApp does.
+
+Not doing so was resulting in such notifications failing to match as
+device notifications, allowing them to be duplicated in the message tray
+
+closes #788
+---
+ src/shell/notification.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shell/notification.js b/src/shell/notification.js
+index e7a5f67ce..eef623a71 100644
+--- a/src/shell/notification.js
++++ b/src/shell/notification.js
+@@ -16,10 +16,10 @@ const APP_PATH = '/org/gnome/Shell/Extensions/GSConnect';
+ 
+ 
+ // deviceId Pattern (<device-id>|<remote-id>)
+-const DEVICE_REGEX = /^([^|]+)\|(.+)$/;
++const DEVICE_REGEX = /^([^|]+)\|([\s\S]+)$/;
+ 
+ // requestReplyId Pattern (<device-id>|<remote-id>)|<reply-id>)
+-const REPLY_REGEX = /^([^|]+)\|(.+)\|([0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})$/i;
++const REPLY_REGEX = /^([^|]+)\|([\s\S]+)\|([0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})$/i;
+ 
+ 
+ /**
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild
new file mode 100644
index 000000000000..5b9bc72ccdc8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 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.34*
+	gnome-base/gvfs
+	gnome-extra/evolution-data-server
+	|| ( media-libs/libcanberra media-libs/gsound )
+	nautilus? (
+		dev-python/nautilus-python
+		gnome-base/nautilus[introspection] )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	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"
+
+PATCHES=(
+	# From 'master'
+	# Shell Notifications: set a limit of 10 notifications from GSConnect
+	"${FILESDIR}/${P}-notifications-limit.patch"
+
+	# Don't show duplicated WhatsApp notifications and avoid repetitions
+	"${FILESDIR}/${P}-whatsapp-duplicates.patch"
+	"${FILESDIR}/${P}-avoid-repetitions.patch"
+)
+
+src_configure() {
+	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
+	# https://bugs.gentoo.org/694388
+	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
+}