summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-desktop/files
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-27 06:19:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-08 08:00:27 (GMT)
commit4557e95cb39a01ab909cd4dbbe5f0dc4964a306e (patch)
tree22fb1cbfd5f0b4c2fef4629cc5e2afd446d59875 /meta/recipes-sato/matchbox-desktop/files
parentf9db5491a1eba10ba826f2c43d11ad344b02293a (diff)
downloadpoky-4557e95cb39a01ab909cd4dbbe5f0dc4964a306e.tar.gz
matchbox-desktop: remove 0.9.1 and 2.0 version
For 0.9.1: ERROR: matchbox-wm: Recipe file does not have license file information (LIC_FILES_CHKSUM) ERROR: Licensing Error: LIC_FILES_CHKSUM does not match, please fix For 2.0: | /path/to/matchbox-desktop-2.0/configure: line 2488: syntax error near unexpected token `build_old_libs,' | /path/to/matchbox-desktop-2.0/configure: line 2488: ` _LT_DECL(build_old_libs, enable_static, 0,' And there is a matchbox-desktop_git.bb which is "GPLv2+ & LGPLv2+", so remove them. (From OE-Core rev: 7b781f1532a64973175cffced1eac4cd8bba3d0c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/matchbox-desktop/files')
-rw-r--r--meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch28
1 files changed, 0 insertions, 28 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
deleted file mode 100644
index 388f51f..0000000
--- a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1after gcc linking has changed, all the libraries must be explicitely specified to for linking.
2This patch avoids this linking error:
3
4| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-desktop-2.0+svnr2096-r0/matchbox-desktop-2/src'^M
5| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o matchbox-desktop main.o taku-category-bar.o desktop.o ../libtaku/libtaku.a -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -ldbus-1 -lpthread -lrt -lstartup-notification-1 ../libtaku/libinotify.a^M
6| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: F^A: invalid DSO for symbol `XFree' definition^M
7| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M
8| collect2: ld returned 1 exit status^M
9| make[2]: *** [matchbox-desktop] Error 1
10
11Nitin A Kamble <nitin.a.kamble@intel.com>
12Date: 2011/01/11
13
14Upstream-Status: Accepted
15
16Index: matchbox-desktop-2/configure.ac
17===================================================================
18--- matchbox-desktop-2.orig/configure.ac
19+++ matchbox-desktop-2/configure.ac
20@@ -14,7 +14,7 @@ if test x$inotify_support = xyes; then
21 AC_DEFINE(WITH_INOTIFY, [1], [If inotify is enabled])
22 fi
23
24-PKG_CHECK_MODULES(GTK, gtk+-2.0)
25+PKG_CHECK_MODULES(GTK, [gtk+-2.0 x11])
26
27 AC_ARG_ENABLE(startup_notification,
28 AC_HELP_STRING([--disable-startup-notification], [disable startup notification support]),