From: David-John Willis <John.Willis@Distant-earth.com>
Date: Wed, 29 Sep 2010 12:09:27 +0000 (+0100)
Subject: task-pandora: Sync in local changes to bump PR's and add more libs to the toolchain.
X-Git-Tag: sz_beta3~234
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=9c7519c4b5fc471208f32483f15b42ae87a2b4f5

task-pandora: Sync in local changes to bump PR's and add more libs to the toolchain.
---

diff --git a/recipes/meta/meta-toolchain-pandora.bb b/recipes/meta/meta-toolchain-pandora.bb
index d8b3d2e..ce1f3d3 100644
--- a/recipes/meta/meta-toolchain-pandora.bb
+++ b/recipes/meta/meta-toolchain-pandora.bb
@@ -17,7 +17,8 @@ do_populate_sdk_append() {
        # SED out incorrect paths in SDK support *-config files so tools can use the files to find libs to cross compile.
        # not ready to commit.
 
-       # Tweak the environment-setup script to get QT4 dev working.
+       # Tweak the environment-setup script to try get Qt4 X11 dev working.
+       # Based on Koen's mods to create the Qte SDK.
        
        script = "${SDK_OUTPUT}/${SDKPATH}/environment-setup"
        touch $script
diff --git a/recipes/tasks/task-pandora-sdk-full.bb b/recipes/tasks/task-pandora-sdk-full.bb
index 4def67b..f4de972 100644
--- a/recipes/tasks/task-pandora-sdk-full.bb
+++ b/recipes/tasks/task-pandora-sdk-full.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "OpenPandora: Full SDK development packages"
 
-PR = "r2"
 ALLOW_EMPTY = "1"
 
+PR = "r4"
+
 DEPENDS = "task-pandora-sdk-base"
 
 RDEPENDS = "\
@@ -51,6 +52,28 @@ RDEPENDS += "\
 # QT4 libs.
 RDEPENDS += "\
   qt4-x11-free-dev \
+  qt4-mkspecs \
+  libqt-phonon4-dev \
+  libqt-3support4-dev \
+  libqt-assistantclient4-dev \
+  libqt-clucene4-dev \
+  libqt-core4-dev \
+  libqt-dbus4-dev \
+  libqt-designercomponents4-dev \
+  libqt-designer4-dev \
+  libqt-uitools4-dev \
+  libqt-gui4-dev \
+  libqt-help4-dev \
+  libqt-network4-dev \
+  libqt-script4-dev \
+  libqt-scripttools4-dev \
+  libqt-sql4-dev \
+  libqt-svg4-dev \
+  libqt-test4-dev \
+  libqt-webkit4-dev \
+  libqt-xml4-dev \
+  sqlite-dev \
+  libsqlite-dev \
 "
 
 # X11 Development libs.
diff --git a/recipes/tasks/task-pandora-toolchain-host.bb b/recipes/tasks/task-pandora-toolchain-host.bb
index f338adb..58da53d 100644
--- a/recipes/tasks/task-pandora-toolchain-host.bb
+++ b/recipes/tasks/task-pandora-toolchain-host.bb
@@ -3,3 +3,8 @@ require task-sdk-host.bb
 DESCRIPTION = "Host packages for OpenPandora SDK"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
+
+PR = "r1"
+
+# Include this to get the native to target Qt4 tools.
+RDEPENDS_${PN} += "qt4-tools-sdk"
diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb
index 92e7aee..d78128f 100755
--- a/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@ -14,11 +14,8 @@ APPS = " \
   evince \
   claws-mail \
   swfdec swfdec-gnome swfdec-mozilla \
-#  firefox \
   gnumeric \   
-#  gimp \
   networkmanager network-manager-applet \ 
-#  synergy \
   vnc x11vnc angstrom-x11vnc-xinit \
   xchat \
 #  xournal \
@@ -71,11 +68,6 @@ GNOME_APPS = " \
   gksu \
 "
 
-GNOME_GTK = " \
-#  gnome-icon-theme \
-#  angstrom-gnome-icon-theme-enable \
-"
-
 GSTREAMER = " \
 #  gstreamer-ti \
   gst-ffmpeg \
@@ -96,7 +88,7 @@ ICON_THEME = " \
 "
 
 LAUNCHERS = " \
-#  netbook-launcher-efl \
+  netbook-launcher-efl \
   pandora-libpnd-minimenu \
   pandora-pmenu \
 "
@@ -255,7 +247,6 @@ RDEPENDS_${PN} = " \
   ${DISPMAN} \
   ${FONTS} \
   ${GAMES} \  
-  ${GNOME_GTK} \
   ${GNOME_APPS} \
   ${GSTREAMER} \
   ${ICON_THEME} \