summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-01-26 19:14:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-28 16:49:12 +0000
commit1b26bce9675f1beb3d0370f49fc5ed9709c979f6 (patch)
tree7a24e783ae68cc1c26c0c8ba16c4e1e53af97ac7 /meta/recipes-sato
parent5612838d7e7f958633d211a186ab1cbab2803805 (diff)
downloadopenembedded-core-contrib-1b26bce9675f1beb3d0370f49fc5ed9709c979f6.tar.gz
openembedded-core-contrib-1b26bce9675f1beb3d0370f49fc5ed9709c979f6.tar.bz2
openembedded-core-contrib-1b26bce9675f1beb3d0370f49fc5ed9709c979f6.zip
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 <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb (renamed from meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb)8
-rw-r--r--meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb (renamed from meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb)8
-rw-r--r--meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb (renamed from meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb)8
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb (renamed from meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb)8
-rw-r--r--meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb (renamed from meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb)8
-rw-r--r--meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb (renamed from meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb)6
-rw-r--r--meta/recipes-sato/settings-daemon/settings-daemon_git.bb (renamed from meta/recipes-sato/settings-daemon/settings-daemon_svn.bb)8
7 files changed, 27 insertions, 27 deletions
diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
index fce21a3a25..9f4e4d3e01 100644
--- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb
+++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
@@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
DEPENDS = "gconf gtk+"
RDEPENDS_${PN} = "settings-daemon"
-PV = "0.0+svnr${SRCPV}"
-PR = "r1"
+PV = "0.0+git${SRCPV}"
+PR = "r0"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/git"
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
+SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
file://no-handed.patch;patch=1;pnum=0"
inherit autotools pkgconfig
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
index bed82acee6..09f79138ca 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
@@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
DEPENDS = "gtk+ startup-notification dbus"
SECTION = "x11/wm"
-PV = "2.0+svnr${SRCPV}"
-PR = "r1"
+PV = "2.0+git${SRCPV}"
+PR = "r0"
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN}-2;proto=http \
+SRC_URI = "git://git.pokylinux.org/${PN}-2;protocol=git \
file://dso_linking_change_build_fix.patch"
EXTRA_OECONF = "--enable-startup-notification --with-dbus"
-S = "${WORKDIR}/${PN}-2"
+S = "${WORKDIR}/git"
inherit autotools pkgconfig
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index 380e5ba338..245f999335 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -10,15 +10,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
RDEPENDS_${PN} = "formfactor dbus-wait"
SECTION = "x11"
-PV = "0.0+svnr${SRCPV}"
-PR = "r5"
+PV = "0.0+git${SRCPV}"
+PR = "r0"
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
+SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
file://configure_fix.patch;patch=1;maxrev=1819 \
file://single-instance.patch;patch=1 \
file://80matchboxkeyboard.shbg"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/git"
inherit autotools pkgconfig gettext
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
index d76fc09dc3..256b5a22da 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
@@ -12,21 +12,21 @@ DEPENDS = "gtk+ startup-notification dbus dbus-glib"
DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
-PV = "0.0+svnr${SRCPV}"
-PR = "r7"
+PV = "0.0+git${SRCPV}"
+PR = "r0"
RPROVIDES_${PN} = "matchbox-panel"
RREPLACES_${PN} = "matchbox-panel"
RCONFLICTS_${PN} = "matchbox-panel"
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
+SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
file://startup_fix.diff;patch=1"
EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/git"
FILES_${PN} += "${libdir}/matchbox-panel/*.so \
${datadir}/matchbox-panel/brightness/*.png \
diff --git a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
index de675c2b9b..8077a56e1c 100644
--- a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb
+++ b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
@@ -7,15 +7,15 @@ LIC_FILES_CHKSUM = "file://src/matchbox-stroke.h;endline=12;md5=8ed5c5bbec2321fb
DEPENDS = "libfakekey expat libxft"
SECTION = "x11/wm"
-PV = "0.0+svnr${SRCPV}"
-PR = "r1"
+PV = "0.0+git${SRCPV}"
+PR = "r0"
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
+SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
file://single-instance.patch;patch=1 \
file://configure_fix.patch;patch=1;maxrev=1819 \
file://dso_linking_change_build_fix.patch "
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/git"
inherit autotools pkgconfig gettext
diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
index f06d80cab0..c26c33861f 100644
--- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb
+++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
DEPENDS = "gtk+ vte"
SECTION = "x11/utils"
-PV = "0.0+svnr${SRCPV}"
+PV = "0.0+git${SRCPV}"
PR = "r0"
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
+SRC_URI = "git://git.pokylinux.org/${PN};protocol=git"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/git"
inherit autotools pkgconfig
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb
index 4f798b85b0..f7dc86fec9 100644
--- a/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb
+++ b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb
@@ -6,16 +6,16 @@ LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc
file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b"
DEPENDS = "gconf glib-2.0 gtk+"
SECTION = "x11"
-PV = "0.0+svnr${SRCPV}"
+PV = "0.0+git${SRCPV}"
-PR = "r4"
+PR = "r0"
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
+SRC_URI = "git://git.pokylinux.org/xsettings-daemon;protocol=git \
file://addsoundkeys.patch;apply=yes \
file://70settings-daemon.sh \
file://dso_linking_change_build_fix.patch"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/git"
inherit autotools pkgconfig gconf