[oe-commits] org.oe.dev uicmoc4: add 4.3.1 building against Qt/Embedded. This no longer depends on X on the buildhost.

[mickeyl commit]

uicmoc4: add 4.3.1 building against Qt/Embedded. This no longer depends on X on the buildhost.
Add missing (non-existant, but you know about ASSUME_PROVDED) dependencies to other versions of uicmoc4

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 88dd6a801655485b76bb6d591c1f763d51ff47b8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=88dd6a801655485b76bb6d591c1f763d51ff47b8
Files:
1
packages/uicmoc/uicmoc4-native_4.3.1.bb
packages/uicmoc/uicmoc4-native_4.2.3.bb
packages/uicmoc/uicmoc4-native_4.3.0.bb
Diffs:

#
# mt diff -re649ed660527963f3dd0ef625f080608104c40f2 -r88dd6a801655485b76bb6d591c1f763d51ff47b8
#
# 
# 
# add_file "packages/uicmoc/uicmoc4-native_4.3.1.bb"
#  content [9a5b3e0cf118671e949e94f3ccdfdc0106bf1511]
# 
# patch "packages/uicmoc/uicmoc4-native_4.2.3.bb"
#  from [bb258bfafd5b03ee012d8e4530a8f4219b862463]
#    to [80dd401b3668e6f4f71b2e43bfff330d9196e7a9]
# 
# patch "packages/uicmoc/uicmoc4-native_4.3.0.bb"
#  from [8520da26a06ef5cd286a9749b5a8e78337c3f665]
#    to [bd07c0050ef051ca21f2712499797670879d8879]
# 
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.1.bb	9a5b3e0cf118671e949e94f3ccdfdc0106bf1511
+++ packages/uicmoc/uicmoc4-native_4.3.1.bb	9a5b3e0cf118671e949e94f3ccdfdc0106bf1511
@@ -0,0 +1,59 @@
+DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+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}/${BUILD_SYS}/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() {
+	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}/${BUILD_SYS}/qt4/
+        install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
+}
============================================================
--- packages/uicmoc/uicmoc4-native_4.2.3.bb	bb258bfafd5b03ee012d8e4530a8f4219b862463
+++ packages/uicmoc/uicmoc4-native_4.2.3.bb	80dd401b3668e6f4f71b2e43bfff330d9196e7a9
@@ -1,7 +1,9 @@ DESCRIPTION = "User-Interface-, Meta-Obj
 DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "libx11-native libxext-native"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
 
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.0.bb	8520da26a06ef5cd286a9749b5a8e78337c3f665
+++ packages/uicmoc/uicmoc4-native_4.3.0.bb	bd07c0050ef051ca21f2712499797670879d8879
@@ -1,8 +1,9 @@ DESCRIPTION = "User-Interface-, Meta-Obj
 DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "libx11-native libxext-native"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"