From f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Sep 2020 17:27:54 +0100 Subject: gentoo resync : 30.09.2020 --- xfce-base/xfdesktop/Manifest | 3 +- .../xfdesktop/files/xfdesktop-4.14.2-memleak.patch | 37 +++++++++++++++ xfce-base/xfdesktop/xfdesktop-4.14.2-r1.ebuild | 54 ++++++++++++++++++++++ xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild | 50 -------------------- 4 files changed, 93 insertions(+), 51 deletions(-) create mode 100644 xfce-base/xfdesktop/files/xfdesktop-4.14.2-memleak.patch create mode 100644 xfce-base/xfdesktop/xfdesktop-4.14.2-r1.ebuild delete mode 100644 xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild (limited to 'xfce-base/xfdesktop') 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-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.14.2-r1.ebuild new file mode 100644 index 000000000000..36257356e8ca --- /dev/null +++ b/xfce-base/xfdesktop/xfdesktop-4.14.2-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit xdg-utils + +DESCRIPTION="Desktop manager for the Xfce desktop environment" +HOMEPAGE="https://www.xfce.org/projects/" +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" +IUSE="debug libnotify +thunar" + +RDEPEND=">=x11-libs/cairo-1.12 + >=dev-libs/glib-2.42 + >=x11-libs/gtk+-3.22:3 + >=x11-libs/libwnck-3.14:3 + x11-libs/libX11 + >=xfce-base/exo-0.11:= + >=xfce-base/garcon-0.6:= + >=xfce-base/libxfce4ui-4.13:= + >=xfce-base/libxfce4util-4.13:= + >=xfce-base/xfconf-4.12.1:= + libnotify? ( >=x11-libs/libnotify-0.7:= ) + thunar? ( >=xfce-base/thunar-1.7:= )" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-memleak.patch +) + +src_configure() { + local myconf=( + $(use_enable thunar file-icons) + $(use_enable thunar thunarx) + $(use_enable libnotify notifications) + ) + + econf "${myconf[@]}" +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild deleted file mode 100644 index 64d22d2e74d8..000000000000 --- a/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg-utils - -DESCRIPTION="Desktop manager for the Xfce desktop environment" -HOMEPAGE="https://www.xfce.org/projects/" -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" -IUSE="debug libnotify +thunar" - -RDEPEND=">=x11-libs/cairo-1.12 - >=dev-libs/glib-2.42 - >=x11-libs/gtk+-3.22:3 - >=x11-libs/libwnck-3.14:3 - x11-libs/libX11 - >=xfce-base/exo-0.11:= - >=xfce-base/garcon-0.6:= - >=xfce-base/libxfce4ui-4.13:= - >=xfce-base/libxfce4util-4.13:= - >=xfce-base/xfconf-4.12.1:= - libnotify? ( >=x11-libs/libnotify-0.7:= ) - thunar? ( >=xfce-base/thunar-1.7:= )" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -src_configure() { - local myconf=( - $(use_enable thunar file-icons) - $(use_enable thunar thunarx) - $(use_enable libnotify notifications) - ) - - econf "${myconf[@]}" -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} -- cgit v1.2.3