From 56d8f000eff4861a2f04a42e5abc12bd48ac6039 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 15 Jun 2005 21:40:10 +0000 Subject: 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 --- .../qmake-native-1.08a/old-moc-compatibility.patch | 0 .../qmake-native-1.08a/old-uic-compatibility.patch | 0 .../qmake/qmake-native-2.00a/linux-oe-qmake.conf | 0 .../qmake-native-2.00a/old-moc-compatibility.patch | 0 .../qmake-native-2.00a/old-uic-compatibility.patch | 0 packages/qmake/qmake-native_1.08a.bb | 56 ---------------------- packages/qmake/qmake-native_2.00a.bb | 0 7 files changed, 56 deletions(-) delete mode 100644 packages/qmake/qmake-native-1.08a/old-moc-compatibility.patch delete mode 100644 packages/qmake/qmake-native-1.08a/old-uic-compatibility.patch create mode 100644 packages/qmake/qmake-native-2.00a/linux-oe-qmake.conf create mode 100644 packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch create mode 100644 packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch delete mode 100644 packages/qmake/qmake-native_1.08a.bb create mode 100644 packages/qmake/qmake-native_2.00a.bb (limited to 'packages/qmake') diff --git a/packages/qmake/qmake-native-1.08a/old-moc-compatibility.patch b/packages/qmake/qmake-native-1.08a/old-moc-compatibility.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/qmake/qmake-native-1.08a/old-uic-compatibility.patch b/packages/qmake/qmake-native-1.08a/old-uic-compatibility.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/qmake/qmake-native-2.00a/linux-oe-qmake.conf b/packages/qmake/qmake-native-2.00a/linux-oe-qmake.conf new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch b/packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch b/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qmake/qmake-native_1.08a.bb b/packages/qmake/qmake-native_1.08a.bb deleted file mode 100644 index 22530d1bfd..0000000000 --- a/packages/qmake/qmake-native_1.08a.bb +++ /dev/null @@ -1,56 +0,0 @@ -DESCRIPTION = "TrollTech Makefile Generator" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -MAINTAINER = "Michael 'Mickey' Lauer " -SECTION = "devel" -LICENSE = "GPL|QPL" -PR = "r3" - -DEFAULT_PREFERENCE = "-1" - -QTEVER = "qt-embedded-opensource-4.0.0-b1" - -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTEVER}.tar.bz2 \ - file://old-moc-compatibility.patch;patch=1 \ - file://old-uic-compatibility.patch;patch=1 \ - file://linux-oe-qmake.conf" -S = "${WORKDIR}/${QTEVER}" - -inherit autotools native - -export QTDIR = "${S}" -EXTRA_OEMAKE = "-e" - -do_configure() { - # Install the OE build templates (linux, linux-uclibc) - install -d ${S}/mkspecs/linux-oe-g++ - install -d ${S}/mkspecs/linux-uclibc-oe-g++ - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf \ - ${S}/mkspecs/linux-oe-g++/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h \ - ${S}/mkspecs/linux-oe-g++/qplatformdefs.h - ln -sf ../linux-oe-g++/qmake.conf \ - ${S}/mkspecs/linux-uclibc-oe-g++/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h \ - ${S}/mkspecs/linux-uclibc-oe-g++/qplatformdefs.h - - QMAKESPEC= - PLATFORM=${HOST_OS}-oe-g++ - export PLATFORM - oenote ./configure ${EXTRA_OECONF} - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed" -} - -do_compile() { - : -} - -do_stage() { - install -m 0755 bin/qmake ${STAGING_BINDIR} - install -d ${QMAKE_MKSPEC_PATH} - cp -dfR mkspecs/* ${QMAKE_MKSPEC_PATH} -} - -do_install() { - : -} diff --git a/packages/qmake/qmake-native_2.00a.bb b/packages/qmake/qmake-native_2.00a.bb new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3