commit menu-cache for openSUSE:Factory

Hello community, here is the log from the commit of package menu-cache for openSUSE:Factory checked in at 2015-11-22 10:59:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/menu-cache (Old) and /work/SRC/openSUSE:Factory/.menu-cache.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "menu-cache" Changes: -------- --- /work/SRC/openSUSE:Factory/menu-cache/menu-cache.changes 2014-10-24 10:48:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.menu-cache.new/menu-cache.changes 2015-11-22 10:59:56.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Oct 31 11:47:39 UTC 2015 - trcs@gmx.com + +- Added menu-cache-1.0.0-Fix-crash-on-generating-menu.patch + * Fix crash on generating menu with both tags <DefaultAppDirs/> + and <KDELegacyDirs/> present +- Added menu-cache-1.0.0-Fix-crash-CACHE_GEN_VERSION.patch + * Fix crash when menu-cache-gen ran manually without + CACHE_GEN_VERSION + +------------------------------------------------------------------- New: ---- menu-cache-1.0.0-Fix-crash-CACHE_GEN_VERSION.patch menu-cache-1.0.0-Fix-crash-on-generating-menu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ menu-cache.spec ++++++ --- /var/tmp/diff_new_pack.ifEFBc/_old 2015-11-22 10:59:57.000000000 +0100 +++ /var/tmp/diff_new_pack.ifEFBc/_new 2015-11-22 10:59:57.000000000 +0100 @@ -24,6 +24,10 @@ Group: System/GUI/LXDE Url: http://www.lxde.org Source0: %{name}-%{version}.tar.xz +# [PATCH] Fix crash on generating menu with both tags <DefaultAppDirs/> and <KDELegacyDirs/> present +Patch0: menu-cache-1.0.0-Fix-crash-on-generating-menu.patch +# [PATCH] Fix crash when menu-cache-gen ran manually without CACHE_GEN_VERSION +Patch1: menu-cache-1.0.0-Fix-crash-CACHE_GEN_VERSION.patch BuildRequires: fdupes BuildRequires: gtk-doc BuildRequires: gtk2-devel @@ -57,6 +61,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build export CFLAGS="%{optflags}" ++++++ menu-cache-1.0.0-Fix-crash-CACHE_GEN_VERSION.patch ++++++

From 2097b14e2fbcf33f2fe0bb0e93829ccb1e04ae64 Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko Date: Tue, 4 Nov 2014 14:07:59 +0200 Subject: [PATCH] Fix crash when menu-cache-gen ran manually without CACHE_GEN_VERSION.

--- NEWS | 3 +++ menu-cache-gen/menu-compose.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index c59b308..20324c2 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,9 @@ * Fixed crash on generating menu with both tags <DefaultAppDirs/> and <KDELegacyDirs/> present. +* Fixed crash when menu-cache-gen ran manually without CACHE_GEN_VERSION. + + Changes in 1.0.0 since 0.7.0: * Added new cache file format generation support with changes: diff --git a/menu-cache-gen/menu-compose.c b/menu-cache-gen/menu-compose.c index b89804d..0be7e24 100644 --- a/menu-cache-gen/menu-compose.c +++ b/menu-cache-gen/menu-compose.c @@ -1023,7 +1023,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char *menuname, const char *fil gboolean ok = FALSE; tmp = (char *)g_getenv("CACHE_GEN_VERSION"); - if (sscanf(tmp, "%d.%u", &i, &req_version) == 2) + if (tmp && sscanf(tmp, "%d.%u", &i, &req_version) == 2) { if (i != VER_MAJOR) /* unsupported format requested */ return FALSE; -- 2.1.4 ++++++ menu-cache-1.0.0-Fix-crash-on-generating-menu.patch ++++++

From 4c0c1e94514de4147fd0683ca3d0380011a2a230 Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko Date: Tue, 4 Nov 2014 01:08:29 +0200 Subject: [PATCH] Fix crash on generating menu with both tags <DefaultAppDirs/> and <KDELegacyDirs/> present.

--- NEWS | 3 +++ menu-cache-gen/menu-merge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a89bd86..c59b308 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +* Fixed crash on generating menu with both tags <DefaultAppDirs/> and + <KDELegacyDirs/> present. + Changes in 1.0.0 since 0.7.0: * Added new cache file format generation support with changes: diff --git a/menu-cache-gen/menu-merge.c b/menu-cache-gen/menu-merge.c index db3c32b..68c44f7 100644 --- a/menu-cache-gen/menu-merge.c +++ b/menu-cache-gen/menu-merge.c @@ -1355,7 +1355,7 @@ restart: g_free(merged); /* destroy all KDELegacyDirs */ for (l = children; l; l = l->next) - if (fm_xml_file_item_get_tag(l->data) == menuTag_KDELegacyDirs) + if (l->data && fm_xml_file_item_get_tag(l->data) == menuTag_KDELegacyDirs) { fm_xml_file_item_destroy(l->data); l->data = NULL; -- 2.1.4