summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky.conf6
-rw-r--r--meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb20
-rw-r--r--meta/packages/matchbox-desktop/matchbox-desktop_2.0.bb11
-rw-r--r--meta/packages/matchbox-desktop/matchbox-desktop_svn.bb34
4 files changed, 20 insertions, 51 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 02b76e4e98..739b46af8c 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -60,7 +60,6 @@ PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
60PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" 60PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
61PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" 61PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
62PREFERRED_PROVIDER_gconf ?= "gconf-dbus" 62PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
63PREFERRED_PROVIDER_matchbox-desktop ?= "matchbox-desktop-2"
64PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" 63PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
65 64
66 65
@@ -80,8 +79,7 @@ SRCDATE_ipkg-utils ?= "20050930"
80SRCDATE_ipkg-link ?= "20050930" 79SRCDATE_ipkg-link ?= "20050930"
81SRCDATE_matchbox-common ?= "20070417" 80SRCDATE_matchbox-common ?= "20070417"
82SRCDATE_matchbox-config-gtk ?= "20070417" 81SRCDATE_matchbox-config-gtk ?= "20070417"
83SRCDATE_matchbox-desktop ?= "20060612" 82SRCDATE_matchbox-desktop ?= "20070531"
84SRCDATE_matchbox-desktop-2 ?= "20070531"
85SRCDATE_matchbox-keyboard ?= "20070529" 83SRCDATE_matchbox-keyboard ?= "20070529"
86SRCDATE_matchbox-panel ?= "20060727" 84SRCDATE_matchbox-panel ?= "20060727"
87SRCDATE_matchbox-panel-manager ?= "20060612" 85SRCDATE_matchbox-panel-manager ?= "20060612"
@@ -128,7 +126,7 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
128PREFERRED_VERSION_matchbox-applet-startup-monitor ?= "0.1" 126PREFERRED_VERSION_matchbox-applet-startup-monitor ?= "0.1"
129PREFERRED_VERSION_matchbox-common ?= "0.9.1+svn${SRCDATE}" 127PREFERRED_VERSION_matchbox-common ?= "0.9.1+svn${SRCDATE}"
130PREFERRED_VERSION_matchbox-config-gtk ?= "0.0+svn${SRCDATE}" 128PREFERRED_VERSION_matchbox-config-gtk ?= "0.0+svn${SRCDATE}"
131PREFERRED_VERSION_matchbox-desktop ?= "0.9.1+svn${SRCDATE}" 129PREFERRED_VERSION_matchbox-desktop ?= "2.0"
132PREFERRED_VERSION_matchbox-keyboard ?= "0.0+svn${SRCDATE}" 130PREFERRED_VERSION_matchbox-keyboard ?= "0.0+svn${SRCDATE}"
133PREFERRED_VERSION_matchbox-panel ?= "0.9.2+svn${SRCDATE}" 131PREFERRED_VERSION_matchbox-panel ?= "0.9.2+svn${SRCDATE}"
134PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}" 132PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"
diff --git a/meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb b/meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb
deleted file mode 100644
index f497468282..0000000000
--- a/meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1DESCRIPTION = "Matchbox Window Manager Desktop"
2LICENSE = "GPL"
3DEPENDS = "gtk+ startup-notification"
4RDEPENDS = "matchbox-common"
5SECTION = "x11/wm"
6PV = "2.0+svn${SRCDATE}"
7PR = "r1"
8
9PROVIDES_${PN} = matchbox-desktop
10RPROVIDES_${PN} = matchbox-desktop
11RREPLACES_${PN} = matchbox-desktop
12RCONFLICTS_${PN} = matchbox-desktop
13
14SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
15
16EXTRA_OECONF = "--enable-startup-notification"
17
18S = "${WORKDIR}/${PN}"
19
20inherit autotools pkgconfig
diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_2.0.bb b/meta/packages/matchbox-desktop/matchbox-desktop_2.0.bb
new file mode 100644
index 0000000000..a48d0e073c
--- /dev/null
+++ b/meta/packages/matchbox-desktop/matchbox-desktop_2.0.bb
@@ -0,0 +1,11 @@
1DESCRIPTION = "Matchbox Window Manager Desktop"
2LICENSE = "GPL"
3DEPENDS = "gtk+ startup-notification"
4RDEPENDS = "matchbox-common"
5SECTION = "x11/wm"
6
7SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2"
8
9EXTRA_OECONF = "--enable-startup-notification"
10
11inherit autotools pkgconfig
diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb b/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
index 8e89d9b9ff..f3ceaf48bd 100644
--- a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
@@ -1,35 +1,15 @@
1DESCRIPTION = "Matchbox Window Manager Desktop" 1DESCRIPTION = "Matchbox Window Manager Desktop"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "libmatchbox startup-notification" 3DEPENDS = "gtk+ startup-notification"
4RDEPENDS = "matchbox-common"
4SECTION = "x11/wm" 5SECTION = "x11/wm"
5PV = "0.9.1+svn${SRCDATE}" 6PV = "2.0+svn${SRCDATE}"
6DEFAULT_PREFERENCE = "-1" 7PR = "r1"
7 8
8SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" 9SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN}-2;proto=http"
9 10
10EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" 11EXTRA_OECONF = "--enable-startup-notification"
11 12
12S = "${WORKDIR}/${PN}" 13S = "${WORKDIR}/${PN}-2"
13 14
14inherit autotools pkgconfig 15inherit autotools pkgconfig
15
16FILES_${PN} = "${bindir}/* \
17 ${datadir}/applications \
18 ${libdir}/matchbox/desktop/*.so \
19 ${datadir}/matchbox-desktop \
20 ${datadir}/pixmaps \
21 ${sysconfdir}/matchbox"
22
23FILES_${PN}-dev += "${libdir}/matchbox-desktop \
24 ${includedir}/matchbox-desktop \
25 ${libdir}/matchbox/desktop/*.*a \
26 ${datadir}/matchbox/desktop/modules/*a"
27
28FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
29
30
31do_stage() {
32 install -d ${STAGING_INCDIR}/matchbox-desktop/
33 install -m 0644 ${S}/src/*.h ${STAGING_INCDIR}/matchbox-desktop/
34}
35