gentoo resync : 30.09.2020

6 files changed, 45 insertions, 3 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index bb1394a507c6..c33255a63d49 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 49f726e1b056..1bea51064995 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,5 +1,6 @@
+AUX xfdesktop-4.14.2-memleak.patch 1166 BLAKE2B a034bfcadfa9156fc2a204f838df999641d8fb8230e6a0a7e3fc99ddfd4511bb9360b8e6c4f4ada79e3db7dd0525cca3a17d004c96877a1aa72e770f9b309bcd SHA512 e0dd39ea9c691f8bdfa2ff5b0bff19ce0170e4e39cef24010d46f15d7ff00a9e0f4cacd2e21fe9c7c9e91b47601d923ac5aeeaf7e396c8b05843068a2c292c1a
 DIST xfdesktop-4.14.2.tar.bz2 1513121 BLAKE2B afe5dad03ed4d084bd7578074f91fbc8dc121bf67b8f4793ca5c6abb67dea4f61cfa484404d79d14cf2abf64227cee883bc8f36af05802071f5b9f79300704d4 SHA512 8515fc1c048da50c8c2986ea8590144203fdf3107b81e2d2dd44ee408938fb71281abe52cc098508dc2ae20ef2cbc31903086941206c0cbbc92a661dbfb2c472
 DIST xfdesktop-4.15.0.tar.bz2 1509639 BLAKE2B fe63ba8731095622e8b5701c30a5cc786c1b8cc7bff5cb66cc477281198749887879f001fdc4652d86d01765543d4474ce52170d318af6e43124a7d7208f97ee SHA512 cb5266ab7edc5a068756ec30a3fd92af50150c3523575e2c727fc8d7eb8660259e6e8c5d59d7bc02ec85b052f779e332dcea55414fcc706f608b1eea8242897a
-EBUILD xfdesktop-4.14.2.ebuild 1154 BLAKE2B 065908ca5d908a837bdd3edf753c0f8b2bd59ea51e4aeca51e68fa06e52dde8246c6af97c225f15c4a3aed95ce4ab45bb5884b19e83518744f5888ff6af65693 SHA512 01d3302fc5927bb6ca7ead4d47ba2ded68856d56500d68a3ebc41c85cd7d569bc6695c40b0e1386e07940ac176c6f5e9e07c032f5f21e98e38dd1db6180f4517
+EBUILD xfdesktop-4.14.2-r1.ebuild 1201 BLAKE2B 2d1ec83ca3a96374e44133acccafdb17f9ae4372ef9293c507108113ee5cea782996a4f2bc0943bb0b647fdea6f04df7d69f7a121c4c213b0a9b1b0274a129dc SHA512 38856d3e4c36db25532cc03af3ce4b5fdcb7f18996c71d1f155a966b194ac879bce1b21aab87d5d660fdcec06aec7df1d31b97451c112ac72eefd53c6ff474fc
 EBUILD xfdesktop-4.15.0.ebuild 1159 BLAKE2B c700d0cee41fd788ac2809efae9f9c77942926542565540ca2e7be2b800eaef88bd449b32e3f2f3c9b52a12d636556f73ae79d38844ec7b0ce4c830dded65e60 SHA512 b1a33f3af5644294c1f5f6265ae939d3ac29424cc9678576b2eec1076fbdaff577a961e26cf0dd0a6be4332afa1b0e4579ebcb42e8f165bb7cc827a0a8d02563
 MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.14.2-memleak.patch b/xfce-base/xfdesktop/files/xfdesktop-4.14.2-memleak.patch
new file mode 100644
index 000000000000..e99167cb91af
--- /dev/null
+++ b/xfce-base/xfdesktop/files/xfdesktop-4.14.2-memleak.patch
@@ -0,0 +1,37 @@
+From bd6cd3ce62057370a9e7c6699e52385f479e3390 Mon Sep 17 00:00:00 2001
+From: Jan Ziak <0xe2.0x9a.0x9b@gmail.com>
+Date: Sat, 11 Apr 2020 15:43:55 +0200
+Subject: Fix memory leak when reconnecting DP monitor (Bug #16314)
+
+Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b@gmail.com>
+---
+ src/xfce-backdrop.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/xfce-backdrop.c b/src/xfce-backdrop.c
+index bd9180e6..955e51f8 100644
+--- a/src/xfce-backdrop.c
++++ b/src/xfce-backdrop.c
+@@ -1599,6 +1599,11 @@ xfce_backdrop_image_data_release(XfceBackdropImageData *image_data)
+ 
+     if(image_data->loader)
+         g_object_unref(image_data->loader);
++
++    if(image_data->backdrop) {
++        g_object_unref(image_data->backdrop);
++        image_data->backdrop = NULL;
++    }
+ }
+ 
+ /**
+@@ -1671,6 +1676,7 @@ xfce_backdrop_generate_async(XfceBackdrop *backdrop)
+     backdrop->priv->image_data = image_data;
+ 
+     image_data->backdrop = backdrop;
++    g_object_ref(backdrop);
+     image_data->loader = gdk_pixbuf_loader_new();
+     image_data->cancellable = g_cancellable_new();
+     image_data->image_buffer = g_new0(guchar, XFCE_BACKDROP_BUFFER_SIZE);
+-- 
+cgit v1.2.3
+
diff --git a/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.14.2-r1.ebuild
index 64d22d2e74d8..36257356e8ca 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.14.2-r1.ebuild
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-memleak.patch
+)
+
 src_configure() {
 	local myconf=(
 		$(use_enable thunar file-icons)
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 876f67bafa77..3d62d5d163f0 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -2,6 +2,6 @@ DIST xfwm4-4.14.2.tar.bz2 1158799 BLAKE2B 87270997688a44e1476935f2158842999befeb
 DIST xfwm4-4.14.5.tar.bz2 1165140 BLAKE2B 3f598b5cb8ce58a8aa4a4c82e53a5b02a870e26ddd0487796aeab86695c5dc6bc132daac32630dc109ec12dd10dab370a91c00dfbdf1109815cf5a9ae82fc88b SHA512 d2b5b198f3ffa91b0b07d5258f5f14f45e431fd7d992143bf9fc381f647ea0ee47ae447122ef8c7a40606c08955f83975fcff94b6f7ceb331a0a8681b57050fd
 DIST xfwm4-4.15.1.tar.bz2 1179671 BLAKE2B c358f8050dd6fcc356c2d300dab959dbfb5f452484e0998b25755aa6c6dd1783ca117ba43f44e18a9555542a1794000a768765a5b98e1e381367260df1d503ba SHA512 ae4cea9da4bc852aa3ce19039b66cc05f7c7cabe07637837bf1a51c37b6c9536a46b6af85e9402c33578e8da305b28bac23792afa080076e625a7df9f769935c
 EBUILD xfwm4-4.14.2.ebuild 1639 BLAKE2B 9ce4b689b7edbfc708a47fe45f3fa7aad4e5f65b148045edfd1ccc560d40a13e7f1294db936b93fd0759dda92a022662e0215ca4d319a63e088a693e857514c8 SHA512 81c8a383599a5f1c0ca0e39ff4e1e2bc3e785b0b5c553746cb268d4150d7070d42ff7836abdd6a575260c2517180e2594b61d8f5a343e54f19a9321d09bbd692
-EBUILD xfwm4-4.14.5.ebuild 1658 BLAKE2B 11be3def54db50e845e7f3ef73aae63042402a31ff78feb40103a1208cf113845739cbfc418f5cf4022307fdb52f7db79186c25c9b6c0004c2a72cee5d7fad19 SHA512 500567714d51d6fb68f78b13a1ed305060ccc1cc1a5a2c62dde6a7c2b2a66080d162cb4c4a8a3d1a54743bf272b1ed6aa317af35151f2dda383a76ccad170535
+EBUILD xfwm4-4.14.5.ebuild 1657 BLAKE2B 1ab8099643ce1df13fdceb9e9392a41cdd4702fe5988f3aed77ab1d458dac95c2fe1349eae47a931b978813f7d943a4e5862578aa7419feae72efe46ac2294ec SHA512 91ef2257a1f57051692291375bc0dbb280e27a886fb92d0d8bbdd5e916f47b7708c2dc0e852f7c4370550cba31b7cf20cccaabca50d1935ff05a23a04b2b2e24
 EBUILD xfwm4-4.15.1.ebuild 1662 BLAKE2B 454431488c93296760ea36e53c3e8a9135244b4146b861b354067e8dceb7debf0dc183dae67cd787dc2d563db88871ea45fc1317700e778cffc360426c01c9f8 SHA512 e6d3f2d2cad1273db7c2c129b67218603b22fdbdf8e331b7770ca60c3c4f62ee124d15143af15c304bdc33b384d24f206d9a0e7ef9e1f6c3694adb48538c9c48
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/xfwm4-4.14.5.ebuild b/xfce-base/xfwm4/xfwm4-4.14.5.ebuild
index f642f5ec43ab..58a16b960ecc 100644
--- a/xfce-base/xfwm4/xfwm4-4.14.5.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.14.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="opengl startup-notification +xcomposite +xpresent"
 
 RDEPEND=">=dev-libs/glib-2.20