summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-desktop
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-09-26 11:55:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-26 16:56:42 (GMT)
commitd39c6738df4b7e8ef22f2a7154274c1d08b1d51f (patch)
tree04515a719d958cedc30cfb8cf488b5049ca68d06 /meta/recipes-sato/matchbox-desktop
parent114ade8b143e697f09a0672093fe64205eac6209 (diff)
downloadpoky-d39c6738df4b7e8ef22f2a7154274c1d08b1d51f.tar.gz
matchbox: Upgrade SRCREV to reflect recent accpeted patches by upstream
(From OE-Core rev: 33a1a05ef988c69f8ff8e38c6723922082e5d1aa) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/matchbox-desktop')
-rw-r--r--meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch2
-rw-r--r--meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch50
-rw-r--r--meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb8
3 files changed, 4 insertions, 56 deletions
diff --git a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
index 0edb55e..388f51f 100644
--- a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
+++ b/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
@@ -11,7 +11,7 @@ This patch avoids this linking error:
11Nitin A Kamble <nitin.a.kamble@intel.com> 11Nitin A Kamble <nitin.a.kamble@intel.com>
12Date: 2011/01/11 12Date: 2011/01/11
13 13
14Upstream-Status: Pending 14Upstream-Status: Accepted
15 15
16Index: matchbox-desktop-2/configure.ac 16Index: matchbox-desktop-2/configure.ac
17=================================================================== 17===================================================================
diff --git a/meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch b/meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch
deleted file mode 100644
index 8970ac8..0000000
--- a/meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1commit 2ef9a98cbda46b5a52e20ce292eebd6ba1f3c3a8
2Author: Yu Ke <ke.yu@intel.com>
3Date: Sun Mar 6 17:58:45 2011 +0800
4
5 desktop: Add configure event handler for desktop resize
6
7 desktop need to resize its work area when window manager decorate its
8 window. Originally it is done by the hook in root window PropertyNotify
9 event handler, i.e. net_workarea_changed () routine. However, for unknown
10 reason, the PropertyNotify event does not deliver to the root window,
11 thus this routine does not work.
12
13 this patch fix this issue from another side. Since window manager will also
14 send configure event to desktop window after decoration, it also works to do
15 it in configure event handler.
16
17 Signed-off-by: Yu Ke <ke.yu@intel.com>
18
19Upstream-Status: Pending
20
21diff --git a/src/desktop.c b/src/desktop.c
22index d4fc2fb..5aa2cfc 100644
23--- a/src/desktop.c
24+++ b/src/desktop.c
25@@ -130,6 +130,15 @@ workarea_changed (int x, int y, int w, int h)
26 gtk_fixed_move (GTK_FIXED (fixed), box, x, y);
27 }
28
29+static gboolean
30+desktop_configure_callback(GtkWindow *window,
31+ GdkEvent *event, gpointer data)
32+{
33+ gtk_widget_set_size_request (box, event->configure.width, event->configure.height);
34+ gtk_widget_queue_resize (box);
35+ return FALSE;
36+}
37+
38 GtkWidget *
39 create_desktop (void)
40 {
41@@ -176,6 +185,9 @@ create_desktop (void)
42 /* Set a sane default in case there is no work area defined yet */
43 workarea_changed (0, 0, screen_w, screen_h);
44
45+ g_signal_connect(G_OBJECT(window), "configure-event",
46+ G_CALLBACK(desktop_configure_callback), NULL);
47+
48 #ifdef STANDALONE
49 /* TODO: fake workarea_changed calls on window resize */
50 #else
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
index a3dcec3..e2e3047 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
@@ -10,13 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
10 10
11DEPENDS = "gtk+ startup-notification dbus" 11DEPENDS = "gtk+ startup-notification dbus"
12SECTION = "x11/wm" 12SECTION = "x11/wm"
13SRCREV = "af7ed6775487380be73160aa0298bf6019765fad" 13SRCREV = "71e3e6e04271e9d5a14f1c231ef100c7f320134d"
14PV = "2.0+git${SRCPV}" 14PV = "2.0+git${SRCPV}"
15PR = "r1" 15PR = "r0"
16 16
17SRC_URI = "git://git.yoctoproject.org/${BPN}-2;protocol=git \ 17SRC_URI = "git://git.yoctoproject.org/${BPN}-2;protocol=git"
18 file://dso_linking_change_build_fix.patch \
19 file://window-resize-fix.patch"
20 18
21EXTRA_OECONF = "--enable-startup-notification --with-dbus" 19EXTRA_OECONF = "--enable-startup-notification --with-dbus"
22 20