diff options
author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-15 21:40:10 +0000 |
---|---|---|
committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-15 21:40:10 +0000 |
commit | 56d8f000eff4861a2f04a42e5abc12bd48ac6039 (patch) | |
tree | 3bebdf7521cfd1b92cb004c4b062988cd86fd394 /packages/uicmoc | |
parent | c9577c1b7842b21f60f60bc889df49483ae7158c (diff) |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/06/15 23:25:59+02:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/openembedded
2005/06/15 23:23:46+02:00 handhelds.org!zecke
qmake 2.00a update:
-Use the most recent version of qmake as found in Qt/X11 4rc1
-Update the oe-qmake.conf
2005/06/15 23:18:07+02:00 opfer.lan!dirk
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into wks-dirk.opfer.lan:/prj/zaurus/dev/openembedded
2005/06/15 23:16:28+02:00 opfer.lan!dirk
TOSA: update touchscreen. autoload touchscreen and sound modules on startup
2005/06/15 21:58:37+01:00 rpsys.net!RP
oprofile: update cvs version - some arm patches merged
2005/06/15 21:57:10+01:00 rpsys.net!RP
rootfs_ipk: Make the shell script valid
2005/06/15 22:38:57+02:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/openembedded
2005/06/15 22:37:17+02:00 handhelds.org!zecke
Qt4 uic/moc:
-Use Qt/X11 4.0.0rc1 as the Embedded version is missing
-Update patch and configuration options to 4.0.0rc1 and
X11
BKrev: 42b0a03azEk5o8agXTo43EgKiE5_xg
Diffstat (limited to 'packages/uicmoc')
-rw-r--r-- | packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwsmanager.patch | 0 | ||||
-rw-r--r-- | packages/uicmoc/uicmoc4-native-4.0.0-b1/gcc34.patch | 0 | ||||
-rw-r--r-- | packages/uicmoc/uicmoc4-native-4.0.0-rc1/fix-mkspecs.patch (renamed from packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-mkspecs.patch) | 0 | ||||
-rw-r--r-- | packages/uicmoc/uicmoc4-native_4.0.0-b1.bb | 39 | ||||
-rw-r--r-- | packages/uicmoc/uicmoc4-native_4.0.0-rc1.bb (renamed from packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwidget.patch) | 0 |
5 files changed, 0 insertions, 39 deletions
diff --git a/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwsmanager.patch b/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwsmanager.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwsmanager.patch +++ /dev/null diff --git a/packages/uicmoc/uicmoc4-native-4.0.0-b1/gcc34.patch b/packages/uicmoc/uicmoc4-native-4.0.0-b1/gcc34.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/uicmoc/uicmoc4-native-4.0.0-b1/gcc34.patch +++ /dev/null diff --git a/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.0.0-rc1/fix-mkspecs.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-mkspecs.patch +++ b/packages/uicmoc/uicmoc4-native-4.0.0-rc1/fix-mkspecs.patch diff --git a/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb b/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb deleted file mode 100644 index 9a7391ce38..0000000000 --- a/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL QPL" -PR = "r1" - -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-opensource-${PV}.tar.bz2 \ - file://gcc34.patch;patch=1 \ - file://fix-qwsmanager.patch;patch=1 \ - file://fix-qwidget.patch;patch=1 " -S = "${WORKDIR}/qt-embedded-opensource-${PV}" - -inherit native - -EXTRA_OECONF = "-qt-libjpeg -qt-libpng -qt-gif -system-zlib \ - -no-qvfb -no-nis -no-cups -no-pch \ - -no-accessibility -verbose -no-compat -fast" -EXTRA_OEMAKE = " " - -do_configure() { - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -do_compile() { - unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS - 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() { - install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 - install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 - install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 - install -m 0655 lib/libQtXml.so.4 ${STAGING_LIBDIR} - install -m 0655 lib/libQtCore.so.4 ${STAGING_LIBDIR} -} diff --git a/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwidget.patch b/packages/uicmoc/uicmoc4-native_4.0.0-rc1.bb index e69de29bb2..e69de29bb2 100644 --- a/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwidget.patch +++ b/packages/uicmoc/uicmoc4-native_4.0.0-rc1.bb |