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

into stealth.(none):/home/pb/oe/oe-packages

2004/07/30 23:39:37+02:00 hrw.one.pl!hrw
Merge bk://openembedded@openembedded.bkbits.net/packages
into home.hrw.one.pl:/home/szczepan/zaurus/oe/packages

2004/07/30 23:39:23+02:00 hrw.one.pl!hrw
added ktimetrackerpi 0.9.7

2004/07/30 23:38:29+02:00 hrw.one.pl!hrw
kphonepi: upgraded to 0.9.7 version

2004/07/30 23:37:11+02:00 hrw.one.pl!hrw
kdepimpi: added linking with stdc++ (for STL)

BKrev: 410ac435R53uIgLliib1KDlSJdUhJw

5 files changed, 4 insertions, 35 deletions

diff --git a/kdepimpi/kdepimpi_1.9.3a.oe b/kdepimpi/kdepimpi_1.9.3a.oe
index 3930b77cef..3c3ae65604 100644
--- a/kdepimpi/kdepimpi_1.9.3a.oe
+++ b/kdepimpi/kdepimpi_1.9.3a.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 DEPENDS ="virtual/libqpe"
 HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepim193a.src.tar.gz \
 file://libkcal.pro.patch;patch=1 \
@@ -17,7 +17,7 @@ S = "${WORKDIR}/kdepim"
 
 inherit palmtop
 
-EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ INCLUDEPATH+=../ LIBS+=-L${S}/dest/ DESTDIR=${S}/dest"
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ INCLUDEPATH+=../ LIBS+=-L${S}/dest/ DESTDIR=${S}/dest LIBS+=-lstdc++"
 QMAKE_PROFILES= "all.pro"
 
 # we don't have libopie1 (and ldap?)
diff --git a/kdepimpi/kdepimpi_cvs.oe b/kdepimpi/kdepimpi_cvs.oe
index 39cb89896e..ed4b5a277b 100644
--- a/kdepimpi/kdepimpi_cvs.oe
+++ b/kdepimpi/kdepimpi_cvs.oe
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS ="virtual/libqpe"
 HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
 PV = "1.9.3a-${CVSDATE}"
-PR = "r1"
+PR = "r2"
 
 # Author said that he will tag stable versions in CVS
 # From SF files zone for projects we can get kdepim.src.tar.gz for 1.9.3a version
@@ -16,14 +16,13 @@ file://libkcal.pro.patch;patch=1 \
 file://manager.h.patch;patch=1 \
 file://qinputdialog_inc.patch;patch=1 \
 file://xxportmanager.cpp.patch;patch=1 \
-file://korganizer.pro.patch;patch=1 \
 "
 
 S = "${WORKDIR}/kdepim"
 
 inherit palmtop
 
-EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ INCLUDEPATH+=../ LIBS+=-L${S}/dest/ DESTDIR=${S}/dest"
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ INCLUDEPATH+=../ LIBS+=-L${S}/dest/ DESTDIR=${S}/dest LIBS+=-lstdc++"
 QMAKE_PROFILES= "all.pro"
 
 # we don't have libopie1 (and ldap?)
diff --git a/kdepimpi/kdepimpi/korganizer.pro.patch b/kphonepi/kphonepi_0.9.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/kdepimpi/kdepimpi/korganizer.pro.patch
+++ b/kphonepi/kphonepi_0.9.7.oe
diff --git a/kphonepi/kphonepi_095.oe b/kphonepi/kphonepi_095.oe
deleted file mode 100644
index faae2de31c..0000000000
--- a/kphonepi/kphonepi_095.oe
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Kphone/Pi is a 'Voice Over Internet' phone which uses the Session Initiation Protocol (SIP)."
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS ="virtual/libqpe openssl"
-
-# if someone can then please mirror it somewhere
-SRC_URI = "http://www.hrw.one.pl/_pliki/oe/kphone_pi${PV}.tar.gz "
-
-S = "${WORKDIR}/kphone_pi"
-
-inherit palmtop
-
-EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/kppi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h"
-QMAKE_PROFILES= "kphone.pro"
-
-do_configure_prepend() {
-	mkdir ${S}/dest/
-}
-
-do_install() {
-    install -d ${D}/${palmtopdir}/bin \
-               ${D}/${palmtopdir}/apps/Applications \
-               ${D}/${palmtopdir}/pics/kphone/ 
-
-    install -m 0644 ${S}/icons/kphone/*.png ${D}/${palmtopdir}/pics/kphone/
-    install -m 0644 ${S}/kphone.desktop ${D}/${palmtopdir}/apps/Applications/
-
-    install -m 0755 ${S}/dest/kppi ${D}/${palmtopdir}/bin/kppi
-}
diff --git a/kphonepi/kphonepi_096.oe b/ktimetrackerpi/ktimetrackerpi_0.9.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/kphonepi/kphonepi_096.oe
+++ b/ktimetrackerpi/ktimetrackerpi_0.9.7.oe