summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-panel-2
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-02-29 13:48:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:05:22 +0100
commitff6dd0663419be8aae5f498eb15d9b09ed3f469a (patch)
tree932fcd52dc2ccacf4b2605fb162a9f275173e97f /meta/recipes-sato/matchbox-panel-2
parent7a69ef0c3a15a51206498a442267c7309ac737d1 (diff)
downloadpoky-ff6dd0663419be8aae5f498eb15d9b09ed3f469a.tar.gz
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>
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_2.10.bb (renamed from meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb)15
2 files changed, 7 insertions, 72 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
deleted file mode 100644
index 45ba9a0318..0000000000
--- a/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch
+++ /dev/null
@@ -1,64 +0,0 @@
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_2.10.bb
index ff35b3370a..3ccd6a268b 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.10.bb
@@ -5,25 +5,23 @@ BUGTRACKER = "http://bugzilla.yoctoproject.org/"
5LICENSE = "GPLv2+" 5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 6LIC_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=7cbcea60b667f609495222faf3e07917"
9 9
10DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib dbus-glib-native" 10DEPENDS = "gnome-common gtk+3 startup-notification dbus dbus-glib dbus-glib-native"
11DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" 11DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
12DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" 12DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
13 13
14# The startup-notification requires x11 in DISTRO_FEATURES 14# The startup-notification requires x11 in DISTRO_FEATURES
15REQUIRED_DISTRO_FEATURES = "x11" 15REQUIRED_DISTRO_FEATURES = "x11"
16 16
17SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae" 17# SRCREV tagged 2.10
18PV = "2.0+git${SRCPV}" 18SRCREV = "145a8075c66952dad9ab5f36d944c78c1ae3f4ab"
19 19
20RPROVIDES_${PN} = "matchbox-panel" 20RPROVIDES_${PN} = "matchbox-panel"
21RREPLACES_${PN} = "matchbox-panel" 21RREPLACES_${PN} = "matchbox-panel"
22RCONFLICTS_${PN} = "matchbox-panel" 22RCONFLICTS_${PN} = "matchbox-panel"
23 23
24SRC_URI = "git://git.yoctoproject.org/${BPN} \ 24SRC_URI = "git://git.yoctoproject.org/${BPN}"
25 file://0001-showdesktop-Make-sure-active-state-is-initialized.patch \
26 file://silence-warnings.patch"
27 25
28EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 26EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
29EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" 27EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
@@ -33,7 +31,8 @@ S = "${WORKDIR}/git"
33 31
34FILES_${PN} += "${libdir}/matchbox-panel/*.so \ 32FILES_${PN} += "${libdir}/matchbox-panel/*.so \
35 ${datadir}/matchbox-panel/brightness/*.png \ 33 ${datadir}/matchbox-panel/brightness/*.png \
36 ${datadir}/matchbox-panel/startup/*.png " 34 ${datadir}/matchbox-panel/startup/*.png \
35 ${datadir}/icons/"
37FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" 36FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la"
38 37
39inherit autotools pkgconfig distro_features_check 38inherit autotools pkgconfig distro_features_check