[oe-commits] org.oe.dev qt-x11-free: update to 3.3.7
pb commit
openembedded-commits at lists.openembedded.org
Wed Jan 17 15:31:52 UTC 2007
qt-x11-free: update to 3.3.7
Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: e6a146e5939a85de15f93abfd20e4ad3ab3a9e5c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e6a146e5939a85de15f93abfd20e4ad3ab3a9e5c
Files:
1
packages/qt/qt-x11-free-common.inc
packages/qt/qt-x11-free_3.3.7.bb
packages/qt/qt-x11-free_3.3.6.bb
Diffs:
#
# mt diff -rb7978ebf2e054833097fa45e169a38c61fb4e8e1 -re6a146e5939a85de15f93abfd20e4ad3ab3a9e5c
#
#
#
# add_file "packages/qt/qt-x11-free-common.inc"
# content [6e79e88705eb97b52c64561f29f7dde9e9d95d80]
#
# add_file "packages/qt/qt-x11-free_3.3.7.bb"
# content [a91159c64b3bcffb7b060ac142682f35ae93777c]
#
# patch "packages/qt/qt-x11-free_3.3.6.bb"
# from [1e18ee4f56c0928ba39bb3a73490ea39bccd089e]
# to [e5e41c08475b2200c6878ae93c0737f8637de1ea]
#
============================================================
--- packages/qt/qt-x11-free-common.inc 6e79e88705eb97b52c64561f29f7dde9e9d95d80
+++ packages/qt/qt-x11-free-common.inc 6e79e88705eb97b52c64561f29f7dde9e9d95d80
@@ -0,0 +1,86 @@
+DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+HOMEPAGE = "http://www.trolltech.com"
+
+S = "${WORKDIR}/qt-x11-free-${PV}"
+
+inherit qmake-base qt3x11
+
+export QTDIR = "${S}"
+STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
+ARCH_i686 = "x86"
+EXTRA_OEMAKE = "-e"
+
+QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \
+ -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose"
+
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \
+ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
+ QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+ AR="${TARGET_PREFIX}ar cqs" \
+ MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"'
+
+do_configure() {
+ echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \
+ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
+ # force regenerate
+ rm -f src/qtmain.pro
+ cat Makefile >makefile
+ find . -name "Makefile"|xargs rm -f
+ (cd src && qmake -spec ${QMAKESPEC} )
+ (cd plugins/src && qmake -spec ${QMAKESPEC} )
+ (cd tools && qmake -spec ${QMAKESPEC} )
+ (cd tools/qvfb && qmake -spec ${QMAKESPEC} )
+}
+
+do_compile() {
+ unset CFLAGS
+ unset CXXFLAGS
+ oe_runmake -C src ${EXTRA_ENV}
+ oe_runmake -C plugins/src ${EXTRA_ENV}
+ oe_runmake -C tools ${EXTRA_ENV}
+ oe_runmake -C tools/qvfb ${EXTRA_ENV}
+}
+
+do_stage() {
+ install -d ${STAGING_QT_DIR}/bin
+ ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc
+ ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic
+ ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake
+ install -d ${STAGING_QT_DIR}/lib
+ oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
+ install -d ${STAGING_QT_DIR}/include/private
+ for f in include/*.h
+ do
+ install -m 0644 $f ${STAGING_QT_DIR}/include/
+ done
+ for f in include/private/*.h
+ do
+ install -m 0644 $f ${STAGING_QT_DIR}/include/private
+ done
+ for f in lib/*.prl
+ do
+ install -m 0644 $f ${STAGING_QT_DIR}/lib
+ done
+}
+
+do_install() {
+ install -d ${D}${libdir}/
+ oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
+ install -d ${D}${bindir}/
+ install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir}
+ install -d ${D}${prefix}/plugins/
+ cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/
+}
+
+PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \
+ qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig"
+FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats"
+FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers"
+FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer"
+FILES_qt-x11-designer = "${bindir}/designer"
+FILES_qt-x11-assistant = "${bindir}/assistant"
+FILES_qt-x11-qvfb = "${bindir}/qvfb"
+FILES_qt-x11-qtconfig = "${bindir}/qtconfig"
============================================================
--- packages/qt/qt-x11-free_3.3.7.bb a91159c64b3bcffb7b060ac142682f35ae93777c
+++ packages/qt/qt-x11-free_3.3.7.bb a91159c64b3bcffb7b060ac142682f35ae93777c
@@ -0,0 +1,10 @@
+DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa"
+PROVIDES = "qt3x11"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+ file://configure.patch;patch=1 \
+ file://no-examples.patch;patch=1 \
+ file://gcc4_1-HACK.patch;patch=1"
+
+require qt-x11-free-common.inc
============================================================
--- packages/qt/qt-x11-free_3.3.6.bb 1e18ee4f56c0928ba39bb3a73490ea39bccd089e
+++ packages/qt/qt-x11-free_3.3.6.bb e5e41c08475b2200c6878ae93c0737f8637de1ea
@@ -1,8 +1,3 @@
-DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "GPL QPL"
-HOMEPAGE = "http://www.trolltech.com"
DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa"
PROVIDES = "qt3x11"
PR = "r1"
@@ -11,83 +6,5 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/so
file://configure.patch;patch=1 \
file://no-examples.patch;patch=1 \
file://gcc4_1-HACK.patch;patch=1"
-S = "${WORKDIR}/qt-x11-free-${PV}"
+require qt-x11-free-common.inc
-inherit qmake-base qt3x11
-
-export QTDIR = "${S}"
-STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
-ARCH_i686 = "x86"
-EXTRA_OEMAKE = "-e"
-
-QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \
- -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose"
-
-EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \
- INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
- QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
- AR="${TARGET_PREFIX}ar cqs" \
- MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"'
-
-do_configure() {
- echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \
- -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
- # force regenerate
- rm -f src/qtmain.pro
- cat Makefile >makefile
- find . -name "Makefile"|xargs rm -f
- (cd src && qmake -spec ${QMAKESPEC} )
- (cd plugins/src && qmake -spec ${QMAKESPEC} )
- (cd tools && qmake -spec ${QMAKESPEC} )
- (cd tools/qvfb && qmake -spec ${QMAKESPEC} )
-}
-
-do_compile() {
- unset CFLAGS
- unset CXXFLAGS
- oe_runmake -C src ${EXTRA_ENV}
- oe_runmake -C plugins/src ${EXTRA_ENV}
- oe_runmake -C tools ${EXTRA_ENV}
- oe_runmake -C tools/qvfb ${EXTRA_ENV}
-}
-
-do_stage() {
- install -d ${STAGING_QT_DIR}/bin
- ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc
- ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic
- ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake
- install -d ${STAGING_QT_DIR}/lib
- oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
- install -d ${STAGING_QT_DIR}/include/private
- for f in include/*.h
- do
- install -m 0644 $f ${STAGING_QT_DIR}/include/
- done
- for f in include/private/*.h
- do
- install -m 0644 $f ${STAGING_QT_DIR}/include/private
- done
- for f in lib/*.prl
- do
- install -m 0644 $f ${STAGING_QT_DIR}/lib
- done
-}
-
-do_install() {
- install -d ${D}${libdir}/
- oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
- install -d ${D}${bindir}/
- install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir}
- install -d ${D}${prefix}/plugins/
- cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/
-}
-
-PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \
- qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig"
-FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats"
-FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers"
-FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer"
-FILES_qt-x11-designer = "${bindir}/designer"
-FILES_qt-x11-assistant = "${bindir}/assistant"
-FILES_qt-x11-qvfb = "${bindir}/qvfb"
-FILES_qt-x11-qtconfig = "${bindir}/qtconfig"
More information about the Openembedded-commits
mailing list