Merge openembedded@openembedded.bkbits.net:packages

into linux.local:/home/kergoth/code/packages

2004/05/08 23:00:41-04:00 local!kergoth
Upgrade the alsa packages to 1.0.4.

2004/05/08 22:17:13-04:00 local!kergoth
Fix compile error with adns, resulting from a function definition not matching the declaration.

2004/05/08 18:00:51-04:00 local!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages

2004/05/08 13:59:20-04:00 local!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages

2004/05/08 13:59:15-04:00 local!kergoth
Fixing up the libtool-native/libtool-cross mess.

2004/05/08 13:59:04-04:00 local!kergoth
Bugfix in ncurses usage of oe_libinstall.

2004/05/07 21:46:16-04:00 local!kergoth
Merge

2004/05/07 21:45:26-04:00 local!kergoth
Adapt some .oe's to use oe_libinstall.

BKrev: 409d9ee2NnxGHPWH0kUIfg5f6DoPcQ

3 files changed, 72 insertions, 21 deletions

diff --git a/korganizer/korganizer-embedded_1.5.0.oe b/korganizer/korganizer-embedded_1.5.0.oe
index ff81c311dc..586fa79e5b 100644
--- a/korganizer/korganizer-embedded_1.5.0.oe
+++ b/korganizer/korganizer-embedded_1.5.0.oe
@@ -29,15 +29,14 @@ do_install() {
 	       ${D}/${palmtopdir}/lib \
 	       ${D}/${palmtopdir}/apps/Pim \
        	       ${D}/${palmtopdir}/pics/korganizer/icons16
-    install -m 0644 korganizer/korganizer.desktop ${D}/opt/QtPalmtop/apps/Pim/korganizer.desktop
+    install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/Pim/korganizer.desktop
     cd ${S}/pics
-    cp *.png *.wav ${D}/opt/QtPalmtop/pics/korganizer
-    cp ./icons16/*.png ${D}/opt/QtPalmtop/pics/korganizer/icons16
-    for f in libmicrokde.so.1.0.0 libkcal.so.1.0.0 libkdepim.so.1.0.0 libqtcompat.so.1.0.0
+    cp *.png *.wav ${D}/${palmtopdir}/pics/korganizer
+    cp ./icons16/*.png ${D}/${palmtopdir}/pics/korganizer/icons16
+    for f in libmicrokde libkcal libkdepim libqtcompat
     do
-        oe_soinstall ${STAGING_LIBDIR}/${f} ${D}/opt/QtPalmtop/lib
-        rm -f ${STAGING_LIBDIR}/${f}
+        oe_libinstall -so -C ${STAGING_LIBDIR} $f ${D}/${palmtopdir}/lib
     done
-    install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/korganizer ${D}/opt/QtPalmtop/bin/korganizer
+    install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/korganizer ${D}/${palmtopdir}/bin/korganizer
     rm -f ${STAGING_DIR}/${HOST_SYS}/bin/korganizer
 }
diff --git a/korganizer/korganizer-embedded_1.7.0.oe b/korganizer/korganizer-embedded_1.7.0.oe
index e1f9852bf3..79f8e8c1ce 100644
--- a/korganizer/korganizer-embedded_1.7.0.oe
+++ b/korganizer/korganizer-embedded_1.7.0.oe
@@ -33,23 +33,22 @@ do_install() {
                ${D}/${palmtopdir}/pics/korganizer/icons16 \
                ${D}/${palmtopdir}/pics/korganizer/iconsmini \
                ${D}/${palmtopdir}/plugins/applets
-    install -m 0644 korganizer/korganizer.desktop ${D}/opt/QtPalmtop/apps/Pim/korganizer.desktop
+    install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/Pim/korganizer.desktop
     cd ${S}/pics
-    cp ko*.png ${D}/opt/QtPalmtop/pics
-    cp *.png *.wav ${D}/opt/QtPalmtop/pics/korganizer
-    cp ./icons16/*.png ${D}/opt/QtPalmtop/pics/korganizer/icons16
-    cp ./iconsmini/*.png ${D}/opt/QtPalmtop/pics/korganizer/iconsmini
-
-    for f in libmicrokde.so.1.0.0 libmicrokdepim.so.1.0.0 libmicrokabc.so.1.0.0 libmicrokcal.so.1.0.0 libmicroqtcompat.so.1.0.0
-    do                                                                                  
-        oe_soinstall ${STAGING_LIBDIR}/${f} ${D}/opt/QtPalmtop/lib
-    done
+    cp ko*.png ${D}/${palmtopdir}/pics
+    cp *.png *.wav ${D}/${palmtopdir}/pics/korganizer
+    cp ./icons16/*.png ${D}/${palmtopdir}/pics/korganizer/icons16
+    cp ./iconsmini/*.png ${D}/${palmtopdir}/pics/korganizer/iconsmini
 
-    install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/kopi ${D}/opt/QtPalmtop/bin/kopi
-    
-    for f in libkopialarmapplet.so.1.0.0 
+    for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
     do
-        oe_soinstall ${STAGING_DIR}/${HOST_SYS}/plugins/applets/${f} ${D}/opt/QtPalmtop/plugins/applets
+        oe_libinstall -so -C ${STAGING_LIBDIR} $f ${D}/${palmtopdir}/lib
     done
 
+    install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/kopi ${D}/${palmtopdir}/bin/kopi
+
+    for f in libkopialarmapplet
+    do
+        oe_libinstall -so -C ${STAGING_DIR}/${HOST_SYS}/plugins/applets $f ${d}/${palmtopdir}/plugins/applets
+    done
 }
diff --git a/korganizer/korganizer-embedded_1.7.5.oe b/korganizer/korganizer-embedded_1.7.5.oe
index e69de29bb2..90be6abd08 100644
--- a/korganizer/korganizer-embedded_1.7.5.oe
+++ b/korganizer/korganizer-embedded_1.7.5.oe
@@ -0,0 +1,53 @@
+DESCRIPTION= "Korganizer/Pi is a powerful calender and ToDo Tool for Qt/Embedded based Palmtop Environments"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Sebastian Goergen <zeppo@gmx.net>"
+LICENSE = "GPL"
+RDEPENDS = "lipqpe1"
+DEPENDS ="virtual/libc virtual/libqpe libopie1"
+
+SRC_URI = "http://www.pi-sync.net/daunlood/stable/korganizerPi.175.tar.gz"
+
+S = "${WORKDIR}/korganizerPi.175"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link,"
+QMAKE_PROFILES= "all.pro"
+
+SUBDIRS="microkde libical/src/libical libical/src/libicalss libkcal libkdepim libkabcwrap kalarmd korganizer" 
+
+do_configure_prepend() {
+        echo -e "TEMPLATE=subdirs\nSUBDIRS=qtcompat ${SUBDIRS}\n" >all.pro
+        for d in ${SUBDIRS}
+        do
+                mv -f ${d}/`basename ${d}`E.pro ${d}/`basename ${d}`.pro
+        done
+}
+
+do_install() {
+    install -d ${D}/${palmtopdir}/bin \
+               ${D}/${palmtopdir}/lib \
+               ${D}/${palmtopdir}/apps/1Pim \
+               ${D}/${palmtopdir}/pics/korganizer/icons16 \
+               ${D}/${palmtopdir}/pics/korganizer/iconsmini \
+               ${D}/${palmtopdir}/plugins/applets
+    install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/1Pim/korganizer.desktop
+    cd ${S}/pics
+    install -m 0644 ${S}/pics/ko*.png ${D}/${palmtopdir}/pics
+    install -m 0644 ${S}/pics/*.png ${D}/${palmtopdir}/pics/korganizer
+    install -m 0644 ${S}/pics/icons16/*.png ${D}/${palmtopdir}/pics/korganizer/icons16
+    install -m 0644 ${S}/pics/iconsmini/*.png ${D}/${palmtopdir}/pics/korganizer/iconsmini
+
+    for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
+    do
+        oe_libinstall -so -C ${STAGING_LIBDIR} $f ${d}/${palmtopdir}/lib
+    done
+
+    install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/kopi ${D}/${palmtopdir}/bin/kopi
+
+    for f in libkopialarmapplet
+    do
+        oe_libinstall -so -C ${STAGING_DIR}/${HOST_SYS}/plugins/applets $f ${d}/${palmtopdir}/plugins/applets
+    done
+}