From e8848c25d6704e650ba75a080825a5277ab3f317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Thu, 16 Oct 2008 03:59:59 +0200 Subject: uicmoc4-(native|sdk): update to version 4.4.3 * drop qapplication.diff, included upstream * update URL in uicmoc4-native.inc, qtopia is gone --- packages/uicmoc/files/qapplication.diff | 132 -------------------------------- packages/uicmoc/uicmoc4-native.inc | 4 +- packages/uicmoc/uicmoc4-native_4.4.0.bb | 21 ----- packages/uicmoc/uicmoc4-native_4.4.3.bb | 16 ++++ packages/uicmoc/uicmoc4-sdk_4.4.0.bb | 23 ------ packages/uicmoc/uicmoc4-sdk_4.4.3.bb | 16 ++++ 6 files changed, 34 insertions(+), 178 deletions(-) delete mode 100644 packages/uicmoc/files/qapplication.diff delete mode 100644 packages/uicmoc/uicmoc4-native_4.4.0.bb create mode 100644 packages/uicmoc/uicmoc4-native_4.4.3.bb delete mode 100644 packages/uicmoc/uicmoc4-sdk_4.4.0.bb create mode 100644 packages/uicmoc/uicmoc4-sdk_4.4.3.bb (limited to 'packages/uicmoc') diff --git a/packages/uicmoc/files/qapplication.diff b/packages/uicmoc/files/qapplication.diff deleted file mode 100644 index 4600f66bd3..0000000000 --- a/packages/uicmoc/files/qapplication.diff +++ /dev/null @@ -1,132 +0,0 @@ ---- /tmp/qapplication_p.h 2008-07-14 11:39:24.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.0/src/gui/kernel/qapplication_p.h 2008-07-14 11:39:47.000000000 +0200 -@@ -344,7 +344,7 @@ - # endif - QRect maxWindowRect(const QScreen *screen) const { return maxWindowRects[screen]; } - void setMaxWindowRect(const QScreen *screen, int screenNo, const QRect &rect); -- void setScreenTransformation(QScreen *screen, int screen, int transformation); -+ void setScreenTransformation(QScreen *screen, int screenNo, int transformation); - #endif - - static QApplicationPrivate *instance() { return self; } ---- /tmp/qdrawhelper_p.h 2008-07-14 11:48:26.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.0/src/gui/painting/qdrawhelper_p.h 2008-07-14 11:50:12.000000000 +0200 -@@ -1379,7 +1379,7 @@ - static inline quint32 qt_convertToRgb(SRC color); - - template <> --static inline quint32 qt_convertToRgb(quint32 color) -+inline quint32 qt_convertToRgb(quint32 color) - { - const int r = qRed(color) >> (8 - qrgb::len_red); - const int g = qGreen(color) >> (8 - qrgb::len_green); -@@ -1394,7 +1394,7 @@ - } - - template <> --static inline quint32 qt_convertToRgb(quint16 color) -+inline quint32 qt_convertToRgb(quint16 color) - { - return qt_convertToRgb(qt_colorConvert(color, 0)); - } -@@ -1422,14 +1422,14 @@ - } Q_PACKED; - - template <> --static inline qrgb_generic16 qt_colorConvert(quint32 color, qrgb_generic16 dummy) -+inline qrgb_generic16 qt_colorConvert(quint32 color, qrgb_generic16 dummy) - { - Q_UNUSED(dummy); - return qrgb_generic16(color); - } - - template <> --static inline qrgb_generic16 qt_colorConvert(quint16 color, qrgb_generic16 dummy) -+inline qrgb_generic16 qt_colorConvert(quint16 color, qrgb_generic16 dummy) - { - Q_UNUSED(dummy); - return qrgb_generic16(qt_colorConvert(color, 0)); ---- /tmp/qscreen_qws.cpp 2008-07-14 11:51:39.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.0/src/gui/embedded/qscreen_qws.cpp 2008-07-14 11:52:56.000000000 +0200 -@@ -828,13 +828,13 @@ - static inline quint8 qt_convertToGray4(SRC color); - - template <> --static inline quint8 qt_convertToGray4(quint32 color) -+inline quint8 qt_convertToGray4(quint32 color) - { - return qGray(color) >> 4; - } - - template <> --static inline quint8 qt_convertToGray4(quint16 color) -+inline quint8 qt_convertToGray4(quint16 color) - { - const int r = (color & 0xf800) >> 11; - const int g = (color & 0x07e0) >> 6; // only keep 5 bit -@@ -843,13 +843,13 @@ - } - - template <> --static inline quint8 qt_convertToGray4(qrgb444 color) -+inline quint8 qt_convertToGray4(qrgb444 color) - { - return qt_convertToGray4(quint32(color)); - } - - template <> --static inline quint8 qt_convertToGray4(qargb4444 color) -+inline quint8 qt_convertToGray4(qargb4444 color) - { - return qt_convertToGray4(quint32(color)); - } -@@ -969,25 +969,25 @@ - static inline quint8 qt_convertToMono(SRC color); - - template <> --static inline quint8 qt_convertToMono(quint32 color) -+inline quint8 qt_convertToMono(quint32 color) - { - return qGray(color) >> 7; - } - - template <> --static inline quint8 qt_convertToMono(quint16 color) -+inline quint8 qt_convertToMono(quint16 color) - { - return (qGray(qt_colorConvert(color, 0)) >> 7); - } - - template <> --static inline quint8 qt_convertToMono(qargb4444 color) -+inline quint8 qt_convertToMono(qargb4444 color) - { - return (qGray(quint32(color)) >> 7); - } - - template <> --static inline quint8 qt_convertToMono(qrgb444 color) -+inline quint8 qt_convertToMono(qrgb444 color) - { - return (qGray(quint32(color)) >> 7); - } ---- /tmp/qdrawhelper.cpp 2008-07-14 11:56:25.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.0/src/gui/painting/qdrawhelper.cpp 2008-07-14 11:57:29.000000000 +0200 -@@ -3374,7 +3374,7 @@ - - #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN - template <> --static inline void madd_4(qargb8565 *dest, const quint32 a, const qargb8565 *src) -+inline void madd_4(qargb8565 *dest, const quint32 a, const qargb8565 *src) - { - Q_ASSERT((quintptr(dest) & 0x3) == 0); - Q_ASSERT((quintptr(src) & 0x3) == 0); -@@ -3455,7 +3455,7 @@ - - #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN - template <> --static inline void madd_4(qargb8555 *dest, const quint32 a, const qargb8555 *src) -+inline void madd_4(qargb8555 *dest, const quint32 a, const qargb8555 *src) - { - Q_ASSERT((quintptr(dest) & 0x3) == 0); - Q_ASSERT((quintptr(src) & 0x3) == 0); diff --git a/packages/uicmoc/uicmoc4-native.inc b/packages/uicmoc/uicmoc4-native.inc index c8417d01ab..340cf51c97 100644 --- a/packages/uicmoc/uicmoc4-native.inc +++ b/packages/uicmoc/uicmoc4-native.inc @@ -6,9 +6,9 @@ PRIORITY = "optional" LICENSE = "GPL" FILE_PR = "r1" -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ file://configure-fix.patch;patch=1" -S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" +S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \ -qt-libjpeg -qt-gif -system-zlib \ diff --git a/packages/uicmoc/uicmoc4-native_4.4.0.bb b/packages/uicmoc/uicmoc4-native_4.4.0.bb deleted file mode 100644 index c1282f9805..0000000000 --- a/packages/uicmoc/uicmoc4-native_4.4.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -require uicmoc4-native.inc - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ - file://configure-fix.patch;patch=1 \ - file://qapplication.diff;patch=1 " - -S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" -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/ -} - diff --git a/packages/uicmoc/uicmoc4-native_4.4.3.bb b/packages/uicmoc/uicmoc4-native_4.4.3.bb new file mode 100644 index 0000000000..083635c12b --- /dev/null +++ b/packages/uicmoc/uicmoc4-native_4.4.3.bb @@ -0,0 +1,16 @@ +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/ +} + diff --git a/packages/uicmoc/uicmoc4-sdk_4.4.0.bb b/packages/uicmoc/uicmoc4-sdk_4.4.0.bb deleted file mode 100644 index 00aeb26564..0000000000 --- a/packages/uicmoc/uicmoc4-sdk_4.4.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -require uicmoc4-native.inc - -inherit sdk - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ - file://configure-fix.patch;patch=1 \ - file://qapplication.diff;patch=1 " - -S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" - -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/ -} - - diff --git a/packages/uicmoc/uicmoc4-sdk_4.4.3.bb b/packages/uicmoc/uicmoc4-sdk_4.4.3.bb new file mode 100644 index 0000000000..6953ee6b51 --- /dev/null +++ b/packages/uicmoc/uicmoc4-sdk_4.4.3.bb @@ -0,0 +1,16 @@ +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/ +} + -- cgit v1.2.3