summaryrefslogtreecommitdiff
path: root/meta/recipes-sato/matchbox-stroke
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-09-26 19:55:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-26 17:53:42 +0100
commit33a1a05ef988c69f8ff8e38c6723922082e5d1aa (patch)
treeded5d7c7db49d62a7b625aeb384d4e9a9bdf7bbb /meta/recipes-sato/matchbox-stroke
parent7c503d056d15e376243928ffb815296e9c711658 (diff)
downloadopenembedded-core-33a1a05ef988c69f8ff8e38c6723922082e5d1aa.tar.gz
openembedded-core-33a1a05ef988c69f8ff8e38c6723922082e5d1aa.tar.bz2
openembedded-core-33a1a05ef988c69f8ff8e38c6723922082e5d1aa.tar.xz
openembedded-core-33a1a05ef988c69f8ff8e38c6723922082e5d1aa.zip
matchbox: Upgrade SRCREV to reflect recent accpeted patches by upstream
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-stroke')
-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
2 files changed, 1 insertions, 39 deletions
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 cbfa7dee6..000000000
--- a/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -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
-+"
diff --git a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
index 10388f4c7..44b316dde 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"
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"