diff options
-rw-r--r-- | recipes/matchbox2/matchbox-desktop-2/fallback-folder.patch | 15 | ||||
-rw-r--r-- | recipes/matchbox2/matchbox-desktop-2_svn.bb | 8 |
2 files changed, 19 insertions, 4 deletions
diff --git a/recipes/matchbox2/matchbox-desktop-2/fallback-folder.patch b/recipes/matchbox2/matchbox-desktop-2/fallback-folder.patch new file mode 100644 index 0000000000..2d3b9f9a57 --- /dev/null +++ b/recipes/matchbox2/matchbox-desktop-2/fallback-folder.patch @@ -0,0 +1,15 @@ +matchbox-desktop-2 wants "meta-fallback", but matchbox-common-0.9.x +defines "fallback" and there is no matchbox-common-2. +Index: libtaku/taku-menu-desktop.c +=================================================================== +--- libtaku/taku-menu-desktop.c (revision 2096) ++++ libtaku/taku-menu-desktop.c (working copy) +@@ -239,7 +239,7 @@ + /* Find a fallback category */ + if (priv->fallback_category == NULL) + for (l = matches; *l; l++) +- if (strcmp (*l, "meta-fallback") == 0) ++ if (strcmp (*l, "fallback") == 0) + priv->fallback_category = category; + + done: diff --git a/recipes/matchbox2/matchbox-desktop-2_svn.bb b/recipes/matchbox2/matchbox-desktop-2_svn.bb index 21581e911b..f0261f9ea1 100644 --- a/recipes/matchbox2/matchbox-desktop-2_svn.bb +++ b/recipes/matchbox2/matchbox-desktop-2_svn.bb @@ -4,13 +4,13 @@ SECTION = "x11/panels" DEPENDS = "gtk+ startup-notification" RDEPENDS = "matchbox-common" PV = "2.0+svnr${SRCREV}" -PR = "r0" +PR = "r1" inherit autotools_stage pkgconfig -SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" +SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ + file://fallback-folder.patch;patch=1;pnum=0 \ +" S = "${WORKDIR}/${PN}" -#PARALLEL_MAKE = "" - EXTRA_OECONF = "--program-transform-name='s/$/-2/'" |