[oe-commits] org.oe.dev classes/qt4x11.bbclass, uicmoc4-native: add qt3support

[polyonymous commit]

classes/qt4x11.bbclass, uicmoc4-native: add qt3support

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: c163d74eb8ebc600d546ddbc1d8aa37533f1c654
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c163d74eb8ebc600d546ddbc1d8aa37533f1c654
Files:
1
classes/qt4x11.bbclass
packages/uicmoc/uicmoc4-native_4.3.0.bb
Diffs:

#
# mt diff -r352f365ac610a842def312e8d8e33fe0215872c7 -rc163d74eb8ebc600d546ddbc1d8aa37533f1c654
#
# 
# 
# patch "classes/qt4x11.bbclass"
#  from [7d466c81d6791bc2458fe1e2eadfd62d9cfb02bd]
#    to [c1c773af617672d8ff38e8bd5f5d04d6773ae67c]
# 
# patch "packages/uicmoc/uicmoc4-native_4.3.0.bb"
#  from [bb258bfafd5b03ee012d8e4530a8f4219b862463]
#    to [8520da26a06ef5cd286a9749b5a8e78337c3f665]
# 
============================================================
--- classes/qt4x11.bbclass	7d466c81d6791bc2458fe1e2eadfd62d9cfb02bd
+++ classes/qt4x11.bbclass	c1c773af617672d8ff38e8bd5f5d04d6773ae67c
@@ -6,6 +6,7 @@ export OE_QMAKE_UIC = "${STAGING_BINDIR_
 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"
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.0.bb	bb258bfafd5b03ee012d8e4530a8f4219b862463
+++ packages/uicmoc/uicmoc4-native_4.3.0.bb	8520da26a06ef5cd286a9749b5a8e78337c3f665
@@ -1,7 +1,8 @@ LICENSE = "GPL QPL"
 DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
 
@@ -9,7 +10,8 @@ inherit native
 
 inherit native
 
-EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+		-qt-libjpeg -qt-gif -system-zlib \
 		-no-nis -no-cups -no-exceptions  \
 		-no-accessibility -no-libjpeg    \
                 -no-nas-sound -no-sm             \
@@ -18,7 +20,8 @@ EXTRA_OECONF = "-qt-libjpeg -qt-gif -sys
                 -no-xrender   -no-fontconfig     \
                 -no-tablet    -no-xkb            \
                 -no-libpng                       \
-                -verbose -release  -fast -static "
+                -verbose -release  -fast -static \
+                -qt3support "
 EXTRA_OEMAKE = " "
 
 do_configure() {
@@ -27,15 +30,23 @@ do_compile() {
 
 do_compile() {
 	unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
-	cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/corelib   && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/xml       && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/moc  && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/corelib    && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/sql        && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/qt3support && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/xml        && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/uic  && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/rcc  && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/network    && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/gui        && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/uic3 && oe_runmake CC="${CC}" CXX="${CXX}"
 }
 
 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}/${BUILD_SYS}/qt4/
+        install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
 }