From 9a2afd676a10b1f5da3b779a518f16e1c2c1269d Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 9 Aug 2004 20:50:12 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into
 home.hrw.one.pl:/home/szczepan/zaurus/oe/packages

2004/08/09 22:50:00+02:00 hrw.one.pl!hrw
KDEPIM/PI: mark CVS version as broken and set priority to get 1.9.3a instead

2004/08/09 22:46:15+02:00 hrw.one.pl!hrw
gammu: install library and includes to staging

BKrev: 4117e384URu7-TnGlBe14tV-vD18TQ
---
 kdepimpi/kdepimpi/locale.h.patch |  0
 kdepimpi/kdepimpi_cvs.oe         | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 kdepimpi/kdepimpi/locale.h.patch

(limited to 'kdepimpi')

diff --git a/kdepimpi/kdepimpi/locale.h.patch b/kdepimpi/kdepimpi/locale.h.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/kdepimpi/kdepimpi_cvs.oe b/kdepimpi/kdepimpi_cvs.oe
index ed4b5a277b..07775ed570 100644
--- a/kdepimpi/kdepimpi_cvs.oe
+++ b/kdepimpi/kdepimpi_cvs.oe
@@ -1,3 +1,10 @@
+BROKEN = 1
+# Authors recently added Gammu to sources - I plan to talk with them to use
+# libgammu instead of microgammu
+#
+# Actually building will fail on qtopia/services.h from Qtopia 1.7 (?)
+# If I won't fix it before 2004.08.13 I will fix it in September (time for vacation)
+
 DESCRIPTION = "Korganizer/Pi is a powerful calender and ToDo Tool for Qt/Embedded based Palmtop Environments"
 SECTION = "base"
 PRIORITY = "optional"
@@ -6,7 +13,9 @@ LICENSE = "GPL"
 DEPENDS ="virtual/libqpe"
 HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
 PV = "1.9.3a-${CVSDATE}"
-PR = "r2"
+PR = "r3"
+
+DEFAULT_PREFERENCE = "-1"
 
 # 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
@@ -15,14 +24,14 @@ SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/kdepimpi;module=kdepim \
 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://locale.h.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 LIBS+=-lstdc++"
+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++ LIBS-=-lmicrogammu LIBS+=-llibgammu"
 QMAKE_PROFILES= "all.pro"
 
 # we don't have libopie1 (and ldap?)
-- 
cgit v1.2.3