[oe-commits] Holger Hans Peter Freyther : uicmoc4: qt4-tools is the replacement.

[git version control]

Module: openembedded.git
Branch: master
Commit: f454442543a01a735a933a53a7487e1690439288
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f454442543a01a735a933a53a7487e1690439288

Author: Holger Hans Peter Freyther <zecke at selfish.org>
Date:   Wed Sep 29 00:36:52 2010 +0800

uicmoc4: qt4-tools is the replacement.

qt4-tools exists for 4.5, 4.6, 4.7. There is nothing in the OE
tree that is still using the uicmoc4* target. Remove it so people
do not think that they need to use it.

---

 recipes/uicmoc/uicmoc4-native.inc      |   77 --------------------------------
 recipes/uicmoc/uicmoc4-native_4.4.3.bb |   19 --------
 recipes/uicmoc/uicmoc4-sdk_4.4.3.bb    |   19 --------
 3 files changed, 0 insertions(+), 115 deletions(-)

diff --git a/recipes/uicmoc/uicmoc4-native.inc b/recipes/uicmoc/uicmoc4-native.inc
deleted file mode 100644
index 1124226..0000000
--- a/recipes/uicmoc/uicmoc4-native.inc
+++ /dev/null
@@ -1,77 +0,0 @@
-DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "zlib-native"
-SECTION = "libs"
-HOMEPAGE = "http://www.trolltech.com"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
-           file://configure-fix.patch"
-S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
-
-EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/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 = " "
-
-export LFLAGS="${LDFLAGS}"
-
-do_configure() {
-    sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
-    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 \
-"
-
-TOBUILD2 = "\
-  tools/linguist/lrelease \
-  tools/linguist/lupdate \
-"
-
-do_compile() {
-    unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
-    for i in ${TOBUILD};
-    do
-        cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
-    done
-    for i in ${TOBUILD2};
-    do
-        cd ${S}/$i && \
-	${S}/bin/qmake -spec ${S}/mkspecs/linux-g++  && \
-	oe_runmake CC="${CC}" CXX="${CXX}"
-    done
-}
-
-do_stage() {
-	install -d ${STAGING_BINDIR}/
-    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 -m 0755 bin/lrelease ${STAGING_BINDIR}/lrelease4
-    install -m 0755 bin/lupdate ${STAGING_BINDIR}/lupdate4
-    install -d ${STAGING_DIR_NATIVE}/qt4/
-    install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/
-}
diff --git a/recipes/uicmoc/uicmoc4-native_4.4.3.bb b/recipes/uicmoc/uicmoc4-native_4.4.3.bb
deleted file mode 100644
index d1816d2..0000000
--- a/recipes/uicmoc/uicmoc4-native_4.4.3.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require uicmoc4-native.inc
-
-inherit native
-
-do_stage() {
-    install -d ${STAGING_BINDIR}/
-    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 -m 0755 bin/lrelease ${STAGING_BINDIR}/lrelease4
-    install -m 0755 bin/lupdate ${STAGING_BINDIR}/lupdate4
-    install -d ${STAGING_DIR_NATIVE}/qt4/
-    install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/
-}
-
-
-SRC_URI[md5sum] = "9a639aec44a1e4c70040117183d247a3"
-SRC_URI[sha256sum] = "05d06b93f95092f1318634fca24f0c2d0a1252c9f1dc2fbb427b07e8ecbb4f39"
diff --git a/recipes/uicmoc/uicmoc4-sdk_4.4.3.bb b/recipes/uicmoc/uicmoc4-sdk_4.4.3.bb
deleted file mode 100644
index 137a150..0000000
--- a/recipes/uicmoc/uicmoc4-sdk_4.4.3.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require uicmoc4-native.inc
-
-inherit sdk 
-
-do_install_append() {
-    install -d ${D}/${bindir}
-    install -m 0755 bin/moc ${D}/${bindir}/moc4
-    install -m 0755 bin/uic ${D}/${bindir}/uic4
-    install -m 0755 bin/uic3 ${D}/${bindir}/uic34
-    install -m 0755 bin/rcc ${D}/${bindir}/rcc4
-    install -m 0755 bin/lrelease ${D}/${bindir}/lrelease4
-    install -m 0755 bin/lupdate ${D}/${bindir}/lupdate4
-    install -d ${D}/${datadir}/qt4/
-    install -m 0644 tools/porting/src/q3porting.xml ${D}/${datadir}/qt4/
-}
-
-
-SRC_URI[md5sum] = "9a639aec44a1e4c70040117183d247a3"
-SRC_URI[sha256sum] = "05d06b93f95092f1318634fca24f0c2d0a1252c9f1dc2fbb427b07e8ecbb4f39"