diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-09-29 16:03:54 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-09-29 16:03:54 +0000 |
| commit | e7accf1d04937aafeda19cf5575398465a7ccd5c (patch) | |
| tree | 86a71fd37ec01c58e77d1a67e66daa151484a836 /konqueror | |
| parent | 69d94698c98150c9cc32ee8a14bc29b8ea3766c9 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/09/29 18:03:23+02:00 uni-frankfurt.de!mickeyl
konqueror and libqpe-opie: catch up with qt staging changes
2004/09/29 18:02:28+02:00 uni-frankfurt.de!mickeyl
first bits for the qt2/qt3 split. Notes: a) qte2 is default, so no changes should be necessary for packages using the qmake or qmake-derived oeclasses. b) overriding QTDIR is no longer supported, remove that from your .oe files. c) manual changes for non-qmake packages can be necessary. d) inherit qt3x11 to configure qmake for Qt3/X11 (sic)
2004/09/29 17:58:32+02:00 uni-frankfurt.de!mickeyl
fix section for mikmod and modplugplay
2004/09/29 17:12:08+02:00 uni-frankfurt.de!mickeyl
enable losetup in default busybox config
BKrev: 415adcea4UMfz2lvSSK4JcNs17Q9sQ
Diffstat (limited to 'konqueror')
| -rw-r--r-- | konqueror/konqueror-embedded_20030705.oe | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/konqueror-embedded_20030705.oe b/konqueror/konqueror-embedded_20030705.oe index 701795d9aa..035ade154e 100644 --- a/konqueror/konqueror-embedded_20030705.oe +++ b/konqueror/konqueror-embedded_20030705.oe @@ -2,7 +2,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition SECTION = "opie/applications" PRIORITY = "optional" DEPENDS = "libqpe-opie openssl pcre" -PR = "r1" +PR = "r2" SRC_URI = "http://devel-home.kde.org/~hausmann/snapshots/konqueror-embedded-snapshot-${PV}.tar.gz \ file://opie1.patch;patch=1 \ @@ -25,7 +25,7 @@ EXTRA_OECONF = "--prefix=${palmtopdir} --exec-prefix=${palmtopdir} --with-javascript=static --enable-qpe --enable-qt-embedded \ --with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR} \ --with-ssl-version=0.9.7c --with-ssl-dir=${STAGING_LIBDIR}/.. \ - --with-qt-dir=${STAGING_LIBDIR}/.. --with-qtopia-dir=${STAGING_LIBDIR}/.. " + --with-qt-dir=${QTDIR} --with-qtopia-dir=${OPIEDIR} " CXXFLAGS += "-DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" |