summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-panel-2
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
commit972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch)
tree97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-sato/matchbox-panel-2
downloadpoky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-sato/matchbox-panel-2')
-rw-r--r--meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch64
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb36
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 @@
1Don't warn if the machine doesn't actually have a battery, or if the applets
2string contains consecutive separators.
3
4Upstream-Status: Backport
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7diff --git a/applets/battery/battery-acpi.c b/applets/battery/battery-acpi.c
8index 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
31diff --git a/applets/battery/battery-apm.c b/applets/battery/battery-apm.c
32index 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
44diff --git a/matchbox-panel/mb-panel.c b/matchbox-panel/mb-panel.c
45index 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..490e2bc86b
--- /dev/null
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
@@ -0,0 +1,36 @@
1SUMMARY = "Simple GTK+ based panel for handheld devices"
2HOMEPAGE = "http://matchbox-project.org"
3BUGTRACKER = "http://bugzilla.yoctoproject.org/"
4
5LICENSE = "GPLv2+"
6LIC_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
10DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib"
11DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
12DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
13
14SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae"
15PV = "2.0+git${SRCPV}"
16
17RPROVIDES_${PN} = "matchbox-panel"
18RREPLACES_${PN} = "matchbox-panel"
19RCONFLICTS_${PN} = "matchbox-panel"
20
21SRC_URI = "git://git.yoctoproject.org/${BPN} \
22 file://silence-warnings.patch"
23
24EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
25EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
26EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}"
27
28S = "${WORKDIR}/git"
29
30FILES_${PN} += "${libdir}/matchbox-panel/*.so \
31 ${datadir}/matchbox-panel/brightness/*.png \
32 ${datadir}/matchbox-panel/startup/*.png "
33FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
34FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la"
35
36inherit autotools pkgconfig