[oe-commits] org.oe.dev matchbox-wm: add 1.2, merge in fixes from poky

[koen commit]

matchbox-wm: add 1.2, merge in fixes from poky

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: fdb3a990f25607c7b10b3ace56859b837e3e6a99
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fdb3a990f25607c7b10b3ace56859b837e3e6a99
Files:
1
packages/matchbox-wm/matchbox-wm/gconf-2.m4
packages/matchbox-wm/matchbox-wm_1.2.bb
Diffs:

#
# mt diff -r46a4a2ecf44f4339cc7dc7abad48e7c20f490825 -rfdb3a990f25607c7b10b3ace56859b837e3e6a99
#
# 
# 
# add_file "packages/matchbox-wm/matchbox-wm/gconf-2.m4"
#  content [36f7b405a627019d8c63f44ec7fd01a6d27327aa]
# 
# add_file "packages/matchbox-wm/matchbox-wm_1.2.bb"
#  content [37c977f19c947e74821e4d7fea079dad3ffbb12f]
# 
============================================================
--- packages/matchbox-wm/matchbox-wm/gconf-2.m4	36f7b405a627019d8c63f44ec7fd01a6d27327aa
+++ packages/matchbox-wm/matchbox-wm/gconf-2.m4	36f7b405a627019d8c63f44ec7fd01a6d27327aa
@@ -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])
+])
============================================================
--- packages/matchbox-wm/matchbox-wm_1.2.bb	37c977f19c947e74821e4d7fea079dad3ffbb12f
+++ packages/matchbox-wm/matchbox-wm_1.2.bb	37c977f19c947e74821e4d7fea079dad3ffbb12f
@@ -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
+}
+