summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/qtopia4core.bbclass13
-rw-r--r--packages/qt4/qtopia-core-4.3.3/0004-no-qmake.patch25
-rw-r--r--packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch23
-rw-r--r--packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch23
-rw-r--r--packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch62
-rw-r--r--packages/qt4/qtopia-core-4.3.3/build-tools.patch28
-rw-r--r--packages/qt4/qtopia-core-4.3.3/linux-oe-qmake.conf95
-rw-r--r--packages/qt4/qtopia-core-4.3.3/qconfig-oe.h45
-rw-r--r--packages/qt4/qtopia-core_4.3.3.bb46
9 files changed, 0 insertions, 360 deletions
diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass
deleted file mode 100644
index b5f10fa486..0000000000
--- a/classes/qtopia4core.bbclass
+++ /dev/null
@@ -1,13 +0,0 @@
-DEPENDS_prepend = "${@["qtopia-core ", ""][(bb.data.getVar('PN', d, 1) == 'qtopia-core')]}"
-inherit qmake2
-
-QT_DIR_NAME = "qtopia"
-#
-# override variables set by qmake-base to compile QtopiaCore apps
-#
-export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia"
-export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
-export OE_QMAKE_LIBS_QT = "qt"
-export OE_QMAKE_LIBS_X11 = ""
-export OE_QMAKE_EXTRA_MODULES = "network"
-EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E "
diff --git a/packages/qt4/qtopia-core-4.3.3/0004-no-qmake.patch b/packages/qt4/qtopia-core-4.3.3/0004-no-qmake.patch
deleted file mode 100644
index 28f8d3ad9d..0000000000
--- a/packages/qt4/qtopia-core-4.3.3/0004-no-qmake.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Sat, 2 Jun 2007 16:06:59 +0200
-Subject: [PATCH] no qmake
-
----
- configure | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index b3c2a52..1901e57 100755
---- a/configure
-+++ b/configure
-@@ -3517,7 +3517,7 @@ END {
- }
-
- # build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
- echo "Creating qmake. Please wait..."
-
- OLD_QCONFIG_H=
---
-1.5.0.7
-
diff --git a/packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch b/packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch
deleted file mode 100644
index cc8e115fee..0000000000
--- a/packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Mon, 4 Jun 2007 14:48:50 +0200
-Subject: [PATCH] freetype host includes
-
----
- config.tests/unix/freetype/freetype.pri | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
-index 84974bf..ab9a6f2 100644
---- a/config.tests/unix/freetype/freetype.pri
-+++ b/config.tests/unix/freetype/freetype.pri
-@@ -1,5 +1,5 @@
- !cross_compile {
-- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-+ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
- for(p, TRY_INCLUDEPATHS) {
- p = $$join(p, "", "", "/freetype2")
- exists($$p):INCLUDEPATH *= $$p
---
-1.5.0.7
-
diff --git a/packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch b/packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch
deleted file mode 100644
index 35b71d9694..0000000000
--- a/packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Mon, 4 Jun 2007 14:58:34 +0200
-Subject: [PATCH] openssl host includes
-
----
- config.tests/unix/openssl/openssl.pri | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri
-index 756e5fe..19b4061 100644
---- a/config.tests/unix/openssl/openssl.pri
-+++ b/config.tests/unix/openssl/openssl.pri
-@@ -1,5 +1,5 @@
- !cross_compile {
-- TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
-+ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
- for(p, TRY_INCLUDEPATHS) {
- pp = $$join(p, "", "", "/openssl")
- exists($$pp):INCLUDEPATH *= $$p
---
-1.5.0.7
-
diff --git a/packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch b/packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch
deleted file mode 100644
index 601f2fc369..0000000000
--- a/packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: qtopia-core-opensource-src-4.3.3/configure
-===================================================================
---- qtopia-core-opensource-src-4.3.3.orig/configure 2008-01-20 11:42:07.000000000 +0100
-+++ qtopia-core-opensource-src-4.3.3/configure 2008-01-20 22:31:37.000000000 +0100
-@@ -639,10 +639,10 @@
-
- CFG_SQL_AVAILABLE=
- if [ -d "$relpath/src/plugins/sqldrivers" ]; then
-- for a in "$relpath/src/plugins/sqldrivers/"*; do
-- if [ -d "$a" ]; then
-- base_a=`basename $a`
-- CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${base_a}"
-+ for a in `ls $relpath/src/plugins/sqldrivers/`; do
-+ dir="$relpath/src/plugins/sqldrivers/$a"
-+ if [ -d "$dir" ]; then
-+ CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${a}"
- eval "CFG_SQL_${base_a}=auto"
- fi
- done
-@@ -650,30 +650,30 @@
-
- CFG_DECORATION_PLUGIN_AVAILABLE=
- if [ -d "$relpath/src/plugins/decorations" ]; then
-- for a in "$relpath/src/plugins/decorations/"*; do
-- if [ -d "$a" ]; then
-- base_a=`basename $a`
-- CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${base_a}"
-+ for a in `ls $relpath/src/plugins/decorations/`; do
-+ dir="$relpath/src/plugins/decorations/$a"
-+ if [ -d "$dir" ]; then
-+ CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${a}"
- fi
- done
- fi
-
- CFG_MOUSE_PLUGIN_AVAILABLE=
- if [ -d "$relpath/src/plugins/mousedrivers" ]; then
-- for a in "$relpath/src/plugins/mousedrivers/"*; do
-- if [ -d "$a" ]; then
-- base_a=`basename $a`
-- CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${base_a}"
-+ for a in `ls $relpath/src/plugins/mousedrivers/`; do
-+ dir="$relpath/src/plugins/mousedrivers/$a"
-+ if [ -d "$dir" ]; then
-+ CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${a}"
- fi
- done
- fi
-
- CFG_GFX_PLUGIN_AVAILABLE=
- if [ -d "$relpath/src/plugins/gfxdrivers" ]; then
-- for a in "$relpath/src/plugins/gfxdrivers/"*; do
-- if [ -d "$a" ]; then
-- base_a=`basename $a`
-- CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${base_a}"
-+ for a in `ls $relpath/src/plugins/gfxdrivers/`; do
-+ dir="$relpath/src/plugins/gfxdrivers/$a"
-+ if [ -d "$dir" ]; then
-+ CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${a}"
- fi
- done
- CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off
diff --git a/packages/qt4/qtopia-core-4.3.3/build-tools.patch b/packages/qt4/qtopia-core-4.3.3/build-tools.patch
deleted file mode 100644
index 54ad666374..0000000000
--- a/packages/qt4/qtopia-core-4.3.3/build-tools.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Do not disable tools, examples and demos for the QWS build. Use brute-force
-to do this.
-
-Index: qtopia-core-opensource-src-4.3.3/configure
-===================================================================
---- qtopia-core-opensource-src-4.3.3.orig/configure 2007-12-27 16:30:36.000000000 +0100
-+++ qtopia-core-opensource-src-4.3.3/configure 2007-12-27 16:30:52.000000000 +0100
-@@ -2265,13 +2265,13 @@
- CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS"
-
- # don't build tools by default when cross-compiling
-- if [ "$PLATFORM" != "$XPLATFORM" ]; then
-- CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
-- fi
--fi
--for nobuild in $CFG_NOBUILD_PARTS; do
-- CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
--done
-+ #if [ "$PLATFORM" != "$XPLATFORM" ]; then
-+ # CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
-+ #fi
-+fi
-+#for nobuild in $CFG_NOBUILD_PARTS; do
-+# CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
-+#done
- if echo $CFG_BUILD_PARTS | grep -v libs >/dev/null 2>&1; then
- # echo
- # echo "WARNING: libs is a required part of the build."
diff --git a/packages/qt4/qtopia-core-4.3.3/linux-oe-qmake.conf b/packages/qt4/qtopia-core-4.3.3/linux-oe-qmake.conf
deleted file mode 100644
index fc5ac6dc5c..0000000000
--- a/packages/qt4/qtopia-core-4.3.3/linux-oe-qmake.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org
-#
-
-MAKEFILE_GENERATOR = UNIX
-TEMPLATE = app
-CONFIG += qt warn_on release link_prl
-QT += core gui network
-QMAKE_INCREMENTAL_STYLE = sublib
-
-QMAKE_CC = $(OE_QMAKE_CC)
-QMAKE_LEX = flex
-QMAKE_LEXFLAGS =
-QMAKE_YACC = yacc
-QMAKE_YACCFLAGS = -d
-QMAKE_YACCFLAGS_MANGLE = -p $base -b $base
-QMAKE_YACC_HEADER = $base.tab.h
-QMAKE_YACC_SOURCE = $base.tab.c
-QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA)
-QMAKE_CFLAGS_DEPS = -M
-QMAKE_CFLAGS_WARN_ON = -Wall -W
-QMAKE_CFLAGS_WARN_OFF =
-QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
-QMAKE_CFLAGS_DEBUG = -g
-QMAKE_CFLAGS_SHLIB = -fPIC
-QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD = -D_REENTRANT
-QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden
-
-QMAKE_CXX = $(OE_QMAKE_CXX)
-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA)
-QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
-QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
-
-QMAKE_INCDIR =
-QMAKE_LIBDIR =
-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_INCDIR_QTOPIA = $(OE_QMAKE_INCDIR_QTOPIA)
-QMAKE_LIBDIR_QTOPIA = $(OE_QMAKE_LIBDIR_QTOPIA)
-
-
-QMAKE_LINK = $(OE_QMAKE_LINK)
-QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
-QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA)
-QMAKE_LFLAGS_RELEASE =
-QMAKE_LFLAGS_DEBUG =
-QMAKE_LFLAGS_SHLIB = -shared
-QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME = -Wl,-soname,
-QMAKE_LFLAGS_THREAD =
-QMAKE_RPATH = -Wl,-rpath-link,
-
-QMAKE_LIBS = $(LIBS_EXTRA)
-QMAKE_LIBS_DYNLOAD = -ldl
-QMAKE_LIBS_X11 =
-QMAKE_LIBS_X11SM =
-QMAKE_LIBS_QT = -lqte
-QMAKE_LIBS_QT_THREAD = -lqte-mt
-QMAKE_LIBS_QT_OPENGL = -lqgl
-QMAKE_LIBS_THREAD = -lpthread
-QMAKE_LIBS_QTOPIA = -lqpe -lqtopia
-QMAKE_LIBS_THREAD = -lpthread
-
-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
-
-QMAKE_AR = $(OE_QMAKE_AR) cqs
-QMAKE_RANLIB = $(OE_QMAKE_RANLIB)
-
-QMAKE_TAR = tar -cf
-QMAKE_GZIP = gzip -9f
-
-QMAKE_COPY = cp -f
-QMAKE_COPY_FILE = $(COPY)
-QMAKE_COPY_DIR = $(COPY) -r
-QMAKE_MOVE = mv -f
-QMAKE_DEL_FILE = rm -f
-QMAKE_DEL_DIR = rmdir
-QMAKE_STRIP = $(OE_QMAKE_STRIP)
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS = test -d
-QMAKE_MKDIR = mkdir -p
-load(qt_config)
diff --git a/packages/qt4/qtopia-core-4.3.3/qconfig-oe.h b/packages/qt4/qtopia-core-4.3.3/qconfig-oe.h
deleted file mode 100644
index f820c01da8..0000000000
--- a/packages/qt4/qtopia-core-4.3.3/qconfig-oe.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved.
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License version 2.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of
-** this file. Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/
-**
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.0, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** In addition, as a special exception, Trolltech, as the sole copyright
-** holder for Qt Designer, grants users of the Qt/Eclipse Integration
-** plug-in the right for the Qt/Eclipse Integration to link to
-** functionality provided by Qt Designer and its related libraries.
-**
-** Trolltech reserves all rights not expressly granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-
-/*
- Empty leaves all features enabled. See doc/html/emb-features.html for choices.
-
- Note that disabling some features will produce a libqt that is not
- compatible with other libqt builds. Such modifications are only
- supported on Qtopia Core where reducing the library size is important
- and where the application-suite is often a fixed set.
-*/
diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb
deleted file mode 100644
index 7888a8e7d3..0000000000
--- a/packages/qt4/qtopia-core_4.3.3.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version."
-SECTION = "libs"
-LICENSE = "GPL"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-DEPENDS += "tslib"
-PR = "r4"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
- file://qconfig-oe.h \
- file://0001-cross-compile.patch;patch=1 \
- file://0003-no-tools.patch;patch=1 \
- file://0004-no-qmake.patch;patch=1 \
- file://0005-fix-mkspecs.patch;patch=1 \
- file://build-tools.patch;patch=1 \
- file://0006-freetype-host-includes.patch;patch=1 \
- file://0007-openssl-host-includes.patch;patch=1 \
- file://0008-backport-qt-lib-infix.patch;patch=1 \
- file://allow-configure-plugins.patch;patch=1 "
-S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
-
-QT_CONFIG_FLAGS += " \
- -nomake demos -nomake examples -nomake tools -qtlibinfix E\
- -embedded ${QT_ARCH} \
- -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
- -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc\
- -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb\
- -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb\
- ${QT_QCONFIG} \
- "
-
-do_configure_prepend() {
- cp ${WORKDIR}/qconfig-oe.h ${S}/src/corelib/global
-}
-
-QT_QCONFIG = ""
-QT_BASE_NAME = "qtopiacore"
-QT_BASE_LIB = "libqtopiacore"
-QT_DIR_NAME = "qtopia"
-QT_LIBINFIX="E"
-require qt_depends.inc
-require qt_configuration.inc
-require qt_packaging.inc
-require qt_staging.inc
-
-inherit qtopia4core