From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- .../gnome-shell-extension-gsconnect/Manifest | 5 -- ...-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, 203 deletions(-) delete mode 100644 gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch delete mode 100644 gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-notifications-limit.patch delete mode 100644 gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch delete mode 100644 gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild (limited to 'gnome-extra/gnome-shell-extension-gsconnect') diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest index a189face115b..3c21282ee69e 100644 --- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest +++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest @@ -1,10 +1,5 @@ -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-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 -EBUILD gnome-shell-extension-gsconnect-33-r2.ebuild 1842 BLAKE2B dbf4d5d232fa28b389f20225108049f4f2c6367dc6e8f0facd734bf96f55f5e3a824e56563246f7958453d4a97dfa700c8ad32bd33bc8b4a541a442d3f0986ee SHA512 a4d2a37fdda6e53d9fe9faf733ce03216af380c494959374b813be6a42742013021fd5ca39dde2b10ddf856a059c6e47a1a5187d6c39282967b80a29eb553faf EBUILD gnome-shell-extension-gsconnect-41.ebuild 1589 BLAKE2B 2fe5b45b50e276f1b075d3541f78bb798a9ce254bcc88c40e9ddcf13a1668386cb97710e33db19fdcd5f71ae11603f42a8d005c6db7b13793526a5af2a328688 SHA512 c74181be8de7a50b6bb1938b9d756563bc7d9f89ecc609a1204a7f3aaadce7f2f801499f4374f8e0ce29b832575e1eace11979b83b7e76fd4446d18cd3b2ffb1 EBUILD gnome-shell-extension-gsconnect-42.ebuild 1619 BLAKE2B ac709d464e11b0060a789b98137c6092b84c18fff2f201575d34995d207fbc565dadd69c0cdb9a91e55f67fbe5c01fc4554d93543ac465d1ceb79555d6f2c7ed SHA512 cb8b85bfc3a8226b9fb289d0cc81555ac1bab214e5cb3ca11daeeaba220c6b62729ea9c5736eb0688666b816196ff018394eedadb2812260b66c758965fcd52b 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 deleted file mode 100644 index d7ed8780ee0b..000000000000 --- 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 8c2846c5ecbd..000000000000 --- 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 7301bfe11321..000000000000 --- 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 b47a1cf9a3ba..000000000000 --- 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 -} -- cgit v1.2.3