summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-04-26 11:45:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-29 14:45:10 +0100
commitd36cc477345f99ea101703b20aa0c32251622585 (patch)
tree7d417a319b57e3fcc77bba487c4ede18db456755
parent4a3d4b8d7a6f5bb177ddd9844313e153cd860cbe (diff)
downloadpoky-d36cc477345f99ea101703b20aa0c32251622585.tar.gz
matchbox-panel-2: bump srcrev to fix compile warnings
The older versions of matchbox-panel were naively using -Werror which causes warnings with gcc 4.6 (which were patched away) and again more with gcc 4.8. I'd already fixed this upstream so bump the srvrev and drop the patch. (From OE-Core rev: ae38cac225f0d84e6acecb6bc46df939d37cd031) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/gcc-4.6.0-compile.patch53
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb7
2 files changed, 3 insertions, 57 deletions
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/gcc-4.6.0-compile.patch b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/gcc-4.6.0-compile.patch
deleted file mode 100644
index 71a4727391..0000000000
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/gcc-4.6.0-compile.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1Upstream-Status: Inappropriate [other] - need clean up
2
3diff -ur git.ORIG/applets/startup/startup.c git/applets/startup/startup.c
4--- git.ORIG/applets/startup/startup.c 2011-04-28 08:13:25.000000000 -0600
5+++ git/applets/startup/startup.c 2011-04-28 09:36:48.521990746 -0600
6@@ -210,9 +210,8 @@
7 {
8 XEvent *xevent;
9 xevent = (XEvent *) gdk_xevent;
10- gboolean ret;
11
12- ret = sn_display_process_event (applet->sn_display, xevent);
13+ sn_display_process_event (applet->sn_display, xevent);
14
15 return GDK_FILTER_CONTINUE;
16 }
17@@ -223,7 +222,6 @@
18 {
19 StartupApplet *applet;
20 Display *xdisplay;
21- SnMonitorContext *context;
22
23 /* Create applet data structure */
24 applet = g_slice_new0 (StartupApplet);
25@@ -248,7 +246,7 @@
26
27 applet->sn_display = sn_display_new (xdisplay, NULL, NULL);
28
29- context = sn_monitor_context_new (applet->sn_display,
30+ sn_monitor_context_new (applet->sn_display,
31 DefaultScreen(xdisplay),
32 monitor_event_func,
33 (void *) applet,
34diff -ur git.ORIG/applets/startup-notify/startup.c git/applets/startup-notify/startup.c
35--- git.ORIG/applets/startup-notify/startup.c 2011-04-28 08:05:46.000000000 -0600
36+++ git/applets/startup-notify/startup.c 2011-04-28 09:42:17.793864786 -0600
37@@ -305,7 +305,6 @@
38 StartupApplet *applet;
39 GtkWidget *widget;
40 Display *xdisplay;
41- SnMonitorContext *context;
42
43 applet = g_slice_new0 (StartupApplet);
44
45@@ -317,7 +316,7 @@
46
47 applet->sn_display = sn_display_new (xdisplay, NULL, NULL);
48
49- context = sn_monitor_context_new (applet->sn_display,
50+ sn_monitor_context_new (applet->sn_display,
51 DefaultScreen (xdisplay),
52 monitor_event_func,
53 applet, NULL);
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 dbe1fadf51..1160b87f47 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
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://matchbox-panel/mb-panel.h;endline=10;md5=0b7db28f4b6863fb853d0467e590019a \ 7 file://matchbox-panel/mb-panel.h;endline=10;md5=0b7db28f4b6863fb853d0467e590019a \
8 file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03" 8 file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03"
9 9
10DEPENDS = "gtk+ startup-notification dbus dbus-glib" 10DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib"
11DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" 11DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
12DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" 12DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
13 13
14SRCREV = "cdf7a22716b87468f10573f622d5c7a58a684e35" 14SRCREV = "c03234512784b78a95b5aa9ca445d05836b9d51a"
15PV = "2.0+git${SRCPV}" 15PV = "2.0+git${SRCPV}"
16PR = "r0" 16PR = "r0"
17 17
@@ -19,8 +19,7 @@ RPROVIDES_${PN} = "matchbox-panel"
19RREPLACES_${PN} = "matchbox-panel" 19RREPLACES_${PN} = "matchbox-panel"
20RCONFLICTS_${PN} = "matchbox-panel" 20RCONFLICTS_${PN} = "matchbox-panel"
21 21
22SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ 22SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
23 file://gcc-4.6.0-compile.patch"
24 23
25EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 24EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
26EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" 25EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"