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

diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb
index eab9c48..d3fd4c7 100644 (file)
--- a/packages/qmake/qmake-native_1.07a.bb
+++ b/packages/qmake/qmake-native_1.07a.bb
@@ -6,9 +6,9 @@ SECTION = "devel"
 LICENSE = "GPL QPL"
 PR = "r2"
 
-QTEVER = "qt-embedded-free-3.3.4"
+QTEVER = "qt-embedded-free-3.3.5"
 
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTEVER}.tar.gz \
+SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTEVER}.tar.bz2 \
            file://linux-oe-qmake.conf"
 S = "${WORKDIR}/${QTEVER}"
 

diff --git a/packages/qt/qt-x11-free-native_3.3.2.bb b/packages/qt/qt-x11-free-native_3.3.5.bb
similarity index 100%
rename from packages/qt/qt-x11-free-native_3.3.2.bb
rename to packages/qt/qt-x11-free-native_3.3.5.bb

diff --git a/packages/qt/qt-x11-free_3.3.3.bb b/packages/qt/qt-x11-free_3.3.5.bb
similarity index 100%
rename from packages/qt/qt-x11-free_3.3.3.bb
rename to packages/qt/qt-x11-free_3.3.5.bb

diff --git a/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb
similarity index 99%
rename from packages/qte-fonts-common/qte-fonts-common_3.3.3.bb
rename to packages/qte-fonts-common/qte-fonts-common_3.3.5.bb
index 7eceaef..188b78d 100644 (file)
--- a/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb
+++ b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL QPL"
 PACKAGE_ARCH = "all"
 PR = "r3"
 
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2"
 SRC_URI += "file://update-qtfontdir"
 S = "${WORKDIR}/qt-embedded-free-${PV}"
 

diff --git a/packages/uicmoc/uicmoc3-native-3.3.2/.mtn2git_empty b/packages/uicmoc/uicmoc3-native-3.3.5/.mtn2git_empty
similarity index 100%
rename from packages/uicmoc/uicmoc3-native-3.3.2/.mtn2git_empty
rename to 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
similarity index 100%
rename from packages/uicmoc/uicmoc3-native-3.3.2/no-examples.patch
rename to 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
similarity index 73%
rename from packages/uicmoc/uicmoc3-native_3.3.2.bb
rename to packages/uicmoc/uicmoc3-native_3.3.5.bb
index f7024f9..6354377 100644 (file)
--- 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}