summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-desktop
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-26 22:19:33 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-07 18:52:46 +0000
commit7b781f1532a64973175cffced1eac4cd8bba3d0c (patch)
treecf233992d4d400df16f9ff123a8bc07cfc04aef8 /meta/recipes-sato/matchbox-desktop
parent5b74b2c129ded8d8d8e2843ff7b86e1053c81ba7 (diff)
downloadopenembedded-core-7b781f1532a64973175cffced1eac4cd8bba3d0c.tar.gz
openembedded-core-7b781f1532a64973175cffced1eac4cd8bba3d0c.tar.bz2
openembedded-core-7b781f1532a64973175cffced1eac4cd8bba3d0c.zip
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. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-sato/matchbox-desktop')
-rw-r--r--meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch28
-rw-r--r--meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb27
-rw-r--r--meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb15
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 @@
-after gcc linking has changed, all the libraries must be explicitely specified to for linking.
-This patch avoids this linking error:
-
-| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-desktop-2.0+svnr2096-r0/matchbox-desktop-2/src'^M
-| 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
-| /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
-| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M
-| collect2: ld returned 1 exit status^M
-| make[2]: *** [matchbox-desktop] Error 1
-
-Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: 2011/01/11
-
-Upstream-Status: Accepted
-
-Index: matchbox-desktop-2/configure.ac
-===================================================================
---- matchbox-desktop-2.orig/configure.ac
-+++ matchbox-desktop-2/configure.ac
-@@ -14,7 +14,7 @@ if test x$inotify_support = xyes; then
- AC_DEFINE(WITH_INOTIFY, [1], [If inotify is enabled])
- fi
-
--PKG_CHECK_MODULES(GTK, gtk+-2.0)
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0 x11])
-
- AC_ARG_ENABLE(startup_notification,
- 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 @@
-SUMMARY = "Matchbox Window Manager Desktop"
-LICENSE = "GPLv2.0+"
-DEPENDS = "libmatchbox startup-notification"
-SECTION = "x11/wm"
-
-SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "3335a30b1a1aacfb39f23b505254765c"
-SRC_URI[sha256sum] = "ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793"
-
-EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "${bindir}/* \
- ${datadir}/applications \
- ${libdir}/matchbox/desktop/*.so \
- ${datadir}/matchbox-desktop \
- ${datadir}/pixmaps \
- ${sysconfdir}/matchbox"
-
-FILES_${PN}-dev += "${libdir}/matchbox-desktop \
- ${includedir}/matchbox-desktop \
- ${libdir}/matchbox/desktop/*.*a \
- ${datadir}/matchbox/desktop/modules/*a"
-
-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 @@
-SUMMARY = "Matchbox Window Manager Desktop"
-LICENSE = "GPLv2.0+"
-DEPENDS = "gtk+ startup-notification"
-SECTION = "x11/wm"
-PR = "r2"
-
-SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2 \
- file://dso_linking_change_build_fix.patch"
-
-SRC_URI[md5sum] = "b0a4a47130272e2adab4e9feb43a6c9c"
-SRC_URI[sha256sum] = "be33ff0bc8a9b1eee6af360a5118e470e69a6292ecc9e154ec6f349fce5c5f75"
-
-EXTRA_OECONF = "--enable-startup-notification"
-
-inherit autotools pkgconfig