From 20cd3c5c4024f2bac590ddd7373cc80f74371689 Mon Sep 17 00:00:00 2001
From: KyleMaas <kylemaasdev@gmail.com>
Date: Sun, 7 Jul 2013 10:35:06 -0400
Subject: [PATCH 1/3] Update versions of components

Open-webOS-DCO-1.0-Signed-off-by: Kyle Maas kylemaasdev@gmail.com
---
 build-webos-desktop.sh | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/build-webos-desktop.sh b/build-webos-desktop.sh
index 9a1d01d..5d9b75a 100755
--- a/build-webos-desktop.sh
+++ b/build-webos-desktop.sh
@@ -1734,20 +1734,15 @@ if [ -d $BASE/luna-sysmgr ] ; then
     rm -f $BASE/luna-sysmgr/luna-desktop-build*.stamp
 fi
 
-## TODO: Remove this temporary fix once pbnjson incremented past 7
-if [ -d "$BASE/pbnjson" ] && [ -e "$BASE/pbnjson/luna-desktop-build-7.stamp" ] ; then
-    rm -f $BASE/pbnjson/luna-desktop-build-7.stamp
-fi
-
 # Build a local version of cmake 2.8.7 so that cmake-modules-webos doesn't have to write to the OS-supplied CMake modules directory
 build cmake
 build cmake-modules-webos 12
 
 build cjson 35
-build pbnjson 7
-build pmloglib 21
+build pbnjson 14
+build pmloglib 22
 build nyx-lib 58
-build luna-service2 149
+build luna-service2 150
 #build qt4 4
 build_qt5
 build npapi-headers 0.4
@@ -1756,12 +1751,12 @@ build luna-webkit-api 3
 
 build luna-sysmgr-ipc 2
 build luna-sysmgr-ipc-messages 3
-build luna-sysmgr-common 8
+build luna-sysmgr-common 11
 build luna-sysmgr $LSM_TAG
-build keyboard-efigs 5
+build keyboard-efigs 12
 
 build webappmanager 5
-build luna-init 1.03
+build luna-init 1.04
 build luna-prefs 1.01
 build luna-sysservice 3
 build librolegen 16
@@ -1776,10 +1771,10 @@ build core-apps 2
 #build isis-browser 0.21
 build isis-fonts v0.1
 
-build foundation-frameworks 1.0
+build foundation-frameworks 1.0.1
 build mojoservice-frameworks 1.0
 build loadable-frameworks 1.0.1
-build app-services 1.02
+build app-services 1.03
 build mojolocation-stub 2
 build pmnetconfigmanager-stub 3
 
@@ -1800,10 +1795,10 @@ build node-addon pmlog 10
 build node-addon dynaload 11
 
 build leveldb 1.9 0
-build db8 63
+build db8 72 #74
 build configurator 49
 build hunspell 1.3 2
-build smartkey-hun 2
+build smartkey-hun 6
 
 build activitymanager 110
 build pmstatemachineengine 13

From 69946d25f00d887fcaecca933062363e036be0af Mon Sep 17 00:00:00 2001
From: KyleMaas <kylemaasdev@gmail.com>
Date: Sun, 7 Jul 2013 10:47:19 -0400
Subject: [PATCH 2/3] Add a few more of this build's dependencies

Open-webOS-DCO-1.0-Signed-off-by: Kyle Maas kylemaasdev@gmail.com
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7c8ab3b..bcfb2cc 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,8 @@ Prerequisites
 
         $ sudo apt-get build-dep qt4-qmake
 
+        $ sudo apt-get gdb "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev hunspell
+
   * The components listed above are valid for both Ubuntu 11.04 and 12.04, except for libxcb-icccm1-dev which is libxcb-icccm4-dev on 12.04
 
   * CMake version 2.8.7 will be fetched and used for the build; there is no need to install it.

From b9a09df332ab1f81e22016abefde48b8c29e2647 Mon Sep 17 00:00:00 2001
From: KyleMaas <kylemaasdev@gmail.com>
Date: Sun, 7 Jul 2013 15:31:38 -0400
Subject: [PATCH 3/3] Link to correct directory within user's home even when
 running under sudo

Open-webOS-DCO-1.0-Signed-off-by: Kyle Maas kylemaasdev@gmail.com
---
 install-webos-desktop.sh | 12 ++++++++++++
 local.sh.default         |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/install-webos-desktop.sh b/install-webos-desktop.sh
index 7be06bf..579fe5a 100755
--- a/install-webos-desktop.sh
+++ b/install-webos-desktop.sh
@@ -29,6 +29,18 @@ export SCRIPT_DIR=$PWD
 
 source ./webos-desktop-common.sh
 
+if [ -z "$BASE" ]; then
+    echo "You have a problem with your local.sh script which is"
+    echo "preventing install-luna-sysmgr.sh from locating your"
+    echo "binaries.  Please correct the problem and try again."
+    exit
+fi
+
+if [ $EUID -ne 0 ]; then
+    echo "This script must be run as root."
+    exit
+fi
+
 if [ "$1" = "--help" ] ; then
     echo "Usage: sudo ./install-luna-sysmgr.sh [OPTION]"
     echo "Installs the luna-sysmgr component and its dependencies."
diff --git a/local.sh.default b/local.sh.default
index 53d6b5e..7805769 100644
--- a/local.sh.default
+++ b/local.sh.default
@@ -26,7 +26,11 @@
 ##  This has been the default target location for build-desktop since its initial creation
 ##
 
-export BASE="${HOME}/luna-desktop-binaries"
+if [ -z "${SUDO_USER}" ]; then
+  export BASE="${HOME}/luna-desktop-binaries"
+else
+  export BASE="$(getent passwd ${SUDO_USER} | grep -o [^:]*:[^:]*$ | grep -o ^[^:]*)/luna-desktop-binaries"
+fi
 
 
 #########################################