summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-04-27 00:47:22 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:05:23 +0100
commit920fc82da8bdf6140cc9c3d7a4094d07df251190 (patch)
tree9ab4382790a94db3b4727e277799cfb76a173d39
parent457f8256e96b838a02e0b8a15a7501a2c4738987 (diff)
downloadpoky-920fc82da8bdf6140cc9c3d7a4094d07df251190.tar.gz
matchbox-config-gtk: Upgrade to 0.2
New version supports Gtk+3. Rebase the patch. (From OE-Core rev: 6cc63b713a83f8e624db6a042ab6647051db0c8a) 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>
-rw-r--r--meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch26
-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 @@
1Upstream-Status: Inappropriate [configuration] 1Upstream-Status: Inappropriate [configuration]
2---
3 appearance/mb-appearance.c | 4 ++++
4 1 file changed, 4 insertions(+)
2 5
3Index: appearance/mb-appearance.c 6diff --git a/appearance/mb-appearance.c b/appearance/mb-appearance.c
4=================================================================== 7index 6af8376..71fd57b 100644
5--- appearance/mb-appearance.c (revision 1614) 8--- a/appearance/mb-appearance.c
6+++ appearance/mb-appearance.c (working copy) 9+++ b/appearance/mb-appearance.c
7@@ -300,11 +300,13 @@ 10@@ -317,11 +317,13 @@ on_gconf_value_changed (GConfClient* client, const gchar* key, GConfValue* value
8 gtk_font_button_set_font_name (GTK_FONT_BUTTON (font_button), 11 gtk_font_button_set_font_name (GTK_FONT_BUTTON (font_button),
9 gconf_value_get_string (value)); 12 gconf_value_get_string (value));
10 } else if (strcmp (key, HANDED_KEY) == 0) { 13 } else if (strcmp (key, HANDED_KEY) == 0) {
@@ -18,18 +21,19 @@ Index: appearance/mb-appearance.c
18 } 21 }
19 } 22 }
20 23
21@@ -395,12 +397,13 @@ 24@@ -408,10 +410,12 @@ main (int argc, char **argv) {
22 gtk_container_add (GTK_CONTAINER (align), font_button);
23 25
24 /* Left/Right Handed */ 26 /* Left/Right Handed */
25- 27
26+#if 0 28+#if 0
27 frame = new_frame (_("Orientation"), &align);
28 gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0);
29 handed_check = gtk_check_button_new_with_mnemonic (_("_Left-handed")); 29 handed_check = gtk_check_button_new_with_mnemonic (_("_Left-handed"));
30 frame = new_frame (_("Orientation"),handed_check);
31 gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0);
30 g_signal_connect (handed_check, "toggled", G_CALLBACK (on_handed_set), NULL); 32 g_signal_connect (handed_check, "toggled", G_CALLBACK (on_handed_set), NULL);
31 gtk_container_add (GTK_CONTAINER (align), handed_check);
32+#endif 33+#endif
33 34
34 gconf_client_add_dir (gconf, INTERFACE_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); 35 gconf_client_add_dir (gconf, INTERFACE_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
35 g_signal_connect (gconf, "value-changed", G_CALLBACK (on_gconf_value_changed), NULL); 36 g_signal_connect (gconf, "value-changed", G_CALLBACK (on_gconf_value_changed), NULL);
37--
382.8.1
39
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+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" 7 file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28"
8 8
9DEPENDS = "gconf gtk+" 9DEPENDS = "gconf gtk+3"
10RDEPENDS_${PN} = "settings-daemon" 10RDEPENDS_${PN} = "settings-daemon"
11 11
12SRCREV = "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028" 12# SRCREV tagged 0.2
13PV = "0.0+git${SRCPV}" 13SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa"
14SRC_URI = "git://git.yoctoproject.org/${BPN} \
15 file://no-handed.patch"
14 16
15S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
16 18
17SRC_URI = "git://git.yoctoproject.org/${BPN} \
18 file://no-handed.patch;striplevel=0"
19
20inherit autotools pkgconfig distro_features_check 19inherit autotools pkgconfig distro_features_check
21 20
22# The settings-daemon requires x11 in DISTRO_FEATURES 21# The settings-daemon requires x11 in DISTRO_FEATURES