Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/19 18:35:37+02:00 void!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into  dominion.dominion.void:/data/build/oe/openembedded

2005/05/19 18:35:09+02:00 void!koen
stunnel_4.09.bb:  adjust SRC_URI

2005/05/19 18:27:14+02:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded

2005/05/19 18:26:05+02:00 hrw.one.pl!hrw
set newer konqueror-embedded as non-default one - it's BROKEN

2005/05/19 12:02:05-04:00 local!kergoth
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into linux.local:/home/kergoth/code/openembedded

2005/05/19 12:01:52-04:00 local!kergoth
No longer apply the bytes per inode patch to genext2fs cvs, since it was applied upstream, and switch from cvs to the first prerelease of 1.4.

BKrev: 428cc14dR39y0W7Rxiddgouv1tPEXQ

5 files changed, 58 insertions, 3 deletions

diff --git a/packages/genext2fs/genext2fs-native_1.3+1.4rc1.bb b/packages/genext2fs/genext2fs-native_1.3+1.4rc1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/genext2fs/genext2fs-native_1.3+1.4rc1.bb
diff --git a/packages/genext2fs/genext2fs_1.3+1.4rc1.bb b/packages/genext2fs/genext2fs_1.3+1.4rc1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/genext2fs/genext2fs_1.3+1.4rc1.bb
diff --git a/packages/genext2fs/genext2fs_1.3+cvs.bb b/packages/genext2fs/genext2fs_1.3+cvs.bb
index 94f04d54f1..6a1fcf89af 100644
--- a/packages/genext2fs/genext2fs_1.3+cvs.bb
+++ b/packages/genext2fs/genext2fs_1.3+cvs.bb
@@ -1,10 +1,9 @@
 include genext2fs.inc
 
 PV_append = "${CVSDATE}"
-PR = "r2"
+PR = "r3"
 FILESPATH = "${FILE_DIRNAME}/genext2fs-1.3+cvs:${FILE_DIRNAME}/genext2fs:${FILE_DIRNAME}/files"
-SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/genext2fs;module=genext2fs \
-	   file://bytes_per_inode.patch;patch=1"
+SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/genext2fs;module=genext2fs"
 S = "${WORKDIR}/genext2fs"
 
 inherit autotools
diff --git a/packages/konqueror/konqueror-embedded_20050322.bb b/packages/konqueror/konqueror-embedded_20050322.bb
index e69de29bb2..ca11edbfe4 100644
--- a/packages/konqueror/konqueror-embedded_20050322.bb
+++ b/packages/konqueror/konqueror-embedded_20050322.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition"
+BROKEN = "1"
+SECTION = "applications"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.cirulla.net/kdenox-snapshots/"
+DEPENDS = "openssl pcre"
+LICENSE = "LGPL/GPL"
+PR = "r3"
+
+SRC_URI = "http://www.cirulla.net/kdenox-snapshots/snapshots/konqueror3-embedded-0.2-${PV}.tar.bz2 \
+           file://qt-embedded.patch;patch=1"
+S = "${WORKDIR}/konqueror3-embedded-0.2-${PV}"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools
+
+FILES_${PN} = "${palmtopdir}"
+
+export QMAKE = "${STAGING_BINDIR}/qmake"
+export MOC = "${STAGING_BINDIR}/moc"
+export UIC = "${STAGING_BINDIR}/uic"
+export exec_prefix = "${STAGING_LIBDIR}/.."
+
+EXTRA_OECONF  = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir}'
+EXTRA_OECONF += '--with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR}'
+EXTRA_OECONF += '--enable-static --disable-shared --disable-debug'
+EXTRA_OECONF += '--enable-qt-embedded --enable-embedded --without-arts'
+EXTRA_OECONF += '--with-javascript=static --with-gui=kiosk'
+EXTRA_OECONF += '--disable-selection --disable-scrollbars --disable-bookmarks'
+EXTRA_OECONF += '--with-ssl-version=0.9.7e --with-ssl-dir=${STAGING_LIBDIR}/..'
+EXTRA_OECONF += '--with-qt-includes=${STAGING_INCDIR}/qt3'
+EXTRA_OECONF += '--with-qt-libraries=${STAGING_LIBDIR}'
+
+MOC = ${STAGING_BINDIR}/moc3
+UIC = ${STAGING_BINDIR}/uic3
+
+do_compile_prepend() {
+	perl admin/am_edit
+}
+
+do_install() {
+    install -d ${D}${palmtopdir}/share/
+    install -d ${D}${palmtopdir}/share/config/
+    
+    install -m 0644 ${WORKDIR}/konq-embedrc ${D}${palmtopdir}/share/config/
+    
+    autotools_do_install
+}
diff --git a/packages/stunnel/stunnel_4.09.bb b/packages/stunnel/stunnel_4.09.bb
index e69de29bb2..31711aa355 100644
--- a/packages/stunnel/stunnel_4.09.bb
+++ b/packages/stunnel/stunnel_4.09.bb
@@ -0,0 +1,7 @@
+include stunnel.inc
+
+SRC_URI = "http://www.stunnel.org/download/stunnel/src/stunnel-${PV}.tar.gz \
+	   file://configure.patch;patch=1 \
+	   file://automake.patch;patch=1 \
+	   file://init \
+	   file://stunnel.conf"