6 files changed, 133 insertions, 2 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 3eb5fe8aae0c..4247f2f3886b 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index 05a029110f72..b340210c0b3f 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,5 +1,6 @@
+AUX gnome-shell-extension-bing-wallpaper-34-blur-enable-check.patch 1659 BLAKE2B af3da54697f7b9101fc81f442c5d2d3712866b1da81c56ed24478d21551ca0553d3bf259e54162c04e0a5c2e06cc0c460c23ce0dc47fed493340fb9960fa82b9 SHA512 c5adb0101fb7a834a10316d1bca48a0215cb3cf1c00beb17b9c2c2005c07c9753dbcaa6b4ee5deadae6aa6595b7a3b8cdaef9cd537b2bf236b955b9ac5ef53b2
 DIST gnome-shell-extension-bing-wallpaper-32.tar.gz 4186897 BLAKE2B 2d8d119ef61c426be5e1ad3070fa038fe34f1cedf706a748a9943eaa2ef9bb0ce75a8df99abad38d48fd8f25ae532ae9dd425ca00d7165c06b177580cbed89a3 SHA512 c72473df4b5882ee5964c74fa42d270097526337230e538c1fcfc6e7bee5ab492857ca0f48e019ba7cd3ce6808b22c7751333275dd074b057fa4e09030afb609
-DIST gnome-shell-extension-bing-wallpaper-33.tar.gz 4218373 BLAKE2B e5f7c9845a20eded7dfa56865ce145751b88f92c5c0c89bf305e863aa03e1ea8e305355d34833387a60b26e75aafa4739ddf4a13dac871835d604bade2f8ce5e SHA512 8de4f4a721cd8ca905212a9ebb3e4d26d90832353fca7641eb240ebe12f3fa4cd10acf257823a4a986b18b98216786daf46f3570dd87f2f17e6bfdd6507a687f
+DIST gnome-shell-extension-bing-wallpaper-34.tar.gz 4308799 BLAKE2B 5c14895fbb42fb726e1b6d93924eebfd7b93ccea893075bfd698476579962a88f8e0008d7e935304d56caba1db1f8afc8fee3498f63044e4a9da13f568025e84 SHA512 7e1e26b5494a9e66d74c3d1045827445935d1a0ed20b095cb72b3b06b622ae5fda7980313dcddedf25c5ed3b40717a8e322bc80764f502c5eb7fe7155ec84ca7
 EBUILD gnome-shell-extension-bing-wallpaper-32.ebuild 1103 BLAKE2B 8192d6f5820fe66d719b41aeea459f4a328e74cc605a01d74df1f34d5ca71c0bf2f5beffce00ff62afba9ef41a387c31e9a8802a039a0010d5174f0e78f6a214 SHA512 970b84e8e80e7c34b23f710164bc9ae00972524b83796f361139b00238cd170f249709c81ae245f3b14a0d003563ab82f47a7a348aa0f6123a1425ac31a73d42
-EBUILD gnome-shell-extension-bing-wallpaper-33.ebuild 1105 BLAKE2B 9d0ed7edea8b098da017ee6d201d59a6353ac8d9ba20c7b2ce7921c62f9e4321976ef016082b7185b4b65be5e149b8d1965df477299c01b957f2ff03afc6165a SHA512 44a4fcc8a00a1a2b4339f2d96ed960b7099b55234f2c6bcf7443042b207324e5b6aace0d6f8fc381f333d14b2de78496e5bac5d6645464be7b937fe5a813db6c
+EBUILD gnome-shell-extension-bing-wallpaper-34.ebuild 1232 BLAKE2B ed8657fa7975460f929030c9fde9acb616c4a11c2d92e3a8f6c90ccdc8a65cb28df454529222ff695b4bb8055035ecbd91d7301f227922ee34d57dd1f4bc47cf SHA512 4ee76316d0192f4ef7f1df740e50095b9e3353c9c5487715f5f71aff2c4a610df08a11f13578569068507549a1b8d42918adf441d292cdce19cb3dbdf6652cb2
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/files/gnome-shell-extension-bing-wallpaper-34-blur-enable-check.patch b/gnome-extra/gnome-shell-extension-bing-wallpaper/files/gnome-shell-extension-bing-wallpaper-34-blur-enable-check.patch
new file mode 100644
index 000000000000..64f72f388dec
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/files/gnome-shell-extension-bing-wallpaper-34-blur-enable-check.patch
@@ -0,0 +1,49 @@
+From d6350119bccb896744e574d0f10e34c1309bc1b1 Mon Sep 17 00:00:00 2001
+From: Michael Carroll <ineffable@gmail.com>
+Date: Wed, 16 Jun 2021 00:11:26 +1000
+Subject: [PATCH] dont reset blur on disable() if never enabled #113
+
+---
+ blur.js | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/blur.js b/blur.js
+index 613e301..c16af6f 100644
+--- a/blur.js
++++ b/blur.js
+@@ -27,6 +27,7 @@ var blur_strength = 2;
+ var blur_brightness = 55;
+ var debug = false;
+ 
++let blurEnabled = false;
+ var blurMode = whichVersion();
+ 
+ function log(msg) {
+@@ -63,6 +64,7 @@ var Blur = class Blur {
+         let effect = new Shell.BlurEffect({ brightness: blur_brightness * 0.01, sigma: blur_strength * themeContext.scale_factor / 5 }); // fix me, should this be /5?
+         this._scaleChangedId = themeContext.connect('notify::scale-factor', () => { effect.sigma = blur_strength * themeContext.scale_factor / 5; });
+         widget.add_effect(effect);
++        blurEnabled = true;
+     }
+ 
+     _do_blur_v2(monitorIndex) {
+@@ -74,8 +76,8 @@ var Blur = class Blur {
+                 brightness: blur_brightness * 0.01,
+                 sigma: blur_strength * themeContext.scale_factor,
+             });
+-        } 
+-    
++        }
++        blurEnabled = true;
+     }
+ 
+     set_blur_strength(value) {
+@@ -119,6 +121,8 @@ var Blur = class Blur {
+     }
+ 
+     _disable() {
++        if (blurEnabled == false) // nothing to do, don't clash without other extensions that do the same
++            return;
+         log("_lockscreen_blur_disable() called");
+         if (blurMode == 1) {
+             UnlockDialog.prototype._createBackground = _createBackground;
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-33.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-34.ebuild
index c31bdf512404..a1b25a62c8c3 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-33.ebuild
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-34.ebuild
@@ -24,6 +24,11 @@ BDEPEND=""
 S="${WORKDIR}/bing-wallpaper-gnome-extension-${PV}"
 extension_uuid="BingWallpaper@ineffable-gmail.com"
 
+PATCHES=(
+	# https://github.com/neffo/bing-wallpaper-gnome-extension/issues/113
+	"${FILESDIR}/${P}-blur-enable-check.patch"
+)
+
 src_install() {
 	einstalldocs
 	rm -f README.md LICENSE || die
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index dbc6a3661969..ed8718788edf 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,7 +1,9 @@
 AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e124561143b577413090e16c7ad0c8cbb66911b079ae5844da9cf04e0197aab15fc4f746d3020ab7d4e6756b8a35befa773967c223d29289e13c6b3ffd70234 SHA512 8c176972ff10e87e957cfdda23e86a3e434dc050e8a954e7c2257942301daa5aa7c5b788188768f13c5b009d842fca8b14819a255a6a561dac8fa60e355ec211
 DIST gnome-shell-extension-dash-to-panel-42.tar.gz 21140972 BLAKE2B a4f6dc7a3770753f37cabb6c165f51a455a34456de5fe15cbfde1b3018f4aee32cdc6876286bb6e6671430f18f14f7fb370d2059fe6032d85d93b0adacdb9f48 SHA512 7746098395513cd2b94166358d2315e581248a2ad35dfa0ee685386633a95aed0897cea17335e73c22cdd81a68900de7718ed34e262614358706e560bbdc3bf8
+DIST gnome-shell-extension-dash-to-panel-43.tar.gz 21140181 BLAKE2B cfac79409ae5415bf371b1f45ef1e55bb4d06a8613ef0b0ff481a231edf33ebd44d1dcd9b37dd0bbe78791ea39e66aa914a6741dd5150e9f4eb55ad2b56478eb SHA512 41b2b3553bc75f82c868ee69a411ad3f82f456cde1cfc06792bb602c9fd95e78c9538aecd58752a3500e9aad2e98e17176c2d754da6c77eb3cc453cd0c3b235c
 DIST gnome-shell-extension-dash-to-panel-43_pre20210510.tar.gz 21139555 BLAKE2B 2edd8dc8e16be6186791f7915f75f50abf355455ae54eadf0c9c45bca7b39f035b427027fa06485a004efc07dae37089268e244a911d39d42914619c36e13ced SHA512 db41b1d714a339b24c956805b14484c3be3572b1077c5b5b2f7a91d880a8784e1f02a024d515d40dcc1e65fa2ef60682d029ff6e6891aa2db687382b2b92dfbf
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gnome-shell-extension-dash-to-panel-42.ebuild 1828 BLAKE2B 09db667d779d1911c1823db8d0fca16f2e9cd7e4830f9ba4a08707783379415444d073924a85f05f391e75d29e6aaa8ebdbd1984c12637e4cbd0164b12a853b1 SHA512 117aec5ea76083a1781013b937029db0434ac92187e0ac05480a35451a83b00b439b636b686b9c005e901a21593fc25d6aacbac3dabef514124ef68837c9ee5d
+EBUILD gnome-shell-extension-dash-to-panel-43.ebuild 1826 BLAKE2B 74983a08cebe9d851c5e8aff37fd267fd747bdab7001b8884f4dc2257532e222ed848b0355346831477ba487cf37a7837504ca29d647d83792292f0275838d43 SHA512 7ad3c7fa27e2b460ef8f5875471bfa919393971144eb9580c2258dfa0daae4f8680917e15184879eb8402757fb5fe1002bcae3d5d2ac6316b62e2f928cc664cc
 EBUILD gnome-shell-extension-dash-to-panel-43_pre20210510.ebuild 1878 BLAKE2B 5115c3ef3a915854bfb10d6f457d93cc0aeb0179cb11b2058ed2fd7a269cb2559112b0a7efb51d62ae25d0ff2e3e45f952f00ec9192c7bce0fb7aa1770d475e1 SHA512 36a96d7184040ef05f2795ed5be04b626ce79039bdf8a4fe3902a9a588074dcbe24743b599e699c9c78aa12d5f5652b73d04c8085decdb5ffa0884f4305f057d
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-43.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-43.ebuild
new file mode 100644
index 000000000000..1b9a36754932
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-43.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+MY_PN="${PN/gnome-shell-extension-/}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="An icon taskbar for the Gnome Shell"
+HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
+SRC_URI="
+	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="branding"
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-40
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+S="${WORKDIR}/${MY_P}"
+extension_uuid="dash-to-panel@jderose9.github.com"
+
+src_prepare() {
+	default
+
+	# Set correct version
+	export VERSION="${PV}"
+
+	# Don't install README and COPYING in unwanted locations
+	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
+
+	# Provide fancy Gentoo icon when requested
+	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
+}
+
+src_install() {
+	default
+	if use branding; then
+		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
+		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
+	fi
+
+	# Install schemas system-wide
+	dodir /usr/share/glib-2.0/schemas
+	mv "${ED}/usr/share/gnome-shell/extensions/${extension_uuid}"/schemas/ "${ED}/usr/share/glib-2.0" || die
+	rm "${ED}/usr/share/glib-2.0/schemas/gschemas.compiled" || die
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}