menu-cache: update to 1.0.0

menu-cache depends on fmlib-extra and thus requires the split
of the libfm recipe in version 1.2.3.

This obsoletes Fix-segfault.patch.

menu-cache license has been changed by the authors from GPL to LGPL:
http://git.lxde.org/gitweb/?p=lxde/menu-cache.git;a=commit;h=7972913d8e47e4970b9aa70267cb87fe7eb3a8b4
http://git.lxde.org/gitweb/?p=lxde/menu-cache.git;a=commit;h=08fe520c52a79d425504ba631afbea5fd62cc735

(From OE-Core rev: a356da6094982cc76b4e742e17e556094fb3e38a)

Signed-off-by: Max Krummenacher <max.oss.09@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Max Krummenacher 2015-01-07 23:29:56 +01:00 committed by Richard Purdie
parent 6450281c6b
commit bb21377878
3 changed files with 16 additions and 52 deletions

View File

@ -1,31 +0,0 @@
From a497ea6aae3994b7f6527ef7599dd95baf2ad841 Mon Sep 17 00:00:00 2001
From: Laurentiu Palcu <laurentiu.palcu@intel.com>
Date: Mon, 29 Apr 2013 12:04:20 +0300
Subject: [PATCH] Fix segfault
Apparently, g_io_channel_unref() was called twice: once in the
menu-cache's on_client_closed() callback and once from the finalize
function, g_io_unix_finalize()/g_io_win32_finalize(), which is called
anyway when the source is removed.
Upstream-Status: Pending
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
menu-cache-daemon/menu-cached.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/menu-cache-daemon/menu-cached.c b/menu-cache-daemon/menu-cached.c
index e246bb4..a10b6db 100644
--- a/menu-cache-daemon/menu-cached.c
+++ b/menu-cache-daemon/menu-cached.c
@@ -579,7 +579,6 @@ static void on_client_closed(gpointer user_data)
}
}
/* DEBUG("client closed"); */
- g_io_channel_unref(ch);
}
static gboolean on_client_data_in(GIOChannel* ch, GIOCondition cond, gpointer user_data)
--
1.7.9.5

View File

@ -1,21 +0,0 @@
SUMMARY = "Library for caching application menus"
DESCRIPTION = "A library creating and utilizing caches to speed up freedesktop.org application menus"
HOMEPAGE = "http://lxde.sourceforge.net/"
LICENSE = "GPLv2 & GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://libmenu-cache/menu-cache.h;endline=29;md5=26571532593adb17a37eac396260532c \
file://menu-cache-daemon/menu-cached.c;endline=22;md5=fcecb7d315c57ef804103fa9cdab7111"
SECTION = "x11/libs"
DEPENDS = "glib-2.0 zlib"
SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz \
file://Fix-segfault.patch \
"
SRC_URI[md5sum] = "20fed982f5d8e6ec8a56a5b48894ecf0"
SRC_URI[sha256sum] = "4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e"
inherit autotools pkgconfig gtk-doc

View File

@ -0,0 +1,16 @@
SUMMARY = "Library for caching application menus"
DESCRIPTION = "A library creating and utilizing caches to speed up freedesktop.org application menus"
HOMEPAGE = "http://lxde.sourceforge.net/"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=0964c689fcf4c21c6797ea87408416b6"
SECTION = "x11/libs"
DEPENDS = "glib-2.0 intltool-native libfm-extra"
SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.xz"
SRC_URI[md5sum] = "4a8e6c1a86d5e64ec725d850a4abfbad"
SRC_URI[sha256sum] = "ff7df437bbfd3119c5f662c6d209b98f15de03a7203308c6b56a4c1e1d419aaf"
inherit autotools gettext pkgconfig gtk-doc