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

3 files changed, 87 insertions, 3 deletions

diff --git a/gammu/gammu_0.97.7.oe b/gammu/gammu_0.97.7.oe
index e69de29bb2..b1e38f7e19 100644
--- a/gammu/gammu_0.97.7.oe
+++ b/gammu/gammu_0.97.7.oe
@@ -0,0 +1,75 @@
+DESCRIPTION = "GNU All Mobile Managment Utilities"
+LICENCE = "GPL"
+HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
+AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+PR="r1"
+
+SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/older/gammu-${PV}.tar.gz \
+file://ldflags.patch;patch=1 \
+file://bluez.patch;patch=1 \
+"
+
+DEPENDS = "bluez-libs"
+
+inherit autotools
+
+do_compile () {
+	oe_runmake shared
+}
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/gammu/misc  ${STAGING_INCDIR}/gammu/misc/coding \
+			   ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
+			   ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
+			   ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4 \
+			   ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
+			   ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
+			   ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
+			   ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
+			   ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
+			   ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
+			   ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
+			   ${STAGING_INCDIR}/gammu/protocol/alcatel
+
+	oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
+	install -m 0644 common/*.h					${STAGING_INCDIR}/gammu/
+	install -m 0644 common/misc/*.h				${STAGING_INCDIR}/gammu/misc 
+    install -m 0644 common/misc/coding/*.h		${STAGING_INCDIR}/gammu/misc/coding 
+    install -m 0644 common/phone/*.h			${STAGING_INCDIR}/gammu/phone 
+    install -m 0644 common/phone/at/*.h			${STAGING_INCDIR}/gammu/phone/at 
+    install -m 0644 common/phone/obex/*.h		${STAGING_INCDIR}/gammu/phone/obex 
+    install -m 0644 common/phone/nokia/*.h		${STAGING_INCDIR}/gammu/phone/nokia 
+    install -m 0644 common/phone/nokia/dct3/*.h	${STAGING_INCDIR}/gammu/phone/nokia/dct3 
+    install -m 0644 common/phone/nokia/dct4/*.h	${STAGING_INCDIR}/gammu/phone/nokia/dct4 
+    install -m 0644 common/phone/symbian/*.h	${STAGING_INCDIR}/gammu/phone/symbian 
+    install -m 0644 common/phone/alcatel/*.h	${STAGING_INCDIR}/gammu/phone/alcatel 
+    install -m 0644 common/service/*.h			${STAGING_INCDIR}/gammu/service 
+    install -m 0644 common/service/sms/*.h		${STAGING_INCDIR}/gammu/service/sms 
+    install -m 0644 common/service/backup/*.h	${STAGING_INCDIR}/gammu/service/backup 
+    install -m 0644 common/device/*.h			${STAGING_INCDIR}/gammu/device 
+	install -m 0644 common/device/irda/*.h		${STAGING_INCDIR}/gammu/device/irda 
+    install -m 0644 common/device/bluetoth/*.h	${STAGING_INCDIR}/gammu/device/bluetoth 
+    install -m 0644 common/device/serial/*.h	${STAGING_INCDIR}/gammu/device/serial 
+    install -m 0644 common/protocol/*.h			${STAGING_INCDIR}/gammu/protocol 
+    install -m 0644 common/protocol/at/*.h		${STAGING_INCDIR}/gammu/protocol/at 
+    install -m 0644 common/protocol/obex/*.h	${STAGING_INCDIR}/gammu/protocol/obex 
+    install -m 0644 common/protocol/nokia/*.h	${STAGING_INCDIR}/gammu/protocol/nokia 
+    install -m 0644 common/protocol/symbian/*.h	${STAGING_INCDIR}/gammu/protocol/symbian 
+    install -m 0644 common/protocol/alcatel/*.h	${STAGING_INCDIR}/gammu/protocol/alcatel
+}
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' installshared
+}
+
+PACKAGES = "libgammu gammu gammu-doc gammu-dev"
+
+FILES_${PN} = "/usr/bin/gammu"
+FILES_libgammu = "/usr/lib/libGammu.so*"
+
+python populate_packages_prepend () {
+	help_dir = oe.data.expand('/usr/share/gammu/', d)
+	
+	do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
+}
diff --git a/kdepimpi/kdepimpi/locale.h.patch b/kdepimpi/kdepimpi/locale.h.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/kdepimpi/kdepimpi/locale.h.patch
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?)