[oe-commits] org.oe.dev uicmoc4: add sdk version, fix build with gcc 4.3.x
koen commit
oe at amethyst.openembedded.net
Mon Jul 14 10:13:57 UTC 2008
uicmoc4: add sdk version, fix build with gcc 4.3.x
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 43ceaaee3dd83514a8b70e965bc24fba2eedca99
ViewMTN: http://monotone.openembedded.org/revision/info/43ceaaee3dd83514a8b70e965bc24fba2eedca99
Files:
1
packages/uicmoc/files/qapplication.diff
packages/uicmoc/uicmoc4-sdk_4.4.0.bb
packages/uicmoc/uicmoc4-native.inc
packages/uicmoc/uicmoc4-native_4.3.1.bb
packages/uicmoc/uicmoc4-native_4.3.3.bb
packages/uicmoc/uicmoc4-native_4.4.0.bb
Diffs:
#
# mt diff -rf879a25cba5c629e557672ebef8352acf937c9ac -r43ceaaee3dd83514a8b70e965bc24fba2eedca99
#
#
#
# add_file "packages/uicmoc/files/qapplication.diff"
# content [51c3e599aa93c5448fb3c2dcb3e340280a0fa986]
#
# add_file "packages/uicmoc/uicmoc4-sdk_4.4.0.bb"
# content [8e0cacdabfd0b87bc63a1ddab2da7d09520add25]
#
# patch "packages/uicmoc/uicmoc4-native.inc"
# from [4c402959a827e4fca268fdf66ffb1970c81dfd02]
# to [043e25c5533489d6bcfe95d8ae39f63961957071]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.1.bb"
# from [7cc53a71e63f8787010e6481bcaf2f1d1958283a]
# to [53dc3b079efb3a707825659e794510ab71d98bbf]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.3.bb"
# from [7cc53a71e63f8787010e6481bcaf2f1d1958283a]
# to [d07679a6b088211ea65c2ce940cfaac2d902fc96]
#
# patch "packages/uicmoc/uicmoc4-native_4.4.0.bb"
# from [301657a33a03471124a9ed314c128a1d49dd97f9]
# to [3279313c21ce4a2e7869d37eb6ad6781132a9f42]
#
============================================================
--- packages/uicmoc/files/qapplication.diff 51c3e599aa93c5448fb3c2dcb3e340280a0fa986
+++ packages/uicmoc/files/qapplication.diff 51c3e599aa93c5448fb3c2dcb3e340280a0fa986
@@ -0,0 +1,132 @@
+--- /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);
============================================================
--- packages/uicmoc/uicmoc4-sdk_4.4.0.bb 8e0cacdabfd0b87bc63a1ddab2da7d09520add25
+++ packages/uicmoc/uicmoc4-sdk_4.4.0.bb 8e0cacdabfd0b87bc63a1ddab2da7d09520add25
@@ -0,0 +1,23 @@
+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/
+}
+
+
============================================================
--- packages/uicmoc/uicmoc4-native.inc 4c402959a827e4fca268fdf66ffb1970c81dfd02
+++ packages/uicmoc/uicmoc4-native.inc 043e25c5533489d6bcfe95d8ae39f63961957071
@@ -10,8 +10,6 @@ S = "${WORKDIR}/qtopia-core-opensource-s
file://configure-fix.patch;patch=1"
S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
-inherit native
-
EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \
-qt-libjpeg -qt-gif -system-zlib \
-no-nis -no-cups -no-exceptions \
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.1.bb 7cc53a71e63f8787010e6481bcaf2f1d1958283a
+++ packages/uicmoc/uicmoc4-native_4.3.1.bb 53dc3b079efb3a707825659e794510ab71d98bbf
@@ -1 +1,3 @@ require uicmoc4-native.inc
require uicmoc4-native.inc
+
+inherit native
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.3.bb 7cc53a71e63f8787010e6481bcaf2f1d1958283a
+++ packages/uicmoc/uicmoc4-native_4.3.3.bb d07679a6b088211ea65c2ce940cfaac2d902fc96
@@ -1 +1,2 @@ require uicmoc4-native.inc
require uicmoc4-native.inc
+inherit native
============================================================
--- packages/uicmoc/uicmoc4-native_4.4.0.bb 301657a33a03471124a9ed314c128a1d49dd97f9
+++ packages/uicmoc/uicmoc4-native_4.4.0.bb 3279313c21ce4a2e7869d37eb6ad6781132a9f42
@@ -1,7 +1,10 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/so
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://configure-fix.patch;patch=1 \
+ file://qapplication.diff;patch=1 "
+
S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
+inherit native
More information about the Openembedded-commits
mailing list