From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- ...applets-systray-Allow-icons-to-be-smaller.patch | 34 ++++++++++++++++++ .../matchbox-panel-2/matchbox-panel-2_2.11.bb | 40 ++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 poky/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch create mode 100644 poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb (limited to 'poky/meta/recipes-sato/matchbox-panel-2') diff --git a/poky/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch b/poky/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch new file mode 100644 index 000000000..d13dd3d5a --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch @@ -0,0 +1,34 @@ +From f83a9179696b2d060ee4860733dafbf38bbd4b87 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Wed, 28 Sep 2016 15:05:41 +0300 +Subject: [PATCH] applets/systray: Allow icons to be smaller + +Don't expand/fill the systray items, align them in the center of the +systray panel. This makes sure the icons are drawn at the size they +expect. + +Signed-off-by: Jussi Kukkonen +Upstream-Status: Submitted +--- + applets/systray/systray.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/applets/systray/systray.c b/applets/systray/systray.c +index 39698a8..94a5753 100644 +--- a/applets/systray/systray.c ++++ b/applets/systray/systray.c +@@ -29,8 +29,9 @@ on_realize (GtkWidget *widget, gpointer user_data) + tray = (GtkWidget *)na_tray_new_for_screen (screen, orientation); + + gtk_widget_show (tray); +- +- gtk_container_add (GTK_CONTAINER (widget), tray); ++ gtk_widget_set_valign (tray, GTK_ALIGN_CENTER); ++ gtk_widget_set_halign (tray, GTK_ALIGN_CENTER); ++ gtk_box_pack_start (GTK_BOX (widget), tray, FALSE, FALSE, 0); + } + + G_MODULE_EXPORT GtkWidget * +-- +2.1.4 + diff --git a/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb b/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb new file mode 100644 index 000000000..421740f98 --- /dev/null +++ b/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb @@ -0,0 +1,40 @@ +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=7cbcea60b667f609495222faf3e07917" + +DEPENDS = "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 tagged 2.11 plus some autotools fixes +SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" + +RPROVIDES_${PN} = "matchbox-panel" +RREPLACES_${PN} = "matchbox-panel" +RCONFLICTS_${PN} = "matchbox-panel" + +SRC_URI = "git://git.yoctoproject.org/${BPN} \ + file://0001-applets-systray-Allow-icons-to-be-smaller.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 \ + ${datadir}/icons/" +FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" + +inherit autotools pkgconfig distro_features_check gettext -- cgit v1.2.3