summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS7
-rw-r--r--packages/angstrom/angstrom-gpe-task-apps.bb7
-rw-r--r--packages/angstrom/angstrom-gpe-task-base.bb7
-rw-r--r--packages/angstrom/angstrom-gpe-task-game.bb7
-rw-r--r--packages/angstrom/angstrom-gpe-task-pim.bb7
-rw-r--r--packages/angstrom/angstrom-gpe-task-settings.bb7
-rw-r--r--packages/angstrom/angstrom-ohand-task-pim.bb7
-rw-r--r--packages/angstrom/angstrom-task-office.bb7
-rw-r--r--packages/angstrom/angstrom-task-printing.bb7
-rw-r--r--packages/angstrom/angstrom-task-sectest.bb7
-rw-r--r--packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch28
-rw-r--r--packages/avahi/avahi-python_0.6.21.bb14
-rw-r--r--packages/avahi/avahi.inc25
-rw-r--r--packages/avahi/avahi_0.6.15.bb3
-rw-r--r--packages/avahi/avahi_0.6.16.bb1
-rw-r--r--packages/avahi/avahi_0.6.17.bb1
-rw-r--r--packages/avahi/avahi_0.6.18.bb1
-rw-r--r--packages/avahi/avahi_0.6.19.bb3
-rw-r--r--packages/avahi/avahi_0.6.20.bb3
-rw-r--r--packages/avahi/avahi_0.6.21.bb3
-rw-r--r--packages/avahi/files/configure-check-pymod.patch27
-rw-r--r--packages/bluez/bluez-libs_3.15.bb1
-rw-r--r--packages/bluez/bluez-utils_3.15.bb116
-rw-r--r--packages/dbus/dbus-glib-native_0.72.bb3
-rw-r--r--packages/e17/exhibit_cvs.bb2
-rw-r--r--packages/e17/expedite_cvs.bb2
-rw-r--r--packages/gstreamer/gst-plugins-bad_0.10.3.bb4
-rw-r--r--packages/gstreamer/gst-plugins-bad_0.10.5.bb3
-rw-r--r--packages/gstreamer/gstreamer.inc2
-rw-r--r--packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch30
-rw-r--r--packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch100
-rw-r--r--packages/gtk+/gtk+_2.10.14.bb8
-rw-r--r--packages/libxslt/libxslt_1.1.12.bb45
-rw-r--r--packages/qmake/qmake2-native-2.01a/.mtn2git_empty0
-rw-r--r--packages/qmake/qmake2-native-2.10a/.mtn2git_empty (renamed from packages/avahi/avahi-0.6.15/.mtn2git_empty)0
-rw-r--r--packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch (renamed from packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch)0
-rw-r--r--packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf (renamed from packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf)0
-rw-r--r--packages/qmake/qmake2-native_2.10a.bb (renamed from packages/qmake/qmake2-native_2.01a.bb)5
-rw-r--r--packages/tasks/task-base.bb8
-rw-r--r--packages/tasks/task-boot.bb7
-rw-r--r--packages/tasks/task-dvb.bb8
-rw-r--r--packages/tasks/task-e-x11.bb9
-rw-r--r--packages/tasks/task-gmae.bb9
-rw-r--r--packages/tasks/task-gpe-apps.bb7
-rw-r--r--packages/tasks/task-gpe-base.bb5
-rw-r--r--packages/tasks/task-gpe-connectivity.bb7
-rw-r--r--packages/tasks/task-gpe-desktopapps.bb7
-rw-r--r--packages/tasks/task-gpe-games.bb7
-rw-r--r--packages/tasks/task-gpe-pim.bb5
-rw-r--r--packages/tasks/task-gpe-sectest.bb7
-rw-r--r--packages/tasks/task-gpe-settings.bb7
-rw-r--r--packages/tasks/task-gpe-web.bb6
-rw-r--r--packages/tasks/task-gpe.bb5
-rw-r--r--packages/tasks/task-gpephone.bb5
-rw-r--r--packages/tasks/task-mokogateway.bb4
-rw-r--r--packages/tasks/task-mythfront.bb12
-rw-r--r--packages/tasks/task-opie-16mb.bb7
-rw-r--r--packages/tasks/task-opie-all.bb5
-rw-r--r--packages/tasks/task-opie-apps.bb3
-rw-r--r--packages/tasks/task-opie-games.bb4
-rw-r--r--packages/tasks/task-opie.bb15
-rw-r--r--packages/tasks/task-proper-tools.bb7
-rw-r--r--packages/tasks/task-qpe.bb6
-rw-r--r--packages/tasks/task-sdl.bb4
-rw-r--r--packages/tasks/task-xfce-base.bb10
-rw-r--r--packages/tasks/task-xterminal.bb7
-rw-r--r--packages/twisted/twisted_1.2.0.bb19
-rw-r--r--packages/uicmoc/uicmoc4-native_4.2.3.bb2
-rw-r--r--packages/uicmoc/uicmoc4-native_4.3.0.bb3
-rw-r--r--packages/uicmoc/uicmoc4-native_4.3.1.bb59
-rw-r--r--packages/xorg-app/sessreg_1.0.3.bb7
-rw-r--r--packages/xorg-app/setxkbmap_1.0.4.bb7
-rw-r--r--packages/xorg-app/xdm_1.1.6.bb8
-rw-r--r--packages/xorg-app/xmodmap_1.0.3.bb5
-rw-r--r--packages/xorg-app/xprop_1.0.3.bb7
-rw-r--r--packages/xorg-app/xrdb_1.0.4.bb6
-rw-r--r--packages/xorg-app/xsetroot_1.0.2.bb6
-rw-r--r--packages/xorg-app/xvinfo_1.0.2.bb5
-rw-r--r--packages/xorg-doc/xorg-sgml-doctools_1.2.bb8
-rw-r--r--packages/xorg-driver/xf86-input-mouse_1.2.2.bb7
-rw-r--r--packages/xorg-driver/xf86-video-ati_6.6.193.bb6
-rw-r--r--packages/xorg-driver/xf86-video-nv_2.1.3.bb6
-rw-r--r--packages/xorg-driver/xf86-video-savage_2.1.3.bb6
-rw-r--r--packages/xorg-lib/diet-x11_1.1.3.bb8
-rw-r--r--packages/xorg-lib/libice_1.0.4.bb9
-rw-r--r--packages/xorg-lib/libx11_1.1.3.bb24
-rw-r--r--packages/xorg-lib/libxaw_1.0.4.bb21
-rw-r--r--packages/xorg-lib/libxpm_3.5.7.bb13
-rw-r--r--packages/xorg-lib/libxrender_0.9.3.bb9
-rw-r--r--packages/xorg-lib/libxtst_1.0.3.bb9
-rw-r--r--packages/xorg-lib/xtrans_1.0.4.bb7
91 files changed, 723 insertions, 237 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7c445a7604..c77342d641 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -217,3 +217,10 @@ Person: Henning Heinold 'woglinde'
Mail: heinold@inf.fu-berlin.de
Machines: simpad
Recipes: classpath-minimal, midpath, cacao-clcd
+
+Person: Philipp Zabel
+Mail: philipp.zabel@gmail.com
+Interests: Kernels, PXA, GTK+, gsmd
+Distros: Ångström
+Machines: hx4700, magician
+Recipes: avahi, libgsmd
diff --git a/packages/angstrom/angstrom-gpe-task-apps.bb b/packages/angstrom/angstrom-gpe-task-apps.bb
index 37a6ed98c3..0a4b1309da 100644
--- a/packages/angstrom/angstrom-gpe-task-apps.bb
+++ b/packages/angstrom/angstrom-gpe-task-apps.bb
@@ -1,10 +1,11 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
+
+inherit task
PACKAGE_ARCH = "${MACHINE_ARCH}"
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
gpe-edit \
gpe-gallery \
gpe-calculator \
diff --git a/packages/angstrom/angstrom-gpe-task-base.bb b/packages/angstrom/angstrom-gpe-task-base.bb
index c931d9d1e4..265f51863d 100644
--- a/packages/angstrom/angstrom-gpe-task-base.bb
+++ b/packages/angstrom/angstrom-gpe-task-base.bb
@@ -1,10 +1,11 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
+
+inherit task
PACKAGE_ARCH = "${MACHINE_ARCH}"
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
matchbox \
matchbox-panel-hacks \
xcursor-transparent-theme \
diff --git a/packages/angstrom/angstrom-gpe-task-game.bb b/packages/angstrom/angstrom-gpe-task-game.bb
index 09a47f6a26..beca89cdbc 100644
--- a/packages/angstrom/angstrom-gpe-task-game.bb
+++ b/packages/angstrom/angstrom-gpe-task-game.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
gpe-go \
gpe-lights \
gpe-othello \
diff --git a/packages/angstrom/angstrom-gpe-task-pim.bb b/packages/angstrom/angstrom-gpe-task-pim.bb
index 8e9d0d4f31..fc0b4109f4 100644
--- a/packages/angstrom/angstrom-gpe-task-pim.bb
+++ b/packages/angstrom/angstrom-gpe-task-pim.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
gpe-timesheet \
gpe-todo \
gpe-calendar \
diff --git a/packages/angstrom/angstrom-gpe-task-settings.bb b/packages/angstrom/angstrom-gpe-task-settings.bb
index c79c068cbd..a9463fdbe5 100644
--- a/packages/angstrom/angstrom-gpe-task-settings.bb
+++ b/packages/angstrom/angstrom-gpe-task-settings.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
matchbox-panel-manager \
gpe-su \
gpe-conf \
diff --git a/packages/angstrom/angstrom-ohand-task-pim.bb b/packages/angstrom/angstrom-ohand-task-pim.bb
index 70d52c922f..71d0512687 100644
--- a/packages/angstrom/angstrom-ohand-task-pim.bb
+++ b/packages/angstrom/angstrom-ohand-task-pim.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
dates \
contacts \
tasks \
diff --git a/packages/angstrom/angstrom-task-office.bb b/packages/angstrom/angstrom-task-office.bb
index 364924995a..90b700b8c9 100644
--- a/packages/angstrom/angstrom-task-office.bb
+++ b/packages/angstrom/angstrom-task-office.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
gnumeric \
abiword \
imposter \
diff --git a/packages/angstrom/angstrom-task-printing.bb b/packages/angstrom/angstrom-task-printing.bb
index 2954667192..f4a833645a 100644
--- a/packages/angstrom/angstrom-task-printing.bb
+++ b/packages/angstrom/angstrom-task-printing.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
cups \
# gnome-cups-manager \
"
diff --git a/packages/angstrom/angstrom-task-sectest.bb b/packages/angstrom/angstrom-task-sectest.bb
index 3142f280f3..c3ebcab31d 100644
--- a/packages/angstrom/angstrom-task-sectest.bb
+++ b/packages/angstrom/angstrom-task-sectest.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
nmap \
ettercap \
stunnel \
diff --git a/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch b/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch
deleted file mode 100644
index 0971a9eea8..0000000000
--- a/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-marcus 2006-11-11 02:56:18 UTC
-
- FreeBSD ports repository
-
- Modified files:
- net/avahi Makefile distinfo
- Added files:
- net/avahi/files patch-avahi-daemon_dbus-protocol.c
- Log:
- Update to 0.6.15, and fix the build with D-BUS 1.0.
-
- Revision Changes Path
- 1.43 +3 -3 ports/net/avahi/Makefile
- 1.12 +3 -3 ports/net/avahi/distinfo
- 1.3 +11 -0 ports/net/avahi/files/patch-avahi-daemon_dbus-protocol.c (new)
-
---- avahi-daemon/dbus-protocol.c.orig Fri Nov 10 21:50:07 2006
-+++ avahi-daemon/dbus-protocol.c Fri Nov 10 21:50:55 2006
-@@ -1067,7 +1067,7 @@ static int dbus_connect(void) {
- if (dbus_bus_request_name(
- server->bus,
- AVAHI_DBUS_NAME,
--#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
-+#if ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)) || DBUS_VERSION_MAJOR > 0
- DBUS_NAME_FLAG_DO_NOT_QUEUE,
- #else
- DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
-
diff --git a/packages/avahi/avahi-python_0.6.21.bb b/packages/avahi/avahi-python_0.6.21.bb
new file mode 100644
index 0000000000..8eaac073ac
--- /dev/null
+++ b/packages/avahi/avahi-python_0.6.21.bb
@@ -0,0 +1,14 @@
+require avahi.inc
+PR = "r0"
+
+# FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built
+FILES_avahi-discover = ""
+
+PROVIDES = "avahi"
+DEPENDS += "python-native"
+
+SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1 \
+ file://configure-check-pymod.patch;patch=1"
+S = "${WORKDIR}/avahi-${PV}"
+
+AVAHI_PYTHON = "--enable-python"
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index 2cb986012f..991d282a3e 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -4,24 +4,31 @@ HOMEPAGE = "http://avahi.org"
SECTION = "network"
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
DEPENDS = "expat libdaemon dbus glib-2.0"
# uclibc has no nss
-RRECOMMENDS_append_linux = "libnss-mdns"
RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
-RDEPENDS_avahi-daemon = "sysvinit-pidof"
+RDEPENDS_avahi-daemon = "sysvinit-pidof update-rc.d"
+RDEPENDS_avahi-autoipd = "update-rc.d"
+RDEPENDS_avahi-discover = "python-avahi python-pygtk"
+RDEPENDS_python-avahi = "python-dbus"
SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
file://00avahi-autoipd file://99avahi-autoipd"
inherit autotools pkgconfig update-rc.d
+# handle update-rc.d RDEPENDS manually, we don't need it on
+# anything but avahi-daemon and avahi-autoipd
+RDEPENDS_append = ""
# TODO: build and enable all the extra stuff avahi offers
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
+EXTRA_OECONF = "--with-distro=debian --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
+AVAHI_PYTHON = "--disable-python"
+AVAHI_GTK = "--disable-gtk"
-PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils"
+PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils python-avahi"
FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
@@ -35,6 +42,7 @@ FILES_avahi-daemon = "${sbindir}/avahi-daemon \
${datadir}/avahi/avahi-service.dtd \
${datadir}/avahi/service-types"
FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
+FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
${sysconfdir}/avahi/avahi-dnsconfd.action \
${sysconfdir}/init.d/avahi-dnsconfd"
@@ -43,7 +51,12 @@ FILES_avahi-utils = "${bindir}/avahi-*"
FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
${sysconfdir}/avahi/avahi-autoipd.action \
${sysconfdir}/udhcpc.d/*avahi-autoipd"
-
+FILES_python-avahi = "${libdir}/python*/site-packages/avahi/*"
+FILES_avahi-discover = "${bindir}/avahi-discover \
+ ${datadir}/applications/avahi-discover.desktop \
+ ${datadir}/avahi/interfaces/avahi-discover.glade"
+FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \
+ ${datadir}/avahi/interfaces/avahi-discover.glade"
CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
diff --git a/packages/avahi/avahi_0.6.15.bb b/packages/avahi/avahi_0.6.15.bb
deleted file mode 100644
index b7645bc50f..0000000000
--- a/packages/avahi/avahi_0.6.15.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require avahi.inc
-
-SRC_URI += "file://patch-avahi-daemon_dbus-protocol.c.patch;patch=1;pnum=0"
diff --git a/packages/avahi/avahi_0.6.16.bb b/packages/avahi/avahi_0.6.16.bb
deleted file mode 100644
index 9189734dfa..0000000000
--- a/packages/avahi/avahi_0.6.16.bb
+++ /dev/null
@@ -1 +0,0 @@
-require avahi.inc
diff --git a/packages/avahi/avahi_0.6.17.bb b/packages/avahi/avahi_0.6.17.bb
deleted file mode 100644
index 9189734dfa..0000000000
--- a/packages/avahi/avahi_0.6.17.bb
+++ /dev/null
@@ -1 +0,0 @@
-require avahi.inc
diff --git a/packages/avahi/avahi_0.6.18.bb b/packages/avahi/avahi_0.6.18.bb
deleted file mode 100644
index 9189734dfa..0000000000
--- a/packages/avahi/avahi_0.6.18.bb
+++ /dev/null
@@ -1 +0,0 @@
-require avahi.inc
diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb
index 27dcdcffcb..69763e3932 100644
--- a/packages/avahi/avahi_0.6.19.bb
+++ b/packages/avahi/avahi_0.6.19.bb
@@ -1,3 +1,2 @@
require avahi.inc
-
-PR = "r1"
+PR = "r2"
diff --git a/packages/avahi/avahi_0.6.20.bb b/packages/avahi/avahi_0.6.20.bb
index 59de20446c..0b7fe70be5 100644
--- a/packages/avahi/avahi_0.6.20.bb
+++ b/packages/avahi/avahi_0.6.20.bb
@@ -1,3 +1,2 @@
require avahi.inc
-
-PR = "r0"
+PR = "r1"
diff --git a/packages/avahi/avahi_0.6.21.bb b/packages/avahi/avahi_0.6.21.bb
index fb6191e53a..fa3fef039e 100644
--- a/packages/avahi/avahi_0.6.21.bb
+++ b/packages/avahi/avahi_0.6.21.bb
@@ -1,5 +1,4 @@
require avahi.inc
-
-PR = "r0"
+PR = "r1"
SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
diff --git a/packages/avahi/files/configure-check-pymod.patch b/packages/avahi/files/configure-check-pymod.patch
new file mode 100644
index 0000000000..e2df5d6fc0
--- /dev/null
+++ b/packages/avahi/files/configure-check-pymod.patch
@@ -0,0 +1,27 @@
+Index: avahi-0.6.21/configure.ac
+===================================================================
+--- avahi-0.6.21.orig/configure.ac 2007-08-16 21:36:12.000000000 +0200
++++ avahi-0.6.21/configure.ac 2007-08-16 21:45:14.000000000 +0200
+@@ -700,10 +700,6 @@
+ esac],
+ [HAVE_PYGTK=yes])
+
+- if test "x$HAVE_PYGTK" = "xyes" ; then
+- AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)])
+- fi
+-
+
+ if test "x$HAVE_DBUS" = "xyes" ; then
+ AC_ARG_ENABLE(python-dbus,
+@@ -715,11 +711,6 @@
+ esac],
+ [HAVE_PYTHON_DBUS=yes])
+
+- if test "x$HAVE_PYTHON_DBUS" = "xyes"; then
+- AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)])
+- fi
+-
+- AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
+ if test "x$HAVE_GDBM" = "xyes"; then
+ AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)])
+ fi
diff --git a/packages/bluez/bluez-libs_3.15.bb b/packages/bluez/bluez-libs_3.15.bb
new file mode 100644
index 0000000000..6ddf62a4fb
--- /dev/null
+++ b/packages/bluez/bluez-libs_3.15.bb
@@ -0,0 +1 @@
+require bluez-libs.inc
diff --git a/packages/bluez/bluez-utils_3.15.bb b/packages/bluez/bluez-utils_3.15.bb
new file mode 100644
index 0000000000..b8dbfbca7c
--- /dev/null
+++ b/packages/bluez/bluez-utils_3.15.bb
@@ -0,0 +1,116 @@
+require bluez-utils.inc
+
+DEPENDS += "glib-2.0"
+
+# ti patch doesn't apply, people using it should rediff it and send it upstream
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+ file://hcid.conf \
+# file://hciattach-ti-bts.patch;patch=1 \
+ "
+PR = "r0"
+
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --enable-alsa \
+ --enable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+# The config options are explained below:
+
+# --enable-obex enable OBEX support
+# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+# --enable-cups install CUPS backend support
+# --enable-bccmd install BCCMD interface utility
+# --enable-avctrl install Audio/Video control utility
+# --enable-hid2hci install HID mode switching utility
+# --enable-dfutool install DFU firmware upgrade utility
+
+# --enable-glib For systems that use and install GLib anyway
+# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
+
+#Following services can be enabled so far:
+# --enable-network
+# --enable-serial
+# --enable-input
+# --enable-audio
+# --enable-echo
+
+#There is no need to modify any init script. They will be started
+#automatically or on demand. Only /etc/bluetooth/*.service files should
+#be patched to change name or the autostart value.
+# --enable-configfile
+# --enable-initscripts
+
+#For even smaller -doc packages
+# --disable-manpages
+# --disable-pcmciarules
+
+#I haven't seen any embedded device with HID proxy support. So simply
+#disable it:
+# --disable-hid2hci
+
+
+PACKAGES =+ "${PN}-compat ${PN}-alsa"
+
+CONFFILES_${PN} = " \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default/bluetooth \
+ "
+
+CONFFILES_${PN}-compat = " \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+FILES_${PN} = " \
+ ${base_sbindir}/hcid \
+ ${libdir}/bluetooth \
+ ${sysconfdir}/init.d/bluetooth \
+ ${sysconfdir}/bluetooth/*.service \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default \
+ ${sysconfdir}/dbus-1 \
+ ${base_sbindir}/hciattach \
+ "
+
+FILES_${PN}-dbg += " \
+ ${libdir}/bluetooth/.debug \
+ ${libdir}/cups/backend/.debug \
+ ${libdir}/alsa-lib/.debug \
+ "
+
+FILES_${PN}-compat = " \
+ ${base_bindir}/sdptool \
+ ${base_bindir}/dund \
+ ${base_bindir}/rctest \
+ ${base_bindir}/ciptool \
+ ${base_bindir}/l2test \
+ ${base_bindir}/rfcomm \
+ ${base_bindir}/hcitool \
+ ${base_bindir}/pand \
+ ${base_bindir}/hidd \
+ ${base_bindir}/l2ping \
+ ${base_sbindir}/hciconfig \
+ ${base_sbindir}/bccmd \
+ ${base_sbindir}/hciemu \
+ ${base_sbindir}/hid2hci \
+ ${base_bindir}/passkey-agent \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
+
+FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_bluez-cups-backend = "cups"
+
+
diff --git a/packages/dbus/dbus-glib-native_0.72.bb b/packages/dbus/dbus-glib-native_0.72.bb
index 842ddeb159..90ecc4e9fe 100644
--- a/packages/dbus/dbus-glib-native_0.72.bb
+++ b/packages/dbus/dbus-glib-native_0.72.bb
@@ -1,5 +1,5 @@
SECTION = "base"
-PR = "r0"
+PR = "r1"
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
DESCRIPTION = "message bus system for applications to talk to one another"
LICENSE = "GPL"
@@ -19,4 +19,5 @@ do_stage() {
install -d ${STAGING_DATADIR}/dbus
install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
+ install -m 0755 dbus/.libs/dbus-binding-tool ${STAGING_BINDIR}/
}
diff --git a/packages/e17/exhibit_cvs.bb b/packages/e17/exhibit_cvs.bb
index 1c3c836955..4433287353 100644
--- a/packages/e17/exhibit_cvs.bb
+++ b/packages/e17/exhibit_cvs.bb
@@ -6,5 +6,5 @@ PR = "r0"
inherit e
-SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/exhibit"
+SRC_URI = "${E_CVS};module=e17/apps/exhibit"
S = "${WORKDIR}/${PN}"
diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb
index ea376c2442..9d8a7d6070 100644
--- a/packages/e17/expedite_cvs.bb
+++ b/packages/e17/expedite_cvs.bb
@@ -6,7 +6,7 @@ PR = "r0"
inherit e
-SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/expedite"
+SRC_URI = "${E_CVS};module=e17/apps/expedite"
S = "${WORKDIR}/${PN}"
do_configure_append() {
diff --git a/packages/gstreamer/gst-plugins-bad_0.10.3.bb b/packages/gstreamer/gst-plugins-bad_0.10.3.bb
index 51ce56dc1f..3e487314be 100644
--- a/packages/gstreamer/gst-plugins-bad_0.10.3.bb
+++ b/packages/gstreamer/gst-plugins-bad_0.10.3.bb
@@ -1,5 +1,5 @@
require gst-plugins.inc
-DEPENDS += "gst-plugins-base"
+DEPENDS += "gst-plugins-base directfb"
SRC_URI += "file://cross-compile.patch;patch=1"
-PR = "r4"
+PR = "r6"
diff --git a/packages/gstreamer/gst-plugins-bad_0.10.5.bb b/packages/gstreamer/gst-plugins-bad_0.10.5.bb
index a6a7d19a3d..9c7d94117c 100644
--- a/packages/gstreamer/gst-plugins-bad_0.10.5.bb
+++ b/packages/gstreamer/gst-plugins-bad_0.10.5.bb
@@ -1,7 +1,8 @@
require gst-plugins.inc
SRC_URI += "file://vorbisenc.h file://vorbisdec.h"
-DEPENDS += "gst-plugins-base directfb"
+DEPENDS += "gst-plugins-base"
+EXTRA_OECONF += " --disable-directfb "
do_compile_prepend() {
# work around missing files in upstream tarball (upstream bug #454078)
diff --git a/packages/gstreamer/gstreamer.inc b/packages/gstreamer/gstreamer.inc
index a8bece92e3..87a6f82135 100644
--- a/packages/gstreamer/gstreamer.inc
+++ b/packages/gstreamer/gstreamer.inc
@@ -10,3 +10,5 @@ EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=
FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+
diff --git a/packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch b/packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch
new file mode 100644
index 0000000000..aa7e276bec
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch
@@ -0,0 +1,30 @@
+Index: gtk/gtkcellrenderertext.c
+===================================================================
+--- gtk/gtkcellrenderertext.c (revision 18557)
++++ gtk/gtkcellrenderertext.c (working copy)
+@@ -1794,13 +1794,24 @@ gtk_cell_renderer_text_focus_out_event (
+ gpointer data)
+ {
+ GtkCellRendererTextPrivate *priv;
++ GtkSettings *settings;
++ gboolean in_touchscreen_mode = FALSE;
+
+ priv = GTK_CELL_RENDERER_TEXT_GET_PRIVATE (data);
+
+ if (priv->in_entry_menu)
+ return FALSE;
+
+- GTK_ENTRY (entry)->editing_canceled = TRUE;
++ if (gtk_widget_has_screen (entry))
++ settings = gtk_settings_get_for_screen (gtk_widget_get_screen (entry));
++ else
++ settings = gtk_settings_get_default ();
++
++ g_object_get (G_OBJECT (settings),
++ "gtk-touchscreen-mode", &in_touchscreen_mode,
++ NULL);
++
++ GTK_ENTRY (entry)->editing_canceled = !in_touchscreen_mode;
+ gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (entry));
+ gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (entry));
+
diff --git a/packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch b/packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch
new file mode 100644
index 0000000000..ab3c208ee5
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch
@@ -0,0 +1,100 @@
+Index: gtk/gtkcellrenderertoggle.c
+===================================================================
+--- gtk/gtkcellrenderertoggle.c (revision 18523)
++++ gtk/gtkcellrenderertoggle.c (working copy)
+@@ -71,6 +71,8 @@
+ PROP_INDICATOR_SIZE
+ };
+
++/* This is a hard-coded default which promptly gets overridden by a size
++ calculated from the font size. */
+ #define TOGGLE_WIDTH 12
+
+ static guint toggle_cell_signals[LAST_SIGNAL] = { 0 };
+@@ -80,8 +82,9 @@
+ typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate;
+ struct _GtkCellRendererTogglePrivate
+ {
+- gint indicator_size;
+-
++ gint indicator_size; /* This is the real size */
++ gint override_size; /* This is the size set from the indicator-size property */
++ GtkWidget *cached_widget;
+ guint inconsistent : 1;
+ };
+
+@@ -104,6 +107,7 @@
+ GTK_CELL_RENDERER (celltoggle)->ypad = 2;
+
+ priv->indicator_size = TOGGLE_WIDTH;
++ priv->override_size = 0;
+ priv->inconsistent = FALSE;
+ }
+
+@@ -210,7 +214,7 @@
+ g_value_set_boolean (value, celltoggle->radio);
+ break;
+ case PROP_INDICATOR_SIZE:
+- g_value_set_int (value, priv->indicator_size);
++ g_value_set_int (value, priv->override_size ? priv->override_size : priv->indicator_size);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+@@ -245,7 +249,7 @@
+ celltoggle->radio = g_value_get_boolean (value);
+ break;
+ case PROP_INDICATOR_SIZE:
+- priv->indicator_size = g_value_get_int (value);
++ priv->override_size = g_value_get_int (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+@@ -273,6 +277,27 @@
+ }
+
+ static void
++on_widget_style_set (GtkWidget *widget, GtkStyle *previous, gpointer user_data)
++{
++ GtkCellRendererTogglePrivate *priv = user_data;
++ PangoContext *context;
++ PangoFontMetrics *metrics;
++ int height;
++
++ context = gtk_widget_get_pango_context (widget);
++ metrics = pango_context_get_metrics (context,
++ widget->style->font_desc,
++ pango_context_get_language (context));
++
++ height = pango_font_metrics_get_ascent (metrics) +
++ pango_font_metrics_get_descent (metrics);
++
++ pango_font_metrics_unref (metrics);
++
++ priv->indicator_size = PANGO_PIXELS (height * 0.85);
++}
++
++static void
+ gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
+ GtkWidget *widget,
+ GdkRectangle *cell_area,
+@@ -287,6 +312,20 @@
+
+ priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell);
+
++ if (priv->override_size) {
++ priv->indicator_size = priv->override_size;
++ } else if (priv->cached_widget != widget) {
++ if (priv->cached_widget) {
++ g_object_remove_weak_pointer (G_OBJECT (widget), (gpointer*)&priv->cached_widget);
++ g_signal_handlers_disconnect_by_func (priv->cached_widget, on_widget_style_set, priv);
++ }
++ priv->cached_widget = widget;
++ g_object_add_weak_pointer (G_OBJECT (widget), (gpointer*)&priv->cached_widget);
++ g_signal_connect (widget, "style-set", G_CALLBACK (on_widget_style_set), priv);
++
++ on_widget_style_set (widget, NULL, priv);
++ }
++
+ calc_width = (gint) cell->xpad * 2 + priv->indicator_size;
+ calc_height = (gint) cell->ypad * 2 + priv->indicator_size;
+
diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb
index ecee0bf91a..947cf19077 100644
--- a/packages/gtk+/gtk+_2.10.14.bb
+++ b/packages/gtk+/gtk+_2.10.14.bb
@@ -1,6 +1,6 @@
require gtk-2.10.inc
-PR = "r5"
+PR = "r6"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
file://no-xwc.patch;patch=1 \
@@ -19,19 +19,21 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
file://spinbutton.patch;patch=1 \
file://gtk+-handhelds.patch;patch=1 \
file://filesel-fix-segfault.patch;patch=1 \
- file://toggle-font.diff;patch=1;pnum=0 \
file://combo-arrow-size.patch;patch=1;pnum=0 \
file://range-no-redraw.patch;patch=1;pnum=0 \
file://scrolled-placement.patch;patch=1;pnum=0 \
+ file://treeview-checkbox-size.patch;patch=1;pnum=0 \
+ file://cell-renderer-edit-focus.patch;patch=1;pnum=0 \
"
-#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
require gtk-fpu.inc
EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}"
# try to squeeze some more performance out of it
SRC_URI_append_fic-gta01 = " file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
SRC_URI_append_fic-gta02 = " file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
+
# this doesn't seem to work
SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
# let's do it manually then
diff --git a/packages/libxslt/libxslt_1.1.12.bb b/packages/libxslt/libxslt_1.1.12.bb
deleted file mode 100644
index 9c59407ebf..0000000000
--- a/packages/libxslt/libxslt_1.1.12.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "GNOME XSLT library"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libxml2"
-LICENSE = "MIT"
-PR = "r2"
-
-SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
-S = "${WORKDIR}/libxslt-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
-
-xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \
- keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \
- templates.h transform.h variables.h xslt.h xsltInternals.h xsltconfig.h \
- xsltexports.h xsltutils.h"
-exsltheaders = "exslt.h exsltconfig.h exsltexports.h"
-
-do_stage () {
- oe_libinstall -C libxslt -so -a libxslt ${STAGING_LIBDIR}
- oe_libinstall -C libexslt -so -a libexslt ${STAGING_LIBDIR}
-
- mkdir -p ${STAGING_INCDIR}/libxslt
- for i in ${xsltheaders}; do
- install -m 0644 ${S}/libxslt/$i ${STAGING_INCDIR}/libxslt/$i
- done
- mkdir -p ${STAGING_INCDIR}/libexslt
- for i in ${exsltheaders}; do
- install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
- done
-
- cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \
- -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \
- -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
- -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
- chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config
- install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xslt-config"
-FILES_${PN}-utils += "${bindir}"
diff --git a/packages/qmake/qmake2-native-2.01a/.mtn2git_empty b/packages/qmake/qmake2-native-2.01a/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/qmake/qmake2-native-2.01a/.mtn2git_empty
+++ /dev/null
diff --git a/packages/avahi/avahi-0.6.15/.mtn2git_empty b/packages/qmake/qmake2-native-2.10a/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/avahi/avahi-0.6.15/.mtn2git_empty
+++ b/packages/qmake/qmake2-native-2.10a/.mtn2git_empty
diff --git a/packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch b/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch
index abebfdfa27..abebfdfa27 100644
--- a/packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch
+++ b/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch
diff --git a/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf b/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf
index f58481a693..f58481a693 100644
--- a/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf
+++ b/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf
diff --git a/packages/qmake/qmake2-native_2.01a.bb b/packages/qmake/qmake2-native_2.10a.bb
index 2ec783574c..94b2002a20 100644
--- a/packages/qmake/qmake2-native_2.01a.bb
+++ b/packages/qmake/qmake2-native_2.10a.bb
@@ -3,10 +3,9 @@ PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
LICENSE = "GPL QPL"
+PR = "r0"
-PR = "r2"
-
-QTVER = "qt-x11-opensource-src-4.3.0"
+QTVER = "qtopia-core-opensource-src-4.3.1"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
file://0001-fix-mkspecs.patch;patch=1 \
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 84c3610b8f..14d06e8926 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,7 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r41"
+PR = "r42"
+
+inherit task
DEPENDS = "task-boot"
PROVIDES = "${PACKAGES}"
@@ -36,10 +38,6 @@ PACKAGES = ' \
${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
'
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "all"
-
#
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
#
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index f1a90abf8e..fe4d43b767 100644
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,10 +1,7 @@
DESCRIPTION = "Basic task to get a device booting"
-PR = "r38"
+PR = "r39"
-PROVIDES = "${PACKAGES}"
-PACKAGES = 'task-boot'
-
-ALLOW_EMPTY = "1"
+inherit task
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
#
diff --git a/packages/tasks/task-dvb.bb b/packages/tasks/task-dvb.bb
index 57778f3836..e93a66273f 100644
--- a/packages/tasks/task-dvb.bb
+++ b/packages/tasks/task-dvb.bb
@@ -1,9 +1,9 @@
-PACKAGES = "task-dvb"
DESCRIPTION = "Meta-package for DVB application"
-ALLOW_EMPTY = "1"
-PR = "r5"
+PR = "r6"
-RDEPENDS = "dvbstream dvbtune xserver-xorg tda1004x-firmware mythtv lirc lirc-modules drm-module-via"
+inherit task
+
+RDEPENDS_${PN} = "dvbstream dvbtune xserver-xorg tda1004x-firmware mythtv lirc lirc-modules drm-module-via"
LICENSE = "MIT"
diff --git a/packages/tasks/task-e-x11.bb b/packages/tasks/task-e-x11.bb
index bd376d8841..3663532527 100644
--- a/packages/tasks/task-e-x11.bb
+++ b/packages/tasks/task-e-x11.bb
@@ -1,12 +1,13 @@
DESCRIPTION = "Tasks for Enlightenment/X11"
+PR = "r10"
+
+inherit task
+
PACKAGES = "task-e-x11-core task-e-x11"
PROVIDES = "task-e-x11-core task-e-x11"
-PR = "r9"
PREFERRED_PROVIDER_virtual/imlib2 = "imlib-x11"
-ALLOW_EMPTY = "1"
-
#
# X
#
@@ -21,5 +22,3 @@ RDEPENDS_task-e-x11-core += "entrance e-wm"
RDEPENDS_task-e-x11 = "task-e-x11-core"
# entice eclair examine evidence e-modules e-utils elitaire"
-DEPENDS_task-e-x11 = "task-e-x11-core"
-# entice eclair examine evidence e-modules e-utils elitaire"
diff --git a/packages/tasks/task-gmae.bb b/packages/tasks/task-gmae.bb
index ac794102f2..73710f8ffa 100644
--- a/packages/tasks/task-gmae.bb
+++ b/packages/tasks/task-gmae.bb
@@ -1,5 +1,7 @@
DESCRIPTION = "GNOME Mobile & Embedded Initiative"
-PR = "r0"
+PR = "r1"
+
+inherit task
PACKAGES = 'gmae-core \
gmae-toolkit \
@@ -7,11 +9,6 @@ PACKAGES = 'gmae-core \
task-gmae \
'
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "all"
-
-
RDEPENDS_gmae-core = " \
${XSERVER} \
glib-2.0 \
diff --git a/packages/tasks/task-gpe-apps.bb b/packages/tasks/task-gpe-apps.bb
index 5aee575b75..058a3fd6b1 100644
--- a/packages/tasks/task-gpe-apps.bb
+++ b/packages/tasks/task-gpe-apps.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "Application task package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
gpe-edit \
gpe-gallery \
gpe-calculator \
diff --git a/packages/tasks/task-gpe-base.bb b/packages/tasks/task-gpe-base.bb
index 4b9a64927a..a26c2118e4 100644
--- a/packages/tasks/task-gpe-base.bb
+++ b/packages/tasks/task-gpe-base.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "Base task package for GPE Palmtop Environment"
PR = "r8"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
gpe-bootsplash \
bluez-utils-dbus \
matchbox \
diff --git a/packages/tasks/task-gpe-connectivity.bb b/packages/tasks/task-gpe-connectivity.bb
index 678afb8c1a..7babc03c56 100644
--- a/packages/tasks/task-gpe-connectivity.bb
+++ b/packages/tasks/task-gpe-connectivity.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "Connectivity task packages for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
gpe-mini-browser \
gpe-irc"
diff --git a/packages/tasks/task-gpe-desktopapps.bb b/packages/tasks/task-gpe-desktopapps.bb
index 346cd70353..25c055f446 100644
--- a/packages/tasks/task-gpe-desktopapps.bb
+++ b/packages/tasks/task-gpe-desktopapps.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "Additional desktop applications package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
sylpheed \
firefox \
thunderbird \
diff --git a/packages/tasks/task-gpe-games.bb b/packages/tasks/task-gpe-games.bb
index 6076f5ba70..335f64031e 100644
--- a/packages/tasks/task-gpe-games.bb
+++ b/packages/tasks/task-gpe-games.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "Games task package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
gpe-go \
gpe-lights \
gpe-othello \
diff --git a/packages/tasks/task-gpe-pim.bb b/packages/tasks/task-gpe-pim.bb
index 5a49af473d..c6e6c22e6c 100644
--- a/packages/tasks/task-gpe-pim.bb
+++ b/packages/tasks/task-gpe-pim.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "PIM task packages for GPE Palmtop Environment"
PR = "r6"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
gpe-timesheet \
gpe-todo \
gpe-calendar \
diff --git a/packages/tasks/task-gpe-sectest.bb b/packages/tasks/task-gpe-sectest.bb
index 75b525b618..b647c6136b 100644
--- a/packages/tasks/task-gpe-sectest.bb
+++ b/packages/tasks/task-gpe-sectest.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "Security testing task packages for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
nmap \
ettercap \
stunnel \
diff --git a/packages/tasks/task-gpe-settings.bb b/packages/tasks/task-gpe-settings.bb
index ddfcb282f1..84302fdf5a 100644
--- a/packages/tasks/task-gpe-settings.bb
+++ b/packages/tasks/task-gpe-settings.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "Settings task package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
gpe-mininet \
gpe-bluetooth \
gpe-beam \
diff --git a/packages/tasks/task-gpe-web.bb b/packages/tasks/task-gpe-web.bb
index 247165ba9d..674dd86224 100644
--- a/packages/tasks/task-gpe-web.bb
+++ b/packages/tasks/task-gpe-web.bb
@@ -1,10 +1,10 @@
DESCRIPTION = "Additional web task packages for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
+inherit task
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
pidgin \
minimo"
diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb
index 5399c12025..bbb3857b3b 100644
--- a/packages/tasks/task-gpe.bb
+++ b/packages/tasks/task-gpe.bb
@@ -1,7 +1,8 @@
DESCRIPTION = "Task packages for GPE Palmtop Environment"
-PR = "r4"
+PR = "r5"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
+
+inherit task
PACKAGES = "\
gpe-base-depends \
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index f2a108b712..e0298ae8d7 100644
--- a/packages/tasks/task-gpephone.bb
+++ b/packages/tasks/task-gpephone.bb
@@ -1,7 +1,8 @@
DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r8"
+PR = "r9"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
+
+inherit task
PACKAGES = "\
gpephone-task-base \
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
index b50254c7dc..c07ba1672f 100644
--- a/packages/tasks/task-mokogateway.bb
+++ b/packages/tasks/task-mokogateway.bb
@@ -1,10 +1,10 @@
DESCRIPTION = "MokoGateway: Tasks for a companion server for the OpenMoko Linux Distribution"
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
LICENSE = "MIT"
PROVIDES = "task-mokogateway-everything"
PR = "r4"
+inherit task
+
PACKAGES = "\
task-mokogateway-everything \
${MOKOGATEWAY_PACKAGES} \
diff --git a/packages/tasks/task-mythfront.bb b/packages/tasks/task-mythfront.bb
index c99647ecb5..37e0fa0883 100644
--- a/packages/tasks/task-mythfront.bb
+++ b/packages/tasks/task-mythfront.bb
@@ -1,11 +1,13 @@
-PACKAGES = "${PN}"
DESCRIPTION = "Meta-package for MythTV diskless frontend"
-ALLOW_EMPTY = "1"
-PR = "r13"
+PR = "r14"
-RDEPENDS = "xserver-xorg mythtv-frontend mythtv-filters mythtv-theme-g.a.n.t. mythtv-theme-default lirc lirc-modules ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd font-cursor-misc font-misc-misc xf86-input-keyboard xf86-input-mouse"
+inherit task
-RDEPENDS_append_epia = " xorg-driver-via mesa-dri-driver-unichrome"
+RDEPENDS_${PN} = "xserver-xorg mythtv-frontend mythtv-filters mythtv-theme-g.a.n.t. mythtv-theme-default lirc lirc-modules ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd font-cursor-misc font-misc-misc xf86-input-keyboard xf86-input-mouse"
+
+RDEPENDS_${PN}_append_epia = " xorg-driver-via mesa-dri-driver-unichrome"
+
+PACKAGE_ARCH_epia = "${MACHINE_ARCH}"
LICENSE = "MIT"
diff --git a/packages/tasks/task-opie-16mb.bb b/packages/tasks/task-opie-16mb.bb
index 610e06ffb0..7758b9a141 100644
--- a/packages/tasks/task-opie-16mb.bb
+++ b/packages/tasks/task-opie-16mb.bb
@@ -1,10 +1,9 @@
DESCRIPTION = "Tasks for small OPIE image"
SECTION = "opie/base"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
LICENSE = "MIT"
+PR = "r1"
-PR = "r0"
+inherit task
PACKAGES = "task-opie-16mb-base \
task-opie-16mb-applets \
@@ -33,6 +32,8 @@ RDEPENDS_task-opie-16mb-applets = "opie-aboutapplet opie-clockapplet opie-suspen
${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
+PACKAGE_ARCH_task-opie-16mb-applets = "${MACHINE_ARCH}"
+
#
# clamshell models can benefit from the autorotate applet
#
diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
index 8e8d3aa9dc..4666b4ab8d 100644
--- a/packages/tasks/task-opie-all.bb
+++ b/packages/tasks/task-opie-all.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "Tasks for OPIE stuff"
SECTION = "opie/base"
-ALLOW_EMPTY = "1"
LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
+
+inherit task
PACKAGES = "task-opie-applets task-opie-inputmethods task-opie-styles \
task-opie-decorations task-opie-multimedia task-opie-wlan \
diff --git a/packages/tasks/task-opie-apps.bb b/packages/tasks/task-opie-apps.bb
index 1c03dcc9d9..2f9cc27962 100644
--- a/packages/tasks/task-opie-apps.bb
+++ b/packages/tasks/task-opie-apps.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "Tasks for OPIE stuff"
SECTION = "opie/base"
-ALLOW_EMPTY = "1"
LICENSE = "MIT"
+inherit task
+
PACKAGES = "task-opie-apps task-opie-extra-apps"
RDEPENDS_task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
diff --git a/packages/tasks/task-opie-games.bb b/packages/tasks/task-opie-games.bb
index 70d2f39b29..4449c7aaae 100644
--- a/packages/tasks/task-opie-games.bb
+++ b/packages/tasks/task-opie-games.bb
@@ -1,7 +1,9 @@
DESCRIPTION = "Tasks for OPIE stuff"
SECTION = "opie/base"
-ALLOW_EMPTY = "1"
LICENSE = "MIT"
+PR = "r1"
+
+inherit task
PACKAGES = "task-opie-games task-opie-extra-games"
diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index 018ed9a9c8..0f7285236e 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -1,11 +1,12 @@
DESCRIPTION = "Tasks for OPIE stuff"
SECTION = "opie/base"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
LICENSE = "MIT"
-PROVIDES = "task-opie-everything"
-PR = "r11"
+PR = "r12"
+
+inherit task
+
+PROVIDES = "task-opie-everything"
PACKAGES = "task-opie-base \
task-opie-base-applets task-opie-base-apps \
@@ -32,6 +33,8 @@ RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklau
RRECOMMENDS_task-opie-base = "opie-taskbar-images-${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \
opie-taskbar-images-${MACHINE_DISPLAY_HEIGHT_PIXELS}x${MACHINE_DISPLAY_WIDTH_PIXELS}"
+PACKAGE_ARCH_task-opie-base = "${MACHINE_ARCH}"
+
#
# things for reasonable bootstrap image
#
@@ -44,6 +47,8 @@ RDEPENDS_task-opie-base-applets = "opie-aboutapplet opie-clockapplet opie-suspen
${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
+PACKAGE_ARCH_task-opie-base-applets = "${MACHINE_ARCH}"
+
#
# clamshell models can benefit from the autorotate applet
#
@@ -69,6 +74,8 @@ RDEPENDS_task-opie-extra-settings = "opie-language opie-doctab opie-mediummount
${@base_contains("DISTRO_FEATURES", "ppp", "opie-networksettings-pppplugin", "",d)} \
"
+PACKAGE_ARCH_task-opie-extra-settings = "${MACHINE_ARCH}"
+
RDEPENDS_task-opie-base-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
RDEPENDS_task-opie-base-styles = "opie-style-flat opie-style-fresh opie-style-web opie-style-phase"
diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb
index f9d3f7bfc7..1610854bc0 100644
--- a/packages/tasks/task-proper-tools.bb
+++ b/packages/tasks/task-proper-tools.bb
@@ -1,10 +1,9 @@
DESCRIPTION = "Full versions of tools provided by busybox"
-PR = "r4"
+PR = "r5"
-PACKAGE_ARCH = "all"
-ALLOW_EMPTY_${PN} = "1"
+inherit task
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
coreutils \
findutils \
util-linux \
diff --git a/packages/tasks/task-qpe.bb b/packages/tasks/task-qpe.bb
index 3fff3cbeb9..347a4525b8 100644
--- a/packages/tasks/task-qpe.bb
+++ b/packages/tasks/task-qpe.bb
@@ -1,9 +1,9 @@
DESCRIPTION = "Tasks for programs running on Qt/Embedded based Palmtop Environents like Opie and Qtopia."
SECTION = "opie/base"
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
LICENSE = "MIT"
-PR = "r9"
+PR = "r10"
+
+inherit task
PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
task-qpe-multimedia task-qpe-emulators task-qpe-applications \
diff --git a/packages/tasks/task-sdl.bb b/packages/tasks/task-sdl.bb
index d90c117d3f..de457c7e3e 100644
--- a/packages/tasks/task-sdl.bb
+++ b/packages/tasks/task-sdl.bb
@@ -1,5 +1,9 @@
DESCRIPTION = "Tasks for SDL stuff"
LICENSE = "MIT"
+PR = "r1"
+
+inherit task
+
PACKAGES = "task-sdl-libs task-sdl-games task-sdl-emulators"
# no need to add libsdl as all libsdl-* already rdepend on it
diff --git a/packages/tasks/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb
index 3a4081199b..c846b22de5 100644
--- a/packages/tasks/task-xfce-base.bb
+++ b/packages/tasks/task-xfce-base.bb
@@ -4,12 +4,12 @@
DESCRIPTION = "All packages required for an base XFCE installation"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
-PR = "r2"
+PR = "r3"
-RDEPENDS = "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \
+inherit task
+
+RDEPENDS_${PN} = "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \
xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \
xfce4-panel-mcs-plugins \
xfdesktop-mcs-plugins"
-RRECOMMENDS = "xfce-utils-mcs-plugins"
+RRECOMMENDS_${PN} = "xfce-utils-mcs-plugins"
diff --git a/packages/tasks/task-xterminal.bb b/packages/tasks/task-xterminal.bb
index 94a1932004..f2975132e9 100644
--- a/packages/tasks/task-xterminal.bb
+++ b/packages/tasks/task-xterminal.bb
@@ -1,8 +1,9 @@
PACKAGES = "task-xterminal"
DESCRIPTION = "Meta-package for diskless X terminal"
-ALLOW_EMPTY = "1"
-PR = "r0"
+PR = "r1"
-RDEPENDS = "xserver-kdrive-fbdev minicom lrzsz dropbear"
+inherit task
+
+RDEPENDS_${PN} = "xserver-kdrive-fbdev minicom lrzsz dropbear"
LICENSE = "MIT"
diff --git a/packages/twisted/twisted_1.2.0.bb b/packages/twisted/twisted_1.2.0.bb
deleted file mode 100644
index 40f8218fbb..0000000000
--- a/packages/twisted/twisted_1.2.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Twisted is an event-driven networking framework written in \
-Python and licensed under the LGPL. \ Twisted supports TCP, UDP, SSL/TLS, \
-multicast, Unix sockets, a large number of protocols (including HTTP, NNTP, \
-IMAP, SSH, IRC, FTP, and others), and much more."
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-RDEPENDS = "python-core"
-PR = "r1"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/old/Twisted-${PV}.tar.bz2"
-S = "${WORKDIR}/Twisted-${PV}"
-
-inherit distutils
-
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/twisted/protocols/.debug"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/twisted/runner/.debug"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/twisted/spread/.debug"
diff --git a/packages/uicmoc/uicmoc4-native_4.2.3.bb b/packages/uicmoc/uicmoc4-native_4.2.3.bb
index 341b092e29..27b5b5bb31 100644
--- a/packages/uicmoc/uicmoc4-native_4.2.3.bb
+++ b/packages/uicmoc/uicmoc4-native_4.2.3.bb
@@ -1,7 +1,9 @@
DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "libx11-native libxext-native"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL QPL"
+PR = "r1"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
diff --git a/packages/uicmoc/uicmoc4-native_4.3.0.bb b/packages/uicmoc/uicmoc4-native_4.3.0.bb
index fbfd8125cd..27443f6876 100644
--- a/packages/uicmoc/uicmoc4-native_4.3.0.bb
+++ b/packages/uicmoc/uicmoc4-native_4.3.0.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "libx11-native libxext-native"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL QPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
diff --git a/packages/uicmoc/uicmoc4-native_4.3.1.bb b/packages/uicmoc/uicmoc4-native_4.3.1.bb
new file mode 100644
index 0000000000..8fdddb042c
--- /dev/null
+++ b/packages/uicmoc/uicmoc4-native_4.3.1.bb
@@ -0,0 +1,59 @@
+DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
+S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
+
+inherit native
+
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+ -qt-libjpeg -qt-gif -system-zlib \
+ -no-nis -no-cups -no-exceptions \
+ -no-accessibility -no-libjpeg \
+ -no-nas-sound -no-sm \
+ -no-xshape -no-xinerama \
+ -no-xcursor -no-xrandr \
+ -no-xrender -no-fontconfig \
+ -no-tablet -no-xkb \
+ -no-libpng \
+ -verbose -release -fast -static \
+ -qt3support "
+# yank default -e
+EXTRA_OEMAKE = " "
+
+do_configure() {
+ echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+ src/tools/moc \
+ src/corelib \
+ src/sql \
+ src/qt3support \
+ src/xml \
+ src/tools/uic \
+ src/tools/rcc \
+ src/network \
+ src/gui \
+ src/tools/uic3 \
+"
+
+do_compile() {
+ unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
+ for i in ${TOBUILD}; do
+ cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+ done
+}
+
+do_stage() {
+ install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
+ install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+ install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
+ install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+ install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/
+ install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
+}
diff --git a/packages/xorg-app/sessreg_1.0.3.bb b/packages/xorg-app/sessreg_1.0.3.bb
new file mode 100644
index 0000000000..dc281b41b0
--- /dev/null
+++ b/packages/xorg-app/sessreg_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11"
+
diff --git a/packages/xorg-app/setxkbmap_1.0.4.bb b/packages/xorg-app/setxkbmap_1.0.4.bb
new file mode 100644
index 0000000000..9b97cf437a
--- /dev/null
+++ b/packages/xorg-app/setxkbmap_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile virtual/libx11"
+
diff --git a/packages/xorg-app/xdm_1.1.6.bb b/packages/xorg-app/xdm_1.1.6.bb
new file mode 100644
index 0000000000..7b4195e3d8
--- /dev/null
+++ b/packages/xorg-app/xdm_1.1.6.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "X display manager"
+
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/packages/xorg-app/xmodmap_1.0.3.bb b/packages/xorg-app/xmodmap_1.0.3.bb
new file mode 100644
index 0000000000..4b031293a2
--- /dev/null
+++ b/packages/xorg-app/xmodmap_1.0.3.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+LICENSE = "MIT"
+PE = "1"
diff --git a/packages/xorg-app/xprop_1.0.3.bb b/packages/xorg-app/xprop_1.0.3.bb
new file mode 100644
index 0000000000..8623021717
--- /dev/null
+++ b/packages/xorg-app/xprop_1.0.3.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu virtual/libx11"
+
diff --git a/packages/xorg-app/xrdb_1.0.4.bb b/packages/xorg-app/xrdb_1.0.4.bb
new file mode 100644
index 0000000000..177d3ab23b
--- /dev/null
+++ b/packages/xorg-app/xrdb_1.0.4.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
diff --git a/packages/xorg-app/xsetroot_1.0.2.bb b/packages/xorg-app/xsetroot_1.0.2.bb
new file mode 100644
index 0000000000..0f63feb79f
--- /dev/null
+++ b/packages/xorg-app/xsetroot_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
diff --git a/packages/xorg-app/xvinfo_1.0.2.bb b/packages/xorg-app/xvinfo_1.0.2.bb
new file mode 100644
index 0000000000..ac27f13f34
--- /dev/null
+++ b/packages/xorg-app/xvinfo_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Print out X-Video extension adaptor information"
+DEPENDS += " libxv"
+PE = "1"
diff --git a/packages/xorg-doc/xorg-sgml-doctools_1.2.bb b/packages/xorg-doc/xorg-sgml-doctools_1.2.bb
new file mode 100644
index 0000000000..18a3ef964a
--- /dev/null
+++ b/packages/xorg-doc/xorg-sgml-doctools_1.2.bb
@@ -0,0 +1,8 @@
+require xorg-doc-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+FILES_${PN} += " /usr/share/X11/sgml"
diff --git a/packages/xorg-driver/xf86-input-mouse_1.2.2.bb b/packages/xorg-driver/xf86-input-mouse_1.2.2.bb
new file mode 100644
index 0000000000..eb464ad5a6
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-mouse_1.2.2.bb
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+PE = "1"
+
+DESCRIPTION = "Mouse Support in X11"
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-driver/xf86-video-ati_6.6.193.bb b/packages/xorg-driver/xf86-video-ati_6.6.193.bb
new file mode 100644
index 0000000000..994b8b6a3c
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-ati_6.6.193.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-nv_2.1.3.bb b/packages/xorg-driver/xf86-video-nv_2.1.3.bb
new file mode 100644
index 0000000000..843aa707b7
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-nv_2.1.3.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-driver/xf86-video-savage_2.1.3.bb b/packages/xorg-driver/xf86-video-savage_2.1.3.bb
new file mode 100644
index 0000000000..999b319b23
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-savage_2.1.3.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto"
diff --git a/packages/xorg-lib/diet-x11_1.1.3.bb b/packages/xorg-lib/diet-x11_1.1.3.bb
new file mode 100644
index 0000000000..f032987b88
--- /dev/null
+++ b/packages/xorg-lib/diet-x11_1.1.3.bb
@@ -0,0 +1,8 @@
+require libx11_${PV}.bb
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+ file://fix-disable-xlocale.diff;patch=1 \
+ file://fix-utf8-wrong-define.patch;patch=1"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/packages/xorg-lib/libice_1.0.4.bb b/packages/xorg-lib/libice_1.0.4.bb
new file mode 100644
index 0000000000..99f5dfa750
--- /dev/null
+++ b/packages/xorg-lib/libice_1.0.4.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Inter-Client Exchange library"
+DEPENDS += "xproto xtrans"
+PROVIDES = "ice"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libICE"
diff --git a/packages/xorg-lib/libx11_1.1.3.bb b/packages/xorg-lib/libx11_1.1.3.bb
new file mode 100644
index 0000000000..4035c77cdc
--- /dev/null
+++ b/packages/xorg-lib/libx11_1.1.3.bb
@@ -0,0 +1,24 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+ libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "virtual/libx11"
+PE = "1"
+PR = "r0"
+
+XORG_PN = "libX11"
+
+EXTRA_OECONF += "--without-xcb"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+ cd ../../
+ ) || exit 1
+ oe_runmake
+}
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
diff --git a/packages/xorg-lib/libxaw_1.0.4.bb b/packages/xorg-lib/libxaw_1.0.4.bb
new file mode 100644
index 0000000000..ebfb73b34a
--- /dev/null
+++ b/packages/xorg-lib/libxaw_1.0.4.bb
@@ -0,0 +1,21 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Athena Widget Set"
+DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PROVIDES = "xaw"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXaw"
+
+do_stage_append () {
+ ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
+ ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
+ ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
+}
+
+PACKAGES =+ "libxaw6 libxaw7 libxaw8"
+
+FILES_libxaw6 = "${libdir}/libXaw6.so.6*"
+FILES_libxaw7 = "${libdir}/libXaw7.so.7*"
+FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
diff --git a/packages/xorg-lib/libxpm_3.5.7.bb b/packages/xorg-lib/libxpm_3.5.7.bb
new file mode 100644
index 0000000000..e4ecc28cb3
--- /dev/null
+++ b/packages/xorg-lib/libxpm_3.5.7.bb
@@ -0,0 +1,13 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Pixmap library"
+LICENSE = "X-BSD"
+DEPENDS += "libxt libxext"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXpm"
+
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
diff --git a/packages/xorg-lib/libxrender_0.9.3.bb b/packages/xorg-lib/libxrender_0.9.3.bb
new file mode 100644
index 0000000000..0a345b951c
--- /dev/null
+++ b/packages/xorg-lib/libxrender_0.9.3.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Rendering Extension client library"
+LICENSE = "BSD-X"
+DEPENDS += "virtual/libx11 renderproto xproto"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXrender"
diff --git a/packages/xorg-lib/libxtst_1.0.3.bb b/packages/xorg-lib/libxtst_1.0.3.bb
new file mode 100644
index 0000000000..8d92200775
--- /dev/null
+++ b/packages/xorg-lib/libxtst_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Test Extension: client side library"
+DEPENDS += "libxext recordproto inputproto"
+PROVIDES = "xtst"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXtst"
diff --git a/packages/xorg-lib/xtrans_1.0.4.bb b/packages/xorg-lib/xtrans_1.0.4.bb
new file mode 100644
index 0000000000..42cf655a3f
--- /dev/null
+++ b/packages/xorg-lib/xtrans_1.0.4.bb
@@ -0,0 +1,7 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+
+SRC_URI += "file://fix-missing-includepath.patch;patch=1"