Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/20 04:02:25-05:00 handhelds.org!kergoth
automake 1.9.x build fixes: ice, libsm, libxcursor, libxfixes, libxft, libxss, xcomposite, xdamage, xpm, xt, xtst.

2005/01/20 04:00:34-05:00 handhelds.org!kergoth
Disable PARALLEL_MAKE in opie-tinykate.

2005/01/20 03:58:05-05:00 handhelds.org!kergoth
rosetta: inherit gettext and depend on virtual/libintl.

2005/01/20 03:57:40-05:00 handhelds.org!kergoth
A few STAGING_KERNEL_DIR and PACKAGE_ARCH fixes for multimachine builds.

2005/01/20 03:53:46-05:00 handhelds.org!kergoth
tosa.conf: don't bother installing the real modutils.. the busybox modutils is fine.

2005/01/20 03:52:08-05:00 handhelds.org!kergoth
wireless-tools: Apply patch to stop poking into the kernel headers where it shouldnt be, clean things up, use the local wireless.h instead of the kernel's, and split out into more granular ipks.

2005/01/20 03:49:43-05:00 handhelds.org!kergoth
Patch ipkg to fix a bug when built for relatively recent uclibc.

BKrev: 41ef8a88apPGTS6jqkoO28j6FLNtjg

2 files changed, 49 insertions, 0 deletions

diff --git a/packages/opie-tinykate/opie-tinykate_1.1.8.bb b/packages/opie-tinykate/opie-tinykate_1.1.8.bb
index e69de29bb2..daa8017390 100644
--- a/packages/opie-tinykate/opie-tinykate_1.1.8.bb
+++ b/packages/opie-tinykate/opie-tinykate_1.1.8.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "The Kate Text Editor for Opie"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libqtaux2"
+
+APPNAME = "tinykate"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tinykate \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/tinykate"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST += " LIBS+=-L.."
+PARALLEL_MAKE = ""
+
+# FILES plugins/application/libkate.so* bin/kate apps/Applications/tinykate.desktop pics/tinykate lib/libtinykate.so*
+do_install() {
+	install -d ${D}${palmtopdir}/lib/
+	oe_soinstall libkate.so.1.0.0 ${D}${palmtopdir}/lib/
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	install -d ${D}${palmtopdir}/share/${APPNAME}/syntax/
+	install -m 0644 ${WORKDIR}/share/${APPNAME}/syntax/*.* ${D}${palmtopdir}/share/${APPNAME}/syntax/
+}
+
+PACKAGES = " \
+	opie-tinykate-syntax-commondev \
+	opie-tinykate-syntax-documentation \
+	opie-tinykate-syntax-misc \
+	opie-tinykate-syntax-miscdev \
+	opie-tinykate-syntax-unix \
+	opie-tinykate-syntax-web \
+	opie-tinykate "
+
+
+FILES_opie-tinykate-syntax-commondev = " ${palmtopdir}/share/tinykate/syntax/c.xml ${palmtopdir}/share/tinykate/syntax/cpp.xml ${palmtopdir}/share/tinykate/syntax/gnuassembler.xml ${palmtopdir}/share/tinykate/syntax/kbasic.xml ${palmtopdir}/share/tinykate/syntax/pascal.xml ${palmtopdir}/share/tinykate/syntax/perl.xml ${palmtopdir}/share/tinykate/syntax/php.xml ${palmtopdir}/share/tinykate/syntax/python.xml ${palmtopdir}/share/tinykate/syntax/ruby.xml ${palmtopdir}/share/tinykate/syntax/sql.xml ${palmtopdir}/share/tinykate/syntax/tcl.xml ${palmtopdir}/share/tinykate/syntax/xml.xml ${palmtopdir}/share/tinykate/syntax/xmldebug.xml ${palmtopdir}/share/tinykate/syntax/java.xml"
+FILES_opie-tinykate-syntax-documentation = " ${palmtopdir}/share/tinykate/syntax/latex.xml ${palmtopdir}/share/tinykate/syntax/postscript.xml ${palmtopdir}/share/tinykate/syntax/sgml.xml"
+FILES_opie-tinykate-syntax-misc = " ${palmtopdir}/share/tinykate/syntax/idconsole.xml ${palmtopdir}/share/tinykate/syntax/matlab.xml ${palmtopdir}/share/tinykate/syntax/verilog.xml ${palmtopdir}/share/tinykate/syntax/vhdl.xml"
+FILES_opie-tinykate-syntax-miscdev = " ${palmtopdir}/share/tinykate/syntax/ada.xml ${palmtopdir}/share/tinykate/syntax/eiffel.xml ${palmtopdir}/share/tinykate/syntax/ferite.xml ${palmtopdir}/share/tinykate/syntax/fortran.xml ${palmtopdir}/share/tinykate/syntax/haskell.xml ${palmtopdir}/share/tinykate/syntax/literate-haskell.xml ${palmtopdir}/share/tinykate/syntax/objectivec.xml ${palmtopdir}/share/tinykate/syntax/sather.xml ${palmtopdir}/share/tinykate/syntax/scheme.xml"
+FILES_opie-tinykate-syntax-unix = " ${palmtopdir}/share/tinykate/syntax/cs.xml ${palmtopdir}/share/tinykate/syntax/bash.xml ${palmtopdir}/share/tinykate/syntax/changelog.xml ${palmtopdir}/share/tinykate/syntax/desktop.xml ${palmtopdir}/share/tinykate/syntax/diff.xml ${palmtopdir}/share/tinykate/syntax/mab.xml ${palmtopdir}/share/tinykate/syntax/makefile.xml ${palmtopdir}/share/tinykate/syntax/rpmspec.xml ${palmtopdir}/share/tinykate/syntax/sml.xml ${palmtopdir}/share/tinykate/syntax/winehq.xml"
+FILES_opie-tinykate-syntax-web = " ${palmtopdir}/share/tinykate/syntax/css.xml ${palmtopdir}/share/tinykate/syntax/html.xml ${palmtopdir}/share/tinykate/syntax/javascript.xml"
diff --git a/packages/opie-tinykate/opie-tinykate_cvs.bb b/packages/opie-tinykate/opie-tinykate_cvs.bb
index 96a4ed5a4a..ab3c1f34ce 100644
--- a/packages/opie-tinykate/opie-tinykate_cvs.bb
+++ b/packages/opie-tinykate/opie-tinykate_cvs.bb
@@ -17,6 +17,7 @@ S = "${WORKDIR}/tinykate"
 inherit opie
 
 EXTRA_QMAKEVARS_POST += " LIBS+=-L.."
+PARALLEL_MAKE = ""
 
 # FILES plugins/application/libkate.so* bin/kate apps/Applications/tinykate.desktop pics/tinykate lib/libtinykate.so*
 do_install() {