diff options
| author |   Koen Kooi <koen@openembedded.org> | 2007-04-23 10:41:29 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-04-23 10:41:29 +0000 |
| commit | 30dbe7baba9a0101801b4db9101dbc69d5cb48e1 (patch) | |
| tree | 8dafe081dc14c6f12ac4c889044c0201a522cc5e /packages/matchbox-wm | |
| parent | 99ad35ff9b91d5ca4e46267e54cd664ac3001f58 (diff) | |
| download | openembedded-30dbe7baba9a0101801b4db9101dbc69d5cb48e1.tar.gz | |
matchbox-wm: add 1.2, merge in fixes from poky
Diffstat (limited to 'packages/matchbox-wm')
| -rw-r--r-- | packages/matchbox-wm/matchbox-wm/gconf-2.m4 | 39 | ||||
| -rw-r--r-- | packages/matchbox-wm/matchbox-wm_1.2.bb | 41 |
2 files changed, 80 insertions, 0 deletions
diff --git a/packages/matchbox-wm/matchbox-wm/gconf-2.m4 b/packages/matchbox-wm/matchbox-wm/gconf-2.m4 new file mode 100644 index 0000000000..aca7c7da45 --- /dev/null +++ b/packages/matchbox-wm/matchbox-wm/gconf-2.m4 @@ -0,0 +1,39 @@ +dnl AM_GCONF_SOURCE_2 +dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +dnl (i.e. pass to gconftool-2 +dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +dnl you should install foo.schemas files +dnl + +AC_DEFUN([AM_GCONF_SOURCE_2], +[ + if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then + GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` + else + GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE + fi + + AC_ARG_WITH(gconf-source, + [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) + + AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) + AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) + + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' + fi + + AC_ARG_WITH(gconf-schema-file-dir, + [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) + + AC_SUBST(GCONF_SCHEMA_FILE_DIR) + AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) + + AC_ARG_ENABLE(schemas-install, + [ --disable-schemas-install Disable the schemas installation], + [case ${enableval} in + yes|no) ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; + esac]) + AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) +]) diff --git a/packages/matchbox-wm/matchbox-wm_1.2.bb b/packages/matchbox-wm/matchbox-wm_1.2.bb new file mode 100644 index 0000000000..a7e9d4df62 --- /dev/null +++ b/packages/matchbox-wm/matchbox-wm_1.2.bb @@ -0,0 +1,41 @@ +require matchbox-wm.inc + +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +RDEPENDS = "matchbox-common" + +PR="r0" + +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ + file://gconf-2.m4 \ + file://kbdconfig" + +S = "${WORKDIR}/matchbox-window-manager-${PV}" + +inherit autotools pkgconfig update-alternatives + +FILES_${PN} = "${bindir}/* \ + ${datadir}/matchbox \ + ${sysconfdir}/matchbox \ + ${datadir}/themes/blondie/matchbox \ + ${datadir}/themes/Default/matchbox \ + ${datadir}/themes/MBOpus/matchbox" + +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PATH = "${bindir}/matchbox-session" +ALTERNATIVE_PRIORITY = "10" + +EXTRA_OECONF = " \ + --enable-startup-notification\ + --enable-gconf \ + --enable-expat \ + --disable-xrm" + +do_configure_prepend () { + cp ${WORKDIR}/gconf-2.m4 ${S}/ +} + +do_install_prepend() { + install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig +} + |