summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_git.bb (renamed from meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_svn.bb)8
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc22
-rw-r--r--meta/recipes-graphics/libfakekey/libfakekey_git.bb (renamed from meta/recipes-graphics/libfakekey/libfakekey_svn.bb)8
-rw-r--r--meta/recipes-graphics/libmatchbox/libmatchbox_git.bb (renamed from meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb)8
-rw-r--r--meta/recipes-graphics/matchbox-wm/matchbox-wm_0.9.5.bb32
-rw-r--r--meta/recipes-graphics/matchbox-wm/matchbox-wm_1.1.bb37
-rw-r--r--meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb (renamed from meta/recipes-graphics/matchbox-wm/matchbox-wm_svn.bb)8
-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
14 files changed, 55 insertions, 122 deletions
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
index e4e2f73..fdb764c 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"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "matchbox-wm" 3DEPENDS = "matchbox-wm"
4SECTION = "x11/wm" 4SECTION = "x11/wm"
5PV = "0.3+svnr${SRCPV}" 5PV = "0.3+git${SRCPV}"
6 6
7SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-themes-extra;proto=http" 7LIC_FILES_CHKSUM = "file://configure.ac;endline=7;md5=3c4e087662e37f10e469425f3a0ad225"
8S = "${WORKDIR}/${PN}" 8
9SRC_URI = "git://git.pokylinux.org/${PN};protocol=git"
10S = "${WORKDIR}/git"
9 11
10inherit autotools pkgconfig 12inherit autotools pkgconfig
11 13
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 9a34a20..f9a0eef 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"
59SRCREV_pn-inputproto-nativesdk ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" 59SRCREV_pn-inputproto-nativesdk ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
60SRCREV_pn-kern-tools-native ??= "8832b75dc2e494ae96ca3e1dee7bfde2f3096904" 60SRCREV_pn-kern-tools-native ??= "8832b75dc2e494ae96ca3e1dee7bfde2f3096904"
61SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" 61SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
62SRCREV_pn-libfakekey ??= "2031" 62SRCREV_pn-libfakekey ??= "e8c2e412ea4a417afc1f30e32cb7bdc508b1dccc"
63SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f" 63SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f"
64SRCREV_pn-libgsmd ??= "5394" 64SRCREV_pn-libgsmd ??= "5394"
65SRCREV_pn-libmatchbox ??= "1531" 65SRCREV_pn-libmatchbox ??= "c81f8f444b83b187727f046432b186d67a42c732"
66SRCREV_pn-libowl ??= "408" 66SRCREV_pn-libowl ??= "408"
67SRCREV_pn-libowl-av ??= "416" 67SRCREV_pn-libowl-av ??= "416"
68SRCREV_pn-libx11 ??= "d23aad31338e7d869d878d5aa1b6b91d20287005" 68SRCREV_pn-libx11 ??= "d23aad31338e7d869d878d5aa1b6b91d20287005"
@@ -107,19 +107,19 @@ SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "3f01b98238c2ff7913ce9f68f9db5ae95
107SRCREV_machine_pn-linux-yocto_beagleboard ?= "a9d833fda90e2f1257888a97e092135610b5f259" 107SRCREV_machine_pn-linux-yocto_beagleboard ?= "a9d833fda90e2f1257888a97e092135610b5f259"
108SRCREV_meta_pn-linux-yocto ?= "8a49ef6f1a43dabbce34a9ee9a1be08b26fc511c" 108SRCREV_meta_pn-linux-yocto ?= "8a49ef6f1a43dabbce34a9ee9a1be08b26fc511c"
109SRCREV_pn-linux-libc-headers-yocto ??= "a9d833fda90e2f1257888a97e092135610b5f259" 109SRCREV_pn-linux-libc-headers-yocto ??= "a9d833fda90e2f1257888a97e092135610b5f259"
110SRCREV_pn-matchbox-config-gtk ??= "2081" 110SRCREV_pn-matchbox-config-gtk ??= "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028"
111SRCREV_pn-matchbox-desktop-sato ??= "76" 111SRCREV_pn-matchbox-desktop-sato ??= "76"
112SRCREV_pn-matchbox-desktop ??= "2096" 112SRCREV_pn-matchbox-desktop ??= "af7ed6775487380be73160aa0298bf6019765fad"
113SRCREV_pn-matchbox-keyboard ??= "2075" 113SRCREV_pn-matchbox-keyboard ??= "b38f24036cff3be6c2fbcf9ca9881803e69003ac"
114SRCREV_pn-matchbox-panel-2 ??= "2111" 114SRCREV_pn-matchbox-panel-2 ??= "982d9ea173dc87a84db2303d1a6a12607fc4d539"
115SRCREV_pn-matchbox-panel ??= "1364" 115SRCREV_pn-matchbox-panel ??= "1364"
116SRCREV_pn-matchbox-stroke ??= "1820" 116SRCREV_pn-matchbox-stroke ??= "8edfd9a2bf1f0d6b28d4afee4bda9d3635f26a0b"
117SRCREV_pn-matchbox-terminal ??= "1816" 117SRCREV_pn-matchbox-terminal ??= "3fc25cb811a8ed306de897edf9b930f4402f3852"
118SRCREV_pn-matchbox-theme-sato-2 ??= "164" 118SRCREV_pn-matchbox-theme-sato-2 ??= "164"
119SRCREV_pn-matchbox-theme-sato ??= "90" 119SRCREV_pn-matchbox-theme-sato ??= "90"
120SRCREV_pn-matchbox-themes-extra ??= "1524" 120SRCREV_pn-matchbox-themes-extra ??= "f848f9e4e577d5b9719f05b5152df1ce59399f5c"
121SRCREV_pn-matchbox-wm-2 ??= "2106" 121SRCREV_pn-matchbox-wm-2 ??= "2106"
122SRCREV_pn-matchbox-wm ??= "1819" 122SRCREV_pn-matchbox-wm ??= "e8236c9ab44a8af8137cac2a35fb87f9146a9656"
123SRCREV_pn-mesa-dri ??= "1bf94d419805538ac23a4d0b04d31ac5e4487aca" 123SRCREV_pn-mesa-dri ??= "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
124SRCREV_pn-mesa-xlib ??= "1bf94d419805538ac23a4d0b04d31ac5e4487aca" 124SRCREV_pn-mesa-xlib ??= "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
125SRCDATE_minimo ??= "20070510" 125SRCDATE_minimo ??= "20070510"
@@ -162,7 +162,7 @@ SRCREV_pn-qemugl ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
162SRCREV_pn-qemugl-nativesdk ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0" 162SRCREV_pn-qemugl-nativesdk ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
163SRCREV_pn-sat-solver = "aa799f7bae0ec055e0e527203635001bb7346dbc" 163SRCREV_pn-sat-solver = "aa799f7bae0ec055e0e527203635001bb7346dbc"
164SRCREV_pn-screenshot ??= "292" 164SRCREV_pn-screenshot ??= "292"
165SRCREV_pn-settings-daemon ??= "2059" 165SRCREV_pn-settings-daemon ??= "0f174f463dfed500b65533e249cd22942e439c77"
166SRCREV_pn-swabber-native ??= "a0792390c5d6d5a5bade7ab155c80eef3f30fa52" 166SRCREV_pn-swabber-native ??= "a0792390c5d6d5a5bade7ab155c80eef3f30fa52"
167SRCREV_pn-sysprof ??= "38a6af1f0a45e528fd2842983da71e0f23c70d6a" 167SRCREV_pn-sysprof ??= "38a6af1f0a45e528fd2842983da71e0f23c70d6a"
168SRCREV_pn-systemtap ??= "4ab3a1863bf4f472acae7a809bf2b38d91658aa8" 168SRCREV_pn-systemtap ??= "4ab3a1863bf4f472acae7a809bf2b38d91658aa8"
diff --git a/meta/recipes-graphics/libfakekey/libfakekey_svn.bb b/meta/recipes-graphics/libfakekey/libfakekey_git.bb
index 2413666..8670ad8 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
9 9
10DEPENDS = "libxtst" 10DEPENDS = "libxtst"
11SECTION = "x11/wm" 11SECTION = "x11/wm"
12PV = "0.0+svnr${SRCPV}" 12PV = "0.0+git${SRCPV}"
13PR = "r1" 13PR = "r0"
14 14
15SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" 15SRC_URI = "git://git.pokylinux.org/${PN};protocol=git"
16 16
17S = "${WORKDIR}/${PN}" 17S = "${WORKDIR}/git"
18 18
19inherit autotools pkgconfig gettext 19inherit autotools pkgconfig gettext
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb
index 6bc7112..f916889 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_svn.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb
@@ -1,16 +1,16 @@
1require libmatchbox.inc 1require libmatchbox.inc
2 2
3PV = "1.7+svnr${SRCPV}" 3PV = "1.9+git${SRCPV}"
4PR = "r5" 4PR = "r0"
5DEFAULT_PREFERENCE = "-1" 5DEFAULT_PREFERENCE = "-1"
6 6
7SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 7SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
8 file://configure_fixes.patch;patch=1 \ 8 file://configure_fixes.patch;patch=1 \
9 file://check.m4 \ 9 file://check.m4 \
10 file://16bppfixes.patch;patch=1 \ 10 file://16bppfixes.patch;patch=1 \
11 file://matchbox-start-fix.patch;patch=1" 11 file://matchbox-start-fix.patch;patch=1"
12 12
13S = "${WORKDIR}/libmatchbox" 13S = "${WORKDIR}/git"
14 14
15do_configure_prepend () { 15do_configure_prepend () {
16 cp ${WORKDIR}/check.m4 ${S}/ 16 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 e09eb00..0000000
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_0.9.5.bb
+++ /dev/null
@@ -1,32 +0,0 @@
1SECTION = "x11/wm"
2DESCRIPTION = "Matchbox window manager"
3LICENSE = "GPL"
4DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat gconf"
5PR="r2"
6
7
8SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \
9 file://kbdconfig"
10
11S = "${WORKDIR}/matchbox-window-manager-${PV}"
12
13inherit autotools pkgconfig update-alternatives
14
15FILES_${PN} = "${bindir}/* \
16 ${datadir}/matchbox \
17 ${sysconfdir}/matchbox \
18 ${datadir}/themes/blondie/matchbox \
19 ${datadir}/themes/Default/matchbox \
20 ${datadir}/themes/MBOpus/matchbox"
21
22ALTERNATIVE_NAME = "x-session-manager"
23ALTERNATIVE_LINK = "${bindir}/x-session-manager"
24ALTERNATIVE_PATH = "${bindir}/matchbox-session"
25ALTERNATIVE_PRIORITY = "10"
26
27EXTRA_OECONF = " --enable-startup-notification --disable-xrm"
28
29do_install_prepend() {
30 install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
31}
32
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 ebed31e..0000000
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.1.bb
+++ /dev/null
@@ -1,37 +0,0 @@
1SECTION = "x11/wm"
2DESCRIPTION = "Matchbox window manager"
3LICENSE = "GPL"
4DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat"
5PR="r4"
6
7
8SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \
9 file://kbdconfig \
10 file://gconf-2.m4"
11
12S = "${WORKDIR}/matchbox-window-manager-${PV}"
13
14inherit autotools pkgconfig update-alternatives
15
16FILES_${PN} = "${bindir}/* \
17 ${datadir}/matchbox \
18 ${sysconfdir}/matchbox \
19 ${datadir}/themes/blondie/matchbox \
20 ${datadir}/themes/Default/matchbox \
21 ${datadir}/themes/MBOpus/matchbox"
22
23ALTERNATIVE_NAME = "x-session-manager"
24ALTERNATIVE_LINK = "${bindir}/x-session-manager"
25ALTERNATIVE_PATH = "${bindir}/matchbox-session"
26ALTERNATIVE_PRIORITY = "10"
27
28EXTRA_OECONF = " --enable-startup-notification --disable-xrm"
29
30do_configure_prepend () {
31 cp ${WORKDIR}/gconf-2.m4 ${S}/
32}
33
34do_install_prepend() {
35 install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
36}
37
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_svn.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
index d215171..086d485 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
10SECTION = "x11/wm" 10SECTION = "x11/wm"
11DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf" 11DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf"
12 12
13PV = "1.2+svnr${SRCPV}" 13PV = "1.2+git${SRCPV}"
14PR = "r4" 14PR = "r0"
15 15
16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \ 16SRC_URI = "git://git.pokylinux.org/matchbox-window-manager;protocol=git \
17 file://configure_fix.patch;patch=1;maxrev=1818 \ 17 file://configure_fix.patch;patch=1;maxrev=1818 \
18 file://kbdconfig" 18 file://kbdconfig"
19 19
20S = "${WORKDIR}/matchbox-window-manager" 20S = "${WORKDIR}/git"
21 21
22inherit autotools pkgconfig update-alternatives 22inherit autotools pkgconfig update-alternatives
23 23
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 fce21a3..9f4e4d3 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 \
9DEPENDS = "gconf gtk+" 9DEPENDS = "gconf gtk+"
10RDEPENDS_${PN} = "settings-daemon" 10RDEPENDS_${PN} = "settings-daemon"
11 11
12PV = "0.0+svnr${SRCPV}" 12PV = "0.0+git${SRCPV}"
13PR = "r1" 13PR = "r0"
14 14
15S = "${WORKDIR}/${PN}" 15S = "${WORKDIR}/git"
16 16
17SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 17SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
18 file://no-handed.patch;patch=1;pnum=0" 18 file://no-handed.patch;patch=1;pnum=0"
19 19
20inherit autotools pkgconfig 20inherit 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 bed82ac..09f7913 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 \
10 10
11DEPENDS = "gtk+ startup-notification dbus" 11DEPENDS = "gtk+ startup-notification dbus"
12SECTION = "x11/wm" 12SECTION = "x11/wm"
13PV = "2.0+svnr${SRCPV}" 13PV = "2.0+git${SRCPV}"
14PR = "r1" 14PR = "r0"
15 15
16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN}-2;proto=http \ 16SRC_URI = "git://git.pokylinux.org/${PN}-2;protocol=git \
17 file://dso_linking_change_build_fix.patch" 17 file://dso_linking_change_build_fix.patch"
18 18
19EXTRA_OECONF = "--enable-startup-notification --with-dbus" 19EXTRA_OECONF = "--enable-startup-notification --with-dbus"
20 20
21S = "${WORKDIR}/${PN}-2" 21S = "${WORKDIR}/git"
22 22
23inherit autotools pkgconfig 23inherit 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 380e5ba..245f999 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 \
10DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" 10DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
11RDEPENDS_${PN} = "formfactor dbus-wait" 11RDEPENDS_${PN} = "formfactor dbus-wait"
12SECTION = "x11" 12SECTION = "x11"
13PV = "0.0+svnr${SRCPV}" 13PV = "0.0+git${SRCPV}"
14PR = "r5" 14PR = "r0"
15 15
16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 16SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
17 file://configure_fix.patch;patch=1;maxrev=1819 \ 17 file://configure_fix.patch;patch=1;maxrev=1819 \
18 file://single-instance.patch;patch=1 \ 18 file://single-instance.patch;patch=1 \
19 file://80matchboxkeyboard.shbg" 19 file://80matchboxkeyboard.shbg"
20 20
21S = "${WORKDIR}/${PN}" 21S = "${WORKDIR}/git"
22 22
23inherit autotools pkgconfig gettext 23inherit autotools pkgconfig gettext
24 24
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 d76fc09..256b5a2 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"
12DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" 12DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
13DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" 13DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
14 14
15PV = "0.0+svnr${SRCPV}" 15PV = "0.0+git${SRCPV}"
16PR = "r7" 16PR = "r0"
17 17
18RPROVIDES_${PN} = "matchbox-panel" 18RPROVIDES_${PN} = "matchbox-panel"
19RREPLACES_${PN} = "matchbox-panel" 19RREPLACES_${PN} = "matchbox-panel"
20RCONFLICTS_${PN} = "matchbox-panel" 20RCONFLICTS_${PN} = "matchbox-panel"
21 21
22SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 22SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
23 file://startup_fix.diff;patch=1" 23 file://startup_fix.diff;patch=1"
24 24
25EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 25EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
26EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" 26EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
27EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" 27EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}"
28 28
29S = "${WORKDIR}/${PN}" 29S = "${WORKDIR}/git"
30 30
31FILES_${PN} += "${libdir}/matchbox-panel/*.so \ 31FILES_${PN} += "${libdir}/matchbox-panel/*.so \
32 ${datadir}/matchbox-panel/brightness/*.png \ 32 ${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 de675c2..8077a56 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
7 7
8DEPENDS = "libfakekey expat libxft" 8DEPENDS = "libfakekey expat libxft"
9SECTION = "x11/wm" 9SECTION = "x11/wm"
10PV = "0.0+svnr${SRCPV}" 10PV = "0.0+git${SRCPV}"
11PR = "r1" 11PR = "r0"
12 12
13SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 13SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
14 file://single-instance.patch;patch=1 \ 14 file://single-instance.patch;patch=1 \
15 file://configure_fix.patch;patch=1;maxrev=1819 \ 15 file://configure_fix.patch;patch=1;maxrev=1819 \
16 file://dso_linking_change_build_fix.patch " 16 file://dso_linking_change_build_fix.patch "
17 17
18S = "${WORKDIR}/${PN}" 18S = "${WORKDIR}/git"
19 19
20inherit autotools pkgconfig gettext 20inherit autotools pkgconfig gettext
21 21
diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_svn.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
index f06d80c..c26c338 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 \
8 8
9DEPENDS = "gtk+ vte" 9DEPENDS = "gtk+ vte"
10SECTION = "x11/utils" 10SECTION = "x11/utils"
11PV = "0.0+svnr${SRCPV}" 11PV = "0.0+git${SRCPV}"
12PR = "r0" 12PR = "r0"
13 13
14SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" 14SRC_URI = "git://git.pokylinux.org/${PN};protocol=git"
15 15
16S = "${WORKDIR}/${PN}" 16S = "${WORKDIR}/git"
17 17
18inherit autotools pkgconfig 18inherit 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 4f798b8..f7dc86f 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
6 file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" 6 file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b"
7DEPENDS = "gconf glib-2.0 gtk+" 7DEPENDS = "gconf glib-2.0 gtk+"
8SECTION = "x11" 8SECTION = "x11"
9PV = "0.0+svnr${SRCPV}" 9PV = "0.0+git${SRCPV}"
10 10
11PR = "r4" 11PR = "r0"
12 12
13SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 13SRC_URI = "git://git.pokylinux.org/xsettings-daemon;protocol=git \
14 file://addsoundkeys.patch;apply=yes \ 14 file://addsoundkeys.patch;apply=yes \
15 file://70settings-daemon.sh \ 15 file://70settings-daemon.sh \
16 file://dso_linking_change_build_fix.patch" 16 file://dso_linking_change_build_fix.patch"
17 17
18S = "${WORKDIR}/${PN}" 18S = "${WORKDIR}/git"
19 19
20inherit autotools pkgconfig gconf 20inherit autotools pkgconfig gconf
21 21