summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-09-26 19:55:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-30 16:37:49 +0000
commit64ba74deff7fdefcd4a493084a834d825eb1945d (patch)
tree715a299b63c40e21b2e0d423409a7327fe361860
parentff047d3a77f57400ec8e0b7debee34cf4375e5a0 (diff)
downloadpoky-64ba74deff7fdefcd4a493084a834d825eb1945d.tar.gz
matchbox: Upgrade SRCREV to reflect recent accpeted patches by upstream
(From OE-Core rev: 33a1a05ef988c69f8ff8e38c6723922082e5d1aa) (From OE-Core rev: 1194935707f4acd9029b36769bc0320ba0a90163) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/libmatchbox/files/16bppfixes.patch2
-rw-r--r--meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch2
-rw-r--r--meta/recipes-graphics/libmatchbox/libmatchbox_git.bb6
-rw-r--r--meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch4
-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
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb7
-rw-r--r--meta/recipes-sato/matchbox-panel-2/startup_fix.diff19
-rw-r--r--meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch37
-rw-r--r--meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb3
-rw-r--r--meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch16
-rw-r--r--meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb5
13 files changed, 17 insertions, 144 deletions
diff --git a/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch b/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch
index 284318c948..ac22b9995f 100644
--- a/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch
+++ b/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch
@@ -1,4 +1,4 @@
1Upstream-Status: Pending 1Upstream-Status: Accepted
2 2
3Index: libmb/mbpixbuf.c 3Index: libmb/mbpixbuf.c
4=================================================================== 4===================================================================
diff --git a/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch b/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
index 058342c442..88f5d7091b 100644
--- a/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
+++ b/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
@@ -6,7 +6,7 @@ on x86-64. This patch forces a NULL pointer as terminator to fix it.
6 6
7Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 7Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
8 8
9Upstream-Status: Pending 9Upstream-Status: Accepted
10 10
11Index: libmatchbox-1.9/libmb/mbexp.c 11Index: libmatchbox-1.9/libmb/mbexp.c
12=================================================================== 12===================================================================
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb
index d9d4535aa6..ac329e5193 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb
@@ -1,15 +1,13 @@
1require libmatchbox.inc 1require libmatchbox.inc
2 2
3SRCREV = "c81f8f444b83b187727f046432b186d67a42c732" 3SRCREV = "d9dd0ac810de4f0b93cd813ce14aee34c722c2cf"
4PV = "1.9+git${SRCPV}" 4PV = "1.9+git${SRCPV}"
5PR = "r0" 5PR = "r0"
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
7 7
8SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ 8SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
9 file://configure_fixes.patch \ 9 file://configure_fixes.patch \
10 file://check.m4 \ 10 file://check.m4"
11 file://16bppfixes.patch \
12 file://matchbox-start-fix.patch"
13 11
14S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
15 13
diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch
index 8c40e85848..1f877d76fe 100644
--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch
@@ -1,4 +1,6 @@
1Upstream-Status: Pending 1Upstream-Status: Accepted
2Instead matchbox-window-manager-2, it is in libmatchboxwm2, which has build
3failure as partial gtk-doc implementation.
2 4
3Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10 5Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10
4Fix following build error: 6Fix following build error:
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 0edb55e081..388f51f07f 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 8970ac8445..0000000000
--- 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 a3dcec32f0..e2e3047f35 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
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
index 98b3447a71..c1da0cf62a 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
@@ -11,17 +11,16 @@ DEPENDS = "gtk+ startup-notification dbus dbus-glib"
11DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" 11DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
12DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" 12DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
13 13
14SRCREV = "982d9ea173dc87a84db2303d1a6a12607fc4d539" 14SRCREV = "cdf7a22716b87468f10573f622d5c7a58a684e35"
15PV = "0.0+git${SRCPV}" 15PV = "0.0+git${SRCPV}"
16PR = "r1" 16PR = "r0"
17 17
18RPROVIDES_${PN} = "matchbox-panel" 18RPROVIDES_${PN} = "matchbox-panel"
19RREPLACES_${PN} = "matchbox-panel" 19RREPLACES_${PN} = "matchbox-panel"
20RCONFLICTS_${PN} = "matchbox-panel" 20RCONFLICTS_${PN} = "matchbox-panel"
21 21
22SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ 22SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
23 file://gcc-4.6.0-compile.patch \ 23 file://gcc-4.6.0-compile.patch"
24 file://startup_fix.diff"
25 24
26EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 25EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
27EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" 26EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
diff --git a/meta/recipes-sato/matchbox-panel-2/startup_fix.diff b/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
deleted file mode 100644
index d9a0876296..0000000000
--- a/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
+++ /dev/null
@@ -1,19 +0,0 @@
1Fixed the compile error caused by typo, upstream also need this.
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4
5Upstream-Status: Pending
6
7Index: matchbox-panel-2/applets/startup/startup.c
8===================================================================
9--- matchbox-panel-2/applets/startup/startup.c (revision 2109)
10+++ matchbox-panel-2/applets/startup/startup.c (working copy)
11@@ -229,7 +229,7 @@
12 applet = g_slice_new0 (StartupApplet);
13
14 applet->launch_list = NULL;
15- applet->hourglass_show = FALSE;
16+ applet->hourglass_shown = FALSE;
17
18 /* Create image */
19 applet->image = MB_PANEL_SCALING_IMAGE
diff --git a/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
deleted file mode 100644
index cbfa7dee69..0000000000
--- a/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1after gcc linking has changed, all the libraries must be explicitely specified
2This patch avoids these linking errors:
3
4| make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-stroke-0.0+svnr1820-r0/matchbox-stroke'^M
5| Making all in src^M
6| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-stroke-0.0+svnr1820-r0/matchbox-stroke/src'^M
7| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o matchbox-stroke matchbox-stroke.o matchbox-stroke-ui.o matchbox-stroke-recog.o matchbox-stroke-mode.o matchbox-stroke-action.o config-parser.o util-hash.o util.o -lXft -lX11 -lXtst -lfakekey -lexpat -lm^M
8| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: u: invalid DSO for symbol `XRenderFindVisualFormat' definition^M
9| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so.1: could not read symbols: Bad value^M
10| collect2: ld returned 1 exit status^M
11| make[2]: *** [matchbox-stroke] Error 1
12
13Nitin A Kamble <nitin.a.kamble@intel.com>
14Date: 2011/01/11
15
16Upstream-Status: Pending
17
18Index: matchbox-stroke/configure.ac
19===================================================================
20--- matchbox-stroke.orig/configure.ac
21+++ matchbox-stroke/configure.ac
22@@ -38,7 +38,7 @@ AC_ARG_WITH(expat-lib,
23 expat_lib=$withval, expat_lib=yes)
24
25
26-PKG_CHECK_MODULES(MBSTROKE, xft libfakekey,,
27+PKG_CHECK_MODULES(MBSTROKE, xft libfakekey xrender,,
28 AC_MSG_ERROR([*** Required Librarys not found ***]))
29
30 dnl ------ Expat ------------------------------------------------------------
31@@ -160,4 +160,4 @@ echo "
32 compiler: ${CC}
33
34 Building with Debug: ${enable_debug}
35-"
36\ No newline at end of file
37+"
diff --git a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
index 10388f4c71..44b316ddef 100644
--- a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
+++ b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
@@ -13,8 +13,7 @@ PR = "r0"
13 13
14SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ 14SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
15 file://single-instance.patch \ 15 file://single-instance.patch \
16 file://configure_fix.patch;maxrev=1819 \ 16 file://configure_fix.patch;maxrev=1819"
17 file://dso_linking_change_build_fix.patch "
18 17
19S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
20 19
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch
deleted file mode 100644
index d8f264fc2a..0000000000
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Background Image name was changed from background.png to template.png
2
3Signed-off-by: Saul Wold <sgw@linux.intel.com>
4
5Upstream-Status: Pending
6
7Index: matchbox-sato/Sato/matchbox2/Makefile.am
8===================================================================
9--- matchbox-sato.orig/Sato/matchbox2/Makefile.am 2010-12-29 13:08:43.000000000 -0800
10+++ matchbox-sato/Sato/matchbox2/Makefile.am 2010-12-29 22:14:45.690428881 -0800
11@@ -1,4 +1,4 @@
12-pngs = background.png
13+pngs = template.png
14
15 themesdir = $(datadir)/themes/Sato/matchbox2
16 themes_DATA = theme.xml $(pngs)
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb
index d6bfb2f8fb..3edc3a361b 100644
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb
@@ -1,11 +1,10 @@
1require matchbox-theme-sato.inc 1require matchbox-theme-sato.inc
2 2
3DEPENDS = "matchbox-wm-2" 3DEPENDS = "matchbox-wm-2"
4SRCREV = "f72cf4ed7d71ad9e47b0f2d3dbc593bc2f3e76f8" 4SRCREV = "e3ccc08d4a680d70fd4891fca966aa6ce503065c"
5PV = "0.2+git${SRCPV}" 5PV = "0.2+git${SRCPV}"
6 6
7SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=git \ 7SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=git"
8 file://png_rename.patch"
9 8
10S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
11 10