sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

matchbox-panel-2: Upgrade to 2.10 

* Changes in 2.10:
   - Port to GTK3, avoid all deprecated API
   - Add --mode for easier testing
* Remove a backported patch.
* License checksum changes because copyright years change

(From OE-Core rev: 7a64be78d37af46f79342654c43adda945f12885)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jussi Kukkonen 2016-02-29 13:48:14 +02:00 committed by Richard Purdie
parent 7a69ef0c3a
commit ff6dd06634
2 changed files with 7 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch
View File

@ -1,64 +0,0 @@
Don't warn if the machine doesn't actually have a battery, or if the applets
string contains consecutive separators.
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/applets/battery/battery-acpi.c b/applets/battery/battery-acpi.c
index 6515cb0..c44dd12 100644
--- a/applets/battery/battery-acpi.c
+++ b/applets/battery/battery-acpi.c
@@ -14,8 +14,6 @@ int batt_state, ac_state;
int pm_support(void)
{
if(check_acpi_support() == NOT_SUPPORTED){
- g_warning("No ACPI support\n");
-
return 0;
}
@@ -32,8 +30,9 @@ const char* pm_battery_icon(void)
const char *icon;
battery_t *binfo;
+ /* No battery available (not present, disabled, or something
+ else. Silently do nothing. */
if (batt_state != SUCCESS) {
- g_warning("Couldnt initialize ACPI battery\n");
return NULL;
}
diff --git a/applets/battery/battery-apm.c b/applets/battery/battery-apm.c
index 5467438..2f39cb6 100644
--- a/applets/battery/battery-apm.c
+++ b/applets/battery/battery-apm.c
@@ -10,8 +10,6 @@
int pm_support(void)
{
if (1 == apm_exists ()) {
- g_warning ("No APM support");
-
return 0;
}
diff --git a/matchbox-panel/mb-panel.c b/matchbox-panel/mb-panel.c
index 2d8cafd..828a36d 100644
--- a/matchbox-panel/mb-panel.c
+++ b/matchbox-panel/mb-panel.c
@@ -110,10 +110,15 @@ load_applets (const char *applets_desc,
applets = g_strsplit (applets_desc, ",", -1);
for (i = 0; applets[i]; i++) {
+ char *s;
char **bits;
GtkWidget *applet;
- bits = g_strsplit (applets[i], ":", 2);
+ s = applets[i];
+ if (s == NULL || s[0] == '\0')
+ continue;
+
+ bits = g_strsplit (s, ":", 2);
applet = load_applet (bits[0],
bits[1],

15
meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb → meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.10.bb
View File

@ -5,25 +5,23 @@ BUGTRACKER = "http://bugzilla.yoctoproject.org/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://matchbox-panel/mb-panel.h;endline=10;md5=0b7db28f4b6863fb853d0467e590019a \
file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03"
file://applets/startup/startup.c;endline=22;md5=7cbcea60b667f609495222faf3e07917"
DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib dbus-glib-native"
DEPENDS = "gnome-common gtk+3 startup-notification dbus dbus-glib dbus-glib-native"
DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
# The startup-notification requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae"
PV = "2.0+git${SRCPV}"
# SRCREV tagged 2.10
SRCREV = "145a8075c66952dad9ab5f36d944c78c1ae3f4ab"
RPROVIDES_${PN} = "matchbox-panel"
RREPLACES_${PN} = "matchbox-panel"
RCONFLICTS_${PN} = "matchbox-panel"
SRC_URI = "git://git.yoctoproject.org/${BPN} \
file://0001-showdesktop-Make-sure-active-state-is-initialized.patch \
file://silence-warnings.patch"
SRC_URI = "git://git.yoctoproject.org/${BPN}"
EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
@ -33,7 +31,8 @@ S = "${WORKDIR}/git"
FILES_${PN} += "${libdir}/matchbox-panel/*.so \
${datadir}/matchbox-panel/brightness/*.png \
${datadir}/matchbox-panel/startup/*.png "
${datadir}/matchbox-panel/startup/*.png \
${datadir}/icons/"
FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la"
inherit autotools pkgconfig distro_features_check