From 53fe754b23233d0dcc129a703561ceabb763afa0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 15 Oct 2004 22:14:21 +0000 Subject: kdepim/pi: updated to 1.9.7 BKrev: 41704bbdtf8ii5Q6BtoYC_oJvDLG8A --- kdepimpi/files/libsnames.patch | 0 kdepimpi/files/locale.h.patch | 0 kdepimpi/files/xxportmanager.cpp.patch | 0 kdepimpi/kdepimpi-base.inc | 109 +++++++++++++++++++++++++++++++++ kdepimpi/kdepimpi_1.9.6.oe | 8 --- kdepimpi/kdepimpi_1.9.7.oe | 0 kdepimpi/kdepimpi_cvs.oe | 18 +----- 7 files changed, 110 insertions(+), 25 deletions(-) delete mode 100644 kdepimpi/files/libsnames.patch delete mode 100644 kdepimpi/files/locale.h.patch delete mode 100644 kdepimpi/files/xxportmanager.cpp.patch delete mode 100644 kdepimpi/kdepimpi_1.9.6.oe create mode 100644 kdepimpi/kdepimpi_1.9.7.oe diff --git a/kdepimpi/files/libsnames.patch b/kdepimpi/files/libsnames.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/kdepimpi/files/locale.h.patch b/kdepimpi/files/locale.h.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/kdepimpi/files/xxportmanager.cpp.patch b/kdepimpi/files/xxportmanager.cpp.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/kdepimpi/kdepimpi-base.inc b/kdepimpi/kdepimpi-base.inc index e69de29bb2..fe72c65c53 100644 --- a/kdepimpi/kdepimpi-base.inc +++ b/kdepimpi/kdepimpi-base.inc @@ -0,0 +1,109 @@ +DESCRIPTION = "KDE-Pim Platform Independent - port of KDE Pim to PDA" +DESCRIPTION_kopi = "Korganizer/PI is a powerful calendar and ToDo Tool" +DESCRIPTION_kopi-applet = "KDE Pim/PI applet" +DESCRIPTION_kapi = "KAddressbook/PI is a port of KDE addressbook" +DESCRIPTION_libmicrokdelibs = "KDE Pim/PI library - microkde" +DESCRIPTION_libkomicrokcal = "KDE Pim/PI library - microkcal" +DESCRIPTION_libkamicrokabc = "KDE Pim/PI library - microkabc" + +SECTION = "opie/pim" +PRIORITY = "optional" +MAINTAINER = "Marcin Juszkiewicz " +LICENSE = "GPL" +HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/" +#DEPENDS = "gammu libetpan libmailwrapper" +# gammu as replacement for libmicrogammu +# libetpan & libmailwrapper as replacement for kdepim/pi versions + +# TODO: +# checking libmailwrapper changes (diff sent to opie-devel ML) +# author said that he didn't changed libetpan so we probably can get OE one +# compile opie mail/pi + +# we can't build: +# kabc/plugins/qtopia - wants qpe/pim/ (Qtopia) +# kabc/plugins/sharpdtm - wants libsl (Sharp ROM 3.x closed source library) +# kabc/plugins/ldap - wants ldap libs (?) +# kabc/plugins/opie - wants libopie1 (we don't plan to have it in OE) +# kmicromail - have to check changes in KDEPIM/PI version libmailwrapper + + +S = "${WORKDIR}/kdepim" +EXTRA_QMAKEVARS_POST += "KDEPIMDIR=${S} INCLUDEPATH+=../ OBJECTS_DIR=obj/ MOC_DIR=moc/ \ + LIBS+=-L${S}/dest/ DESTDIR=${S}/dest LIBS+=-lstdc++ \ + LIBS+=-Wl,-rpath-link,${S}/dest \ + " + +# That changes will be needed for KMicroMail/PI to get it build with OE libs +# +# LIBS-=-lkmicromailwrapper LIBS+=-lmailwrapper LIBS+=-lopiecore2 \ + +QMAKE_PROFILES= "all.pro" +SUBDIRS="libical/src/libical libical/src/libicalss microkde libkcal libkdepim \ + kabc korganizer kalarmd kaddressbook kabc/plugins/file kabc/plugins/dir \ + kabc/formats/binary " +# "gammu/emb/common gammu/emb/gammu " build +# "pwmanager/pwmanager" needs patching to link with qpe (?) + +inherit palmtop + +do_compile() { + export KDEPIMDIR=${S} + oe_runmake +} + +do_configure_prepend() { + mv ${S}/kabc/formats/binary/kabcformat_binaryE.pro ${S}/kabc/formats/binary/binaryE.pro + 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 + mkdir "${S}/dest" +} + +do_install() { + install -d ${D}/${palmtopdir}/bin \ + ${D}/${palmtopdir}/lib \ + ${D}/${palmtopdir}/apps/1Pim \ + ${D}/${palmtopdir}/pics/kdepim/korganizer/icons16 \ + ${D}/${palmtopdir}/pics/kdepim/korganizer/iconsmini \ + ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons16 \ + ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons22 \ + ${D}/${palmtopdir}/plugins/applets + + install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}/${palmtopdir}/pics/ + install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}/${palmtopdir}/pics/ + install -m 0644 ${S}/bin/kdepim/korganizer/*.* ${D}/${palmtopdir}/pics/kdepim/korganizer + install -m 0644 ${S}/bin/kdepim/korganizer/icons16/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer/icons16 + install -m 0644 ${S}/bin/kdepim/korganizer/iconsmini/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer/iconsmini + install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/1Pim/korganizer.desktop + + install -m 0644 ${S}/bin/kdepim/kaddressbook/*.* ${D}/${palmtopdir}/pics/kdepim/kaddressbook + install -m 0644 ${S}/bin/kdepim/kaddressbook/icons16/*.png ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons16 + install -m 0644 ${S}/bin/kdepim/kaddressbook/icons22/*.png ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons22 + install -m 0644 kaddressbook/kaddressbook.desktop ${D}/${palmtopdir}/apps/1Pim/kaddressbook.desktop + + for f in libmicrokde libmicrokdepim libkamicrokabc libkomicrokcal libmicroqtcompat libmicrokabc_file libmicrokabc_dir libmicrokabcformat_binary + do + oe_libinstall -so -C ${S}/dest/ $f ${D}/${palmtopdir}/lib + done + + install -m 0755 ${S}/dest/kopi ${D}/${palmtopdir}/bin/kopi + install -m 0755 ${S}/dest/kapi ${D}/${palmtopdir}/bin/kapi + + for f in libkopialarmapplet + do + oe_libinstall -so -C ${S}/dest/ $f ${D}/${palmtopdir}/plugins/applets + done +} + + +PACKAGES = "libkomicrokcal libkamicrokabc kopi-applet kopi kapi libmicrokabc libmicrokcal libmicrokdelibs" + +FILES_kopi = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* " +FILES_kapi = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*" +FILES_kopi-applet = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png" +FILES_libkamicrokabc = "${palmtopdir}/lib/libkamicrokabc*" +FILES_libkomicrokcal = "${palmtopdir}/lib/libkomicrokcal*" +FILES_libmicrokdelibs = "${palmtopdir}/lib/*" diff --git a/kdepimpi/kdepimpi_1.9.6.oe b/kdepimpi/kdepimpi_1.9.6.oe deleted file mode 100644 index a616f7ebad..0000000000 --- a/kdepimpi/kdepimpi_1.9.6.oe +++ /dev/null @@ -1,8 +0,0 @@ -SECTION = "opie/pim" -include kdepimpi-base.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepim${PV}.src.tar.gz \ -file://qinputdialog_inc.patch;patch=1 \ -file://manager.h.patch;patch=1 \ -file://libkcal.pro.patch;patch=1 \ -" diff --git a/kdepimpi/kdepimpi_1.9.7.oe b/kdepimpi/kdepimpi_1.9.7.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/kdepimpi/kdepimpi_cvs.oe b/kdepimpi/kdepimpi_cvs.oe index 2e94d680f8..b563e66bd7 100644 --- a/kdepimpi/kdepimpi_cvs.oe +++ b/kdepimpi/kdepimpi_cvs.oe @@ -1,8 +1,6 @@ -SECTION = "opie/pim" include kdepimpi-base.inc -PV = "1.9.6+${CVSDATE}" -PR = "r1" +PV = "1.9.7+${CVSDATE}" DEFAULT_PREFERENCE = "-1" @@ -11,17 +9,3 @@ file://qinputdialog_inc.patch;patch=1 \ file://manager.h.patch;patch=1 \ file://libkcal.pro.patch;patch=1 \ " -#file://libsnames.patch;patch=1 \ - patch to get bluetooth & gammu libs - -PACKAGES_prepend = " libkomicrokcal libkamicrokabc " -FILES_libkamicrokabc = "${palmtopdir}/lib/libkamicrokabc*" -FILES_libkomicrokcal = "${palmtopdir}/lib/libkomicrokcal*" - -do_install_append() { - - for f in libkamicrokabc libkomicrokcal - do - oe_libinstall -so -C ${S}/dest/ $f ${D}/${palmtopdir}/lib - done - -} -- cgit v1.2.3