diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2011-09-26 19:55:47 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:37:49 +0000 |
commit | 64ba74deff7fdefcd4a493084a834d825eb1945d (patch) | |
tree | 715a299b63c40e21b2e0d423409a7327fe361860 /meta/recipes-sato/matchbox-theme-sato | |
parent | ff047d3a77f57400ec8e0b7debee34cf4375e5a0 (diff) | |
download | poky-64ba74deff7fdefcd4a493084a834d825eb1945d.tar.gz |
matchbox: Upgrade SRCREV to reflect recent accpeted patches by upstream
(From OE-Core rev: 33a1a05ef988c69f8ff8e38c6723922082e5d1aa)
(From OE-Core rev: 1194935707f4acd9029b36769bc0320ba0a90163)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/matchbox-theme-sato')
-rw-r--r-- | meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch | 16 | ||||
-rw-r--r-- | meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb | 5 |
2 files changed, 2 insertions, 19 deletions
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch deleted file mode 100644 index d8f264fc2a..0000000000 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Background Image name was changed from background.png to template.png | ||
2 | |||
3 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Index: matchbox-sato/Sato/matchbox2/Makefile.am | ||
8 | =================================================================== | ||
9 | --- matchbox-sato.orig/Sato/matchbox2/Makefile.am 2010-12-29 13:08:43.000000000 -0800 | ||
10 | +++ matchbox-sato/Sato/matchbox2/Makefile.am 2010-12-29 22:14:45.690428881 -0800 | ||
11 | @@ -1,4 +1,4 @@ | ||
12 | -pngs = background.png | ||
13 | +pngs = template.png | ||
14 | |||
15 | themesdir = $(datadir)/themes/Sato/matchbox2 | ||
16 | themes_DATA = theme.xml $(pngs) | ||
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb index d6bfb2f8fb..3edc3a361b 100644 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb | |||
@@ -1,11 +1,10 @@ | |||
1 | require matchbox-theme-sato.inc | 1 | require matchbox-theme-sato.inc |
2 | 2 | ||
3 | DEPENDS = "matchbox-wm-2" | 3 | DEPENDS = "matchbox-wm-2" |
4 | SRCREV = "f72cf4ed7d71ad9e47b0f2d3dbc593bc2f3e76f8" | 4 | SRCREV = "e3ccc08d4a680d70fd4891fca966aa6ce503065c" |
5 | PV = "0.2+git${SRCPV}" | 5 | PV = "0.2+git${SRCPV}" |
6 | 6 | ||
7 | SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=git \ | 7 | SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=git" |
8 | file://png_rename.patch" | ||
9 | 8 | ||
10 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
11 | 10 | ||