diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-04-27 00:47:22 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 17:52:24 +0100 |
| commit | 6cc63b713a83f8e624db6a042ab6647051db0c8a (patch) | |
| tree | 9e4644d7edbe924128fbc156a7dfb4127def751b /meta | |
| parent | 9fc64086b3d7e37493c800f0228d47b1c7bdd1c8 (diff) | |
| download | openembedded-core-6cc63b713a83f8e624db6a042ab6647051db0c8a.tar.gz openembedded-core-6cc63b713a83f8e624db6a042ab6647051db0c8a.tar.bz2 openembedded-core-6cc63b713a83f8e624db6a042ab6647051db0c8a.zip | |
matchbox-config-gtk: Upgrade to 0.2
New version supports Gtk+3.
Rebase the patch.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb (renamed from meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb) | 11 |
2 files changed, 20 insertions, 17 deletions
diff --git a/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch index 825694962b..1cb184fb4c 100644 --- a/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch +++ b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch @@ -1,10 +1,13 @@ Upstream-Status: Inappropriate [configuration] +--- + appearance/mb-appearance.c | 4 ++++ + 1 file changed, 4 insertions(+) -Index: appearance/mb-appearance.c -=================================================================== ---- appearance/mb-appearance.c (revision 1614) -+++ appearance/mb-appearance.c (working copy) -@@ -300,11 +300,13 @@ +diff --git a/appearance/mb-appearance.c b/appearance/mb-appearance.c +index 6af8376..71fd57b 100644 +--- a/appearance/mb-appearance.c ++++ b/appearance/mb-appearance.c +@@ -317,11 +317,13 @@ on_gconf_value_changed (GConfClient* client, const gchar* key, GConfValue* value gtk_font_button_set_font_name (GTK_FONT_BUTTON (font_button), gconf_value_get_string (value)); } else if (strcmp (key, HANDED_KEY) == 0) { @@ -18,18 +21,19 @@ Index: appearance/mb-appearance.c } } -@@ -395,12 +397,13 @@ - gtk_container_add (GTK_CONTAINER (align), font_button); +@@ -408,10 +410,12 @@ main (int argc, char **argv) { /* Left/Right Handed */ -- + +#if 0 - frame = new_frame (_("Orientation"), &align); - gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0); handed_check = gtk_check_button_new_with_mnemonic (_("_Left-handed")); + frame = new_frame (_("Orientation"),handed_check); + gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0); g_signal_connect (handed_check, "toggled", G_CALLBACK (on_handed_set), NULL); - gtk_container_add (GTK_CONTAINER (align), handed_check); +#endif gconf_client_add_dir (gconf, INTERFACE_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); g_signal_connect (gconf, "value-changed", G_CALLBACK (on_gconf_value_changed), NULL); +-- +2.8.1 + diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb index 5f73a4c48d..3ca5989944 100644 --- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb +++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb @@ -6,17 +6,16 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" -DEPENDS = "gconf gtk+" +DEPENDS = "gconf gtk+3" RDEPENDS_${PN} = "settings-daemon" -SRCREV = "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028" -PV = "0.0+git${SRCPV}" +# SRCREV tagged 0.2 +SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa" +SRC_URI = "git://git.yoctoproject.org/${BPN} \ + file://no-handed.patch" S = "${WORKDIR}/git" -SRC_URI = "git://git.yoctoproject.org/${BPN} \ - file://no-handed.patch;striplevel=0" - inherit autotools pkgconfig distro_features_check # The settings-daemon requires x11 in DISTRO_FEATURES |