[PATCH 1/2] matchbox-panel: bump SRCREV for linkage fixes

[PATCH 1/2] matchbox-panel: bump SRCREV for linkage fixes

[Ross Burton]

Newer toolchains are stricter with linking.  Patches have been merged upstream
so bump the SRCREV to use them.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
index 1160b87..ba2780b 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
@@ -11,7 +11,7 @@ DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib"
 DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
 DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
 
-SRCREV = "c03234512784b78a95b5aa9ca445d05836b9d51a"
+SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae"
 PV = "2.0+git${SRCPV}"
 PR = "r0"
 
-- 
1.7.10.4

[PATCH 2/2] sato-screenshot: bump SRCREV for linkage fixes

[Ross Burton]

Newer toolchains are stricter with linking.  Patches have been merged upstream
so bump the SRCREV to use them.

fix_ldadd_order was also merged upstream, so delete it.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../sato-screenshot/files/fix_ldadd_order.patch         |   15 ---------------
 .../recipes-sato/sato-screenshot/sato-screenshot_git.bb |    5 ++---
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch

diff --git a/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch b/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
deleted file mode 100644
index 7d9689e..0000000
--- a/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix the ordering of LDADD options to fix a compilation failure.
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-Upstream-Status: Inappropriate [configuration] 
-
-diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am
---- screenshot.orig//Makefile.am	2010-06-29 11:55:00.000000000 -0700
-+++ screenshot/Makefile.am	2011-03-01 11:09:01.215813968 -0800
-@@ -23,4 +23,4 @@
- # A standalone tool for running from a terminal and scripts
- bin_PROGRAMS = screenshot
- screenshot_SOURCES = main.c
--screenshot_LDADD = $(GTK_LIBS) libshot.la
-+screenshot_LDADD = libshot.la $(GTK_LIBS)
diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
index ff92142..3bad853 100644
--- a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
+++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
@@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0"
 
 DEPENDS = "matchbox-panel-2"
-SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945"
+SRCREV = "3a9688e8a01b63a78f402b4e7c0b8b005fcdfa29"
 PV = "0.1+git${SRCPV}"
 PR = "r2"
 
-SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git \
-           file://fix_ldadd_order.patch"
+SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.10.4