summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/kdepimpi/kdepimpi-base.inc37
-rw-r--r--packages/kdepimpi/kdepimpi_2.0.25.bb (renamed from packages/kdepimpi/kdepimpi_2.0.23.bb)0
-rw-r--r--packages/kdepimpi/kdepimpi_2.0.6.bb2
-rw-r--r--packages/kdepimpi/pwmpi.inc0
-rw-r--r--packages/kdepimpi/pwmpi_2.0.25.bb0
-rw-r--r--packages/kdepimpi/pwmpi_2.0.6.bb4
6 files changed, 32 insertions, 11 deletions
diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc
index fbecc6b700..b77043d315 100644
--- a/packages/kdepimpi/kdepimpi-base.inc
+++ b/packages/kdepimpi/kdepimpi-base.inc
@@ -12,6 +12,7 @@ SECTION = "opie/pim"
PRIORITY = "optional"
LICENSE = "GPL"
HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
# we can't build:
# kabc/plugins/sharpdtm - wants libsl (Sharp ROM 3.x closed source library)
@@ -19,7 +20,6 @@ HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
# kabc/plugins/opie - wants libopie1 (we don't plan to have it in OE)
# kmicromail - conflict with OE libetpan, libmailwrapper/OPIE
-SRC_URI_append = "file://opie-fontselector-copy.patch;patch=1"
PARALLEL_MAKE = ""
S = "${WORKDIR}/kdepim"
@@ -52,11 +52,6 @@ SUBDIRS="qtcompat libical/src/libical libical/src/libicalss microkde libkcal lib
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=${SUBDIRS}\n" >all.pro
@@ -69,6 +64,11 @@ do_configure_prepend() {
done
}
+do_compile() {
+ export KDEPIMDIR=${S}
+ oe_runmake
+}
+
HEADERS_DIRS = "qtcompat \
microkde \
microkde/kdecore \
@@ -81,13 +81,28 @@ kabc \
libkcal \
libkdepim "
+do_unstage() {
+
+ for dir in ${HEADERS_DIRS};
+ do
+ rm -rf ${STAGING_INCDIR}/$dir
+ done
+
+ for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
+ do
+ rm -f ${STAGING_LIBDIR}/$f*
+ done
+}
+
+addtask unstage before do_configure
+
do_stage() {
-for dir in ${HEADERS_DIRS};
-do
- install -d ${STAGING_INCDIR}/$dir
- install -m 0644 ${S}/$dir/*.h ${STAGING_INCDIR}/$dir/
-done
+ for dir in ${HEADERS_DIRS};
+ do
+ install -d ${STAGING_INCDIR}/$dir
+ install -m 0644 ${S}/$dir/*.h ${STAGING_INCDIR}/$dir/
+ done
for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
do
diff --git a/packages/kdepimpi/kdepimpi_2.0.23.bb b/packages/kdepimpi/kdepimpi_2.0.25.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/kdepimpi/kdepimpi_2.0.23.bb
+++ b/packages/kdepimpi/kdepimpi_2.0.25.bb
diff --git a/packages/kdepimpi/kdepimpi_2.0.6.bb b/packages/kdepimpi/kdepimpi_2.0.6.bb
index ee560899bf..a97ca3e30f 100644
--- a/packages/kdepimpi/kdepimpi_2.0.6.bb
+++ b/packages/kdepimpi/kdepimpi_2.0.6.bb
@@ -1,4 +1,6 @@
PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz "
+SRC_URI_append = "file://opie-fontselector-copy.patch;patch=1"
+
include kdepimpi-base.inc
diff --git a/packages/kdepimpi/pwmpi.inc b/packages/kdepimpi/pwmpi.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kdepimpi/pwmpi.inc
diff --git a/packages/kdepimpi/pwmpi_2.0.25.bb b/packages/kdepimpi/pwmpi_2.0.25.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kdepimpi/pwmpi_2.0.25.bb
diff --git a/packages/kdepimpi/pwmpi_2.0.6.bb b/packages/kdepimpi/pwmpi_2.0.6.bb
index e69de29bb2..dc32009d0e 100644
--- a/packages/kdepimpi/pwmpi_2.0.6.bb
+++ b/packages/kdepimpi/pwmpi_2.0.6.bb
@@ -0,0 +1,4 @@
+SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz "
+SRC_URI_append = "file://opie-fontselector-copy.patch;patch=1"
+
+include pwmpi.inc