gentoo resync : 20.03.2021

3 files changed, 76 insertions, 0 deletions

diff --git a/lxde-base/menu-cache/Manifest b/lxde-base/menu-cache/Manifest
index 855e27f616bc..5c0959a2483b 100644
--- a/lxde-base/menu-cache/Manifest
+++ b/lxde-base/menu-cache/Manifest
@@ -1,4 +1,6 @@
 AUX menu-cache-1.1.0-fno-common.diff 2591 BLAKE2B 3e48e23596e1b633cd195700828848754ec1ea498099e3489614642110768d4805af0e53fdbc9c128376dec7f8b366b206fb0fc54656914684b824c245a44933 SHA512 cc740568441296da46cc3382f4e29ab50d677c3900127e4d13652491f6dc1f3473e945f2d05afe756ac0308e26d469c7bdb519040ad886b5bc467e6883f995f1
+AUX menu-cache-1.1.0-memleak.patch 1185 BLAKE2B af0ca2b3ece0bb765192295b561778d883a91500f74bbd6721fc2346a194bc4832e7120983a292879c493afb8822d219bbb22f96ed6f0912e4f631240999b89e SHA512 7c65382ac0c90e4eab452d8cf04967abec2da6a8fcceb34d77540d24ad3d70ff5c523210c2336b34c157faa44de90c5b4311b4b956759dca68dba2615d93e753
 DIST menu-cache-1.1.0.tar.xz 265524 BLAKE2B af7caea53a30be53836ccb7d75b0817aef610815009f22dc56fb6d412508ce27a6a5625c25f92faaafe8123dd73ddb2b3f83484e48c1b5deb635c9d630cc868c SHA512 e4c6619ade7b9a1b97c1366bb94dffb9975be5664b193cf0c69cf9470ef7ae19bda3390d04d98ee9a5b1658ec48aa5c83508c26c347af689161ee67c076b3c9e
+EBUILD menu-cache-1.1.0-r1.ebuild 786 BLAKE2B 4f3bb20e38bd8d8dd6c16b1c4730628dedfc22ff2032f17a7fdd73fb9ed605ba4b0120a1607c6317dc46c918d6454e0e445cd52c32a876ea0d3af5d72d998262 SHA512 88ca314e21d2268c2f073c74ad8a3237f55c114d2f90ada032802387ed472d5b0af8f7c2661a0f09b934bd8f8c12312a3e52c2d54828d8594607abb0c09c64b2
 EBUILD menu-cache-1.1.0.ebuild 705 BLAKE2B 7a853e20f267223f9a5f3c0ff8dbd0cec87bc578833620d0da8c67300f185d7512916286d7abca89ef0cda338fa8e845cd01ee844d8e9b08682df39a93f0e903 SHA512 9313c2765c7ebf260f3c1c3480f70718a3c4fae63bda870d433b3e63ad8d0991d44935796c11b7a8810335e31a3b67974610506f05649147d8b9093a538fc23a
 MISC metadata.xml 320 BLAKE2B ff914db078fa5bfac7bc5184362f6a8c211945f0c1e0286fb3d7ba4da205c108678206272559fe5f5217380ed867a309c8e920c0d4a0cd5773e0b4d8ff9466c5 SHA512 b5a290c4ae3492e59e38159a1ad9aaae97abaad29ae07936db417f85b5a002f6d325d2b769a9222880b3235ed2bec0e3f59f930a9e2ea49fe4c2094549e84060
diff --git a/lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch b/lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch
new file mode 100644
index 000000000000..faa91fff3e92
--- /dev/null
+++ b/lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch
@@ -0,0 +1,37 @@
+From 97e5de8682c0c44fe4e6a2df864c5fdf76cd77cc Mon Sep 17 00:00:00 2001
+From: Palo Kisa <palo.kisa@gmail.com>
+Date: Thu, 30 Nov 2017 11:36:18 +0100
+Subject: [PATCH] libmenu-cache: Fix memory leaks
+
+---
+ libmenu-cache/menu-cache.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libmenu-cache/menu-cache.c b/libmenu-cache/menu-cache.c
+index 5025d72..273b503 100644
+--- a/libmenu-cache/menu-cache.c
++++ b/libmenu-cache/menu-cache.c
+@@ -379,11 +379,15 @@ static MenuCacheItem* read_item(GDataInputStream* f, MenuCache* cache,
+             else /* separator */
+             {
+                 item->type = MENU_CACHE_TYPE_SEP;
++                g_free(line);
+                 return item;
+             }
+         }
+         else
++        {
++            g_free(line);
+             return NULL;
++        }
+ 
+         item->id = g_strndup( line + 1, len - 1 );
+         g_free(line);
+@@ -923,6 +927,7 @@ gboolean menu_cache_item_unref(MenuCacheItem* item)
+         else
+         {
+             MenuCacheApp* app = MENU_CACHE_APP(item);
++            g_free(app->generic_name);
+             g_free( app->exec );
+             g_free(app->try_exec);
+             g_free(app->working_dir);
diff --git a/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..a7684ccc41df
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus"
+HOMEPAGE="https://lxde.org/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2" # ABI is v2. See Makefile.am
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/libfm-extra
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.diff # upstream PR#19
+	"${FILESDIR}"/${P}-memleak.patch # git master
+)
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}