diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2')
3 files changed, 153 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch b/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch new file mode 100644 index 000000000..3bab6d292 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch @@ -0,0 +1,50 @@ +From a0b5fca04da208990f3c40e65dbb045da4cdb35e Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Sun, 20 Mar 2016 13:24:37 +0200 +Subject: [PATCH] showdesktop: Make sure active state is initialized + +There are cases (in qemu at least) where set_active() +is never called on startup. Make sure we initialize the active +state so the icon gets loaded and the applet is not confused +about the current state. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Signed-off-by: Ross Burton <ross.burton@intel.com> + + +Upstream-Status: Backport +--- + applets/showdesktop/showdesktop.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/applets/showdesktop/showdesktop.c b/applets/showdesktop/showdesktop.c +index 61dd5c2..33c13e1 100644 +--- a/applets/showdesktop/showdesktop.c ++++ b/applets/showdesktop/showdesktop.c +@@ -181,6 +181,12 @@ button_clicked_cb (GtkButton *button, + &xev); + } + ++static void ++realize_cb (GtkWidget *button, ShowDesktopApplet *applet) ++{ ++ sync_applet (applet); ++} ++ + G_MODULE_EXPORT GtkWidget * + mb_panel_applet_create (const char *id, + GtkOrientation orientation) +@@ -216,6 +222,10 @@ mb_panel_applet_create (const char *id, + "clicked", + G_CALLBACK (button_clicked_cb), + applet); ++ g_signal_connect (button, ++ "realize", ++ G_CALLBACK (realize_cb), ++ applet); + + g_object_weak_ref (G_OBJECT (button), + (GWeakNotify) show_desktop_applet_free, +-- +2.7.0 + diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch b/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch new file mode 100644 index 000000000..45ba9a031 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/silence-warnings.patch @@ -0,0 +1,64 @@ +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], diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb new file mode 100644 index 000000000..98c3ae487 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb @@ -0,0 +1,39 @@ +SUMMARY = "Simple GTK+ based panel for handheld devices" +HOMEPAGE = "http://matchbox-project.org" +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" + +DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib" +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}" + +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" + +EXTRA_OECONF = "--enable-startup-notification --enable-dbus" +EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" +EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" + +S = "${WORKDIR}/git" + +FILES_${PN} += "${libdir}/matchbox-panel/*.so \ + ${datadir}/matchbox-panel/brightness/*.png \ + ${datadir}/matchbox-panel/startup/*.png " +FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" + +inherit autotools pkgconfig distro_features_check |