diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-26 22:19:33 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-08 08:00:27 +0000 |
commit | 4557e95cb39a01ab909cd4dbbe5f0dc4964a306e (patch) | |
tree | 22fb1cbfd5f0b4c2fef4629cc5e2afd446d59875 | |
parent | f9db5491a1eba10ba826f2c43d11ad344b02293a (diff) | |
download | poky-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>
3 files changed, 0 insertions, 70 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 388f51f07f..0000000000 --- a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | after gcc linking has changed, all the libraries must be explicitely specified to for linking. | ||
2 | This 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 | |||
11 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
12 | Date: 2011/01/11 | ||
13 | |||
14 | Upstream-Status: Accepted | ||
15 | |||
16 | Index: 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]), | ||
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb deleted file mode 100644 index 120f086445..0000000000 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | SUMMARY = "Matchbox Window Manager Desktop" | ||
2 | LICENSE = "GPLv2.0+" | ||
3 | DEPENDS = "libmatchbox startup-notification" | ||
4 | SECTION = "x11/wm" | ||
5 | |||
6 | SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2" | ||
7 | |||
8 | SRC_URI[md5sum] = "3335a30b1a1aacfb39f23b505254765c" | ||
9 | SRC_URI[sha256sum] = "ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793" | ||
10 | |||
11 | EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" | ||
12 | |||
13 | inherit autotools pkgconfig | ||
14 | |||
15 | FILES_${PN} = "${bindir}/* \ | ||
16 | ${datadir}/applications \ | ||
17 | ${libdir}/matchbox/desktop/*.so \ | ||
18 | ${datadir}/matchbox-desktop \ | ||
19 | ${datadir}/pixmaps \ | ||
20 | ${sysconfdir}/matchbox" | ||
21 | |||
22 | FILES_${PN}-dev += "${libdir}/matchbox-desktop \ | ||
23 | ${includedir}/matchbox-desktop \ | ||
24 | ${libdir}/matchbox/desktop/*.*a \ | ||
25 | ${datadir}/matchbox/desktop/modules/*a" | ||
26 | |||
27 | FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/" | ||
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb deleted file mode 100644 index c52e7f2ca4..0000000000 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | SUMMARY = "Matchbox Window Manager Desktop" | ||
2 | LICENSE = "GPLv2.0+" | ||
3 | DEPENDS = "gtk+ startup-notification" | ||
4 | SECTION = "x11/wm" | ||
5 | PR = "r2" | ||
6 | |||
7 | SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2 \ | ||
8 | file://dso_linking_change_build_fix.patch" | ||
9 | |||
10 | SRC_URI[md5sum] = "b0a4a47130272e2adab4e9feb43a6c9c" | ||
11 | SRC_URI[sha256sum] = "be33ff0bc8a9b1eee6af360a5118e470e69a6292ecc9e154ec6f349fce5c5f75" | ||
12 | |||
13 | EXTRA_OECONF = "--enable-startup-notification" | ||
14 | |||
15 | inherit autotools pkgconfig | ||