sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Zhai Edwin 2011-09-26 19:55:47 +08:00 committed by Richard Purdie
parent ff047d3a77
commit 64ba74deff
13 changed files with 17 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-graphics/libmatchbox/files/16bppfixes.patch
View File

@ -1,4 +1,4 @@
Upstream-Status: Pending
Upstream-Status: Accepted
Index: libmb/mbpixbuf.c
===================================================================

2
meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
View File

@ -6,7 +6,7 @@ on x86-64. This patch forces a NULL pointer as terminator to fix it.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Upstream-Status: Pending
Upstream-Status: Accepted
Index: libmatchbox-1.9/libmb/mbexp.c
===================================================================

6
meta/recipes-graphics/libmatchbox/libmatchbox_git.bb
View File

@ -1,15 +1,13 @@
require libmatchbox.inc
SRCREV = "c81f8f444b83b187727f046432b186d67a42c732"
SRCREV = "d9dd0ac810de4f0b93cd813ce14aee34c722c2cf"
PV = "1.9+git${SRCPV}"
PR = "r0"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://configure_fixes.patch \
file://check.m4 \
file://16bppfixes.patch \
file://matchbox-start-fix.patch"
file://check.m4"
S = "${WORKDIR}/git"

4
meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch
View File

@ -1,4 +1,6 @@
Upstream-Status: Pending
Upstream-Status: Accepted
Instead matchbox-window-manager-2, it is in libmatchboxwm2, which has build
failure as partial gtk-doc implementation.
Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10
Fix following build error:

2
meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
View File

@ -11,7 +11,7 @@ This patch avoids this linking error:
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/11
Upstream-Status: Pending
Upstream-Status: Accepted
Index: matchbox-desktop-2/configure.ac
===================================================================

50
meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch
View File

@ -1,50 +0,0 @@
commit 2ef9a98cbda46b5a52e20ce292eebd6ba1f3c3a8
Author: Yu Ke <ke.yu@intel.com>
Date: Sun Mar 6 17:58:45 2011 +0800
desktop: Add configure event handler for desktop resize
desktop need to resize its work area when window manager decorate its
window. Originally it is done by the hook in root window PropertyNotify
event handler, i.e. net_workarea_changed () routine. However, for unknown
reason, the PropertyNotify event does not deliver to the root window,
thus this routine does not work.
this patch fix this issue from another side. Since window manager will also
send configure event to desktop window after decoration, it also works to do
it in configure event handler.
Signed-off-by: Yu Ke <ke.yu@intel.com>
Upstream-Status: Pending
diff --git a/src/desktop.c b/src/desktop.c
index d4fc2fb..5aa2cfc 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -130,6 +130,15 @@ workarea_changed (int x, int y, int w, int h)
gtk_fixed_move (GTK_FIXED (fixed), box, x, y);
}
+static gboolean
+desktop_configure_callback(GtkWindow *window,
+ GdkEvent *event, gpointer data)
+{
+ gtk_widget_set_size_request (box, event->configure.width, event->configure.height);
+ gtk_widget_queue_resize (box);
+ return FALSE;
+}
+
GtkWidget *
create_desktop (void)
{
@@ -176,6 +185,9 @@ create_desktop (void)
/* Set a sane default in case there is no work area defined yet */
workarea_changed (0, 0, screen_w, screen_h);
+ g_signal_connect(G_OBJECT(window), "configure-event",
+ G_CALLBACK(desktop_configure_callback), NULL);
+
#ifdef STANDALONE
/* TODO: fake workarea_changed calls on window resize */
#else

8
meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
View File

@ -10,13 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
DEPENDS = "gtk+ startup-notification dbus"
SECTION = "x11/wm"
SRCREV = "af7ed6775487380be73160aa0298bf6019765fad"
SRCREV = "71e3e6e04271e9d5a14f1c231ef100c7f320134d"
PV = "2.0+git${SRCPV}"
PR = "r1"
PR = "r0"
SRC_URI = "git://git.yoctoproject.org/${BPN}-2;protocol=git \
file://dso_linking_change_build_fix.patch \
file://window-resize-fix.patch"
SRC_URI = "git://git.yoctoproject.org/${BPN}-2;protocol=git"
EXTRA_OECONF = "--enable-startup-notification --with-dbus"

7
meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
View File

@ -11,17 +11,16 @@ DEPENDS = "gtk+ startup-notification dbus dbus-glib"
DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
SRCREV = "982d9ea173dc87a84db2303d1a6a12607fc4d539"
SRCREV = "cdf7a22716b87468f10573f622d5c7a58a684e35"
PV = "0.0+git${SRCPV}"
PR = "r1"
PR = "r0"
RPROVIDES_${PN} = "matchbox-panel"
RREPLACES_${PN} = "matchbox-panel"
RCONFLICTS_${PN} = "matchbox-panel"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://gcc-4.6.0-compile.patch \
file://startup_fix.diff"
file://gcc-4.6.0-compile.patch"
EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"

19
meta/recipes-sato/matchbox-panel-2/startup_fix.diff
View File

@ -1,19 +0,0 @@
Fixed the compile error caused by typo, upstream also need this.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Upstream-Status: Pending
Index: matchbox-panel-2/applets/startup/startup.c
===================================================================
--- matchbox-panel-2/applets/startup/startup.c (revision 2109)
+++ matchbox-panel-2/applets/startup/startup.c (working copy)
@@ -229,7 +229,7 @@
applet = g_slice_new0 (StartupApplet);
applet->launch_list = NULL;
- applet->hourglass_show = FALSE;
+ applet->hourglass_shown = FALSE;
/* Create image */
applet->image = MB_PANEL_SCALING_IMAGE

37
meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
View File

@ -1,37 +0,0 @@
after gcc linking has changed, all the libraries must be explicitely specified
This patch avoids these linking errors:
| make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-stroke-0.0+svnr1820-r0/matchbox-stroke'^M
| Making all in src^M
| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-stroke-0.0+svnr1820-r0/matchbox-stroke/src'^M
| 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
| /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
| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so.1: could not read symbols: Bad value^M
| collect2: ld returned 1 exit status^M
| make[2]: *** [matchbox-stroke] Error 1
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/11
Upstream-Status: Pending
Index: matchbox-stroke/configure.ac
===================================================================
--- matchbox-stroke.orig/configure.ac
+++ matchbox-stroke/configure.ac
@@ -38,7 +38,7 @@ AC_ARG_WITH(expat-lib,
expat_lib=$withval, expat_lib=yes)
-PKG_CHECK_MODULES(MBSTROKE, xft libfakekey,,
+PKG_CHECK_MODULES(MBSTROKE, xft libfakekey xrender,,
AC_MSG_ERROR([*** Required Librarys not found ***]))
dnl ------ Expat ------------------------------------------------------------
@@ -160,4 +160,4 @@ echo "
compiler: ${CC}
Building with Debug: ${enable_debug}
-"
\ No newline at end of file
+"

3
meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
View File

@ -13,8 +13,7 @@ PR = "r0"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://single-instance.patch \
file://configure_fix.patch;maxrev=1819 \
file://dso_linking_change_build_fix.patch "
file://configure_fix.patch;maxrev=1819"
S = "${WORKDIR}/git"

16
meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch
View File

@ -1,16 +0,0 @@
Background Image name was changed from background.png to template.png
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Upstream-Status: Pending
Index: matchbox-sato/Sato/matchbox2/Makefile.am
===================================================================
--- matchbox-sato.orig/Sato/matchbox2/Makefile.am 2010-12-29 13:08:43.000000000 -0800
+++ matchbox-sato/Sato/matchbox2/Makefile.am 2010-12-29 22:14:45.690428881 -0800
@@ -1,4 +1,4 @@
-pngs = background.png
+pngs = template.png
themesdir = $(datadir)/themes/Sato/matchbox2
themes_DATA = theme.xml $(pngs)

5
meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb
View File

@ -1,11 +1,10 @@
require matchbox-theme-sato.inc
DEPENDS = "matchbox-wm-2"
SRCREV = "f72cf4ed7d71ad9e47b0f2d3dbc593bc2f3e76f8"
SRCREV = "e3ccc08d4a680d70fd4891fca966aa6ce503065c"
PV = "0.2+git${SRCPV}"
SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=git \
file://png_rename.patch"
SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=git"
S = "${WORKDIR}/git"