From 1b26bce9675f1beb3d0370f49fc5ed9709c979f6 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Wed, 26 Jan 2011 19:14:35 +0800 Subject: [PATCH] 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 --- ...ra_svn.bb => matchbox-themes-extra_git.bb} | 8 ++-- .../distro/include/poky-default-revisions.inc | 22 +++++------ .../{libfakekey_svn.bb => libfakekey_git.bb} | 8 ++-- ...{libmatchbox_svn.bb => libmatchbox_git.bb} | 8 ++-- .../matchbox-wm/matchbox-wm_0.9.5.bb | 32 ---------------- .../matchbox-wm/matchbox-wm_1.1.bb | 37 ------------------- ...{matchbox-wm_svn.bb => matchbox-wm_git.bb} | 8 ++-- ...-gtk_svn.bb => matchbox-config-gtk_git.bb} | 8 ++-- ...desktop_svn.bb => matchbox-desktop_git.bb} | 8 ++-- ...yboard_svn.bb => matchbox-keyboard_git.bb} | 8 ++-- ...panel-2_svn.bb => matchbox-panel-2_git.bb} | 8 ++-- ...x-stroke_svn.bb => matchbox-stroke_git.bb} | 8 ++-- ...rminal_svn.bb => matchbox-terminal_git.bb} | 6 +-- ...s-daemon_svn.bb => settings-daemon_git.bb} | 8 ++-- 14 files changed, 55 insertions(+), 122 deletions(-) rename meta-demoapps/recipes-sato/matchbox-themes-extra/{matchbox-themes-extra_svn.bb => matchbox-themes-extra_git.bb} (80%) rename meta/recipes-graphics/libfakekey/{libfakekey_svn.bb => libfakekey_git.bb} (77%) rename meta/recipes-graphics/libmatchbox/{libmatchbox_svn.bb => libmatchbox_git.bb} (65%) 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 rename meta/recipes-graphics/matchbox-wm/{matchbox-wm_svn.bb => matchbox-wm_git.bb} (88%) rename meta/recipes-sato/matchbox-config-gtk/{matchbox-config-gtk_svn.bb => matchbox-config-gtk_git.bb} (78%) rename meta/recipes-sato/matchbox-desktop/{matchbox-desktop_svn.bb => matchbox-desktop_git.bb} (83%) rename meta/recipes-sato/matchbox-keyboard/{matchbox-keyboard_svn.bb => matchbox-keyboard_git.bb} (92%) rename meta/recipes-sato/matchbox-panel-2/{matchbox-panel-2_svn.bb => matchbox-panel-2_git.bb} (90%) rename meta/recipes-sato/matchbox-stroke/{matchbox-stroke_svn.bb => matchbox-stroke_git.bb} (82%) rename meta/recipes-sato/matchbox-terminal/{matchbox-terminal_svn.bb => matchbox-terminal_git.bb} (75%) rename meta/recipes-sato/settings-daemon/{settings-daemon_svn.bb => settings-daemon_git.bb} (86%) diff --git a/meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_svn.bb b/meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_git.bb similarity index 80% rename from meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_svn.bb rename to meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_git.bb index e4e2f730c4..fdb764ca03 100644 --- a/meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_svn.bb +++ b/meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_git.bb @@ -2,10 +2,12 @@ DESCRIPTION = "Matchbox window manager extra themes" LICENSE = "GPL" DEPENDS = "matchbox-wm" SECTION = "x11/wm" -PV = "0.3+svnr${SRCPV}" +PV = "0.3+git${SRCPV}" -SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-themes-extra;proto=http" -S = "${WORKDIR}/${PN}" +LIC_FILES_CHKSUM = "file://configure.ac;endline=7;md5=3c4e087662e37f10e469425f3a0ad225" + +SRC_URI = "git://git.pokylinux.org/${PN};protocol=git" +S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 9a34a200dc..f9a0eef34b 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc @@ -59,10 +59,10 @@ SRCREV_pn-inputproto-native ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" SRCREV_pn-inputproto-nativesdk ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" SRCREV_pn-kern-tools-native ??= "8832b75dc2e494ae96ca3e1dee7bfde2f3096904" SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" -SRCREV_pn-libfakekey ??= "2031" +SRCREV_pn-libfakekey ??= "e8c2e412ea4a417afc1f30e32cb7bdc508b1dccc" SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f" SRCREV_pn-libgsmd ??= "5394" -SRCREV_pn-libmatchbox ??= "1531" +SRCREV_pn-libmatchbox ??= "c81f8f444b83b187727f046432b186d67a42c732" SRCREV_pn-libowl ??= "408" SRCREV_pn-libowl-av ??= "416" SRCREV_pn-libx11 ??= "d23aad31338e7d869d878d5aa1b6b91d20287005" @@ -107,19 +107,19 @@ SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "3f01b98238c2ff7913ce9f68f9db5ae95 SRCREV_machine_pn-linux-yocto_beagleboard ?= "a9d833fda90e2f1257888a97e092135610b5f259" SRCREV_meta_pn-linux-yocto ?= "8a49ef6f1a43dabbce34a9ee9a1be08b26fc511c" SRCREV_pn-linux-libc-headers-yocto ??= "a9d833fda90e2f1257888a97e092135610b5f259" -SRCREV_pn-matchbox-config-gtk ??= "2081" +SRCREV_pn-matchbox-config-gtk ??= "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028" SRCREV_pn-matchbox-desktop-sato ??= "76" -SRCREV_pn-matchbox-desktop ??= "2096" -SRCREV_pn-matchbox-keyboard ??= "2075" -SRCREV_pn-matchbox-panel-2 ??= "2111" +SRCREV_pn-matchbox-desktop ??= "af7ed6775487380be73160aa0298bf6019765fad" +SRCREV_pn-matchbox-keyboard ??= "b38f24036cff3be6c2fbcf9ca9881803e69003ac" +SRCREV_pn-matchbox-panel-2 ??= "982d9ea173dc87a84db2303d1a6a12607fc4d539" SRCREV_pn-matchbox-panel ??= "1364" -SRCREV_pn-matchbox-stroke ??= "1820" -SRCREV_pn-matchbox-terminal ??= "1816" +SRCREV_pn-matchbox-stroke ??= "8edfd9a2bf1f0d6b28d4afee4bda9d3635f26a0b" +SRCREV_pn-matchbox-terminal ??= "3fc25cb811a8ed306de897edf9b930f4402f3852" SRCREV_pn-matchbox-theme-sato-2 ??= "164" SRCREV_pn-matchbox-theme-sato ??= "90" -SRCREV_pn-matchbox-themes-extra ??= "1524" +SRCREV_pn-matchbox-themes-extra ??= "f848f9e4e577d5b9719f05b5152df1ce59399f5c" SRCREV_pn-matchbox-wm-2 ??= "2106" -SRCREV_pn-matchbox-wm ??= "1819" +SRCREV_pn-matchbox-wm ??= "e8236c9ab44a8af8137cac2a35fb87f9146a9656" SRCREV_pn-mesa-dri ??= "1bf94d419805538ac23a4d0b04d31ac5e4487aca" SRCREV_pn-mesa-xlib ??= "1bf94d419805538ac23a4d0b04d31ac5e4487aca" SRCDATE_minimo ??= "20070510" @@ -162,7 +162,7 @@ SRCREV_pn-qemugl ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0" SRCREV_pn-qemugl-nativesdk ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0" SRCREV_pn-sat-solver = "aa799f7bae0ec055e0e527203635001bb7346dbc" SRCREV_pn-screenshot ??= "292" -SRCREV_pn-settings-daemon ??= "2059" +SRCREV_pn-settings-daemon ??= "0f174f463dfed500b65533e249cd22942e439c77" SRCREV_pn-swabber-native ??= "a0792390c5d6d5a5bade7ab155c80eef3f30fa52" SRCREV_pn-sysprof ??= "38a6af1f0a45e528fd2842983da71e0f23c70d6a" SRCREV_pn-systemtap ??= "4ab3a1863bf4f472acae7a809bf2b38d91658aa8" diff --git a/meta/recipes-graphics/libfakekey/libfakekey_svn.bb b/meta/recipes-graphics/libfakekey/libfakekey_git.bb similarity index 77% rename from meta/recipes-graphics/libfakekey/libfakekey_svn.bb rename to meta/recipes-graphics/libfakekey/libfakekey_git.bb index 24136664a4..8670ad8215 100644 --- a/meta/recipes-graphics/libfakekey/libfakekey_svn.bb +++ b/meta/recipes-graphics/libfakekey/libfakekey_git.bb @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://src/libfakekey.c;endline=30;md5=602b5ccd48f6440751086 DEPENDS = "libxtst" 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" -S = "${WORKDIR}/${PN}" +S = "${WORKDIR}/git" inherit autotools pkgconfig gettext diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb similarity index 65% rename from meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb rename to meta/recipes-graphics/libmatchbox/libmatchbox_git.bb index 6bc7112eca..f916889cc3 100644 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb @@ -1,16 +1,16 @@ require libmatchbox.inc -PV = "1.7+svnr${SRCPV}" -PR = "r5" +PV = "1.9+git${SRCPV}" +PR = "r0" DEFAULT_PREFERENCE = "-1" -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_fixes.patch;patch=1 \ file://check.m4 \ file://16bppfixes.patch;patch=1 \ file://matchbox-start-fix.patch;patch=1" -S = "${WORKDIR}/libmatchbox" +S = "${WORKDIR}/git" 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_svn.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb similarity index 88% rename from meta/recipes-graphics/matchbox-wm/matchbox-wm_svn.bb rename to meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb index d215171768..086d4853e4 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_svn.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb @@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa SECTION = "x11/wm" DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf" -PV = "1.2+svnr${SRCPV}" -PR = "r4" +PV = "1.2+git${SRCPV}" +PR = "r0" -SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \ +SRC_URI = "git://git.pokylinux.org/matchbox-window-manager;protocol=git \ file://configure_fix.patch;patch=1;maxrev=1818 \ file://kbdconfig" -S = "${WORKDIR}/matchbox-window-manager" +S = "${WORKDIR}/git" inherit autotools pkgconfig update-alternatives 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 similarity index 78% rename from meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_svn.bb rename to 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 similarity index 83% rename from meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb rename to 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 similarity index 92% rename from meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb rename to 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 similarity index 90% rename from meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_svn.bb rename to 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 similarity index 82% rename from meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb rename to 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 similarity index 75% rename from meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb rename to 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 similarity index 86% rename from meta/recipes-sato/settings-daemon/settings-daemon_svn.bb rename to 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