diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-04-01 21:59:44 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-04-01 21:59:44 +0000 |
| commit | 476e3ca683aa352acf1bc4b4eb5affb7f437ef27 (patch) | |
| tree | f1284b72726bd0db6a06ed75a9e0bfca3c058a10 | |
| parent | 7870e6d52d38140b0789176e98aa658f8e52ed5a (diff) | |
| parent | cfe6c7d0e4cfe1f5281d684e7cf64ce51e7363bc (diff) | |
merge of '15e084fa8118e1a49559b4193f626d0c5ad7cce0'
and '80791bbfbbfd682c0e16ebb739bfb7041451a1c1'
| -rw-r--r-- | packages/libmrss/files/fix-memleaks.patch | 17 | ||||
| -rw-r--r-- | packages/libmrss/libmrss_0.17.bb | 2 | ||||
| -rw-r--r-- | packages/openmoko-base/openmoko-session_svn.bb | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/packages/libmrss/files/fix-memleaks.patch b/packages/libmrss/files/fix-memleaks.patch new file mode 100644 index 0000000000..c88570c72e --- /dev/null +++ b/packages/libmrss/files/fix-memleaks.patch @@ -0,0 +1,17 @@ +Index: libmrss-0.17/src/mrss_parser.c +=================================================================== +--- libmrss-0.17.orig/src/mrss_parser.c 2007-04-01 22:23:22.000000000 +0200 ++++ libmrss-0.17/src/mrss_parser.c 2007-04-01 22:23:42.000000000 +0200 +@@ -186,10 +186,10 @@ + cat->allocated = 1; + cat->category = c; + +- if (!(c = nxmle_find_attribute (cur, "scheme", NULL))) ++ if (c = nxmle_find_attribute (cur, "scheme", NULL)) + cat->domain = c; + +- if (!(c = nxmle_find_attribute (cur, "label", NULL))) ++ if (c = nxmle_find_attribute (cur, "label", NULL)) + cat->label = c; + + if (!*category) diff --git a/packages/libmrss/libmrss_0.17.bb b/packages/libmrss/libmrss_0.17.bb index 4d03985f9e..0d23a2b54f 100644 --- a/packages/libmrss/libmrss_0.17.bb +++ b/packages/libmrss/libmrss_0.17.bb @@ -3,12 +3,14 @@ LICENSE = "LGPL" HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php" DEPENDS = "libnxml curl" +PR = "r1" inherit autotools pkgconfig SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \ file://atom-changes.patch;patch=1 \ file://fix_atom_date_locale.patch;patch=1 \ + file://fix-memleaks.patch;patch=1 \ file://bump-version.patch;patch=1 " do_stage() { diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index c352cb7d91..6daacb2842 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" -RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" +RDEPENDS = "matchbox-panel-2 matchbox-wm gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r8" +PR = "r9" inherit openmoko-base |