diff options
author | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
commit | 2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch) | |
tree | cab0f25aca03f6162bd268a401945fbfbb63bff9 /qte | |
parent | 5df179157f90b18f437c6978efb451f515e3d1c9 (diff) |
Merges.
2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.
2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.
2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.
BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w
Diffstat (limited to 'qte')
-rw-r--r-- | qte/qte-for-opie_2.3.7.oe | 2 | ||||
-rw-r--r-- | qte/qte-for-qtopia_2.3.7.oe | 8 | ||||
-rw-r--r-- | qte/qte_2.3.7.oe | 16 | ||||
-rw-r--r-- | qte/qte_2.3.8-snap.oe | 8 |
4 files changed, 17 insertions, 17 deletions
diff --git a/qte/qte-for-opie_2.3.7.oe b/qte/qte-for-opie_2.3.7.oe index 79d418299a..a0a955eb07 100644 --- a/qte/qte-for-opie_2.3.7.oe +++ b/qte/qte-for-opie_2.3.7.oe @@ -4,4 +4,4 @@ FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/qte-${PV}-r0" DESCRIPTION = "Qt/Embedded w/ Opie Patches version ${PV}" -SRC_URI_append = "file://${FILESDIR}/opie.patch;patch=1" +SRC_URI_append = "file://opie.patch;patch=1" diff --git a/qte/qte-for-qtopia_2.3.7.oe b/qte/qte-for-qtopia_2.3.7.oe index 38c461714f..c357d8b71e 100644 --- a/qte/qte-for-qtopia_2.3.7.oe +++ b/qte/qte-for-qtopia_2.3.7.oe @@ -5,8 +5,8 @@ FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/qte-${PV}-r0" DESCRIPTION = "Qt/Embedded w/ Qtopia Patches version ${PV}" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \ - file://${FILESDIR}/qtopia.patch;patch=1 \ - file://${FILESDIR}/tslib.patch;patch=1 \ - file://${FILESDIR}/devfs.patch;patch=1 \ - file://${FILESDIR}/no-moc.patch;patch=1" + file://qtopia.patch;patch=1 \ + file://tslib.patch;patch=1 \ + file://devfs.patch;patch=1 \ + file://no-moc.patch;patch=1" diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe index 2e91c81f78..eb7bfd9b48 100644 --- a/qte/qte_2.3.7.oe +++ b/qte/qte_2.3.7.oe @@ -7,21 +7,21 @@ PROVIDES = "virtual/qte virtual/libqte2" PR = "3" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \ - file://${FILESDIR}/qpe.patch;patch=1 \ - file://${FILESDIR}/tslib.patch;patch=1 \ - file://${FILESDIR}/devfs.patch;patch=1 \ - file://${FILESDIR}/no-moc.patch;patch=1 \ - file://${FILESDIR}/update-qtfontdir \ - file://${FILESDIR}/sharp_char.h " + file://qpe.patch;patch=1 \ + file://tslib.patch;patch=1 \ + file://devfs.patch;patch=1 \ + file://no-moc.patch;patch=1 \ + file://update-qtfontdir \ + file://sharp_char.h " # # FIXME: Apply the SIMpad hardware patch for SIMpad. # -#SRC_URI_append_simpad = "file://${FILESDIR}/simpad.patch;patch=1 " +#SRC_URI_append_simpad = "file://simpad.patch;patch=1 " # # FIXME: Apply the C7xx hardware patch for shepherd/husky/boxer # -#SRC_URI_append_<machine> = "file://${FILESDIR}/c700-hardware.patch;patch=1 " +#SRC_URI_append_<machine> = "file://c700-hardware.patch;patch=1 " S = "${WORKDIR}/qt-${PV}" diff --git a/qte/qte_2.3.8-snap.oe b/qte/qte_2.3.8-snap.oe index 6f0ffb62c7..41ccc781dc 100644 --- a/qte/qte_2.3.8-snap.oe +++ b/qte/qte_2.3.8-snap.oe @@ -4,10 +4,10 @@ LICENSE = "GPL/QPL" SECTION = "libs" PRIORITY = "optional" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}shot-${SNAPDATE}.tar.gz \ - file://${FILESDIR}/qpe.patch;patch=1 \ - file://${FILESDIR}/tslib.patch;patch=1 \ - file://${FILESDIR}/devfs.patch;patch=1 \ - file://${FILESDIR}/no-moc.patch;patch=1" + file://qpe.patch;patch=1 \ + file://tslib.patch;patch=1 \ + file://devfs.patch;patch=1 \ + file://no-moc.patch;patch=1" DEPENDS = "virtual/libc base/zlib base/libpng base/jpeg uicmoc-native" PROVIDES = "virtual/qte virtual/libqte2" S = "${WORKDIR}/qt-${PV}shot-${SNAPDATE}" |