diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 14:36:22 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 15:32:53 +0200 |
commit | f4cf9fe05bb3f32fabea4e54dd92d368967a80da (patch) | |
tree | 487180fa9866985ea7b28e625651765d86f515c3 /meta/recipes-sato/matchbox-panel-2 | |
download | poky-f4cf9fe05bb3f32fabea4e54dd92d368967a80da.tar.gz |
initial commit for Enea Linux 4.0
Migrated from the internal git server on the daisy-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-sato/matchbox-panel-2')
-rw-r--r-- | meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch | 64 | ||||
-rw-r--r-- | meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb | 36 |
2 files changed, 100 insertions, 0 deletions
diff --git a/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch b/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch new file mode 100644 index 0000000000..45ba9a0318 --- /dev/null +++ b/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | Don't warn if the machine doesn't actually have a battery, or if the applets | ||
2 | string contains consecutive separators. | ||
3 | |||
4 | Upstream-Status: Backport | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | diff --git a/applets/battery/battery-acpi.c b/applets/battery/battery-acpi.c | ||
8 | index 6515cb0..c44dd12 100644 | ||
9 | --- a/applets/battery/battery-acpi.c | ||
10 | +++ b/applets/battery/battery-acpi.c | ||
11 | @@ -14,8 +14,6 @@ int batt_state, ac_state; | ||
12 | int pm_support(void) | ||
13 | { | ||
14 | if(check_acpi_support() == NOT_SUPPORTED){ | ||
15 | - g_warning("No ACPI support\n"); | ||
16 | - | ||
17 | return 0; | ||
18 | } | ||
19 | |||
20 | @@ -32,8 +30,9 @@ const char* pm_battery_icon(void) | ||
21 | const char *icon; | ||
22 | battery_t *binfo; | ||
23 | |||
24 | + /* No battery available (not present, disabled, or something | ||
25 | + else. Silently do nothing. */ | ||
26 | if (batt_state != SUCCESS) { | ||
27 | - g_warning("Couldnt initialize ACPI battery\n"); | ||
28 | return NULL; | ||
29 | } | ||
30 | |||
31 | diff --git a/applets/battery/battery-apm.c b/applets/battery/battery-apm.c | ||
32 | index 5467438..2f39cb6 100644 | ||
33 | --- a/applets/battery/battery-apm.c | ||
34 | +++ b/applets/battery/battery-apm.c | ||
35 | @@ -10,8 +10,6 @@ | ||
36 | int pm_support(void) | ||
37 | { | ||
38 | if (1 == apm_exists ()) { | ||
39 | - g_warning ("No APM support"); | ||
40 | - | ||
41 | return 0; | ||
42 | } | ||
43 | |||
44 | diff --git a/matchbox-panel/mb-panel.c b/matchbox-panel/mb-panel.c | ||
45 | index 2d8cafd..828a36d 100644 | ||
46 | --- a/matchbox-panel/mb-panel.c | ||
47 | +++ b/matchbox-panel/mb-panel.c | ||
48 | @@ -110,10 +110,15 @@ load_applets (const char *applets_desc, | ||
49 | applets = g_strsplit (applets_desc, ",", -1); | ||
50 | |||
51 | for (i = 0; applets[i]; i++) { | ||
52 | + char *s; | ||
53 | char **bits; | ||
54 | GtkWidget *applet; | ||
55 | |||
56 | - bits = g_strsplit (applets[i], ":", 2); | ||
57 | + s = applets[i]; | ||
58 | + if (s == NULL || s[0] == '\0') | ||
59 | + continue; | ||
60 | + | ||
61 | + bits = g_strsplit (s, ":", 2); | ||
62 | |||
63 | applet = load_applet (bits[0], | ||
64 | bits[1], | ||
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 new file mode 100644 index 0000000000..31d32c6ec8 --- /dev/null +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb | |||
@@ -0,0 +1,36 @@ | |||
1 | SUMMARY = "Simple GTK+ based panel for handheld devices" | ||
2 | HOMEPAGE = "http://matchbox-project.org" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | |||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
7 | file://matchbox-panel/mb-panel.h;endline=10;md5=0b7db28f4b6863fb853d0467e590019a \ | ||
8 | file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03" | ||
9 | |||
10 | DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib" | ||
11 | DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" | ||
12 | DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" | ||
13 | |||
14 | SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae" | ||
15 | PV = "2.0+git${SRCPV}" | ||
16 | |||
17 | RPROVIDES_${PN} = "matchbox-panel" | ||
18 | RREPLACES_${PN} = "matchbox-panel" | ||
19 | RCONFLICTS_${PN} = "matchbox-panel" | ||
20 | |||
21 | SRC_URI = "git://git.yoctoproject.org/${BPN} \ | ||
22 | file://silence-warnings.patch" | ||
23 | |||
24 | EXTRA_OECONF = "--enable-startup-notification --enable-dbus" | ||
25 | EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" | ||
26 | EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" | ||
27 | |||
28 | S = "${WORKDIR}/git" | ||
29 | |||
30 | FILES_${PN} += "${libdir}/matchbox-panel/*.so \ | ||
31 | ${datadir}/matchbox-panel/brightness/*.png \ | ||
32 | ${datadir}/matchbox-panel/startup/*.png " | ||
33 | FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" | ||
34 | FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" | ||
35 | |||
36 | inherit autotools pkgconfig | ||