From 4b605e2fc31a9f8c418088150ea4c32b8f0470b0 Mon Sep 17 00:00:00 2001
From: David-John Willis <John.Willis@Distant-earth.com>
Date: Wed, 20 May 2009 14:35:06 +0100
Subject: [PATCH] Sync with local tree. Updates to the theme, kernel SRCREV and
 some tweaks to tasks (remove network-manager for now as it is giving issues).

---
 .../omap3-pandora-kernel_2.6.27-pandora.bb    | 16 ++----------
 recipes/pandora-system/pandora-libpnd.bb      |  6 ++---
 .../pandora-matchbox-gtk-theme.bb             | 25 ++++++++++++++-----
 recipes/tasks/task-pandora-core.bb            |  4 +--
 recipes/tasks/task-pandora-gui.bb             |  3 ++-
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb b/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb
index 4d1ff5d..a5b93b3 100755
--- a/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb
+++ b/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb
@@ -5,20 +5,8 @@ KERNEL_IMAGETYPE = "uImage"
 
 COMPATIBLE_MACHINE = "omap3-pandora"
 
-#GIT HEAD WITH DSS2
-SRCREV = 988a5dbcb012af46fb413d7a4105be81481076f0
-
-#GIT HEAD 8th March
-#SRCREV = "6659d29395831bf5d6e589b288bfc3faf2096d2f"
-
-#GIT HEAD 7th Feb
-#SRCREV = "98000fc8f72fd9d35ae2fea0528e756febbe0916"
-
-#MMC3/WiFi commit
-#SRCREV = "33280e83ef2260f8f6ba01345c5d75a9d97a49c0"
-
-#Pre MMC3
-#SRCREV = "fdb85aeee5f1993265bf46d4dfeae32a3fb8b886"
+#GIT HEAD
+SRCREV = "462fa3321de7a3b8646c195130600af296b5e117"
 
 PV = "2.6.27-pandora+${PR}+git${SRCREV}"
 PR = "r1.8"
diff --git a/recipes/pandora-system/pandora-libpnd.bb b/recipes/pandora-system/pandora-libpnd.bb
index ef0976d..421c419 100755
--- a/recipes/pandora-system/pandora-libpnd.bb
+++ b/recipes/pandora-system/pandora-libpnd.bb
@@ -26,8 +26,6 @@ do_compile_prepend() {
           cd ${S}/
 }
 
-#EXTRA_OEMAKE = "all"
-
 do_compile() {
           oe_runmake 
           oe_runmake deploy
@@ -47,9 +45,9 @@ do_install() {
                    
           install -d ${D}${prefix}/pandora/
           install -d ${D}${prefix}/pandora/apps/
-          cp -pP ${S}/deployment/usr/pandora/apps/.* ${D}${prefix}/pandora/apps/
+#          cp -pP ${S}/deployment/usr/pandora/apps/*.* ${D}${prefix}/pandora/apps
           install -d ${D}${prefix}/pandora/scripts/
-          cp -pP ${S}/deployment/usr/pandora/scripts/*.* ${D}${prefix}/pandora/scripts/
+          cp -pP ${S}/deployment/usr/pandora/scripts/*.* ${D}${prefix}/pandora/scripts
           
           install -d ${D}${sysconfdir}/init.d/
           cp -pP ${WORKDIR}/rc.libpnd ${D}${sysconfdir}/init.d/libpnd-init
diff --git a/recipes/pandora-system/pandora-matchbox-gtk-theme.bb b/recipes/pandora-system/pandora-matchbox-gtk-theme.bb
index 97b7ad2..41d7d1a 100755
--- a/recipes/pandora-system/pandora-matchbox-gtk-theme.bb
+++ b/recipes/pandora-system/pandora-matchbox-gtk-theme.bb
@@ -3,18 +3,31 @@ LICENSE = "GPL"
 DEPENDS = "matchbox-wm"
 SECTION = "x11/wm"
 
-DEFAULT_PREFERENCE = "-1"
-
 PV = "0.1"
 PR = "r0"
 
 PACKAGE_ARCH = "all"
 
-SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http"
-S = "${WORKDIR}/matchbox-sato"
+#GIT HEAD
+SRCREV = 1bd11ea0a6bacafe216bbb29492e064fc52979b0
+
+SRC_URI = " \
+	git://git.openpandora.org/pandora-libraries.git;protocol=git;branch=master \
+"
 
-inherit autotools pkgconfig
+S = "${WORKDIR}/git"
 
-FILES_${PN} = "${datadir}/themes/Sato"
+do_install() {
+	find ${WORKDIR} -name ".git" | xargs rm -rf
+	install -d ${D}${datadir}/themes/pandora-standard/gtk-2.0
+	cp -fpPR ${S}/* ${D}${datadir}/themes/pandora-standard/
+	rm -rf ${D}${datadir}/themes/pandora-standard/patches/
+	
+	install -d ${D}${sysconfdir}/gtk-2.0
+	echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
+}
 
+CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
 
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir} ${sysconfdir}"
diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb
index 39b7a85..27d9bba 100755
--- a/recipes/tasks/task-pandora-core.bb
+++ b/recipes/tasks/task-pandora-core.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Task file for default core/console apps in the Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r3.3"
+PR = "r3.4"
 
 inherit task 
 
@@ -49,7 +49,7 @@ RDEPENDS_${PN} = "\
         zip \
         openssh-scp openssh-ssh \
         mplayer \
-        networkmanager netm-cli \
+#        networkmanager netm-cli \
 "
 
 # Make sure we install all kernel modules with the Pandora images
diff --git a/recipes/tasks/task-pandora-gui.bb b/recipes/tasks/task-pandora-gui.bb
index 8c91b69..8467c58 100755
--- a/recipes/tasks/task-pandora-gui.bb
+++ b/recipes/tasks/task-pandora-gui.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Task file for default GUI apps in the Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r1.9"
+PR = "r1.10"
 
 inherit task
 
@@ -48,4 +48,5 @@ RDEPENDS_${PN} = "\
 #	networkmanager-applet \
 	connman-gnome \
         scummvm \
+        pandora-matchbox-gtk-theme \
 "
-- 
2.39.2