gentoo resync : 17.06.2021

3 files changed, 57 insertions, 2 deletions

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