summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2007-12-06 10:23:27 +0000
committerChris Lord <chris@openedhand.com>2007-12-06 10:23:27 +0000
commit2517420cbef24dd1e9a903a8659d41d083a57e23 (patch)
treed3a718c3a47ec0c746907395ca9c7bd072540ab3
parent8ccfa5c993a20c92ef7a2630ed37dea6d1159a89 (diff)
downloadopenembedded-core-2517420cbef24dd1e9a903a8659d41d083a57e23.tar.gz
openembedded-core-2517420cbef24dd1e9a903a8659d41d083a57e23.tar.bz2
openembedded-core-2517420cbef24dd1e9a903a8659d41d083a57e23.zip
Import files from OE to build WebKit (patch to link icu required)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3317 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/classes/qmake2.bbclass20
-rw-r--r--meta/classes/qmake_base.bbclass88
-rw-r--r--meta/packages/gperf/files/autoreconf.patch435
-rw-r--r--meta/packages/gperf/gperf-native_3.0.3.bb10
-rw-r--r--meta/packages/gperf/gperf_3.0.3.bb8
-rw-r--r--meta/packages/icu/icu-3.6.inc15
-rw-r--r--meta/packages/icu/icu-native_3.6.bb3
-rw-r--r--meta/packages/icu/icu_3.6.bb38
-rw-r--r--meta/packages/libidn/libidn_0.5.19.bb19
-rw-r--r--meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch123
-rw-r--r--meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf1
-rw-r--r--meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch22
-rw-r--r--meta/packages/qmake/qmake2-native_2.10a.bb67
-rw-r--r--meta/packages/uicmoc/uicmoc4-native.inc61
-rw-r--r--meta/packages/uicmoc/uicmoc4-native_4.3.2.bb1
-rw-r--r--meta/packages/webkit/files/Makefile22
-rw-r--r--meta/packages/webkit/files/Makefile.shared21
-rw-r--r--meta/packages/webkit/files/WebKit.pri64
-rw-r--r--meta/packages/webkit/files/WebKit.pro11
-rw-r--r--meta/packages/webkit/webkit-gtk_svn.bb24
-rw-r--r--meta/packages/webkit/webkit.inc49
21 files changed, 1102 insertions, 0 deletions
diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
new file mode 100644
index 0000000000..d0f59d2cd4
--- /dev/null
+++ b/meta/classes/qmake2.bbclass
@@ -0,0 +1,20 @@
+#
+# QMake variables for Qt4
+#
+inherit qmake_base
+
+DEPENDS_prepend = "qmake2-native uicmoc4-native "
+
+export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
+export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
+export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
+export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
+export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
+export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
+export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
+export OE_QMAKE_LINK = "${CXX}"
+export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
+export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
+export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
+export OE_QMAKE_LIBS_QT = "qt"
+export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass
new file mode 100644
index 0000000000..ea8903c278
--- /dev/null
+++ b/meta/classes/qmake_base.bbclass
@@ -0,0 +1,88 @@
+
+OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++"
+QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
+
+# We override this completely to eliminate the -e normally passed in
+EXTRA_OEMAKE = ' MAKEFLAGS= '
+
+export OE_QMAKE_CC="${CC}"
+export OE_QMAKE_CFLAGS="${CFLAGS}"
+export OE_QMAKE_CXX="${CXX}"
+export OE_QMAKE_LDFLAGS="${LDFLAGS}"
+export OE_QMAKE_AR="${AR}"
+export OE_QMAKE_STRIP="echo"
+export OE_QMAKE_RPATH="-Wl,-rpath-link,"
+
+# default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11
+
+oe_qmake_mkspecs () {
+ mkdir -p mkspecs/${OE_QMAKE_PLATFORM}
+ for f in ${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}/*; do
+ if [ -L $f ]; then
+ lnk=`readlink $f`
+ if [ -f mkspecs/${OE_QMAKE_PLATFORM}/$lnk ]; then
+ ln -s $lnk mkspecs/${OE_QMAKE_PLATFORM}/`basename $f`
+ else
+ cp $f mkspecs/${OE_QMAKE_PLATFORM}/
+ fi
+ else
+ cp $f mkspecs/${OE_QMAKE_PLATFORM}/
+ fi
+ done
+}
+
+qmake_base_do_configure() {
+ case ${QMAKESPEC} in
+ *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++)
+ ;;
+ *-oe-g++)
+ die Unsupported target ${TARGET_OS} for oe-g++ qmake spec
+ ;;
+ *)
+ oenote Searching for qmake spec file
+ paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++"
+ paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths"
+
+ if (echo "${TARGET_ARCH}"|grep -q 'i.86'); then
+ paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-x86-g++ $paths"
+ fi
+ for i in $paths; do
+ if test -e $i; then
+ export QMAKESPEC=$i
+ break
+ fi
+ done
+ ;;
+ esac
+
+ oenote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'"
+
+ if [ -z "${QMAKE_PROFILES}" ]; then
+ PROFILES="`ls *.pro`"
+ else
+ PROFILES="${QMAKE_PROFILES}"
+ fi
+
+ if [ -z "$PROFILES" ]; then
+ die "QMAKE_PROFILES not set and no profiles found in $PWD"
+ fi
+
+ if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then
+ AFTER="-after"
+ QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}"
+ oenote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}"
+ fi
+
+ if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then
+ QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}"
+ oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}"
+ fi
+
+#oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
+ unset QMAKESPEC || true
+ ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES"
+}
+
+EXPORT_FUNCTIONS do_configure
+
+addtask configure after do_unpack do_patch before do_compile
diff --git a/meta/packages/gperf/files/autoreconf.patch b/meta/packages/gperf/files/autoreconf.patch
new file mode 100644
index 0000000000..432023067b
--- /dev/null
+++ b/meta/packages/gperf/files/autoreconf.patch
@@ -0,0 +1,435 @@
+Index: gperf-3.0.3/configure.ac
+===================================================================
+--- gperf-3.0.3.orig/configure.ac 2007-05-10 18:34:15.000000000 +0200
++++ gperf-3.0.3/configure.ac 2007-05-10 18:34:26.000000000 +0200
+@@ -21,7 +21,7 @@
+ dnl If not, write to the Free Software Foundation, Inc.,
+ dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+-AC_PREREQ([2.60])
++AC_PREREQ([2.59])
+ AC_INIT(doc/gperf.1)
+ AC_PROG_MAKE_SET
+ AC_OBJEXT
+Index: gperf-3.0.3/doc/configure.ac
+===================================================================
+--- gperf-3.0.3.orig/doc/configure.ac 2007-05-10 18:34:30.000000000 +0200
++++ gperf-3.0.3/doc/configure.ac 2007-05-10 18:34:37.000000000 +0200
+@@ -21,7 +21,7 @@
+ dnl If not, write to the Free Software Foundation, Inc.,
+ dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+-AC_PREREQ([2.60])
++AC_PREREQ([2.59])
+ AC_INIT(gperf.1)
+ PACKAGE=gperf
+ AC_SUBST(PACKAGE)
+Index: gperf-3.0.3/lib/configure.ac
+===================================================================
+--- gperf-3.0.3.orig/lib/configure.ac 2007-05-10 18:34:41.000000000 +0200
++++ gperf-3.0.3/lib/configure.ac 2007-05-10 18:34:46.000000000 +0200
+@@ -21,7 +21,7 @@
+ dnl If not, write to the Free Software Foundation, Inc.,
+ dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+-AC_PREREQ([2.60])
++AC_PREREQ([2.59])
+ AC_INIT(hash.cc)
+ AC_PROG_MAKE_SET
+ dnl
+Index: gperf-3.0.3/src/configure.ac
+===================================================================
+--- gperf-3.0.3.orig/src/configure.ac 2007-05-10 18:34:53.000000000 +0200
++++ gperf-3.0.3/src/configure.ac 2007-05-10 18:34:58.000000000 +0200
+@@ -21,7 +21,7 @@
+ dnl If not, write to the Free Software Foundation, Inc.,
+ dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+-AC_PREREQ([2.60])
++AC_PREREQ([2.59])
+ AC_INIT(main.cc)
+ AC_CONFIG_HEADER(config.h)
+ AC_PROG_MAKE_SET
+Index: gperf-3.0.3/tests/configure.ac
+===================================================================
+--- gperf-3.0.3.orig/tests/configure.ac 2007-05-10 18:35:03.000000000 +0200
++++ gperf-3.0.3/tests/configure.ac 2007-05-10 18:35:08.000000000 +0200
+@@ -21,7 +21,7 @@
+ dnl If not, write to the Free Software Foundation, Inc.,
+ dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+-AC_PREREQ([2.60])
++AC_PREREQ([2.59])
+ AC_INIT(c-parse.gperf)
+ AC_PROG_MAKE_SET
+ dnl
+Index: gperf-3.0.3/acinclude.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gperf-3.0.3/acinclude.m4 2007-05-10 18:36:09.000000000 +0200
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.12)
++
++AC_DEFUN(CL_PROG_INSTALL,
++[dnl This is mostly copied from AC_PROG_INSTALL.
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++AC_MSG_CHECKING(for a BSD compatible install)
++if test -z "$INSTALL"; then
++AC_CACHE_VAL(cl_cv_path_install,
++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ # Account for people who put trailing slashes in PATH elements.
++ case "$ac_dir/" in
++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ for ac_prog in ginstall installbsd scoinst install; do
++ if test -f $ac_dir/$ac_prog; then
++ if test $ac_prog = install &&
++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX install. It has an incompatible calling convention.
++ # OSF/1 installbsd also uses dspmsg, but is usable.
++ :
++ else
++ if test $ac_prog = installbsd &&
++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX installbsd doesn't work without option "-g".
++ :
++ else
++ cl_cv_path_install="$ac_dir/$ac_prog -c"
++ break 2
++ fi
++ fi
++ fi
++ done
++ ;;
++ esac
++ done
++ IFS="$ac_save_ifs"
++ # As a last resort, use cp.
++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp"
++])dnl
++ INSTALL="$cl_cv_path_install"
++fi
++dnl We do special magic for INSTALL instead of AC_SUBST, to get
++dnl relative paths right.
++AC_MSG_RESULT($INSTALL)
++AC_SUBST(INSTALL)dnl
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)'
++AC_SUBST(INSTALL_PROGRAM)dnl
++if test -z "$INSTALL_DATA"; then
++ case "$INSTALL" in
++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;;
++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;;
++ esac
++fi
++AC_SUBST(INSTALL_DATA)dnl
++])
++
+Index: gperf-3.0.3/doc/acinclude.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gperf-3.0.3/doc/acinclude.m4 2007-05-10 18:36:11.000000000 +0200
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.12)
++
++AC_DEFUN(CL_PROG_INSTALL,
++[dnl This is mostly copied from AC_PROG_INSTALL.
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++AC_MSG_CHECKING(for a BSD compatible install)
++if test -z "$INSTALL"; then
++AC_CACHE_VAL(cl_cv_path_install,
++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ # Account for people who put trailing slashes in PATH elements.
++ case "$ac_dir/" in
++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ for ac_prog in ginstall installbsd scoinst install; do
++ if test -f $ac_dir/$ac_prog; then
++ if test $ac_prog = install &&
++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX install. It has an incompatible calling convention.
++ # OSF/1 installbsd also uses dspmsg, but is usable.
++ :
++ else
++ if test $ac_prog = installbsd &&
++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX installbsd doesn't work without option "-g".
++ :
++ else
++ cl_cv_path_install="$ac_dir/$ac_prog -c"
++ break 2
++ fi
++ fi
++ fi
++ done
++ ;;
++ esac
++ done
++ IFS="$ac_save_ifs"
++ # As a last resort, use cp.
++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp"
++])dnl
++ INSTALL="$cl_cv_path_install"
++fi
++dnl We do special magic for INSTALL instead of AC_SUBST, to get
++dnl relative paths right.
++AC_MSG_RESULT($INSTALL)
++AC_SUBST(INSTALL)dnl
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)'
++AC_SUBST(INSTALL_PROGRAM)dnl
++if test -z "$INSTALL_DATA"; then
++ case "$INSTALL" in
++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;;
++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;;
++ esac
++fi
++AC_SUBST(INSTALL_DATA)dnl
++])
++
+Index: gperf-3.0.3/lib/acinclude.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gperf-3.0.3/lib/acinclude.m4 2007-05-10 18:36:14.000000000 +0200
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.12)
++
++AC_DEFUN(CL_PROG_INSTALL,
++[dnl This is mostly copied from AC_PROG_INSTALL.
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++AC_MSG_CHECKING(for a BSD compatible install)
++if test -z "$INSTALL"; then
++AC_CACHE_VAL(cl_cv_path_install,
++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ # Account for people who put trailing slashes in PATH elements.
++ case "$ac_dir/" in
++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ for ac_prog in ginstall installbsd scoinst install; do
++ if test -f $ac_dir/$ac_prog; then
++ if test $ac_prog = install &&
++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX install. It has an incompatible calling convention.
++ # OSF/1 installbsd also uses dspmsg, but is usable.
++ :
++ else
++ if test $ac_prog = installbsd &&
++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX installbsd doesn't work without option "-g".
++ :
++ else
++ cl_cv_path_install="$ac_dir/$ac_prog -c"
++ break 2
++ fi
++ fi
++ fi
++ done
++ ;;
++ esac
++ done
++ IFS="$ac_save_ifs"
++ # As a last resort, use cp.
++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp"
++])dnl
++ INSTALL="$cl_cv_path_install"
++fi
++dnl We do special magic for INSTALL instead of AC_SUBST, to get
++dnl relative paths right.
++AC_MSG_RESULT($INSTALL)
++AC_SUBST(INSTALL)dnl
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)'
++AC_SUBST(INSTALL_PROGRAM)dnl
++if test -z "$INSTALL_DATA"; then
++ case "$INSTALL" in
++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;;
++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;;
++ esac
++fi
++AC_SUBST(INSTALL_DATA)dnl
++])
++
+Index: gperf-3.0.3/src/acinclude.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gperf-3.0.3/src/acinclude.m4 2007-05-10 18:36:12.000000000 +0200
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.12)
++
++AC_DEFUN(CL_PROG_INSTALL,
++[dnl This is mostly copied from AC_PROG_INSTALL.
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++AC_MSG_CHECKING(for a BSD compatible install)
++if test -z "$INSTALL"; then
++AC_CACHE_VAL(cl_cv_path_install,
++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ # Account for people who put trailing slashes in PATH elements.
++ case "$ac_dir/" in
++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ for ac_prog in ginstall installbsd scoinst install; do
++ if test -f $ac_dir/$ac_prog; then
++ if test $ac_prog = install &&
++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX install. It has an incompatible calling convention.
++ # OSF/1 installbsd also uses dspmsg, but is usable.
++ :
++ else
++ if test $ac_prog = installbsd &&
++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX installbsd doesn't work without option "-g".
++ :
++ else
++ cl_cv_path_install="$ac_dir/$ac_prog -c"
++ break 2
++ fi
++ fi
++ fi
++ done
++ ;;
++ esac
++ done
++ IFS="$ac_save_ifs"
++ # As a last resort, use cp.
++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp"
++])dnl
++ INSTALL="$cl_cv_path_install"
++fi
++dnl We do special magic for INSTALL instead of AC_SUBST, to get
++dnl relative paths right.
++AC_MSG_RESULT($INSTALL)
++AC_SUBST(INSTALL)dnl
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)'
++AC_SUBST(INSTALL_PROGRAM)dnl
++if test -z "$INSTALL_DATA"; then
++ case "$INSTALL" in
++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;;
++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;;
++ esac
++fi
++AC_SUBST(INSTALL_DATA)dnl
++])
++
+Index: gperf-3.0.3/tests/acinclude.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gperf-3.0.3/tests/acinclude.m4 2007-05-10 18:36:16.000000000 +0200
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.12)
++
++AC_DEFUN(CL_PROG_INSTALL,
++[dnl This is mostly copied from AC_PROG_INSTALL.
++# Find a good install program. We prefer a C program (faster),
++# so one script is as good as another. But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++AC_MSG_CHECKING(for a BSD compatible install)
++if test -z "$INSTALL"; then
++AC_CACHE_VAL(cl_cv_path_install,
++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ # Account for people who put trailing slashes in PATH elements.
++ case "$ac_dir/" in
++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++ *)
++ # OSF1 and SCO ODT 3.0 have their own names for install.
++ for ac_prog in ginstall installbsd scoinst install; do
++ if test -f $ac_dir/$ac_prog; then
++ if test $ac_prog = install &&
++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX install. It has an incompatible calling convention.
++ # OSF/1 installbsd also uses dspmsg, but is usable.
++ :
++ else
++ if test $ac_prog = installbsd &&
++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then
++ # AIX installbsd doesn't work without option "-g".
++ :
++ else
++ cl_cv_path_install="$ac_dir/$ac_prog -c"
++ break 2
++ fi
++ fi
++ fi
++ done
++ ;;
++ esac
++ done
++ IFS="$ac_save_ifs"
++ # As a last resort, use cp.
++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp"
++])dnl
++ INSTALL="$cl_cv_path_install"
++fi
++dnl We do special magic for INSTALL instead of AC_SUBST, to get
++dnl relative paths right.
++AC_MSG_RESULT($INSTALL)
++AC_SUBST(INSTALL)dnl
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)'
++AC_SUBST(INSTALL_PROGRAM)dnl
++if test -z "$INSTALL_DATA"; then
++ case "$INSTALL" in
++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;;
++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;;
++ esac
++fi
++AC_SUBST(INSTALL_DATA)dnl
++])
++
diff --git a/meta/packages/gperf/gperf-native_3.0.3.bb b/meta/packages/gperf/gperf-native_3.0.3.bb
new file mode 100644
index 0000000000..103d1aa3c2
--- /dev/null
+++ b/meta/packages/gperf/gperf-native_3.0.3.bb
@@ -0,0 +1,10 @@
+require gperf_${PV}.bb
+
+S = "${WORKDIR}/gperf-${PV}"
+
+inherit native
+
+do_stage() {
+ install -d ${STAGING_BINDIR_NATIVE}
+ install ${S}/src/gperf ${STAGING_BINDIR_NATIVE}
+}
diff --git a/meta/packages/gperf/gperf_3.0.3.bb b/meta/packages/gperf/gperf_3.0.3.bb
new file mode 100644
index 0000000000..7abfb8fbfb
--- /dev/null
+++ b/meta/packages/gperf/gperf_3.0.3.bb
@@ -0,0 +1,8 @@
+HOMEPAGE = "http://www.gnu.org/software/gperf"
+LICENSE = "GPL"
+SUMMARY = "Generate a perfect hash function from a set of keywords"
+
+SRC_URI = "${GNU_MIRROR}/gperf/gperf-${PV}.tar.gz \
+ file://autoreconf.patch;patch=1"
+
+inherit autotools
diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc
new file mode 100644
index 0000000000..b9031e202a
--- /dev/null
+++ b/meta/packages/icu/icu-3.6.inc
@@ -0,0 +1,15 @@
+
+LICENSE = "ICU"
+
+SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz"
+
+S = "${WORKDIR}/icu/source"
+
+inherit autotools pkgconfig binconfig
+
+do_configure() {
+ libtoolize --force
+ oe_runconf
+}
+
+
diff --git a/meta/packages/icu/icu-native_3.6.bb b/meta/packages/icu/icu-native_3.6.bb
new file mode 100644
index 0000000000..887bfcac2f
--- /dev/null
+++ b/meta/packages/icu/icu-native_3.6.bb
@@ -0,0 +1,3 @@
+require icu-3.6.inc
+
+inherit native
diff --git a/meta/packages/icu/icu_3.6.bb b/meta/packages/icu/icu_3.6.bb
new file mode 100644
index 0000000000..6d312a4496
--- /dev/null
+++ b/meta/packages/icu/icu_3.6.bb
@@ -0,0 +1,38 @@
+require icu-3.6.inc
+
+DEPENDS += "icu-native"
+
+PR = "r2"
+
+do_configure_append() {
+ for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do
+ sed -i -e 's:$(INVOKE) $(BINDIR)/:$(INVOKE) :g' $i
+ sed -i -e 's:$(BINDIR)/::g' $i
+ done
+ sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc || true
+ sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true
+}
+
+do_compile() {
+ oe_runmake 'CXX=${CXX}'
+}
+
+do_install_append() {
+ chmod +x ${D}${libdir}/lib*
+}
+
+PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio"
+
+FILES_libicudata = "${libdir}/libicudata.so.*"
+FILES_libicuuc = "${libdir}/libicuuc.so.*"
+FILES_libicui18n = "${libdir}/libicui18n.so.*"
+FILES_libicule = "${libdir}/libicule.so.*"
+FILES_libiculx = "${libdir}/libiculx.so.*"
+FILES_libicutu = "${libdir}/libicutu.so.*"
+FILES_libicuio = "${libdir}/libicuio.so.*"
+
+do_stage() {
+ autotools_stage_all
+}
+
+
diff --git a/meta/packages/libidn/libidn_0.5.19.bb b/meta/packages/libidn/libidn_0.5.19.bb
new file mode 100644
index 0000000000..322790b8ab
--- /dev/null
+++ b/meta/packages/libidn/libidn_0.5.19.bb
@@ -0,0 +1,19 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group."
+SECTION = "libs"
+PRIORITY = "optional"
+PR = "r0"
+
+inherit pkgconfig autotools
+
+SRC_URI = "http://josefsson.org/libidn/releases/${P}.tar.gz"
+
+EXTRA_OECONF = " --disable-tld"
+
+do_configure_prepend () {
+ autoreconf -f -i -s
+}
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch b/meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch
new file mode 100644
index 0000000000..abebfdfa27
--- /dev/null
+++ b/meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch
@@ -0,0 +1,123 @@
+From 594157753a24d0575aaf948dc0e9500f6bdb2178 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Sat, 2 Jun 2007 16:39:58 +0200
+Subject: [PATCH] fix mkspecs
+
+---
+ mkspecs/common/g++.conf | 18 +++++++++---------
+ mkspecs/common/linux.conf | 26 +++++++++++++-------------
+ 2 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf
+index f5a5c8e..4007c7e 100644
+--- a/mkspecs/common/g++.conf
++++ b/mkspecs/common/g++.conf
+@@ -2,12 +2,12 @@
+ # qmake configuration for common gcc
+ #
+
+-QMAKE_CC = gcc
+-QMAKE_CFLAGS += -pipe
++QMAKE_CC = $(OE_QMAKE_CC)
++QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
+ QMAKE_CFLAGS_DEPS += -M
+ QMAKE_CFLAGS_WARN_ON += -Wall -W
+ QMAKE_CFLAGS_WARN_OFF += -w
+-QMAKE_CFLAGS_RELEASE += -O2
++QMAKE_CFLAGS_RELEASE += -O2
+ QMAKE_CFLAGS_DEBUG += -g
+ QMAKE_CFLAGS_SHLIB += -fPIC
+ QMAKE_CFLAGS_STATIC_LIB += -fPIC
+@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
+ QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+
+-QMAKE_CXX = g++
+-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
++QMAKE_CXX = $(OE_QMAKE_CXX)
++QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
+ QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
+@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+ QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+
+-QMAKE_LINK = g++
+-QMAKE_LINK_SHLIB = g++
+-QMAKE_LFLAGS +=
++QMAKE_LINK = $(OE_QMAKE_LINK)
++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
++QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
+ QMAKE_LFLAGS_RELEASE +=
+ QMAKE_LFLAGS_DEBUG +=
+ QMAKE_LFLAGS_APP +=
+@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared
+ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME += -Wl,-soname,
+ QMAKE_LFLAGS_THREAD +=
+-QMAKE_RPATH = -Wl,-rpath,
++QMAKE_RPATH = -Wl,-rpath-link,
+
+ QMAKE_PCH_OUTPUT_EXT = .gch
+
+diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
+index 3796a87..52acf16 100644
+--- a/mkspecs/common/linux.conf
++++ b/mkspecs/common/linux.conf
+@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
+
+ QMAKE_INCDIR =
+ QMAKE_LIBDIR =
+-QMAKE_INCDIR_X11 = /usr/X11R6/include
+-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
+-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
+-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
++QMAKE_INCDIR_X11 =
++QMAKE_LIBDIR_X11 =
++QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
++QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
++QMAKE_INCDIR_OPENGL =
++QMAKE_LIBDIR_OPENGL =
+
+ QMAKE_LIBS =
+ QMAKE_LIBS_DYNLOAD = -ldl
+-QMAKE_LIBS_X11 = -lXext -lX11 -lm
+-QMAKE_LIBS_X11SM = -lSM -lICE
++QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
++QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
+ QMAKE_LIBS_NIS = -lnsl
+ QMAKE_LIBS_OPENGL = -lGLU -lGL
+ QMAKE_LIBS_OPENGL_QT = -lGL
+ QMAKE_LIBS_THREAD = -lpthread
+
+-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
+-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
++QMAKE_MOC = $(OE_QMAKE_MOC)
++QMAKE_UIC = $(OE_QMAKE_UIC)
+
+-QMAKE_AR = ar cqs
++QMAKE_AR = $(OE_QMAKE_AR) cqs
+ QMAKE_RANLIB =
+
+ QMAKE_TAR = tar -cf
+@@ -38,11 +38,11 @@ QMAKE_COPY_DIR = $(COPY) -r
+ QMAKE_MOVE = mv -f
+ QMAKE_DEL_FILE = rm -f
+ QMAKE_DEL_DIR = rmdir
+-QMAKE_STRIP = strip
++QMAKE_STRIP = $(OE_QMAKE_STRIP)
+ QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+ QMAKE_CHK_DIR_EXISTS = test -d
+ QMAKE_MKDIR = mkdir -p
+ QMAKE_INSTALL_FILE = install -m 644 -p
+ QMAKE_INSTALL_PROGRAM = install -m 755 -p
+
+-include(unix.conf)
+\ No newline at end of file
++include(unix.conf)
+--
+1.5.1.6
+
diff --git a/meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf b/meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf
new file mode 100644
index 0000000000..f58481a693
--- /dev/null
+++ b/meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf
@@ -0,0 +1 @@
+include(../linux-g++/qmake.conf)
diff --git a/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch b/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch
new file mode 100644
index 0000000000..4197dbbf64
--- /dev/null
+++ b/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch
@@ -0,0 +1,22 @@
+Index: qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp
+===================================================================
+--- qtopia-core-opensource-src-4.3.1.orig/qmake/generators/unix/unixmake2.cpp 2007-10-07 13:45:26.000000000 +0200
++++ qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp 2007-10-07 13:57:09.000000000 +0200
+@@ -416,7 +416,7 @@
+ t << "\n\t" << mkdir_p_asstring(destdir) << "\n\t";
+ if(!project->isEmpty("QMAKE_PRE_LINK"))
+ t << var("QMAKE_PRE_LINK") << "\n\t";
+- t << "$(LINK) $(LFLAGS) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS)";
++ t << "$(LINK) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS) $(LFLAGS)";
+ if(!project->isEmpty("QMAKE_POST_LINK"))
+ t << "\n\t" << var("QMAKE_POST_LINK");
+ t << endl << endl;
+@@ -430,7 +430,7 @@
+ t << mkdir_p_asstring(destdir) << "\n\t";
+ if(!project->isEmpty("QMAKE_PRE_LINK"))
+ t << var("QMAKE_PRE_LINK") << "\n\t";
+- t << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)";
++ t << "$(LINK) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(LFLAGS)";
+ if(!project->isEmpty("QMAKE_POST_LINK"))
+ t << "\n\t" << var("QMAKE_POST_LINK");
+ t << endl << endl;
diff --git a/meta/packages/qmake/qmake2-native_2.10a.bb b/meta/packages/qmake/qmake2-native_2.10a.bb
new file mode 100644
index 0000000000..84df0ef732
--- /dev/null
+++ b/meta/packages/qmake/qmake2-native_2.10a.bb
@@ -0,0 +1,67 @@
+DESCRIPTION = "TrollTech Makefile Generator"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+SECTION = "devel"
+LICENSE = "GPL"
+PR = "r1"
+
+QTVER = "qtopia-core-opensource-src-4.3.2"
+
+SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
+ file://0001-fix-mkspecs.patch;patch=1 \
+ file://use-lflags-last.patch;patch=1 \
+ file://linux-oe-qmake.conf"
+S = "${WORKDIR}/${QTVER}"
+
+# we need the real target system here
+CROSS_SYS := "${TARGET_SYS}"
+inherit autotools native
+
+export QTDIR = "${S}"
+EXTRA_OEMAKE = "-e"
+
+do_configure() {
+ # Install the OE build templates
+ for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
+ do
+ install -d ${S}/mkspecs/$template
+ install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
+ ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
+ done
+
+ QMAKESPEC=
+ PLATFORM=${HOST_OS}-oe-g++
+ export PLATFORM
+ # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M:
+ export OE_QMAKE_CC="${CC}"
+ export OE_QMAKE_CFLAGS="${CFLAGS}"
+ export OE_QMAKE_CXX="${CXX}"
+ export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
+ export OE_QMAKE_LDFLAGS="${LDFLAGS}"
+ export OE_QMAKE_LINK="${CCLD}"
+ export OE_QMAKE_AR="${AR}"
+ export OE_QMAKE_STRIP="${STRIP}"
+ export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
+ export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
+ export OE_QMAKE_RCC="non-existant"
+ export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
+ export OE_QMAKE_RPATH="-Wl,-rpath-link,"
+ echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
+}
+
+do_compile() {
+ :
+}
+
+do_stage() {
+ install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2
+ install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4
+ install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/
+ cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
+ install -d ${STAGING_DIR}/${HOST_SYS}/qt4/
+ cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/
+}
+
+do_install() {
+ :
+}
diff --git a/meta/packages/uicmoc/uicmoc4-native.inc b/meta/packages/uicmoc/uicmoc4-native.inc
new file mode 100644
index 0000000000..8f0c715a89
--- /dev/null
+++ b/meta/packages/uicmoc/uicmoc4-native.inc
@@ -0,0 +1,61 @@
+DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "zlib-native"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL"
+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_NATIVE}/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() {
+ sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
+ 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_NATIVE}/qt4/
+ install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/
+}
diff --git a/meta/packages/uicmoc/uicmoc4-native_4.3.2.bb b/meta/packages/uicmoc/uicmoc4-native_4.3.2.bb
new file mode 100644
index 0000000000..1950f63068
--- /dev/null
+++ b/meta/packages/uicmoc/uicmoc4-native_4.3.2.bb
@@ -0,0 +1 @@
+require uicmoc4-native.inc
diff --git a/meta/packages/webkit/files/Makefile b/meta/packages/webkit/files/Makefile
new file mode 100644
index 0000000000..89344f7a58
--- /dev/null
+++ b/meta/packages/webkit/files/Makefile
@@ -0,0 +1,22 @@
+MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
+
+all:
+ @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+debug d development dev develop:
+ @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+release r deployment dep deploy:
+ @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+universal u:
+ @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+clean:
+ @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
diff --git a/meta/packages/webkit/files/Makefile.shared b/meta/packages/webkit/files/Makefile.shared
new file mode 100644
index 0000000000..a036aacc50
--- /dev/null
+++ b/meta/packages/webkit/files/Makefile.shared
@@ -0,0 +1,21 @@
+SCRIPTS_PATH ?= ../WebKitTools/Scripts
+XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
+
+all:
+ ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+debug d development dev develop: force
+ $(SCRIPTS_PATH)/set-webkit-configuration --debug
+ ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+release r deployment dep deploy: force
+ $(SCRIPTS_PATH)/set-webkit-configuration --release
+ ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+universal u: force
+ ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+clean:
+ ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+force: ;
diff --git a/meta/packages/webkit/files/WebKit.pri b/meta/packages/webkit/files/WebKit.pri
new file mode 100644
index 0000000000..0c47afe7fd
--- /dev/null
+++ b/meta/packages/webkit/files/WebKit.pri
@@ -0,0 +1,64 @@
+# Include file to make it easy to include WebKit into Qt projects
+
+
+isEmpty(OUTPUT_DIR) {
+ CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
+ CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
+}
+
+!gtk-port:CONFIG += qt-port
+qt-port:DEFINES += BUILDING_QT__=1
+qt-port:!building-libs {
+ QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
+ LIBS += -lQtWebKit
+}
+gtk-port:CONFIG += link_pkgconfig
+gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl
+gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__
+gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng
+gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
+
+DEFINES += USE_SYSTEM_MALLOC
+CONFIG(release) {
+ DEFINES += NDEBUG
+}
+
+BASE_DIR = $$PWD
+qt-port:INCLUDEPATH += \
+ $$PWD/WebKit/qt/Api
+gtk-port:INCLUDEPATH += \
+ $$BASE_DIR/WebCore/platform/gtk \
+ $$BASE_DIR/WebCore/platform/network/curl \
+ $$BASE_DIR/WebCore/platform/graphics/cairo \
+ $$BASE_DIR/WebCore/loader/gtk \
+ $$BASE_DIR/WebCore/page/gtk \
+ $$BASE_DIR/WebKit/gtk/Api \
+ $$BASE_DIR/WebKit/gtk/WebCoreSupport
+INCLUDEPATH += \
+ $$BASE_DIR/JavaScriptCore/ \
+ $$BASE_DIR/JavaScriptCore/kjs \
+ $$BASE_DIR/JavaScriptCore/bindings \
+ $$BASE_DIR/JavaScriptCore/bindings/c \
+ $$BASE_DIR/JavaScriptCore/wtf \
+ $$BASE_DIR/JavaScriptCore/ForwardingHeaders \
+ $$BASE_DIR/WebCore \
+ $$BASE_DIR/WebCore/ForwardingHeaders \
+ $$BASE_DIR/WebCore/platform \
+ $$BASE_DIR/WebCore/platform/network \
+ $$BASE_DIR/WebCore/platform/graphics \
+ $$BASE_DIR/WebCore/loader \
+ $$BASE_DIR/WebCore/page \
+ $$BASE_DIR/WebCore/css \
+ $$BASE_DIR/WebCore/dom \
+ $$BASE_DIR/WebCore/bridge \
+ $$BASE_DIR/WebCore/editing \
+ $$BASE_DIR/WebCore/rendering \
+ $$BASE_DIR/WebCore/history \
+ $$BASE_DIR/WebCore/xml \
+ $$BASE_DIR/WebCore/html
+
+
+macx {
+ INCLUDEPATH += /usr/include/libxml2
+ LIBS += -lxml2 -lxslt
+}
diff --git a/meta/packages/webkit/files/WebKit.pro b/meta/packages/webkit/files/WebKit.pro
new file mode 100644
index 0000000000..aab0209a93
--- /dev/null
+++ b/meta/packages/webkit/files/WebKit.pro
@@ -0,0 +1,11 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+!gtk-port:CONFIG += qt-port
+qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins
+SUBDIRS += \
+ WebCore
+
+qt-port:SUBDIRS += \
+ WebKit/qt/QtLauncher
+gtk-port:SUBDIRS += \
+ WebKitTools/GtkLauncher
diff --git a/meta/packages/webkit/webkit-gtk_svn.bb b/meta/packages/webkit/webkit-gtk_svn.bb
new file mode 100644
index 0000000000..262c6820db
--- /dev/null
+++ b/meta/packages/webkit/webkit-gtk_svn.bb
@@ -0,0 +1,24 @@
+DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+"
+
+
+WEBKIT_PORT = "gtk-port"
+WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt"
+
+FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"
+FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher"
+
+require webkit.inc
+
+PR = "r3"
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${libdir}
+ install -d ${D}${libdir}/pkgconfig
+
+ install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GtkLauncher/GtkLauncher ${D}${bindir}
+ cd ${S}/WebKitBuilds/Debug
+ PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro
+ oe_runmake install
+}
+
diff --git a/meta/packages/webkit/webkit.inc b/meta/packages/webkit/webkit.inc
new file mode 100644
index 0000000000..2ff61091c3
--- /dev/null
+++ b/meta/packages/webkit/webkit.inc
@@ -0,0 +1,49 @@
+DEPENDS += "flex-native gperf-native perl-native sqlite3"
+SRCREV_FORMAT = "webcore-rwebkit"
+
+PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
+
+# Yes, this is wrong...
+PV = "0.1+svnr${SRCREV}"
+
+inherit qmake2 pkgconfig
+
+SRC_URI = "\
+ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http;name=webcore \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
+ file://Makefile \
+ file://Makefile.shared \
+ file://WebKit.pri \
+ file://WebKit.pro \
+"
+S = "${WORKDIR}/"
+
+WEBKIT_QMAKE = "qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ ${WEBKIT_EXTRA_OPTIONS} CONFIG+=${WEBKIT_PORT}"
+
+do_configure() {
+ qmake2 -spec ${QMAKESPEC} CONFIG+=${WEBKIT_PORT} ${WEBKIT_EXTRA_OPTIONS} CONFIG-=release CONFIG+=debug
+ mkdir -p WebKitBuilds/Debug
+ cd WebKitBuilds/Debug
+ PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir} $PWD/../../WebKit.pro
+}
+
+do_compile_prepend() {
+ mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+ cd ${S}/JavaScriptCore/pcre
+ ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+ cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+ cd ${S}/WebKitBuilds/Debug
+}
+
+do_stage() {
+ install -d ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}
+ cd ${S}/WebKitBuilds/Debug
+ PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR} $PWD/../../WebKit.pro
+ oe_runmake install
+}
+