[oe-commits] org.oe.dev merge of '135f1243bae7b8d2761f12a5ee4792c0fdd61cd7'
oe commit
openembedded-commits at lists.openembedded.org
Fri Feb 22 00:09:22 UTC 2008
merge of '135f1243bae7b8d2761f12a5ee4792c0fdd61cd7'
and '4eb5b005a1da43a766a4d6f77af48d3ba0a994a4'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 8dd93f106147696b10ba9adad1ad903fce55e645
ViewMTN: http://monotone.openembedded.org/revision/info/8dd93f106147696b10ba9adad1ad903fce55e645
Files:
1
classes/kernel.bbclass
packages/ipaq-boot-params/files/h5000/params
packages/ipaq-boot-params/files/params
packages/ipaq-boot-params/ipaq-boot-params.bb
packages/kphonepi
packages/ktimetrackerpi
packages/randrext
packages/randrext/randrext_1.0.bb
packages/randrext/randrext_cvs.bb
packages/recordext
packages/recordext/recordext_cvs.bb
packages/renderext
packages/renderext/renderext_0.8.bb
packages/renderext/renderext_cvs.bb
packages/compositeext
packages/obsolete/compositeext
packages/damageext
packages/obsolete/damageext
packages/fixesext
packages/obsolete/fixesext
packages/kphonepi/kphonepi_1.0.0.bb
packages/kdepimpi/kphonepi_1.0.0.bb
packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb
packages/kdepimpi/ktimetrackerpi_0.9.7.bb
packages/panoramixext
packages/obsolete/panoramixext
packages/resourceext
packages/obsolete/resourceext
packages/xxf86dgaext
packages/obsolete/xxf86dgaext
packages/xxf86vmext
packages/obsolete/xxf86vmext
packages/kdepimpi/kdepimpi-x11
packages/kdepimpi/kdepimpi-qte.inc
packages/kdepimpi/kdepimpi-x11/kabc.patch
packages/kdepimpi/kdepimpi-x11/kammu.patch
packages/kdepimpi/kdepimpi-x11/korganizer.patch
packages/kdepimpi/kdepimpi-x11/libkcal.patch
packages/kdepimpi/kdepimpi-x11/nomail.patch
packages/kdepimpi/kdepimpi-x11.inc
packages/kdepimpi/kdepimpi-x11_2.2.3.bb
classes/nylon-mirrors.bbclass
classes/oplinux-mirrors.bbclass
classes/sanity.bbclass
conf/bitbake.conf
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
packages/asterisk/asterisk_1.4.10.bb
packages/asterisk/asterisk_1.4.11.bb
packages/asterisk/asterisk_1.4.17.bb
packages/findutils/findutils_4.2.29.bb
packages/kdepimpi/files/gcc4.patch
packages/kdepimpi/files/gcc42.patch
packages/kdepimpi/files/qt-mt.patch
packages/libxine/libxine-fb_1.0.bb
packages/libxine/libxine-x11_1.0.bb
packages/libxine/libxine_1.1.0.bb
packages/mozilla/firefox.inc
packages/mozilla/firefox_1.0.7.bb
packages/mozilla/firefox_2.0.0.3.bb
packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
packages/prismstumbler/prismstumbler_0.7.3.bb
packages/rdesktop/rdesktop_1.3.1.bb
packages/rdesktop/rdesktop_1.4.1.bb
packages/rdesktop/rdesktop_1.5.0.bb
packages/subversion/subversion_1.3.1.bb
packages/subversion/subversion_1.4.0.bb
packages/subversion/subversion_1.4.3.bb
packages/subversion/subversion_1.4.5.bb
packages/tcltk/tcl_8.4.11.bb
packages/u-boot/u-boot-openmoko_svn.bb
packages/uclibc/elf2flt_svn.bb
packages/xmms-embedded/xmms-embedded_20040327.bb
packages/xorg-app/mkbold-mkitalic-native_0.11.bb
Diffs:
#
# mt diff -r135f1243bae7b8d2761f12a5ee4792c0fdd61cd7 -r8dd93f106147696b10ba9adad1ad903fce55e645
#
#
#
# patch "classes/kernel.bbclass"
# from [f6edb57c93d376a79d6495683e17bddaa5e58f82]
# to [34b802297a875fd3c77c50d0aac3270b57374764]
#
# patch "packages/ipaq-boot-params/files/h5000/params"
# from [61d996d0d8e2558151d852d4b32982326795d655]
# to [e53a27f81d9567c508c99001bc65dabf2c730326]
#
# patch "packages/ipaq-boot-params/files/params"
# from [61d996d0d8e2558151d852d4b32982326795d655]
# to [e53a27f81d9567c508c99001bc65dabf2c730326]
#
# patch "packages/ipaq-boot-params/ipaq-boot-params.bb"
# from [da409034bea0049185391034b677bcb33f813ea1]
# to [2674865e1b9827ac73951cb040d135313aa67ffd]
#
============================================================
--- classes/kernel.bbclass f6edb57c93d376a79d6495683e17bddaa5e58f82
+++ classes/kernel.bbclass 34b802297a875fd3c77c50d0aac3270b57374764
@@ -70,7 +70,7 @@ do_builtin_initramfs() {
do_builtin_initramfs() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
- cp "${DEPLOY_DIR_IMAME}/${INITRAMFS_SYMLINK_NAME}" usr/initramfs_data.cpio.gz
+ cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_SYMLINK_NAME}" usr/initramfs_data.cpio.gz
oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-initramfs.bin
============================================================
--- packages/ipaq-boot-params/files/h5000/params 61d996d0d8e2558151d852d4b32982326795d655
+++ packages/ipaq-boot-params/files/h5000/params e53a27f81d9567c508c99001bc65dabf2c730326
@@ -1 +1 @@
-set linuxargs "root=/dev/mtdblock1 noinitrd console=tty0 console=ttyS0,115200"
+set linuxargs "root=mtd1 noinitrd console=ttyS0,115200 console=tty0"
============================================================
--- packages/ipaq-boot-params/files/params 61d996d0d8e2558151d852d4b32982326795d655
+++ packages/ipaq-boot-params/files/params e53a27f81d9567c508c99001bc65dabf2c730326
@@ -1 +1 @@
-set linuxargs "root=/dev/mtdblock1 noinitrd console=tty0 console=ttyS0,115200"
+set linuxargs "root=mtd1 noinitrd console=ttyS0,115200 console=tty0"
============================================================
--- packages/ipaq-boot-params/ipaq-boot-params.bb da409034bea0049185391034b677bcb33f813ea1
+++ packages/ipaq-boot-params/ipaq-boot-params.bb 2674865e1b9827ac73951cb040d135313aa67ffd
@@ -1,6 +1,6 @@ LICENSE = "MIT"
DESCRIPTION = "Kernel boot parameters for HH.org bootldr"
LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
COMPATIBLE_MACHINE = "(h3600|h3800|h3900|h5000|simpad)"
#
# mt diff -r4eb5b005a1da43a766a4d6f77af48d3ba0a994a4 -r8dd93f106147696b10ba9adad1ad903fce55e645
#
#
#
# delete "packages/kphonepi"
#
# delete "packages/ktimetrackerpi"
#
# delete "packages/randrext"
#
# delete "packages/randrext/randrext_1.0.bb"
#
# delete "packages/randrext/randrext_cvs.bb"
#
# delete "packages/recordext"
#
# delete "packages/recordext/recordext_cvs.bb"
#
# delete "packages/renderext"
#
# delete "packages/renderext/renderext_0.8.bb"
#
# delete "packages/renderext/renderext_cvs.bb"
#
# rename "packages/compositeext"
# to "packages/obsolete/compositeext"
#
# rename "packages/damageext"
# to "packages/obsolete/damageext"
#
# rename "packages/fixesext"
# to "packages/obsolete/fixesext"
#
# rename "packages/kphonepi/kphonepi_1.0.0.bb"
# to "packages/kdepimpi/kphonepi_1.0.0.bb"
#
# rename "packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb"
# to "packages/kdepimpi/ktimetrackerpi_0.9.7.bb"
#
# rename "packages/panoramixext"
# to "packages/obsolete/panoramixext"
#
# rename "packages/resourceext"
# to "packages/obsolete/resourceext"
#
# rename "packages/xxf86dgaext"
# to "packages/obsolete/xxf86dgaext"
#
# rename "packages/xxf86vmext"
# to "packages/obsolete/xxf86vmext"
#
# add_dir "packages/kdepimpi/kdepimpi-x11"
#
# add_file "packages/kdepimpi/kdepimpi-qte.inc"
# content [fb2614dc19c44fd71119ef6be827e9c62c67b057]
#
# add_file "packages/kdepimpi/kdepimpi-x11/kabc.patch"
# content [df403b912190a224d099dc5f9d374b7b219190da]
#
# add_file "packages/kdepimpi/kdepimpi-x11/kammu.patch"
# content [8546ab724328cc0e928eca11abae77a1ae87ea5c]
#
# add_file "packages/kdepimpi/kdepimpi-x11/korganizer.patch"
# content [36f5509ac6229510a0fc75e3b48c6fbe5985fff1]
#
# add_file "packages/kdepimpi/kdepimpi-x11/libkcal.patch"
# content [e460dfab310f6bc63e9e065e36dfdf9a64075aee]
#
# add_file "packages/kdepimpi/kdepimpi-x11/nomail.patch"
# content [04916bb3da166c0ac4d4618ca18a9504ea33cb20]
#
# add_file "packages/kdepimpi/kdepimpi-x11.inc"
# content [b9ff595eead7a24aedb8391634cc158e956c6271]
#
# add_file "packages/kdepimpi/kdepimpi-x11_2.2.3.bb"
# content [8b8b0aab88bcf20f98725982dfc396ffa242d3cd]
#
# patch "classes/nylon-mirrors.bbclass"
# from [376b7465920814cf2d72d3ad84339ba9443a70ab]
# to [102010d2a19c8b12b6de91f8b903db60701bfede]
#
# patch "classes/oplinux-mirrors.bbclass"
# from [1349196904a1b7eb854816b63b65eb58babc8f0a]
# to [ed581826599bb12881bb248c12360c0f7cbae434]
#
# patch "classes/sanity.bbclass"
# from [476edb8104e59b309dc8324d39e691ffd1116e3a]
# to [17eaa6a6a031b90e039f0607d801649c4c1c56b4]
#
# patch "conf/bitbake.conf"
# from [a605bd5d4d48054b72d21c74a922a9a0a2d12a76]
# to [20411cfe48d828effd31bc1b225638aa75828191]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [c50ac937f3aa1f2966905448c3afbb2e1bb0025f]
# to [5593e5efc3a50fcda9d2247e1e4eb97b9974d204]
#
# patch "conf/distro/openmoko.conf"
# from [4512da55b21499913ae1534988c81c3c26b99c64]
# to [02896609234a09af5537fbcaf494e70d8a9addba]
#
# patch "packages/asterisk/asterisk_1.4.10.bb"
# from [2d51154605b0ca7b662304502f3cb12e7330014e]
# to [63f58515cb08e7fedd04b521e8d2b6ba74a63457]
#
# patch "packages/asterisk/asterisk_1.4.11.bb"
# from [c8d00d57639bbb867b0f3bab8775bb2375e7fd7a]
# to [60ad063e816162c04cc9f9093a4b97c9e48fb6be]
#
# patch "packages/asterisk/asterisk_1.4.17.bb"
# from [060df18e986c1290e557ca7de184d66634bcb25a]
# to [2f04528dd5495d5de7fee0972edafd159d0453b6]
#
# patch "packages/findutils/findutils_4.2.29.bb"
# from [0bc78266cc3e6188b14e673728b00f4816ca45e4]
# to [484641642c9075f098198e29a57416b0b574e8f9]
#
# patch "packages/kdepimpi/files/gcc4.patch"
# from [9c22584bb814e5705d876893fe2ee14cc2f0c0d1]
# to [3dd0dae28378e4b37ab861d9f4466ca8d3b81a66]
#
# patch "packages/kdepimpi/files/gcc42.patch"
# from [af202c7b5a77e0f373d182f75dd9ef7763999d40]
# to [1611592b765e4ebc647e6a65fadbff25317aa9b4]
#
# patch "packages/kdepimpi/files/qt-mt.patch"
# from [f1a89c48541638d944a9512dd87c6ca9aa3f7cd5]
# to [2c163b14fff434b1bc2ab67ddbd7cad79839e45f]
#
# patch "packages/libxine/libxine-fb_1.0.bb"
# from [73dffac6b8f7d07e4dd71ef60094a9809767d703]
# to [fc3151974c5c92881b17578858d24c3c289d8045]
#
# patch "packages/libxine/libxine-x11_1.0.bb"
# from [047dae9a9fb304d0b88425d4f80a45fd14b4e21b]
# to [01225d1ca79203a58650f9705e2013e16dac5c7c]
#
# patch "packages/libxine/libxine_1.1.0.bb"
# from [c1680bf135560557cf801665aa00e1f00619e237]
# to [9e74c0987d37d121a526263edde2a00ba2d26764]
#
# patch "packages/mozilla/firefox.inc"
# from [ce3d32af7c35197aad91f186be895b364ae58f9b]
# to [2b8653e70c8128f0b821b235f2f0e1fbcc2c8779]
#
# patch "packages/mozilla/firefox_1.0.7.bb"
# from [a8138fce8dfb4fd4ec448e058aecd870575ede96]
# to [f02c0cc9b745dd1b59e3c6948bcb6049880a2178]
#
# patch "packages/mozilla/firefox_2.0.0.3.bb"
# from [0ee74a5aef3cee4364cdc98fcb62c10891e384a5]
# to [9f6ce8af3b3e82e5889f640c7552aed39d0fd930]
#
# patch "packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb"
# from [2853cbcd850a08bb25348843fd824ec14dda114e]
# to [be915c43601a85e473bfe81da31c8f2179696358]
#
# patch "packages/prismstumbler/prismstumbler_0.7.3.bb"
# from [7c95fdc5aaf6ba665f6546669d9d8c50e2ebc896]
# to [5e07eff37ac1acddc5f9e7b7094acc7b186aa792]
#
# patch "packages/rdesktop/rdesktop_1.3.1.bb"
# from [123c0963c930eec872198d019f1cf1e48eecccf0]
# to [546d9776aaef7f0a511f8a28671dc0a592278cdb]
#
# patch "packages/rdesktop/rdesktop_1.4.1.bb"
# from [a9ab28ff03d914badd10a000f082d6b5351d7abc]
# to [cef9fbbda34cd8ffc2e16eb427b9930989d5121b]
#
# patch "packages/rdesktop/rdesktop_1.5.0.bb"
# from [8168a10aad2470f1e81cde1b8e148b7691e31cb3]
# to [9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd]
#
# patch "packages/subversion/subversion_1.3.1.bb"
# from [6ff7966e96664ef304c72446fb0683610329c0ab]
# to [fc6b3bacecb3d0e9c501b4769a2b8939cb5c0e83]
#
# patch "packages/subversion/subversion_1.4.0.bb"
# from [f9692d80ac97a59fd09b120d0154ab76bc2babb8]
# to [4015c57dfaaf676b54913d1b5d95c71294ef8219]
#
# patch "packages/subversion/subversion_1.4.3.bb"
# from [74cb237892d32ea834e0050c19f66293c1457d23]
# to [d5f16acf511f297993077ccb53ec969f0d3cf6b1]
#
# patch "packages/subversion/subversion_1.4.5.bb"
# from [680bf01cbd49adaec6a24e728327d7aec6fbaa94]
# to [b3247341e42924a7030a8993469f0c0eddeae7cd]
#
# patch "packages/tcltk/tcl_8.4.11.bb"
# from [936521409ee1bef59ddfec2b66559dfbe0af75b1]
# to [477bbc80abd0d76169279a046fc8b4231975f550]
#
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
# from [cc49be056ab89c25407b8dbef14a32c86fca227f]
# to [2feeb29fabb3786b6eea52cabe765729f2ab5568]
#
# patch "packages/uclibc/elf2flt_svn.bb"
# from [376f3f2ab831cad1d7e4af6fdbc4d054ce873500]
# to [5e4764fa17f04ac0f68f4e90559919814f21f2e0]
#
# patch "packages/xmms-embedded/xmms-embedded_20040327.bb"
# from [03a2dbf2670c2ab7fb9f8c7f99f6b5453b7ad33e]
# to [fa97c83984b56db433bad80d69a6a49429af862a]
#
# patch "packages/xorg-app/mkbold-mkitalic-native_0.11.bb"
# from [b1aea18de213f27a02dd941931cb2b273cdc0922]
# to [112bcd39c5d948f13628b2b335a99e2160820e48]
#
============================================================
--- packages/kdepimpi/kdepimpi-qte.inc fb2614dc19c44fd71119ef6be827e9c62c67b057
+++ packages/kdepimpi/kdepimpi-qte.inc fb2614dc19c44fd71119ef6be827e9c62c67b057
@@ -0,0 +1,163 @@
+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_libmicrokcal = "KDE Pim/PI library - microkcal"
+DESCRIPTION_libmicrokabc = "KDE Pim/PI library - microkabc"
+DESCRIPTION_libmicrokammu = "KDE Pim/PI fork of libGammu"
+DESCRIPTION_kammu = "KDE Pim/PI fork of gammu"
+
+SECTION = "opie/pim"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
+MAINTAINER = "Marcin Juszkiewicz <openembedded at hrw.one.pl>"
+
+# 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 - conflict with OE libetpan, libmailwrapper/OPIE
+
+PARALLEL_MAKE = ""
+
+S = "${WORKDIR}/kdepim"
+
+EXTRA_QMAKEVARS_POST += " \
+INCLUDEPATH+=../ \
+OBJECTS_DIR=obj/ MOC_DIR=moc/ \
+DESTDIR=${S}/dest \
+LIBS+=-L${S}/dest/ \
+LIBS-=-lzlib \
+LIBS+=-lz \
+"
+# 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="qtcompat 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 \
+ "
+
+inherit palmtop
+
+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
+ for d in ${SUBDIRS}
+ do
+ if [ -f ${d}/`basename ${d}`E.pro ];
+ then
+ mv -f ${d}/`basename ${d}`E.pro ${d}/`basename ${d}`.pro
+ fi
+ done
+}
+
+do_compile() {
+ export KDEPIMDIR=${S}
+ oe_runmake
+}
+
+HEADERS_DIRS = "qtcompat \
+microkde \
+microkde/kdecore \
+microkde/kdeui \
+microkde/kio \
+microkde/kresources \
+microkde/kutils \
+microkde/opie2 \
+kabc \
+libkcal \
+libkdepim "
+
+do_unstage() {
+
+ for dir in ${HEADERS_DIRS};
+ do
+ rm -rf ${STAGING_INCDIR}/kdepimpi/$dir
+ done
+
+ for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
+ do
+ rm -f ${STAGING_LIBDIR}/kdepimpi/$f*
+ done
+}
+
+addtask unstage before do_configure
+
+do_stage() {
+
+ for dir in ${HEADERS_DIRS};
+ do
+ install -d ${STAGING_INCDIR}/kdepimpi/$dir
+ install -m 0644 ${S}/$dir/*.h ${STAGING_INCDIR}/kdepimpi/$dir/
+ done
+
+ for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
+ do
+ oe_libinstall -so -C ${S}/dest/ $f ${STAGING_LIBDIR}/kdepimpi/
+ done
+}
+
+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 libmicrokabc libmicrokcal libmicroqtcompat libmicrokabc_file libmicrokabc_dir libmicrokabcformat_binary libmicrokabc_qtopia
+ 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
+
+ install -d ${D}${bindir} ${D}${libdir}
+ install -m 0755 ${S}/dest/kammu ${D}${bindir}/kammu
+ oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}${libdir}
+
+ for f in libkopialarmapplet
+ do
+ oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/plugins/applets
+ done
+}
+
+
+PACKAGES = "libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu"
+
+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_libmicrokabc = "${palmtopdir}/lib/libmicrokabc*"
+FILES_libmicrokcal = "${palmtopdir}/lib/libmicrokcal*"
+FILES_libmicrokdelibs = "${palmtopdir}/lib/*"
+FILES_kammu = "${bindir}/kammu"
+FILES_libmicrokammu = "${libdir}/libmicrokammu*"
============================================================
--- packages/kdepimpi/kdepimpi-x11/kabc.patch df403b912190a224d099dc5f9d374b7b219190da
+++ packages/kdepimpi/kdepimpi-x11/kabc.patch df403b912190a224d099dc5f9d374b7b219190da
@@ -0,0 +1,24 @@
+upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951
+status: upstream is pretty dead
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- kdepim/kaddressbook/kaddressbook.pro~kabc
++++ kdepim/kaddressbook/kaddressbook.pro
+@@ -31,10 +31,10 @@
+ LIBS += ../libical/lib/libicalss.a
+
+ } else {
+-LIBS += ../bin/libmicrokdepim.so
+-LIBS += ../bin/libmicrokde.so
+-LIBS += ../bin/libmicrokabc.so
+-LIBS += ../bin/libmicrokcal.so
++LIBS += $(DESTDIR)/libmicrokdepim.so
++LIBS += $(DESTDIR)/libmicrokde.so
++LIBS += $(DESTDIR)/libmicrokabc.so
++LIBS += $(DESTDIR)/libmicrokcal.so
+ #LIBS += -lldap
+ }
+ OBJECTS_DIR = obj/unix
============================================================
--- packages/kdepimpi/kdepimpi-x11/kammu.patch 8546ab724328cc0e928eca11abae77a1ae87ea5c
+++ packages/kdepimpi/kdepimpi-x11/kammu.patch 8546ab724328cc0e928eca11abae77a1ae87ea5c
@@ -0,0 +1,18 @@
+upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951
+status: upstream is pretty dead
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- kdepim/gammu/emb/gammu/gammu.pro~kammu
++++ kdepim/gammu/emb/gammu/gammu.pro
+@@ -47,7 +47,7 @@
+ depend/nokia/dct3trac/wmx-util.c \
+ depend/nokia/dct3trac/wmx.c
+ unix : {
+-LIBS += ../../../bin/libmicrogammu.so /usr/lib/libpthread.so
++LIBS += $(DESTDIR)/libmicrogammu.so
+ # bluetooth disabled for now
+ #/usr/lib/libbluetooth.so /usr/lib/libsdp.so
+ OBJECTS_DIR = obj/unix
============================================================
--- packages/kdepimpi/kdepimpi-x11/korganizer.patch 36f5509ac6229510a0fc75e3b48c6fbe5985fff1
+++ packages/kdepimpi/kdepimpi-x11/korganizer.patch 36f5509ac6229510a0fc75e3b48c6fbe5985fff1
@@ -0,0 +1,24 @@
+upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951
+status: upstream is pretty dead
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- kdepim/korganizer/korganizer.pro~korganizer
++++ kdepim/korganizer/korganizer.pro
+@@ -34,10 +34,10 @@
+ LIBS += ../libical/lib/libical.a
+ LIBS += ../libical/lib/libicalss.a
+ } else {
+-LIBS += ../bin/libmicrokdepim.so
+-LIBS += ../bin/libmicrokcal.so
+-LIBS += ../bin/libmicrokde.so
+-LIBS += ../bin/libmicrokabc.so
++LIBS += $(DESTDIR)/libmicrokdepim.so
++LIBS += $(DESTDIR)/libmicrokcal.so
++LIBS += $(DESTDIR)/libmicrokde.so
++LIBS += $(DESTDIR)/libmicrokabc.so
+ #LIBS += -lbluetooth
+ #LIBS += -lsdp
+
===========================%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list