Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/24 01:19:00+02:00 handhelds.org!zecke
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported

2004/10/24 01:18:48+02:00 handhelds.org!zecke
Konqueror Embedded:
	-Install custom konq-embedrc which calls opiemail instead of mailit
	 to handle the mailto protocol

2004/10/23 02:53:02+02:00 handhelds.org!zecke
Konqueror Embedded 1.x.x:
	-Backport KDELIBS3.3 cookie jar patches
	-Make Cookie Dialog fit the Screen on 320x240/240x320
	-Install shared konq_embedrc configuration file to have 'gg:' shortcuts again
	-Default to ask for cookies in http
	-Default to cache in '/tmp/'

BKrev: 417bd7d2z--25ivx6LtjIXoGRghHlg

diff --git a/konqueror/konqueror-embedded-20030705/kcookiejar-merge.patch b/konqueror/konqueror-embedded-20030705/kcookiejar-merge.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/konqueror/konqueror-embedded-20030705/konq-embedrc b/konqueror/konqueror-embedded-20030705/konq-embedrc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/konqueror/konqueror-embedded_20030705.oe b/konqueror/konqueror-embedded_20030705.oe
index 035ade1..d2ff073 100644 (file)
--- a/konqueror/konqueror-embedded_20030705.oe
+++ b/konqueror/konqueror-embedded_20030705.oe
@@ -2,13 +2,15 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition
 SECTION = "opie/applications"
 PRIORITY = "optional"
 DEPENDS = "libqpe-opie openssl pcre"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://devel-home.kde.org/~hausmann/snapshots/konqueror-embedded-snapshot-${PV}.tar.gz \
            file://opie1.patch;patch=1 \
            file://packing.patch;patch=1 \
           file://include_qconfig.patch;patch=1 \
-          file://useragent.patch;patch=1 "
+          file://useragent.patch;patch=1 \
+          file://kcookiejar-merge.patch;patch=1 \
+          file://konq-embedrc "
 S = "${WORKDIR}/konqueror-embedded-snapshot-${PV}"
 
 inherit autotools libtool
@@ -32,3 +34,12 @@ CXXFLAGS += "-DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
 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
+}
\ No newline at end of file