aboutsummaryrefslogtreecommitdiffstats
path: root/packages/uicmoc
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2005-09-10 15:17:53 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-10 15:17:53 +0000
commit9337de0503a8541762f6110e1244f0d7f2b9a2b4 (patch)
tree547dfa7b8109b86712bbd6d78425988ce1b1c761 /packages/uicmoc
parent1aa1ee28fe85e7afb540c137b1edc6db720e6113 (diff)
downloadopenembedded-9337de0503a8541762f6110e1244f0d7f2b9a2b4.tar.gz
Update Qt3 from Qt3.3.x to Qt3.3.5
packages/qt/qt-x11-free-native: -update from 3.3.2 to 3.3.5 packages/qt/qt-x11-free: -update from 3.3.3 to 3.3.5 packages/qte-fonts-common/qte-fonts-common: -update from 3.3.3 to 3.3.5 packages/uicmoc/uicmoc3-native: -update from 3.3.2 to 3.3.5 -build not the complete Qt3 but only most parts -use ${PV} instead of hardcondig version packages/qmake/qmake-native_1.07: -update from 3.3.3 to 3.3.5
Diffstat (limited to 'packages/uicmoc')
-rw-r--r--packages/uicmoc/uicmoc3-native-3.3.5/.mtn2git_empty (renamed from packages/uicmoc/uicmoc3-native-3.3.2/.mtn2git_empty)0
-rw-r--r--packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch (renamed from packages/uicmoc/uicmoc3-native-3.3.2/no-examples.patch)0
-rw-r--r--packages/uicmoc/uicmoc3-native_3.3.5.bb (renamed from packages/uicmoc/uicmoc3-native_3.3.2.bb)12
3 files changed, 9 insertions, 3 deletions
diff --git a/packages/uicmoc/uicmoc3-native-3.3.2/.mtn2git_empty b/packages/uicmoc/uicmoc3-native-3.3.5/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uicmoc/uicmoc3-native-3.3.2/.mtn2git_empty
+++ b/packages/uicmoc/uicmoc3-native-3.3.5/.mtn2git_empty
diff --git a/packages/uicmoc/uicmoc3-native-3.3.2/no-examples.patch b/packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch
index b0ee6374ef..b0ee6374ef 100644
--- a/packages/uicmoc/uicmoc3-native-3.3.2/no-examples.patch
+++ b/packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch
diff --git a/packages/uicmoc/uicmoc3-native_3.3.2.bb b/packages/uicmoc/uicmoc3-native_3.3.5.bb
index f7024f90ba..6354377bcf 100644
--- a/packages/uicmoc/uicmoc3-native_3.3.2.bb
+++ b/packages/uicmoc/uicmoc3-native_3.3.5.bb
@@ -4,10 +4,10 @@ PRIORITY = "optional"
LICENSE = "GPL QPL"
PR = "r1"
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.3.2.tar.bz2 \
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \
file://no-examples.patch;patch=1"
-S = "${WORKDIR}/qt-embedded-free-3.3.2"
+S = "${WORKDIR}/qt-embedded-free-${PV}"
inherit native qmake-base qt3e
@@ -16,7 +16,7 @@ export OE_QMAKE_LINK="${CXX}"
CXXFLAGS += " -DQWS"
QT_CONFIG_FLAGS = "-release -static -depths 8,16 -qt-zlib -no-nas-sound \
- -no-sm -qt-libpng -no-gif -no-xshape -no-xinerama \
+ -no-sm -no-libjpeg -no-libmng -no-gif -no-xshape -no-xinerama \
-no-xcursor -no-xrandr -no-xrender -no-xft -no-tablet \
-no-xkb -no-dlopen-opengl -no-freetype -no-thread \
-no-nis -no-cups -prefix ${prefix} \
@@ -28,6 +28,12 @@ do_configure() {
echo "yes" | ./configure ${QT_CONFIG_FLAGS}
}
+do_compile() {
+ oe_runmake symlinks || die "Can't symlink include files"
+ oe_runmake src-moc || die "Building moc failed"
+ oe_runmake sub-tools || die "Building tools failed"
+}
+
do_stage() {
install -d ${OE_QMAKE_INCDIR_QT}
install -d ${OE_QMAKE_LIBDIR_QT}