From 686863b9fc50e297db3b905ec1ae8e61db607a88 Mon Sep 17 00:00:00 2001
From: Donald Kirker <donald.kirker@openmobl.com>
Date: Thu, 25 Oct 2012 07:28:43 +0000
Subject: [PATCH] Add WebKitSupplemental Makefile and freetype.

---
 Makefile                                  |  6 +++-
 packages/isis/Makefile.WebKitSupplemental | 38 +++++++++++++++++++++++
 scripts/get_freetype.sh                   | 30 ++++++++++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 packages/isis/Makefile.WebKitSupplemental
 create mode 100644 scripts/get_freetype.sh

diff --git a/Makefile b/Makefile
index 099ffa3..7cdea88 100644
--- a/Makefile
+++ b/Makefile
@@ -32,13 +32,17 @@ qt4:
 luna-sysmgr: qt4
 	$(MAKE) -C packages/sysmgr/luna-sysmgr
 
-webkit-depends: downloads/.zlib qt4
+webkit-depends: downloads/.zlib downloads/.freetype qt4
 
 # This is a mess... Need to clean it up...
 downloads/.zlib:
 	scripts/get_zlib.sh $(LEVEL)
 	touch $@
 
+downloads/.freetype:
+	scripts/get_freetype.sh $(LEVEL)
+	touch $@
+
 webkit: webkit-depends
 	$(MAKE) -C packages/isis
 
diff --git a/packages/isis/Makefile.WebKitSupplemental b/packages/isis/Makefile.WebKitSupplemental
new file mode 100644
index 0000000..ae3925b
--- /dev/null
+++ b/packages/isis/Makefile.WebKitSupplemental
@@ -0,0 +1,38 @@
+VERSION  = 0.0.1
+
+LEVEL=../..
+
+build::
+
+include $(LEVEL)/Makefile.common
+
+.PHONY: build unpack
+build:: build/$(CONFIG)/.built-WebKitSupplemental-${VERSION}
+unpack: build/$(CONFIG)/.unpacked
+
+### Unpack the software and build it
+#build/$(CONFIG)/.unpacked: $(ISIS_DL)
+#	-rm -rf build/$(CONFIG)
+#	mkdir -p build/$(CONFIG)/src
+#	$(call EXTRACT,ISIS,build/$(CONFIG)/src,--strip=1)
+#	touch $@
+
+INCLUDE_DIRS := -I$(STAGING_DIR)/ISIS_OUT/include/ -I$(STAGING_DIR)/usr/include/ -I$(STAGING_DIR)/usr/include/glib-2.0/
+QTPATH := $(shell readlink -f $(LEVEL)/packages/sysmgr/qt4/build/armv7)
+QMAKE := $(QTPATH)/bin/qmake-palm
+
+QMAKE_CXX := $(TCDIR)/bin/arm-none-linux-gnueabi-g++
+QMAKE_CC := $(TCDIR)/bin/arm-none-linux-gnueabi-gcc
+QMAKE_AR := $(TCDIR)/bin/arm-none-linux-gnueabi-ar
+QMAKE_RANLIB := $(TCDIR)/bin/arm-none-linux-gnueabi-ranlib
+QMAKE_STRIP := $(TCDIR)/bin/arm-none-linux-gnueabi-strip
+QMAKE_LINK := $(TCDIR)/bin/arm-none-linux-gnueabi-g++
+
+
+build/$(CONFIG)/.config-WebKitSupplemental-${VERSION}: build/$(CONFIG)/.unpacked
+	touch $@
+
+build/$(CONFIG)/.built-WebKitSupplemental-${VERSION}: build/$(CONFIG)/.config-WebKitSupplemental-${VERSION}
+	make -C build/$(CONFIG)/src/WebKitSupplemental/ INCLUDES="$(INCLUDE_DIRS)" DISTRO_TYPE=release TARGET_ARCH=arm INCLUDE_DIR=$(STAGING_DIR)/usr/include/ LIB_DIR=$(STAGING_DIR)/usr/lib/ QTDIR=$(QTPATH) QMAKE=$(QMAKE) INSTALL_DIR=$(STAGING_DIR) configure all install
+	touch $@
+
diff --git a/scripts/get_freetype.sh b/scripts/get_freetype.sh
new file mode 100644
index 0000000..b3cce4f
--- /dev/null
+++ b/scripts/get_freetype.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+pushd .
+
+CURRENTDIR=`pwd`
+DOWNLOADS=downloads/freetype/
+
+if [ ! -e $DOWNLOADS ]; then
+        mkdir -p $DOWNLOADS
+fi
+cd $DOWNLOADS
+
+wget http://downloads.help.palm.com/opensource/3.0.5/freetype-2.3.12.tar.bz2
+wget http://downloads.help.palm.com/opensource/3.0.5/freetype-2.3.12-patches.tgz
+
+tar -xvf freetype-2.3.12.tar.bz2
+tar -xvf freetype-2.3.12-patches.tgz
+
+cd freetype-2.3.12
+
+patch -p1 < ../fix-configure.patch
+patch -p1 < ../libtool-tag.patch
+patch -p1 < ../files/no-hardcode.patch
+
+cp include/* $CURRENTDIR/staging/armv7/usr/include/
+
+touch .freetype
+
+popd
+