diff options
| -rw-r--r-- | classes/qpf.bbclass | 3 | ||||
| -rw-r--r-- | classes/qt4x11.bbclass | 0 | ||||
| -rw-r--r-- | packages/qt/qt-x11-free_4.0.0-b1.bb | 70 | ||||
| -rw-r--r-- | packages/uicmoc/uicmoc4-native_4.0.0-b1.bb | 10 |
4 files changed, 77 insertions, 6 deletions
diff --git a/classes/qpf.bbclass b/classes/qpf.bbclass index 7073d25f7e..45cf7d448e 100644 --- a/classes/qpf.bbclass +++ b/classes/qpf.bbclass @@ -18,11 +18,12 @@ ${sbindir}/update-qtfontdir python populate_packages_prepend() { postinst = bb.data.getVar('pkg_postinst_fonts', d, 1) postrm = postinst + fontdir = bb.data.getVar('palmtopdir', d, 1) + '/lib/fonts' pkgregex = "^([a-z]*_[0-9]*).*.qpf$" pkgpattern = bb.data.getVar('QPF_PKGPATTERN', d, 1) or 'qpf-%s' pkgdescription = bb.data.getVar('QPF_DESCRIPTION', d, 1) or 'QPF font %s' - do_split_packages(d, root='/opt/QtPalmtop/lib/fonts', file_regex=pkgregex, output_pattern=pkgpattern, + do_split_packages(d, root=fontdir, file_regex=pkgregex, output_pattern=pkgpattern, description=pkgdescription, postinst=postinst, postrm=postrm, recursive=True, hook=None, extra_depends='qpf-font-common') } diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/classes/qt4x11.bbclass diff --git a/packages/qt/qt-x11-free_4.0.0-b1.bb b/packages/qt/qt-x11-free_4.0.0-b1.bb index e69de29bb2..ca2d1ddf77 100644 --- a/packages/qt/qt-x11-free_4.0.0-b1.bb +++ b/packages/qt/qt-x11-free_4.0.0-b1.bb @@ -0,0 +1,70 @@ +DESCRIPTION = "Qt/X11 Version ${PV}" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL QPL" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +DEPENDS = "uicmoc4-native qmake-native-1.08a freetype x11 xft xext libxrender libxrandr libxcursor mysql" +PR = "r0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-${PV}.tar.gz" +S = "${WORKDIR}/qt-x11-opensource-${PV}" + +# Not the prime time of Qt4 yet +# TODO: make it not look in /usr and /usr/include for its tests! +DEFAULT_PREFERENCE = "-1" +BROKEN = "1" + +PACKAGES += "qt-x11-plugins" +FILES_qt-x11-plugins = "${prefix}/plugins" + +inherit qmake-base qt4x11 + +export QTDIR = "${S}" +STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt4" +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-nis -no-cups -plugin-sql-mysql -verbose -stl" + +do_configure() { + echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri + unset QMAKESPEC + echo yes | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql +} + +do_compile() { + unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS LINK + install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc + install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc + install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic + + oe_runmake +} + +do_stage() { + 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 +} + +do_install() { + install -d ${D}/${libdir}/ + oe_soinstall lib/libqt-mt.so.${PV} ${D}/${libdir}/ + oe_runmake -C plugins/src INSTALL_ROOT="${D}" \ + QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR} \ + QMAKE_LIBS_QT=-lqt QMAKE_LIBS_QT_THREAD=-lqt-mt" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + MOC="${STAGING_BINDIR}/moc4" UIC="${STAGING_BINDIR}/uic4" MAKE="make -e" \ + install +} diff --git a/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb b/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb index 62729e29e3..9a7391ce38 100644 --- a/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb +++ b/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb @@ -23,11 +23,11 @@ do_configure() { do_compile() { unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS - cd ${S}/src/moc && make CC="${CC}" CXX="${CXX}" - cd ${S}/src/core && make CC="${CC}" CXX="${CXX}" - cd ${S}/src/xml && make CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/uic && make CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/rcc && make CC="${CC}" CXX="${CXX}" + cd ${S}/src/moc && oe_runmake CC="${CC}" CXX="${CXX}" + cd ${S}/src/core && 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}" } do_stage() { |