summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2005-02-01 15:47:23 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2005-02-01 15:47:23 +0000
commit73243cecbcae50688f5207890dc1252680d218ef (patch)
tree6447aca9518ad027b0b7eb39cf697c3376a7125d
parent21a62d1944e614639bffa4e464cff973ee4ed6c5 (diff)
kdepimpi updated to 2.0.1
BKrev: 41ffa48bq0JDp1pR_uhc255W6n9gxw
-rw-r--r--packages/kdepimpi/files/qinputdialog_inc.patch38
-rw-r--r--packages/kdepimpi/files/qt2310.patch0
-rw-r--r--packages/kdepimpi/kdepimpi-base.inc35
-rw-r--r--packages/kdepimpi/kdepimpi_2.0.0.bb0
-rw-r--r--packages/kdepimpi/kdepimpi_2.0.1.bb (renamed from packages/kdepimpi/files/libkcal.pro.patch)0
-rw-r--r--packages/kdepimpi/kdepimpi_cvs.bb2
6 files changed, 13 insertions, 62 deletions
diff --git a/packages/kdepimpi/files/qinputdialog_inc.patch b/packages/kdepimpi/files/qinputdialog_inc.patch
deleted file mode 100644
index 50a925c64d..0000000000
--- a/packages/kdepimpi/files/qinputdialog_inc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- kdepim/microkde/kresources/configpage.cpp~qinputdialog_inc.patch
-+++ kdepim/microkde/kresources/configpage.cpp
-@@ -29,7 +29,7 @@
- */
-
- #include <qgroupbox.h>
--#include <qinputdialog.h>
-+#include <qtcompat/qinputdialog.h>
- #include <qlabel.h>
- #include <qlayout.h>
-
---- kdepim/kaddressbook/xxport/csvimportdialog.cpp~qinputdialog_inc.patch
-+++ kdepim/kaddressbook/xxport/csvimportdialog.cpp
-@@ -30,7 +30,7 @@
- #include <qbuttongroup.h>
- #include <qcheckbox.h>
- #include <qcombobox.h>
--#include <qinputdialog.h>
-+#include <qtcompat/qinputdialog.h>
- #include <qlabel.h>
- #include <qlineedit.h>
- #include <qpushbutton.h>
---- kdepim/kaddressbook/keywidget.cpp~qinputdialog_inc.patch
-+++ kdepim/kaddressbook/keywidget.cpp
-@@ -23,7 +23,7 @@
-
- #include <qfile.h>
-
--#include <qinputdialog.h>
-+#include <qtcompat/qinputdialog.h>
-
- #include <qlabel.h>
- #include <qlayout.h>
diff --git a/packages/kdepimpi/files/qt2310.patch b/packages/kdepimpi/files/qt2310.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/kdepimpi/files/qt2310.patch
+++ /dev/null
diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc
index 6e8340ccc3..8c22a6075b 100644
--- a/packages/kdepimpi/kdepimpi-base.inc
+++ b/packages/kdepimpi/kdepimpi-base.inc
@@ -13,51 +13,41 @@ PRIORITY = "optional"
MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
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
-
-SRC_URI += "\
-file://qt2310.patch;patch=1 \
-file://qinputdialog_inc.patch;patch=1 \
-file://libkcal.pro.patch;patch=1 \
-"
-
-# 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/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
+# kmicromail - conflict with OE libetpan, libmailwrapper/OPIE
+# pwmanager - needs stdc++ and some patching
PARALLEL_MAKE = ""
+
S = "${WORKDIR}/kdepim"
-EXTRA_QMAKEVARS_POST += "KDEPIMDIR=${S} INCLUDEPATH+=../ OBJECTS_DIR=obj/ MOC_DIR=moc/ \
- LIBS+=-L${S}/dest/ DESTDIR=${S}/dest LIBS+=-lsupc++ \
- LIBS+=-Wl,-rpath-link,${S}/dest \
- LIBS-=-lzlib LIBS+=-lz \
- "
+EXTRA_QMAKEVARS_POST += " \
+INCLUDEPATH+=../ \
+OBJECTS_DIR=obj/ MOC_DIR=moc/ \
+DESTDIR=${S}/dest \
+LIBS+=-L${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 kabc/plugins/qtopia \
gammu/emb/common \
gammu/emb/gammu \
- "
# pwmanager/libcrypt/mpi \
# pwmanager/libcrypt/error \
# pwmanager/libcrypt/cipher \
# pwmanager/libcrypt/zlib \
-# pwmanager/pwmanager"
+# pwmanager/pwmanager \
+ "
inherit palmtop
@@ -76,7 +66,6 @@ do_configure_prepend() {
mv -f ${d}/`basename ${d}`E.pro ${d}/`basename ${d}`.pro
fi
done
- mkdir "${S}/dest"
}
do_install() {
diff --git a/packages/kdepimpi/kdepimpi_2.0.0.bb b/packages/kdepimpi/kdepimpi_2.0.0.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/kdepimpi/kdepimpi_2.0.0.bb
+++ /dev/null
diff --git a/packages/kdepimpi/files/libkcal.pro.patch b/packages/kdepimpi/kdepimpi_2.0.1.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/kdepimpi/files/libkcal.pro.patch
+++ b/packages/kdepimpi/kdepimpi_2.0.1.bb
diff --git a/packages/kdepimpi/kdepimpi_cvs.bb b/packages/kdepimpi/kdepimpi_cvs.bb
index 343ce7d8ed..b5d611ba37 100644
--- a/packages/kdepimpi/kdepimpi_cvs.bb
+++ b/packages/kdepimpi/kdepimpi_cvs.bb
@@ -1,4 +1,4 @@
-PV = "2.0.0+cvs-${CVSDATE}"
+PV = "2.0.1+cvs-${CVSDATE}"
DEFAULT_PREFERENCE = "-1"