From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6AC4A138359 for ; Sat, 7 Nov 2020 17:41:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4A44E07FE; Sat, 7 Nov 2020 17:41:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B582E07FE for ; Sat, 7 Nov 2020 17:41:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45184340836 for ; Sat, 7 Nov 2020 17:41:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B795C43B for ; Sat, 7 Nov 2020 17:41:08 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1604770850.f3b464294d204ea06e4ad4dbae8992e457463f6d.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extension-gsconnect/, ... X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/gnome-shell-extension-gsconnect/Manifest gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-notifications-limit.patch gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild X-VCS-Directories: gnome-extra/gnome-shell-extension-gsconnect/files/ gnome-extra/gnome-shell-extension-gsconnect/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: f3b464294d204ea06e4ad4dbae8992e457463f6d X-VCS-Branch: master Date: Sat, 7 Nov 2020 17:41:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 737095b9-5305-4d40-9892-4c95e3010df8 X-Archives-Hash: db4ec7d73581da324cb953d74f24276c commit: f3b464294d204ea06e4ad4dbae8992e457463f6d Author: Mart Raudsepp gentoo org> AuthorDate: Sat Nov 7 17:40:50 2020 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sat Nov 7 17:40:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b46429 gnome-extra/gnome-shell-extension-gsconnect: remove old Package-Manager: Portage-2.3.103, Repoman-2.3.20 Signed-off-by: Mart Raudsepp gentoo.org> .../gnome-shell-extension-gsconnect/Manifest | 1 - ...-extension-gsconnect-33-avoid-repetitions.patch | 51 --------------- ...xtension-gsconnect-33-notifications-limit.patch | 39 ------------ ...xtension-gsconnect-33-whatsapp-duplicates.patch | 34 ---------- .../gnome-shell-extension-gsconnect-33-r2.ebuild | 74 ---------------------- 5 files changed, 199 deletions(-) diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest index 6cc91d9d905..d92fbb4ae54 100644 --- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest +++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest @@ -1,3 +1,2 @@ -DIST gnome-shell-extension-gsconnect-33.tar.gz 314704 BLAKE2B fa4f2eb6325356a058b24b92b683ca7331af30112d27060e8ee191c21a3269639da58992d53434c7121ea511ee9e07869b082f908b59e19fc2434f3c07e09624 SHA512 26ef929b9b128db0cb29fba22203a3afd500c5b1c3bac6917926a60350d271e67bb0985866f84877355c079fe4a5656b8ac5e8dae976d17d9a068cc825293bce DIST gnome-shell-extension-gsconnect-41.tar.gz 614195 BLAKE2B ebcf9fca448e27fe0e74bf4118528a5f8f7055ea962d4e928feceaa3257e9ff6f286a2b11631468abac1355c2506a0d8923fe56d4370f37fd7e93fe7cd8e8d45 SHA512 12de97683e4bcbf49774b6b6f93803bb0d0005f3114a581ccd7a7219cc2cb27a0e7b10d45a162c879f27e058d99b791ce33425e465651fe1f4e93f1a332a0eaa DIST gnome-shell-extension-gsconnect-42.tar.gz 729438 BLAKE2B 19aea0008487c5c316a6883da176ccba4bf31334abe1ce273cdba91d4fbacfa8a3e003909488e957486ea371043174eefd1ca990470f99ac4ff36ff73cd498cc SHA512 27965435ef9524021e3ce3825af73d9a8b7f602d8c73b524bcf247b6af47ad14b16e83815b1a30e148b109531fbe230e531e1a0b456f5f51c9c96a4c5a3b19a5 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 deleted file mode 100644 index d7ed8780ee0..00000000000 --- a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- 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-notifications-limit.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-notifications-limit.patch deleted file mode 100644 index 8c2846c5ecb..00000000000 --- a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-notifications-limit.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 641ccb70724f8967439495e2356b2d7a654053cf Mon Sep 17 00:00:00 2001 -From: Andy Holmes -Date: Sat, 4 Apr 2020 17:37:41 -0700 -Subject: [PATCH] Shell Notifications: set a limit of 10 notifications from - GSConnect - -Re-apply the notification limit from GSConnect, set to 10. This should -stop notifications from growing indefinitely, with the consequence that -the notifications that end up in the message tray is non-deterministic. - -cc #364 - -Backported to v33 ---- - src/shell/notification.js | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/shell/notification.js b/src/shell/notification.js -index dc93de955..f345cdde9 100644 ---- a/src/shell/notification.js -+++ b/src/shell/notification.js -@@ -246,13 +246,16 @@ - } - - /** -- * Override to lift the usual notification limit (3) -+ * Override to raise the usual notification limit (3) - * See: https://gitlab.gnome.org/GNOME/gnome-shell/blob/master/js/ui/messageTray.js#L773-L786 - */ - pushNotification(notification) { - if (this.notifications.includes(notification)) - return; - -+ while (this.notifications.length >= 10) -+ this.notifications.shift().destroy(MessageTray.NotificationDestroyedReason.EXPIRED); -+ - notification.connect('destroy', this._onNotificationDestroy.bind(this)); - notification.connect('acknowledged-changed', this.countUpdated.bind(this)); - this.notifications.push(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 deleted file mode 100644 index 7301bfe1132..00000000000 --- a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 959799d934360f95a2e49223b64ffc77bba2736e Mon Sep 17 00:00:00 2001 -From: Andy Holmes -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 (|) --const DEVICE_REGEX = /^([^|]+)\|(.+)$/; -+const DEVICE_REGEX = /^([^|]+)\|([\s\S]+)$/; - - // requestReplyId Pattern (|)|) --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 deleted file mode 100644 index b47a1cf9a3b..00000000000 --- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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 -}