uicmoc4-(native|sdk): update to version 4.4.3

* drop qapplication.diff, included upstream
* update URL in uicmoc4-native.inc, qtopia is gone

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 409af09..1df6a35 100644 (file)
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -12722,6 +12722,10 @@ sha256=79945d06de16736d14210139e8e68cf29f8ea312190d2375507511f367a2f872
 md5=491d41cae681a2bab2656f8adc3ba503
 sha256=37274eff0b7cfb6f5a01e2535639ccd3eb4e9c6b27902d1f3bdf68a705c438d0
 
+[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.4.3.tar.bz2]
+md5=9a639aec44a1e4c70040117183d247a3
+sha256=05d06b93f95092f1318634fca24f0c2d0a1252c9f1dc2fbb427b07e8ecbb4f39
+
 [ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2]
 md5=05d04688c0c0230ed54e89102d689ca4
 sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96

diff --git a/packages/uicmoc/files/qapplication.diff b/packages/uicmoc/files/qapplication.diff
deleted file mode 100644 (file)
index 4600f66..0000000
--- 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<quint32, quint16>(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<quint32, quint16>(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<quint32, quint16>(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 c8417d0..340cf51 100644 (file)
--- 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.3.bb
similarity index 68%
rename from packages/uicmoc/uicmoc4-native_4.4.0.bb
rename to packages/uicmoc/uicmoc4-native_4.4.3.bb
index c1282f9..083635c 100644 (file)
--- a/packages/uicmoc/uicmoc4-native_4.4.0.bb
+++ b/packages/uicmoc/uicmoc4-native_4.4.3.bb
@@ -1,10 +1,5 @@
 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() {

diff --git a/packages/uicmoc/uicmoc4-sdk_4.4.0.bb b/packages/uicmoc/uicmoc4-sdk_4.4.3.bb
similarity index 63%
rename from packages/uicmoc/uicmoc4-sdk_4.4.0.bb
rename to packages/uicmoc/uicmoc4-sdk_4.4.3.bb
index 00aeb26..6953ee6 100644 (file)
--- a/packages/uicmoc/uicmoc4-sdk_4.4.0.bb
+++ b/packages/uicmoc/uicmoc4-sdk_4.4.3.bb
@@ -2,14 +2,8 @@ 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 -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
@@ -20,4 +14,3 @@ do_install_append() {
     install -m 0644 tools/porting/src/q3porting.xml ${D}/${datadir}/qt4/
 }
 
-