summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-26 22:05:43 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-08 08:00:27 +0000
commitf9db5491a1eba10ba826f2c43d11ad344b02293a (patch)
tree16ad531fcc8d48c4cf3e62a83c6d991454bf75be
parenta960a14c7fc48752517665fd103f2b4052971643 (diff)
downloadpoky-f9db5491a1eba10ba826f2c43d11ad344b02293a.tar.gz
matchbox-wm 1.2: remove it
It doesn't work: 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 And there is a matchbox-wm_git.bb, they have the same GPLv2+ license. (From OE-Core rev: 5b74b2c129ded8d8d8e2843ff7b86e1053c81ba7) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch15
-rw-r--r--meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m439
-rw-r--r--meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb39
3 files changed, 0 insertions, 93 deletions
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch b/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
deleted file mode 100644
index 800bf3b559..0000000000
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: matchbox-window-manager/configure.ac
4===================================================================
5--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
6+++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000
7@@ -283,7 +283,7 @@
8 yes)
9
10 case "$expat" in
11- yes)
12+ yes|"")
13 EXPAT_LIBS="-lexpat"
14 ;;
15 *)
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 b/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4
deleted file mode 100644
index aca7c7da45..0000000000
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4
+++ /dev/null
@@ -1,39 +0,0 @@
1dnl AM_GCONF_SOURCE_2
2dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
3dnl (i.e. pass to gconftool-2
4dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
5dnl you should install foo.schemas files
6dnl
7
8AC_DEFUN([AM_GCONF_SOURCE_2],
9[
10 if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
11 GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
12 else
13 GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
14 fi
15
16 AC_ARG_WITH(gconf-source,
17 [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
18
19 AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
20 AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
21
22 if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
23 GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
24 fi
25
26 AC_ARG_WITH(gconf-schema-file-dir,
27 [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
28
29 AC_SUBST(GCONF_SCHEMA_FILE_DIR)
30 AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
31
32 AC_ARG_ENABLE(schemas-install,
33 [ --disable-schemas-install Disable the schemas installation],
34 [case ${enableval} in
35 yes|no) ;;
36 *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
37 esac])
38 AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
39])
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
deleted file mode 100644
index 8ee42c34b0..0000000000
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
+++ /dev/null
@@ -1,39 +0,0 @@
1SUMMARY = "Matchbox lightweight window manager"
2SECTION = "x11/wm"
3LICENSE = "GPLv2.0+"
4DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxcursor xdamage libxrender startup-notification expat"
5PR = "r5"
6
7SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \
8 file://configure_fix.patch \
9 file://kbdconfig \
10 file://gconf-2.m4"
11
12SRC_URI[md5sum] = "3e158dcf57823b55c926d95b245500fb"
13SRC_URI[sha256sum] = "81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff"
14
15S = "${WORKDIR}/matchbox-window-manager-${PV}"
16
17inherit autotools pkgconfig
18
19FILES_${PN} = "${bindir}/* \
20 ${datadir}/matchbox \
21 ${sysconfdir}/matchbox \
22 ${datadir}/themes/blondie/matchbox \
23 ${datadir}/themes/Default/matchbox \
24 ${datadir}/themes/MBOpus/matchbox"
25
26EXTRA_OECONF = " --enable-startup-notification \
27 --disable-xrm \
28 --enable-expat \
29 --with-expat-lib=${STAGING_LIBDIR} \
30 --with-expat-includes=${STAGING_INCDIR}"
31
32
33do_configure_prepend () {
34 cp ${WORKDIR}/gconf-2.m4 ${S}/
35}
36
37do_install_prepend() {
38 install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
39}