From 1b26bce9675f1beb3d0370f49fc5ed9709c979f6 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Wed, 26 Jan 2011 19:14:35 +0800 Subject: matchbox: Convert all the matchbox components' repo from svn to git including: matchbox-wm matchbox-panel-2 matchbox-terminal matchbox-config-gtk matchbox-stroke matchbox-desktop matchbox-keyboard matchbox-themes-extra libfakekey settings-daemon Also remove some old recipes. Signed-off-by: Zhai Edwin --- meta/recipes-graphics/libfakekey/libfakekey_git.bb | 19 ++++++++++ meta/recipes-graphics/libfakekey/libfakekey_svn.bb | 19 ---------- .../libmatchbox/libmatchbox_git.bb | 17 +++++++++ .../libmatchbox/libmatchbox_svn.bb | 17 --------- .../matchbox-wm/matchbox-wm_0.9.5.bb | 32 ---------------- .../matchbox-wm/matchbox-wm_1.1.bb | 37 ------------------ .../matchbox-wm/matchbox-wm_git.bb | 44 ++++++++++++++++++++++ .../matchbox-wm/matchbox-wm_svn.bb | 44 ---------------------- 8 files changed, 80 insertions(+), 149 deletions(-) create mode 100644 meta/recipes-graphics/libfakekey/libfakekey_git.bb delete mode 100644 meta/recipes-graphics/libfakekey/libfakekey_svn.bb create mode 100644 meta/recipes-graphics/libmatchbox/libmatchbox_git.bb delete mode 100644 meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb delete mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm_0.9.5.bb delete mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm_1.1.bb create mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb delete mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm_svn.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/libfakekey/libfakekey_git.bb b/meta/recipes-graphics/libfakekey/libfakekey_git.bb new file mode 100644 index 0000000000..8670ad8215 --- /dev/null +++ b/meta/recipes-graphics/libfakekey/libfakekey_git.bb @@ -0,0 +1,19 @@ +SUMMARY = "Library for converting characters to X key-presses" +DESCRIPTION = "libfakekey is a simple library for converting UTF-8 characters into 'fake' X \ +key-presses." +HOMEPAGE = "http://matchbox-project.org/" +BUGTRACKER = "http://bugzilla.openedhand.com/" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://src/libfakekey.c;endline=30;md5=602b5ccd48f64407510867f3373b448c" + +DEPENDS = "libxtst" +SECTION = "x11/wm" +PV = "0.0+git${SRCPV}" +PR = "r0" + +SRC_URI = "git://git.pokylinux.org/${PN};protocol=git" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig gettext diff --git a/meta/recipes-graphics/libfakekey/libfakekey_svn.bb b/meta/recipes-graphics/libfakekey/libfakekey_svn.bb deleted file mode 100644 index 24136664a4..0000000000 --- a/meta/recipes-graphics/libfakekey/libfakekey_svn.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Library for converting characters to X key-presses" -DESCRIPTION = "libfakekey is a simple library for converting UTF-8 characters into 'fake' X \ -key-presses." -HOMEPAGE = "http://matchbox-project.org/" -BUGTRACKER = "http://bugzilla.openedhand.com/" - -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://src/libfakekey.c;endline=30;md5=602b5ccd48f64407510867f3373b448c" - -DEPENDS = "libxtst" -SECTION = "x11/wm" -PV = "0.0+svnr${SRCPV}" -PR = "r1" - -SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" - -S = "${WORKDIR}/${PN}" - -inherit autotools pkgconfig gettext diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb new file mode 100644 index 0000000000..f916889cc3 --- /dev/null +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb @@ -0,0 +1,17 @@ +require libmatchbox.inc + +PV = "1.9+git${SRCPV}" +PR = "r0" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \ + file://configure_fixes.patch;patch=1 \ + file://check.m4 \ + file://16bppfixes.patch;patch=1 \ + file://matchbox-start-fix.patch;patch=1" + +S = "${WORKDIR}/git" + +do_configure_prepend () { + cp ${WORKDIR}/check.m4 ${S}/ +} diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb deleted file mode 100644 index 6bc7112eca..0000000000 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb +++ /dev/null @@ -1,17 +0,0 @@ -require libmatchbox.inc - -PV = "1.7+svnr${SRCPV}" -PR = "r5" -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ - file://configure_fixes.patch;patch=1 \ - file://check.m4 \ - file://16bppfixes.patch;patch=1 \ - file://matchbox-start-fix.patch;patch=1" - -S = "${WORKDIR}/libmatchbox" - -do_configure_prepend () { - cp ${WORKDIR}/check.m4 ${S}/ -} diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_0.9.5.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_0.9.5.bb deleted file mode 100644 index e09eb00ed1..0000000000 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_0.9.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat gconf" -PR="r2" - - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ - 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-session-manager" -ALTERNATIVE_LINK = "${bindir}/x-session-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "10" - -EXTRA_OECONF = " --enable-startup-notification --disable-xrm" - -do_install_prepend() { - install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig -} - diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.1.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.1.bb deleted file mode 100644 index ebed31e2a5..0000000000 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat" -PR="r4" - - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \ - file://kbdconfig \ - file://gconf-2.m4" - -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-session-manager" -ALTERNATIVE_LINK = "${bindir}/x-session-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "10" - -EXTRA_OECONF = " --enable-startup-notification --disable-xrm" - -do_configure_prepend () { - cp ${WORKDIR}/gconf-2.m4 ${S}/ -} - -do_install_prepend() { - install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig -} - diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb new file mode 100644 index 0000000000..086d4853e4 --- /dev/null +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "Matchbox window manager" +HOMEPAGE = "http://matchbox-project.org" +BUGTRACKER = "http://bugzilla.openedhand.com/" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa835 \ + file://src/main.c;endline=21;md5=3e5d9f832b527b0d72dbe8e3c4c60b95 \ + file://src/wm.c;endline=21;md5=8dc9d24477d87ef5dfbc2e4927146aab" + +SECTION = "x11/wm" +DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf" + +PV = "1.2+git${SRCPV}" +PR = "r0" + +SRC_URI = "git://git.pokylinux.org/matchbox-window-manager;protocol=git \ + file://configure_fix.patch;patch=1;maxrev=1818 \ + file://kbdconfig" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig update-alternatives + +ALTERNATIVE_NAME = "x-session-manager" +ALTERNATIVE_LINK = "${bindir}/x-session-manager" +ALTERNATIVE_PATH = "${bindir}/matchbox-session" +ALTERNATIVE_PRIORITY = "10" + +FILES_${PN} = "${bindir}/* \ + ${datadir}/matchbox \ + ${sysconfdir}/matchbox \ + ${datadir}/themes/blondie/matchbox \ + ${datadir}/themes/Default/matchbox \ + ${datadir}/themes/MBOpus/matchbox" + +EXTRA_OECONF = " --enable-startup-notification \ + --disable-xrm \ + --enable-expat \ + --with-expat-lib=${STAGING_LIBDIR} \ + --with-expat-includes=${STAGING_INCDIR}" + +do_install_prepend() { + install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig +} diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_svn.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_svn.bb deleted file mode 100644 index d215171768..0000000000 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_svn.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "Matchbox window manager" -HOMEPAGE = "http://matchbox-project.org" -BUGTRACKER = "http://bugzilla.openedhand.com/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa835 \ - file://src/main.c;endline=21;md5=3e5d9f832b527b0d72dbe8e3c4c60b95 \ - file://src/wm.c;endline=21;md5=8dc9d24477d87ef5dfbc2e4927146aab" - -SECTION = "x11/wm" -DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf" - -PV = "1.2+svnr${SRCPV}" -PR = "r4" - -SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \ - file://configure_fix.patch;patch=1;maxrev=1818 \ - file://kbdconfig" - -S = "${WORKDIR}/matchbox-window-manager" - -inherit autotools pkgconfig update-alternatives - -ALTERNATIVE_NAME = "x-session-manager" -ALTERNATIVE_LINK = "${bindir}/x-session-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "10" - -FILES_${PN} = "${bindir}/* \ - ${datadir}/matchbox \ - ${sysconfdir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/Default/matchbox \ - ${datadir}/themes/MBOpus/matchbox" - -EXTRA_OECONF = " --enable-startup-notification \ - --disable-xrm \ - --enable-expat \ - --with-expat-lib=${STAGING_LIBDIR} \ - --with-expat-includes=${STAGING_INCDIR}" - -do_install_prepend() { - install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig -} -- cgit v1.2.3-54-g00ecf