From a9bae3ef6bd429ef123b36652bb9cab9dd46f067 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Thu, 16 Feb 2006 20:54:39 +0000 Subject: matchbox-desktop: add patch to allow vfolders to match against multiple categories - a vfolder can now contain something like Match=AudioVideo;Graphics;Media;Viewer; --- .../matchbox-desktop-0.9.1/.mtn2git_empty | 0 .../mb-desktop-multi-category-matching.patch | 39 ++++++++++++++++++++++ .../matchbox-desktop/matchbox-desktop_0.9.1.bb | 4 ++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty create mode 100644 packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch (limited to 'packages/matchbox-desktop') diff --git a/packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty b/packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch b/packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch new file mode 100644 index 0000000000..e4c245e5f0 --- /dev/null +++ b/packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch @@ -0,0 +1,39 @@ +--- matchbox-desktop-0.9.1/modules/dotdesktop.c.orig 2006-02-15 23:08:31.000000000 +0100 ++++ matchbox-desktop-0.9.1/modules/dotdesktop.c 2006-02-16 00:31:46.000000000 +0100 +@@ -84,9 +84,33 @@ + item_fallback = item; + continue; + } +- if (category && strstr(category, match_str)) +- { +- return item; ++ if (category) ++ { ++ if (strstr(match_str, ";")) ++ { ++ char *s; ++ ++ while (s = strstr(match_str, ";")) ++ { ++ size_t len = s - match_str; ++ char *tok = (char *) malloc (sizeof (char) * (len + 1)); ++ ++ strncpy (tok, match_str, len); ++ tok[len] = 0; ++ if (strstr (category, tok)) ++ { ++ free (tok); ++ return item; ++ } ++ match_str = s + 1; ++ ++ free (tok); ++ } ++ } ++ else if (strstr(category, match_str)) ++ { ++ return item; ++ } + } + } + } diff --git a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb index 5b1e472de7..5e9748c4d9 100644 --- a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb +++ b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb @@ -2,8 +2,10 @@ DESCRIPTION = "Matchbox Window Manager Desktop" LICENSE = "GPL" DEPENDS = "libmatchbox startup-notification" SECTION = "x11/wm" +PR = "r1" -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2" +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \ + file://mb-desktop-multi-category-matching.patch;patch=1" EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" -- cgit v1.2.3