diff options
35 files changed, 1190 insertions, 12 deletions
diff --git a/org.handhelds.familiar/classes/java.bbclass b/org.handhelds.familiar/classes/java.bbclass new file mode 100644 index 0000000..71f50da --- /dev/null +++ b/org.handhelds.familiar/classes/java.bbclass @@ -0,0 +1,25 @@ +# java.bbclass OE class file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +DEPENDS += "java-wrappers-native \ + classpath \ + fastjar-native \ + jamvm-native \ + jikes-native \ + cp-tools-native \ + zip-native" +RDEPENDS += "classpath" + +export JAVA = "jamvm" +export JAVAC = "jikes-classpath" +export JAVAH = "javah-cp -classpath ." +export JAVAP = "false" +export JAR = "fastjar" +export JAVADOC = "true" + +export CLASSPATH = ".:${STAGING_DATADIR}/classpath/glibj.zip" + +CFLAGS += "-I${STAGING_INCDIR}/classpath" + +EXTRA_OEMAKE += "-e JAVA='${JAVA}' JAVAC='${JAVAC}' JAVAH='${JAVAH}' JAR='${JAR}' JAVADOC='${JAVADOC}'" diff --git a/org.handhelds.familiar/packages/classpath/classpath-native_0.18.bb b/org.handhelds.familiar/packages/classpath/classpath-native_0.18.bb new file mode 100644 index 0000000..48d54bb --- /dev/null +++ b/org.handhelds.familiar/packages/classpath/classpath-native_0.18.bb @@ -0,0 +1,40 @@ +# classpath-native OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +# NOTE: This is supposed to be used in conjunction with a VM (JamVM) +# to run build tools only. Don't compile any target java code +# against this! + +include classpath_${PV}.bb +inherit native + +DEPENDS = "jikes-native zip-native" + +EXTRA_OECONF += "--disable-gtk-peer" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/classpath" +S = "${WORKDIR}/classpath-${PV}" + +STAGE_TEMP="${WORKDIR}/temp-staging" + +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + make DESTDIR="${STAGE_TEMP}" install + + # stage class library + mkdir -p ${STAGING_DATADIR}/classpath + for i in `find ${STAGE_TEMP} -name 'glibj.zip'`; do + install -m 0644 $i ${STAGING_DATADIR}/classpath + done + + # stage JNI libraries + mkdir -p ${STAGING_LIBDIR}/classpath + for i in `find ${STAGE_TEMP} -name '*.so*'`; do + install -m 0644 $i ${STAGING_LIBDIR}/classpath + done + + rm -rf ${STAGE_TEMP} +} + diff --git a/org.handhelds.familiar/packages/classpath/classpath-native_0.90.bb b/org.handhelds.familiar/packages/classpath/classpath-native_0.90.bb new file mode 100644 index 0000000..48d54bb --- /dev/null +++ b/org.handhelds.familiar/packages/classpath/classpath-native_0.90.bb @@ -0,0 +1,40 @@ +# classpath-native OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +# NOTE: This is supposed to be used in conjunction with a VM (JamVM) +# to run build tools only. Don't compile any target java code +# against this! + +include classpath_${PV}.bb +inherit native + +DEPENDS = "jikes-native zip-native" + +EXTRA_OECONF += "--disable-gtk-peer" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/classpath" +S = "${WORKDIR}/classpath-${PV}" + +STAGE_TEMP="${WORKDIR}/temp-staging" + +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + make DESTDIR="${STAGE_TEMP}" install + + # stage class library + mkdir -p ${STAGING_DATADIR}/classpath + for i in `find ${STAGE_TEMP} -name 'glibj.zip'`; do + install -m 0644 $i ${STAGING_DATADIR}/classpath + done + + # stage JNI libraries + mkdir -p ${STAGING_LIBDIR}/classpath + for i in `find ${STAGE_TEMP} -name '*.so*'`; do + install -m 0644 $i ${STAGING_LIBDIR}/classpath + done + + rm -rf ${STAGE_TEMP} +} + diff --git a/org.handhelds.familiar/packages/classpath/classpath_0.18.bb b/org.handhelds.familiar/packages/classpath/classpath_0.18.bb index 028e161..79bb1c9 100644 --- a/org.handhelds.familiar/packages/classpath/classpath_0.18.bb +++ b/org.handhelds.familiar/packages/classpath/classpath_0.18.bb @@ -1,32 +1,65 @@ +# classpath OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + DESCRIPTION = "GNU Classpath standard Java libraries" HOMEPAGE = "http://www.gnu.org/software/classpath/" LICENSE = "Classpath" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "libs" +PR = "r2" DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (>= ${PV})" +RDEPENDS_jikes-${PN} = "${PN} jikes" -SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ - file://disable-automake-checks.patch;patch=1" +SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \ + file://disable-automake-checks.patch;patch=1 \ + file://jikes-classpath.sh" inherit autotools EXTRA_OECONF = "--with-jikes" -PACKAGES += " ${PN}-common ${PN}-examples" +PACKAGES += " ${PN}-common ${PN}-examples jikes-${PN}" FILES_${PN} = "${libdir}/${PN}" FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" FILES_${PN}-examples = "${datadir}/${PN}/examples" +FILES_jikes-${PN} = "${bindir}" do_stage() { + # stage JNI headers install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ + install -m 0644 include/jni* ${STAGING_INCDIR}/classpath/ + + # stage glibj.zip (containing all class files) + install -d ${STAGING_DATADIR}/classpath + install -m 0644 lib/glibj.zip ${STAGING_DATADIR}/classpath/ + + # stage jikes-classpath wrapper script + install -d ${STAGING_BINDIR} + # just to get the permissions right + install -m 0755 ${WORKDIR}/jikes-classpath.sh ${STAGING_BINDIR}/jikes-classpath + sed -e "s:DATADIR:${STAGING_DATADIR}:" ${WORKDIR}/jikes-classpath.sh > ${STAGING_BINDIR}/jikes-classpath } do_install() { autotools_do_install mv ${D}${libdir}/security ${D}${libdir}/${PN} + + # install jikes-classpath wrapper script + install -d ${D}${bindir} + # just to get the permissions right + install -m 0755 ${WORKDIR}/jikes-classpath.sh ${D}${bindir}/jikes-classpath + sed -e "s:DATADIR:${datadir}:" ${WORKDIR}/jikes-classpath.sh > ${D}${bindir}/jikes-classpath +} + +pkg_postinst_jikes-${PN} () { + update-alternatives --install ${bindir}/javac javac ${bindir}/jikes-${PN} 10 +} + +pkg_postrm_jikes-${PN} () { + update-alternatives --remove javac ${bindir}/jikes-${PN} } diff --git a/org.handhelds.familiar/packages/classpath/classpath_0.90.bb b/org.handhelds.familiar/packages/classpath/classpath_0.90.bb index 4b4647f..9d8bfb9 100644 --- a/org.handhelds.familiar/packages/classpath/classpath_0.90.bb +++ b/org.handhelds.familiar/packages/classpath/classpath_0.90.bb @@ -1,32 +1,65 @@ +# classpath OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + DESCRIPTION = "GNU Classpath standard Java libraries" HOMEPAGE = "http://www.gnu.org/software/classpath/" LICENSE = "Classpath" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "libs" +PR = "r1" DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (>= ${PV})" +RDEPENDS_jikes-${PN} = "${PN} jikes" -SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ - file://disable-automake-checks.patch;patch=1" +SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \ + file://disable-automake-checks.patch;patch=1 \ + file://jikes-classpath.sh" inherit autotools EXTRA_OECONF = "--with-jikes --disable-alsa" -PACKAGES += " ${PN}-common ${PN}-examples" +PACKAGES += " ${PN}-common ${PN}-examples jikes-${PN}" FILES_${PN} = "${libdir}/${PN}" FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" FILES_${PN}-examples = "${datadir}/${PN}/examples" +FILES_jikes-${PN} = "${bindir}" do_stage() { + # stage JNI headers install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ + install -m 0644 include/jni* ${STAGING_INCDIR}/classpath/ + + # stage glibj.zip (containing all class files) + install -d ${STAGING_DATADIR}/classpath + install -m 0644 lib/glibj.zip ${STAGING_DATADIR}/classpath/ + + # stage jikes-classpath wrapper script + install -d ${STAGING_BINDIR} + # just to get the permissions right + install -m 0755 ${WORKDIR}/jikes-classpath.sh ${STAGING_BINDIR}/jikes-classpath + sed -e "s:DATADIR:${STAGING_DATADIR}:" ${WORKDIR}/jikes-classpath.sh > ${STAGING_BINDIR}/jikes-classpath } do_install() { autotools_do_install mv ${D}${libdir}/security ${D}${libdir}/${PN} + + # install jikes-classpath wrapper script + install -d ${D}${bindir} + # just to get the permissions right + install -m 0755 ${WORKDIR}/jikes-classpath.sh ${D}${bindir}/jikes-classpath + sed -e "s:DATADIR:${datadir}:" ${WORKDIR}/jikes-classpath.sh > ${D}${bindir}/jikes-classpath +} + +pkg_postinst_jikes-${PN} () { + update-alternatives --install ${bindir}/javac javac ${bindir}/jikes-${PN} 10 +} + +pkg_postrm_jikes-${PN} () { + update-alternatives --remove javac ${bindir}/jikes-${PN} } diff --git a/org.handhelds.familiar/packages/classpath/cp-tools-native_0.00-cvs20050701.bb b/org.handhelds.familiar/packages/classpath/cp-tools-native_0.00-cvs20050701.bb new file mode 100644 index 0000000..29c7d63 --- /dev/null +++ b/org.handhelds.familiar/packages/classpath/cp-tools-native_0.00-cvs20050701.bb @@ -0,0 +1,31 @@ +# cp-tools-native OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +include cp-tools_${PV}.bb +inherit native + +DEPENDS="autoconf-native automake-native libtool-native gnu-config-native quilt-native \ + java-wrappers-native classpath fastjar-native jamvm-native jikes-native zip-native" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/cp-tools" + +do_stage() { + + # stage jars + mkdir -p ${STAGING_DATADIR}/java + + install -m 0644 cptools-0.00-cvs.jar ${STAGING_DATADIR}/java/cptools-${PV}.jar + (cd ${STAGING_DATADIR}/java && ln -sf cptools-${PV}.jar cptools-0.00-cvs.jar) + (cd ${STAGING_DATADIR}/java && ln -sf cptools-${PV}.jar cptools.jar) + + install -m 0644 ${WORKDIR}/bytecode.jar ${STAGING_DATADIR}/java/ + + # stage wrapper scripts + mkdir -p ${STAGING_BINDIR} + for i in ${binprograms}; do + sed -e 's,java,java -cp .:${STAGING_DATADIR}/java/bytecode.jar:${STAGING_DATADIR}/java/cptools.jar,' bin/$i > bin/$i-cp + install -m 0755 bin/$i-cp ${STAGING_BINDIR}/$i-cp + done +} + diff --git a/org.handhelds.familiar/packages/classpath/cp-tools/bytecodejar-workaround.patch b/org.handhelds.familiar/packages/classpath/cp-tools/bytecodejar-workaround.patch new file mode 100644 index 0000000..f1336c2 --- /dev/null +++ b/org.handhelds.familiar/packages/classpath/cp-tools/bytecodejar-workaround.patch @@ -0,0 +1,38 @@ +--- cp-tools.orig/configure.ac 2005-10-01 19:26:32.000000000 +0200 ++++ cp-tools/configure.ac 2005-10-01 19:34:12.000000000 +0200 +@@ -75,8 +75,21 @@ + with_gnubytecode=yes + ] + ) ++AC_ARG_WITH([gnu-bytecode-jar], ++ [AS_HELP_STRING(--with-gnu-bytecode-jar,where to look for the gnu.bytecode.jar [[default=search]])], ++ [ ++ if test "x${withval}" != xno; then ++ with_gnubytecodejar=${withval} ++ else ++ with_gnubytecodejar=no ++ fi ++ ], ++ [ ++ with_gnubytecodejar=no ++ ] ++) + AM_CONDITIONAL(USE_GNUBYTECODE, test "x${with_gnubytecode}" = xyes) +-if test "x${with_gnubytecode}" = xyes ++if test "x${with_gnubytecode}" = xyes -a "x${with_gnubytecodejar}" = xno + then + for path in /usr /usr/local; do + AC_CHECK_FILE([$path/share/java/bytecode.jar], +@@ -88,6 +101,12 @@ + test -d src || mkdir src + test -d src/jars || mkdir src/jars + cp -f ${BYTECODE_JAR} src/jars/ ++else ++ BYTECODE_JAR=$with_gnubytecodejar ++ export BYTECODE_JAR ++ test -d src || mkdir src ++ test -d src/jars || mkdir src/jars ++ cp -f ${BYTECODE_JAR} src/jars/ + fi + + dnl diff --git a/org.handhelds.familiar/packages/classpath/cp-tools/destdir.patch b/org.handhelds.familiar/packages/classpath/cp-tools/destdir.patch new file mode 100644 index 0000000..d4740e2 --- /dev/null +++ b/org.handhelds.familiar/packages/classpath/cp-tools/destdir.patch @@ -0,0 +1,15 @@ +--- cp-tools/Makefile.am.orig 2005-10-01 20:34:45.000000000 +0200 ++++ cp-tools/Makefile.am 2005-10-01 20:36:28.000000000 +0200 +@@ -187,9 +187,9 @@ + cp $(srcdir)/bin/serialver $(distdir)/bin/ + + install-data-hook: +- $(INSTALL) -d $(datadir)/java +- $(INSTALL) --mode 644 $(data_JARS) $(datadir)/java +- $(LN_S) -f $(datadir)/java/cptools-$(VERSION).jar $(datadir)/java/cptools.jar ++ $(INSTALL) -d $(DESTDIR)$(datadir)/java ++ $(INSTALL) --mode 644 $(data_JARS) $(DESTDIR)$(datadir)/java ++ $(LN_S) -f $(DESTDIR)$(datadir)/java/cptools-$(VERSION).jar $(DESTDIR)$(datadir)/java/cptools.jar + + test: tests/%.class $(srcdir)/src/test/%.java + $(JAVAC) -g -d tests $< diff --git a/org.handhelds.familiar/packages/classpath/cp-tools_0.00-cvs20020812.bb b/org.handhelds.familiar/packages/classpath/cp-tools_0.00-cvs20020812.bb new file mode 100644 index 0000000..92c48c7 --- /dev/null +++ b/org.handhelds.familiar/packages/classpath/cp-tools_0.00-cvs20020812.bb @@ -0,0 +1,55 @@ +# cp-tools OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +DESCRIPTION = "GNU Classpath tools (javah, javap, etc.)" +HOMEPAGE = "http://www.gnu.org/software/classpath/cp-tools/" +LICENSE = "GPLv2" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "utils" + +inherit java + +FIXEDCVSDATE = "${@bb.data.getVar('PV', d, 1).split('cvs')[-1]}" +SRC_URI = "cvs://anoncvs@savannah.gnu.org/cvsroot/classpath;module=cp-tools;method=ext;date=${FIXEDCVSDATE}" +S = "${WORKDIR}/cp-tools" + +# bypassing the original build system. only compiling pure java code. +do_configure () { + true +} + +do_compile () { + echo $JAVAC `find . -name '*.java' | grep -v tools/rmi` + $JAVAC -cp . `find . -name '*.java'` + echo $JAR cfm ../cp-tools.jar `find . -name '*.class'` + $JAR cfm ../cp-tools.jar `find . -name '*.class'` +} + +do_install () { + install -d ${D}${datadir} + install -d ${D}${datadir}/java + + install -m 0644 cp-tools.jar ${D}${datadir}/java/cp-tools-${PV}.jar + (cd ${D}${datadir}/java && ln -sf cp-tools-${PV}.jar cp-tools.jar) + + install -d ${D}${bindir} + for i in javah javap serialver; do + sed -e 's:java:java -cp ${datadir}/java/cp-tools.jar:' bin/$i > bin/$i-cp + install -m 0755 bin/$i-cp ${D}${bindir}/$i-cp + done +} + +pkg_portinst () { + for i in javah javap serialver; do + update-alternatives --install ${bindir}/$i $i ${bindir}/$i-cp 350 + done +} + +pkg_postrm_append () { + for i in javah javap serialver; do + update-alternatives --remove $i ${bindir}/$i-cp + done +} + diff --git a/org.handhelds.familiar/packages/classpath/cp-tools_0.00-cvs20050701.bb b/org.handhelds.familiar/packages/classpath/cp-tools_0.00-cvs20050701.bb new file mode 100644 index 0000000..4af1145 --- /dev/null +++ b/org.handhelds.familiar/packages/classpath/cp-tools_0.00-cvs20050701.bb @@ -0,0 +1,74 @@ +# cp-tools OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +DESCRIPTION = "GNU Classpath tools (javah, javap, etc.)" +HOMEPAGE = "http://www.gnu.org/software/classpath/cp-tools/" +LICENSE = "GPLv2" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "utils" + +inherit autotools java + +FIXEDCVSDATE = "${@bb.data.getVar('PV', d, 1).split('cvs')[-1]}" +SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/classpath;module=cp-tools;date=${FIXEDCVSDATE} \ + file://bytecodejar-workaround.patch;patch=1 \ + file://destdir.patch;patch=1 \ + ${GNU_MIRROR}/kawa/kawa-1.7.tar.gz" +S = "${WORKDIR}/cp-tools" + +export CLASSPATH = ".:${STAGING_DATADIR}/classpath/glibj.zip:${WORKDIR}/bytecode.jar" + +EXTRA_OECONF = "--disable-native --with-gnu-bytecode-jar=${WORKDIR}/bytecode.jar" + +FILES_${PN} += "${datadir}/java" + +do_configure () { + cd ${WORKDIR}/kawa-1.7 + javac gnu/bytecode/*.java + zip bytecode.jar gnu/bytecode/*.class || die + mv bytecode.jar .. + + cd ${S} + autotools_do_configure +} + +binprograms="currencygen \ + javah \ + javap \ + localegen \ + native2ascii \ + rmic \ + rmiregistry \ + serialver" + +do_install () { + install -d ${D}${datadir} + install -d ${D}${datadir}/java + + install -m 0644 cptools-0.00-cvs.jar ${D}${datadir}/java/cptools-${PV}.jar + (cd ${D}${datadir}/java && ln -sf cptools-${PV}.jar cptools-0.00-cvs.jar) + (cd ${D}${datadir}/java && ln -sf cptools-${PV}.jar cptools.jar) + + install -m 0644 ${WORKDIR}/bytecode.jar ${D}${datadir}/java/ + + install -d ${D}${bindir} + for i in ${binprograms}; do + sed -e 's,java,java -cp .:${datadir}/java/bytecode.jar:${datadir}/java/cptools.jar,' bin/$i > bin/$i-cp + install -m 0755 bin/$i-cp ${D}${bindir}/$i-cp + done +} + +pkg_postinst () { + for i in ${binprograms}; do + update-alternatives --install ${bindir}/$i $i ${bindir}/$i-cp 350 + done +} + +pkg_postrm_append () { + for i in ${binprograms}; do + update-alternatives --remove $i ${bindir}/$i-cp + done +} + diff --git a/org.handhelds.familiar/packages/classpath/files/jikes-classpath.sh b/org.handhelds.familiar/packages/classpath/files/jikes-classpath.sh new file mode 100644 index 0000000..b27f53c --- /dev/null +++ b/org.handhelds.familiar/packages/classpath/files/jikes-classpath.sh @@ -0,0 +1,11 @@ +#!/bin/sh -e + +if [ -r DATADIR/classpath/glibj.zip ]; then + jikes -bootclasspath DATADIR/classpath/glibj.zip "$@" +else + echo + echo "----------- ERROR -----------" + echo "Cannot find/read classpath classes. Please report." + echo + exit 1 +fi diff --git a/org.handhelds.familiar/packages/fastjar/fastjar-native_0.92+gcc3.4.4.bb b/org.handhelds.familiar/packages/fastjar/fastjar-native_0.92+gcc3.4.4.bb new file mode 100644 index 0000000..7f584b6 --- /dev/null +++ b/org.handhelds.familiar/packages/fastjar/fastjar-native_0.92+gcc3.4.4.bb @@ -0,0 +1,36 @@ +# fastjar-native OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +DESCRIPTION = "jar replacement written in C." +HOMEPAGE = "http://sourceforge.net/projects/fastjar/" +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "GPL" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" + +DEPENDS = "zlib" + +GCC_VER = "${@bb.data.getVar('PV',d,1).split('gcc')[1]}" +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.bz2" + +S = "${WORKDIR}/gcc-${GCC_VER}" + +inherit autotools native + +EXTRA_OECONF = "--with-system-zlib --with-fastjar" + +do_configure () { + gnu-configize || die "failure running gnu-configize" + oe_runconf +} + +do_compile() { + oe_runmake maybe-all-fastjar +} + +do_stage() { + install -d ${STAGING_BINDIR} + install -m 755 fastjar/jar ${STAGING_BINDIR}/fastjar + install -m 755 fastjar/grepjar ${STAGING_BINDIR} +} diff --git a/org.handhelds.familiar/packages/jamvm/jamvm-native_1.3.3.bb b/org.handhelds.familiar/packages/jamvm/jamvm-native_1.3.3.bb new file mode 100644 index 0000000..f972c9e --- /dev/null +++ b/org.handhelds.familiar/packages/jamvm/jamvm-native_1.3.3.bb @@ -0,0 +1,25 @@ +# jamvm-native OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +include jamvm_${PV}.bb +inherit native + +DEPENDS = "classpath-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz" + +prefix = "${STAGING_DIR}/${HOST_SYS}" +EXTRA_OECONF = "--with-classpath-install-dir=${STAGING_DIR}/${HOST_SYS}" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/jamvm" +S = "${WORKDIR}/jamvm-${PV}" + +do_stage() { + mkdir -p ${STAGING_BINDIR} + install -m 0755 src/jamvm ${STAGING_BINDIR}/ + + mkdir -p ${STAGING_DATADIR}/jamvm + install -m 0644 lib/inst_classes.zip ${STAGING_DATADIR}/jamvm/classes.zip +} + diff --git a/org.handhelds.familiar/packages/jamvm/jamvm-native_1.4.2.bb b/org.handhelds.familiar/packages/jamvm/jamvm-native_1.4.2.bb new file mode 100644 index 0000000..f972c9e --- /dev/null +++ b/org.handhelds.familiar/packages/jamvm/jamvm-native_1.4.2.bb @@ -0,0 +1,25 @@ +# jamvm-native OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +include jamvm_${PV}.bb +inherit native + +DEPENDS = "classpath-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz" + +prefix = "${STAGING_DIR}/${HOST_SYS}" +EXTRA_OECONF = "--with-classpath-install-dir=${STAGING_DIR}/${HOST_SYS}" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/jamvm" +S = "${WORKDIR}/jamvm-${PV}" + +do_stage() { + mkdir -p ${STAGING_BINDIR} + install -m 0755 src/jamvm ${STAGING_BINDIR}/ + + mkdir -p ${STAGING_DATADIR}/jamvm + install -m 0644 lib/inst_classes.zip ${STAGING_DATADIR}/jamvm/classes.zip +} + diff --git a/org.handhelds.familiar/packages/jamvm/jamvm/debian-jni.patch b/org.handhelds.familiar/packages/jamvm/jamvm/debian-jni.patch new file mode 100644 index 0000000..ac39cb3 --- /dev/null +++ b/org.handhelds.familiar/packages/jamvm/jamvm/debian-jni.patch @@ -0,0 +1,19 @@ +--- jamvm/src/dll.c.orig 2004-09-09 15:48:45.000000000 +0000 ++++ jamvm/src/dll.c 2004-09-09 15:50:32.000000000 +0000 +@@ -189,6 +189,16 @@ + #ifndef NO_JNI + /* Init hash table, and create lock */ + initHashTable(hash_table, HASHTABSZE, TRUE); ++ ++ /* XXX: Add Debian JNI directory and /usr/lib. */ ++ char* path = getenv("LD_LIBRARY_PATH"); ++ ++ if (path != NULL) ++ path = strcat(path, ":/usr/lib:/usr/lib/jni"); ++ else ++ path = "/usr/lib:/usr/lib/jni"; ++ ++ setenv("LD_LIBRARY_PATH", path, 1); + #endif + } + diff --git a/org.handhelds.familiar/packages/jamvm/jamvm_1.3.3.bb b/org.handhelds.familiar/packages/jamvm/jamvm_1.3.3.bb index 2e5d4a4..cb7590a 100644 --- a/org.handhelds.familiar/packages/jamvm/jamvm_1.3.3.bb +++ b/org.handhelds.familiar/packages/jamvm/jamvm_1.3.3.bb @@ -1,15 +1,21 @@ +# jamvm OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." HOMEPAGE = "http://jamvm.sourceforge.net/" LICENSE = "GPL" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "interpreters" +PR = "r1" DEPENDS = "zlib classpath" RDEPENDS = "classpath (>= 0.18) classpath-common (>= 0.18)" -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ - file://jamvm-1.3.1-size-defaults.patch;patch=1" +SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ + file://jamvm-1.3.1-size-defaults.patch;patch=1 \ + file://debian-jni.patch;patch=1" inherit autotools update-alternatives diff --git a/org.handhelds.familiar/packages/jamvm/jamvm_1.4.2.bb b/org.handhelds.familiar/packages/jamvm/jamvm_1.4.2.bb index d8024e8..7897af1 100644 --- a/org.handhelds.familiar/packages/jamvm/jamvm_1.4.2.bb +++ b/org.handhelds.familiar/packages/jamvm/jamvm_1.4.2.bb @@ -1,15 +1,21 @@ +# jamvm OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." HOMEPAGE = "http://jamvm.sourceforge.net/" LICENSE = "GPL" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "interpreters" +PR = "r1" DEPENDS = "zlib classpath" RDEPENDS = "classpath (>= 0.20) classpath-common (>= 0.20)" -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ - file://jamvm-1.3.1-size-defaults.patch;patch=1" +SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ + file://jamvm-1.3.1-size-defaults.patch;patch=1 \ + file://debian-jni.patch;patch=1" # This uses 32 bit arm, so force the instruction set to arm, not thumb ARM_INSTRUCTION_SET = "arm" diff --git a/org.handhelds.familiar/packages/java-gnome/libglade-java_2.10.1.bb b/org.handhelds.familiar/packages/java-gnome/libglade-java_2.10.1.bb new file mode 100644 index 0000000..53bbfff --- /dev/null +++ b/org.handhelds.familiar/packages/java-gnome/libglade-java_2.10.1.bb @@ -0,0 +1,27 @@ +# libglade-java OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +DESCRIPTION = "Glade Java bindings" +HOMEPAGE = "http://java-gnome.sf.net" +LICENSE = "LGPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +PR = "r1" + +DEPENDS = "libglade libgtk-java" +RDEPENDS_${PN} = "${PN}-common (>= ${PV})" + +inherit gnome java + +EXTRA_OECONF = "--without-javadocs --without-gcj-compile --without-gnome" + +EXTRA_AUTORECONF += "-I ${STAGING_DATADIR}/aclocal/jg-macros" + +PACKAGES =+ "${PN}-common ${PN}-examples" + +FILES_${PN} = "${libdir}/lib*so" +FILES_${PN}-common = "${datadir}/java" +FILES_${PN}-dev += "${datadir}/${PN}/macros" +FILES_${PN}-examples = "${datadir}/doc/${PN}/examples" + diff --git a/org.handhelds.familiar/packages/java-gnome/libgtk-java/pc.patch b/org.handhelds.familiar/packages/java-gnome/libgtk-java/pc.patch new file mode 100644 index 0000000..6087e62 --- /dev/null +++ b/org.handhelds.familiar/packages/java-gnome/libgtk-java/pc.patch @@ -0,0 +1,12 @@ +--- libgtk-java-2.6.2.orig/gtk2-java.pc.in 2005-10-20 23:33:20.000000000 +0200 ++++ libgtk-java-2.6.2/gtk2-java.pc.in 2005-10-20 23:35:58.000000000 +0200 +@@ -10,6 +10,6 @@ + api_version=@gtkapiversion@
+ classpath=@INSTALLED_CLASSPATH@
+ macro_dir=@INSTALLED_MACRO_DIR@
+-jnilibs=-L@libdir@ -lgtkjni
+-Libs: -L@libdir@ -lgtkjava
+-Cflags: -I@includedir@/libgtk-java
++jnilibs=-L${libdir} -lgtkjni
++Libs: -L${libdir} -lgtkjava
++Cflags: -I${includedir}/libgtk-java
diff --git a/org.handhelds.familiar/packages/java-gnome/libgtk-java/textbuffer.patch b/org.handhelds.familiar/packages/java-gnome/libgtk-java/textbuffer.patch new file mode 100644 index 0000000..0db37f0 --- /dev/null +++ b/org.handhelds.familiar/packages/java-gnome/libgtk-java/textbuffer.patch @@ -0,0 +1,11 @@ +--- libgtk-java-2.6.2/src/jni/org_gnu_gtk_TextBuffer.c.orig 2005-09-30 22:50:27.000000000 +0200 ++++ libgtk-java-2.6.2/src/jni/org_gnu_gtk_TextBuffer.c 2005-09-30 23:55:30.000000000 +0200 +@@ -120,7 +120,7 @@ + const char *utf = (*env)->GetStringUTFChars(env, text, NULL); + jint len = (*env)->GetStringUTFLength(env, text); + gtk_text_buffer_insert_at_cursor (buffer_g, +- (gchar*)utf, (gint32)len); ++ (gchar*)utf, (gint32)len - 1); + (*env)->ReleaseStringUTFChars(env, text, utf); + } + diff --git a/org.handhelds.familiar/packages/java-gnome/libgtk-java_2.6.2.bb b/org.handhelds.familiar/packages/java-gnome/libgtk-java_2.6.2.bb new file mode 100644 index 0000000..59a5a55 --- /dev/null +++ b/org.handhelds.familiar/packages/java-gnome/libgtk-java_2.6.2.bb @@ -0,0 +1,43 @@ +# libgtk-java OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +DESCRIPTION = "Gtk+ Java bindings" +HOMEPAGE = "http://java-gnome.sf.net" +LICENSE = "LGPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +PR = "r2" + +DEPENDS = "glib-2.0 gtk+ libart-lgpl pango" +RDEPENDS_${PN} = "${PN}-common (>= ${PV})" + +inherit gnome java pkgconfig + +SRC_URI += "${DEBIAN_MIRROR}/main/libg/${PN}/${PN}_${PV}-1.diff.gz;patch=1 \ + file://textbuffer.patch;patch=1 \ + file://pc.patch;patch=1" + +EXTRA_OECONF = "--without-javadocs --without-gcj-compile" + +PACKAGES =+ "${PN}-common ${PN}-examples" + +FILES_${PN} = "${libdir}/lib*so" +FILES_${PN}-common = "${datadir}/java" +FILES_${PN}-dev += "${datadir}/${PN}/macros" +FILES_${PN}-examples = "${datadir}/doc/${PN}/examples" + +do_stage () { + autotools_stage_all + + install -d ${STAGING_DATADIR}/aclocal/jg-macros + for i in macros/*; do + install -m 0644 $i ${STAGING_DATADIR}/aclocal/jg-macros/ + done + + mkdir -p ${STAGING_DATADIR}/java + for i in *.jar; do + install -m 0644 $i ${STAGING_DATADIR}/java/`basename $i .jar`-${PV}.jar + (cd ${STAGING_DATADIR}/java && ln -sf `basename $i .jar`-${PV}.jar $i) + done +} diff --git a/org.handhelds.familiar/packages/java-wrappers/files/jar b/org.handhelds.familiar/packages/java-wrappers/files/jar new file mode 100644 index 0000000..f6e0966 --- /dev/null +++ b/org.handhelds.familiar/packages/java-wrappers/files/jar @@ -0,0 +1,12 @@ +#!/bin/sh + +# jar OE wrapper script +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +if [ -z ${JAR} ]; then + echo 'Error: $JAR not set.' + exit 1 +fi + +exec ${JAR} $@ diff --git a/org.handhelds.familiar/packages/java-wrappers/files/java b/org.handhelds.familiar/packages/java-wrappers/files/java new file mode 100644 index 0000000..9d64b49 --- /dev/null +++ b/org.handhelds.familiar/packages/java-wrappers/files/java @@ -0,0 +1,12 @@ +#!/bin/sh + +# java OE wrapper script +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +if [ -z ${JAVA} ]; then + echo 'Error: $JAVA not set.' + exit 1 +fi + +exec ${JAVA} $@ diff --git a/org.handhelds.familiar/packages/java-wrappers/files/javac b/org.handhelds.familiar/packages/java-wrappers/files/javac new file mode 100644 index 0000000..43db512 --- /dev/null +++ b/org.handhelds.familiar/packages/java-wrappers/files/javac @@ -0,0 +1,12 @@ +#!/bin/sh + +# javac OE wrapper script +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +if [ -z ${JAVAC} ]; then + echo 'Error: $JAVAC not set.' + exit 1 +fi + +exec ${JAVAC} $@ diff --git a/org.handhelds.familiar/packages/java-wrappers/files/javadoc b/org.handhelds.familiar/packages/java-wrappers/files/javadoc new file mode 100644 index 0000000..7d0e20d --- /dev/null +++ b/org.handhelds.familiar/packages/java-wrappers/files/javadoc @@ -0,0 +1,12 @@ +#!/bin/sh + +# javadoc OE wrapper script +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +if [ -z ${JAVADOC} ]; then + echo 'Error: $JAVADOC not set.' + exit 1 +fi + +exec ${JAVADOC} $@ diff --git a/org.handhelds.familiar/packages/java-wrappers/files/javah b/org.handhelds.familiar/packages/java-wrappers/files/javah new file mode 100644 index 0000000..046bee8 --- /dev/null +++ b/org.handhelds.familiar/packages/java-wrappers/files/javah @@ -0,0 +1,12 @@ +#!/bin/sh + +# javah OE wrapper script +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +if [ -z ${JAVAH} ]; then + echo 'Error: $JAVAH not set.' + exit 1 +fi + +exec ${JAVAH} $@ diff --git a/org.handhelds.familiar/packages/java-wrappers/files/javap b/org.handhelds.familiar/packages/java-wrappers/files/javap new file mode 100644 index 0000000..d87991e --- /dev/null +++ b/org.handhelds.familiar/packages/java-wrappers/files/javap @@ -0,0 +1,12 @@ +#!/bin/sh + +# javap OE wrapper script +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +if [ -z ${JAVAP} ]; then + echo 'Error: $JAVAP not set.' + exit 1 +fi + +exec ${JAVAP} $@ diff --git a/org.handhelds.familiar/packages/java-wrappers/java-wrappers-native_0.1.bb b/org.handhelds.familiar/packages/java-wrappers/java-wrappers-native_0.1.bb new file mode 100644 index 0000000..23f474f --- /dev/null +++ b/org.handhelds.familiar/packages/java-wrappers/java-wrappers-native_0.1.bb @@ -0,0 +1,23 @@ +# java-wrappers-native OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +DESCRIPTION = "Wrapper scripts to select Java related tools by environment variables" +LICENSE = "GPL" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" + +inherit native + +SRC_URI = "file://java \ + file://javac \ + file://javah \ + file://javap \ + file://jar \ + file://javadoc" + +do_stage () { + install -d ${STAGING_BINDIR} + for i in java javac javah javap jar javadoc; do + install -m 0755 ${WORKDIR}/$i ${STAGING_BINDIR}/ + done +} diff --git a/org.handhelds.familiar/packages/javasqlite/files/buildsystem-fixes.patch b/org.handhelds.familiar/packages/javasqlite/files/buildsystem-fixes.patch new file mode 100644 index 0000000..40cd272 --- /dev/null +++ b/org.handhelds.familiar/packages/javasqlite/files/buildsystem-fixes.patch @@ -0,0 +1,307 @@ +--- javasqlite-20050608.orig/configure.in 2005-05-16 12:03:26.000000000 +0200 ++++ javasqlite-20050608/configure.in 2005-10-01 22:08:57.000000000 +0200 +@@ -1,5 +1,5 @@ + AC_INIT(native/sqlite_jni.c) +-AM_PROG_LIBTOOL ++AC_PROG_LIBTOOL + AC_PROG_INSTALL + CC=${CC:-cc} + AC_SUBST(CC) +@@ -27,59 +27,11 @@ + ########## + # Find SQLite header file and library + # +-AC_ARG_WITH(sqlite, [ --with-sqlite=DIR use SQLite header/lib from DIR], +- SQLITE_DIR=$withval) +-if test ! -n "$SQLITE_DIR" -a -d "$SQLITE_DIR" ; then +- AC_MSG_WARN([SQLite2 directory $SQLITE_DIR does not exist]) +-fi +- +-if test -z "$SQLITE_DIR" ; then +- SQLITE_DIR="../sqlite /usr /usr/local /opt" +-fi +- +-AC_MSG_CHECKING([for SQLite header and library]) +-SQLITE_INC=UNKNOWN +-SQLITE_LIB=UNKNOWN +-for i in $SQLITE_DIR ; do +- if test -r $i/sqlite.h ; then +- if test -r $i/libsqlite.la ; then +- SQLITE_INC="$i" +- SQLITE_LIB="$i/libsqlite.la" +- SQLITE_LIBDIR="$i" +- break +- elif test -r $i/libsqlite.a ; then +- SQLITE_INC="$i" +- SQLITE_LIB="$i/libsqlite.a" +- SQLITE_LIBDIR="$i" +- break +- fi +- elif test -r $i/include/sqlite.h ; then +- if test -r $i/lib/libsqlite.la ; then +- SQLITE_INC="$i/include" +- SQLITE_LIB="$i/lib/libsqlite.la" +- SQLITE_LIBDIR="$i/lib" +- break +- elif test -r $i/lib/libsqlite.a ; then +- SQLITE_INC="$i/include" +- SQLITE_LIB="$i/lib/libsqlite.a" +- SQLITE_LIBDIR="$i/lib" +- break +- fi +- fi +-done +-if test "$SQLITE_INC" = "UNKNOWN" -o "$SQLITE_LIB" = "UNKNOWN" ; then +- AC_MSG_RESULT(no) +- AC_MSG_WARN(SQLite2 header files and/or library not found) +- SQLITE_INC="" +- SQLITE_LIB="" +- HAVE_SQLITE2=0 +-else +- SQLITE_INC="-I${SQLITE_INC}" +- HAVE_SQLITE2=1 +- AC_MSG_RESULT(yes) +-fi +-AC_SUBST(SQLITE_INC) +-AC_SUBST(SQLITE_LIB) ++SQLITE_MODULES="sqlite >= 2.8.15" ++PKG_CHECK_MODULES(SQLITE, $SQLITE_MODULES) ++AC_SUBST(SQLITE_CFLAGS) ++AC_SUBST(SQLITE_LIBS) ++HAVE_SQLITE2=1 + AC_SUBST(HAVE_SQLITE2) + + ########## +@@ -87,9 +39,9 @@ + # + + saved_CFLAGS=$CFLAGS +-CFLAGS="$CFLAGS $SQLITE_INC" ++CFLAGS="$CFLAGS $SQLITE_CFLAGS" + saved_LIBS=$LIBS +-LIBS="$LIBS -L$SQLITE_LIBDIR" ++LIBS="$LIBS $SQLITE_LIBS" + AC_CHECK_LIB(sqlite,sqlite_function_type, + HAVE_SQLITE_FUNCTION_TYPE=1,HAVE_SQLITE_FUNCTION_TYPE=0) + AC_CHECK_LIB(sqlite,sqlite_open_aux_file, +@@ -114,60 +66,11 @@ + ########## + # Find SQLite3 header file and library + # +-AC_ARG_WITH(sqlite3, +- [ --with-sqlite3=DIR use SQLite3 header/lib from DIR], +- SQLITE3_DIR=$withval) +-if test ! -n "$SQLITE3_DIR" -a -d "$SQLITE3_DIR" ; then +- AC_MSG_WARN([SQLite3 directory $SQLITE3_DIR does not exist]) +-fi +- +-if test -z "$SQLITE3_DIR" ; then +- SQLITE3_DIR="../sqlite /usr /usr/local /opt" +-fi +- +-AC_MSG_CHECKING([for SQLite3 header and library]) +-SQLITE3_INC=UNKNOWN +-SQLITE3_LIB=UNKNOWN +-for i in $SQLITE3_DIR ; do +- if test -r $i/sqlite3.h ; then +- if test -r $i/libsqlite3.la ; then +- SQLITE3_INC="$i" +- SQLITE3_LIB="$i/libsqlite3.la" +- SQLITE3_LIBDIR="$i" +- break +- elif test -r $i/libsqlite3.a ; then +- SQLITE3_INC="$i" +- SQLITE3_LIB="$i/libsqlite3.a" +- SQLITE3_LIBDIR="$i" +- break +- fi +- elif test -r $i/include/sqlite3.h ; then +- if test -r $i/lib/libsqlite3.la ; then +- SQLITE3_INC="$i/include" +- SQLITE3_LIB="$i/lib/libsqlite3.la" +- SQLITE3_LIBDIR="$i/lib" +- break +- elif test -r $i/lib/libsqlite3.a ; then +- SQLITE3_INC="$i/include" +- SQLITE3_LIB="$i/lib/libsqlite3.a" +- SQLITE3_LIBDIR="$i/lib" +- break +- fi +- fi +-done +-if test "$SQLITE3_INC" = "UNKNOWN" -o "$SQLITE3_LIB" = "UNKNOWN" ; then +- AC_MSG_RESULT(no) +- AC_MSG_WARN(SQLite3 header files and/or library not found) +- SQLITE3_INC="" +- SQLITE3_LIB="" +- HAVE_SQLITE3=0 +-else +- SQLITE3_INC="-I${SQLITE3_INC}" +- HAVE_SQLITE3=1 +- AC_MSG_RESULT(yes) +-fi +-AC_SUBST(SQLITE3_INC) +-AC_SUBST(SQLITE3_LIB) ++SQLITE3_CFLAGS="" ++SQLITE3_LIBS="" ++AC_SUBST(SQLITE3_CFLAGS) ++AC_SUBST(SQLITE3_LIBS) ++HAVE_SQLITE3=0 + AC_SUBST(HAVE_SQLITE3) + + ########## +@@ -176,7 +79,7 @@ + + AC_MSG_CHECKING([for usable SQLite]) + if test "$HAVE_SQLITE2" != "1" -a "$HAVE_SQLITE3" != "1" ; then +- AC_MSG_ERROR([No SQLite found, please try --with-sqlite/--with-sqlite3]) ++ AC_MSG_ERROR([No SQLite found]) + fi + AC_MSG_RESULT(yes) + +@@ -184,58 +87,20 @@ + # Find JRE things + # + +-AC_ARG_WITH(jdk, [ --with-jdk=DIR use Java top directory DIR], +- JAVA_HOME=$withval) +-if test -z "$JAVA_HOME" ; then +- JAVA_HOME=`which java` +- JAVA_HOME=`dirname $JAVA_HOME` +- JAVA_HOME=`dirname $JAVA_HOME` +-fi +-if test ! -d "$JAVA_HOME" ; then +- AC_MSG_ERROR([JAVA_HOME directory not found, please use --with-jdk=DIR]) +-fi +- +-if test -n "$JAVA_HOME" ; then +- JAVA_RUN=$JAVA_HOME/bin/java +- JAVAC=$JAVA_HOME/bin/javac +- JAVAH="$JAVA_HOME/bin/javah -jni" +- JAR=$JAVA_HOME/bin/jar +- JAVADOC=$JAVA_HOME/bin/javadoc +-else +- JAVA_RUN=`which java` +- JAVAC=`which javac` +- JAVAH="`which javah` -jni" +- JAR=`which jar` +- JAVADOC=`which javadoc` +- JAVA_HOME=`dirname $JAVAC` +- JAVA_HOME=`dirname $JAVA_HOME` +-fi ++AC_PATH_PROG(JAVA, java) ++AC_PATH_PROG(JAVAC, javac) ++AC_PATH_PROG(JAVAH, javah) ++AC_PATH_PROG(JAR, jar) ++AC_PATH_PROG(JAVADOC, javadoc) + +-AC_SUBST(JAVAH) +-AC_SUBST(JAVAC) +-AC_SUBST(JAR) +-AC_SUBST(JAVADOC) +- +-# Set up the JNI include directory specification +-case $build_os in +- solaris* ) +- JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/solaris" +- ;; +- linux* ) +- JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" +- ;; +- *) +- JNIINCLUDE="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${build_os}" +- AC_MSG_WARN([setting generic JNI include file directives!]) +- ;; +-esac ++JNIINCLUDE="" + AC_MSG_RESULT([setting JNI include file directives: $JNIINCLUDE]) + + # Figure out JDK version +-JDBCVER=JDBC2 +-$JAVA_RUN -version 2>&1 | grep 'version "1.1' >/dev/null && JDBCVER=JDBC1 +-$JAVA_RUN -version 2>&1 | grep 'version "1.4' >/dev/null && JDBCVER=JDBC2x +-$JAVA_RUN -version 2>&1 | grep 'version "1.5' >/dev/null && JDBCVER=JDBC2y ++JDBCVER=JDBC2x ++#$JAVA -version 2>&1 | grep -q 'version "1.1' && JDBCVER=JDBC1 ++#$JAVA -version 2>&1 | grep -q 'version "1.4' && JDBCVER=JDBC2x ++#$JAVA -version 2>&1 | grep -q 'version "1.5' && JDBCVER=JDBC2y + AC_MSG_RESULT([using JDBC driver from $JDBCVER directory]) + + if test "$JDBCVER" = "JDBC2y" ; then + +--- javasqlite-20050608.orig/Makefile.in 2005-05-15 19:35:57.000000000 +0200 ++++ javasqlite-20050608/Makefile.in 2005-10-01 22:17:11.000000000 +0200 +@@ -1,12 +1,13 @@ + # Makefile template for SQLite Java wrapper + ++top_builddir = . + prefix = @prefix@ + CC = @CC@ +-LIBTOOL = ./libtool +-SQLITE_INC = @SQLITE_INC@ +-SQLITE_LIB = @SQLITE_LIB@ +-SQLITE3_INC = @SQLITE3_INC@ +-SQLITE3_LIB = @SQLITE3_LIB@ ++LIBTOOL = @LIBTOOL@ ++SQLITE_INC = @SQLITE_CFLAGS@ ++SQLITE_LIB = @SQLITE_LIBS@ ++SQLITE3_INC = @SQLITE3_CFLAGS@ ++SQLITE3_LIB = @SQLITE3_LIBS@ + JAVAH = @JAVAH@ + JAVAC = @JAVAC@ + JAVADOC = @JAVADOC@ +@@ -16,15 +17,15 @@ + JAR_DIR = @JAR_DIR@ + NATIVE_LIB_DIR = @NATIVE_LIB_DIR@ + +-CFLAGS= -Wall -O -fPIC $(JNIINCLUDE) $(SQLITE_INC) $(SQLITE3_INC) \ +- -DHAVE_SQLITE2=@HAVE_SQLITE2@ -DHAVE_SQLITE3=@HAVE_SQLITE3@ \ +- -DHAVE_SQLITE_FUNCTION_TYPE=@HAVE_SQLITE_FUNCTION_TYPE@ \ +- -DHAVE_SQLITE_OPEN_AUX_FILE=@HAVE_SQLITE_OPEN_AUX_FILE@ \ +- -DHAVE_SQLITE_SET_AUTHORIZER=@HAVE_SQLITE_SET_AUTHORIZER@ \ +- -DHAVE_SQLITE_TRACE=@HAVE_SQLITE_TRACE@ \ +- -DHAVE_SQLITE_COMPILE=@HAVE_SQLITE_COMPILE@ \ +- -DHAVE_SQLITE_PROGRESS_HANDLER=@HAVE_SQLITE_PROGRESS_HANDLER@ +-LIBS= @SQLITE_LIB@ @SQLITE3_LIB@ ++PKG_CFLAGS = -Wall -O -fPIC $(JNIINCLUDE) $(SQLITE_INC) $(SQLITE3_INC) \ ++ -DHAVE_SQLITE2=@HAVE_SQLITE2@ -DHAVE_SQLITE3=@HAVE_SQLITE3@ \ ++ -DHAVE_SQLITE_FUNCTION_TYPE=@HAVE_SQLITE_FUNCTION_TYPE@ \ ++ -DHAVE_SQLITE_OPEN_AUX_FILE=@HAVE_SQLITE_OPEN_AUX_FILE@ \ ++ -DHAVE_SQLITE_SET_AUTHORIZER=@HAVE_SQLITE_SET_AUTHORIZER@ \ ++ -DHAVE_SQLITE_TRACE=@HAVE_SQLITE_TRACE@ \ ++ -DHAVE_SQLITE_COMPILE=@HAVE_SQLITE_COMPILE@ \ ++ -DHAVE_SQLITE_PROGRESS_HANDLER=@HAVE_SQLITE_PROGRESS_HANDLER@ ++LIBS= $(SQLITE_LIB) $(SQLITE3_LIB) + + # Add new suffixes + .SUFFIXES: .java .class .lo .la .jar +@@ -92,14 +93,14 @@ + SQLite.FunctionContext + + sqlite_jni.lo: native/sqlite_jni.h native/sqlite_jni.c +- $(LIBTOOL) $(CC) -c $(CFLAGS) native/sqlite_jni.c ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $(PKG_CFLAGS) native/sqlite_jni.c + + libsqlite_jni.la: sqlite_jni.lo +- $(LIBTOOL) $(CC) -o libsqlite_jni.la sqlite_jni.lo \ ++ $(LIBTOOL) --tag=CC --mode=link $(CC) -o libsqlite_jni.la sqlite_jni.lo \ + -rpath $(NATIVE_LIB_DIR) $(LIBS) + + native/mkconst: native/mkconst.c +- $(LIBTOOL) $(CC) $(SQLITE_INC) $(SQLITE3_INC) \ ++ $(BUILD_CC) $(SQLITE_INC) $(SQLITE3_INC) \ + -DHAVE_SQLITE2=@HAVE_SQLITE2@ -DHAVE_SQLITE3=@HAVE_SQLITE3@ \ + -o native/mkconst native/mkconst.c $(LIBS) + +@@ -126,7 +127,7 @@ + $(INSTALL) -m 644 test.java doc/test.java + + install: +- $(INSTALL) -d -m 755 $(JAR_DIR) +- $(INSTALL) -m 644 sqlite.jar $(JAR_DIR) +- $(INSTALL) -d -m 755 $(NATIVE_LIB_DIR) +- $(LIBTOOL) $(INSTALL) libsqlite_jni.la $(NATIVE_LIB_DIR) ++ $(INSTALL) -d -m 755 $(DESTDIR)$(JAR_DIR) ++ $(INSTALL) -m 644 sqlite.jar $(DESTDIR)$(JAR_DIR) ++ $(INSTALL) -d -m 755 $(DESTDIR)$(NATIVE_LIB_DIR) ++ $(LIBTOOL) --mode=install $(INSTALL) libsqlite_jni.la $(DESTDIR)$(NATIVE_LIB_DIR) diff --git a/org.handhelds.familiar/packages/javasqlite/javasqlite_20050608.bb b/org.handhelds.familiar/packages/javasqlite/javasqlite_20050608.bb new file mode 100644 index 0000000..1f66f4b --- /dev/null +++ b/org.handhelds.familiar/packages/javasqlite/javasqlite_20050608.bb @@ -0,0 +1,24 @@ +# javasqlite OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +DESCRIPTION = "SQLite Java Wrapper/JDBC Driver" +HOMEPAGE = "http://www.ch-werner.de/javasqlite/" +LICENSE = "unknown" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "libs" +PR = "r1" + +DEPENDS = "sqlite" + +SRC_URI = "http://www.ch-werner.de/javasqlite/javasqlite-${PV}.tar.gz \ + file://buildsystem-fixes.patch;patch=1" + +inherit autotools java + +EXTRA_OECONF = "--with-sqlite=${STAGING_INCDIR} \ + --with-sqlite3=${STAGING_INCDIR}" + +FILES_${PN} += "${datadir}/java ${libdir}/*.so" + diff --git a/org.handhelds.familiar/packages/libfakekey/libfakekey_0.1.bb b/org.handhelds.familiar/packages/libfakekey/libfakekey_0.1.bb new file mode 100644 index 0000000..6883d12 --- /dev/null +++ b/org.handhelds.familiar/packages/libfakekey/libfakekey_0.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "library for converting characters to X key-presses" +LICENSE = "GPL" +DEPENDS = "xtst" +SECTION = "x11/wm" + +SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${@'.'.join(bb.data.getVar('PV', d, 1).split('.')[:2])}/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig gettext + +FILES_${PN} = "${libdir} \ + ${datadir}/applications \ + ${datadir}/pixmaps" + +do_stage () { + install -d ${STAGING_INCDIR}/fakekey + install -m 0644 ${S}/fakekey/fakekey.h ${STAGING_INCDIR}/fakekey + oe_libinstall -so -C src libfakekey ${STAGING_LIBDIR} +} + diff --git a/org.handhelds.familiar/packages/matchbox-keyboard/files/fontsize.patch b/org.handhelds.familiar/packages/matchbox-keyboard/files/fontsize.patch new file mode 100644 index 0000000..f57aff2 --- /dev/null +++ b/org.handhelds.familiar/packages/matchbox-keyboard/files/fontsize.patch @@ -0,0 +1,11 @@ +--- matchbox-keyboard-0.1/src/matchbox-keyboard.c.orig 2006-11-04 00:41:52.000000000 +0100 ++++ matchbox-keyboard-0.1/src/matchbox-keyboard.c 2006-11-04 00:29:25.000000000 +0100 +@@ -77,7 +77,7 @@ + kb->key_pad = 0; + kb->col_spacing = 0; + kb->row_spacing = 0; +- kb->font_pt_size = 8; ++ kb->font_pt_size = 6; + } + + if (!mb_kbd_config_load(kb, variant)) diff --git a/org.handhelds.familiar/packages/matchbox-keyboard/matchbox-keyboard_0.1.bb b/org.handhelds.familiar/packages/matchbox-keyboard/matchbox-keyboard_0.1.bb new file mode 100644 index 0000000..2cf98e4 --- /dev/null +++ b/org.handhelds.familiar/packages/matchbox-keyboard/matchbox-keyboard_0.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Matchbox keyboard" +LICENSE = "GPL" +DEPENDS = "libfakekey expat libxft" +SECTION = "x11/wm" + +SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${@'.'.join(bb.data.getVar('PV', d, 1).split('.')[:2])}/${PN}-${PV}.tar.bz2 \ + file://fontsize.patch;patch=1" + +inherit autotools pkgconfig gettext + +FILES_${PN} = "${bindir} \ + ${datadir}/applications \ + ${datadir}/pixmaps \ + ${datadir}/matchbox-keyboard" + diff --git a/org.handhelds.familiar/packages/swt/no-native-no-files-cruft.patch b/org.handhelds.familiar/packages/swt/no-native-no-files-cruft.patch new file mode 100644 index 0000000..57a5f38 --- /dev/null +++ b/org.handhelds.familiar/packages/swt/no-native-no-files-cruft.patch @@ -0,0 +1,65 @@ +--- swt-gtk-3.1.orig.orig/Makefile 2005-10-02 19:17:47.000000000 +0200 ++++ swt-gtk-3.1.orig/Makefile 2005-10-02 19:27:30.000000000 +0200 +@@ -1,4 +1,4 @@ +-TARGETS=swt.jar libswt.so libswt-pi.so libswt-mozilla.so ++TARGETS=swt.jar + CLEANFILES=java-stamp *.jar *.o *.so.* `find org -name *.class` + + RELEASE=3.1 +@@ -7,22 +7,12 @@ + AGE=1 + SOVERSION=$(CURRENT).$(REVISION).$(AGE) + +-GCJ=gcj +-GCJLD=gcj + JAR=fastjar + JAVAC=jikes-classpath -nowarn +-LDCONFIG=/sbin/ldconfig + LN_S=ln -s + RM=rm -f + +-GCJFLAGS=-fPIC -fjni +-GCJLDFLAGS=-shared +- +-COMPILE=$(GCJ) $(GCJFLAGS) +-LINK=$(GCJLD) $(GCJLDFLAGS) -o $@ +- + all: $(TARGETS) +- $(LDCONFIG) -n . + + clean distclean: + $(RM) $(CLEANFILES) $(TARGETS) +@@ -31,33 +21,11 @@ + + java-stamp: + for i in `find org -name *.java`; do \ +- echo " GCJ $$i"; \ +- $(COMPILE) -c $$i; \ + echo " JAVAC $$i"; \ + $(JAVAC) $$i; \ + done + touch $@ + +-swt.files: +- find org -type f \ +- -not -path org/eclipse/swt/internal\* \ +- -not -path org/eclipse/swt/browser\* | sort > $@ +- +-swt-mozilla.files: +- find org/eclipse/swt/browser org/eclipse/swt/internal/mozilla \ +- -type f | sort > $@ +- +-swt-pi.files: +- find org/eclipse/swt/internal -type f \ +- -not -path org/eclipse/swt/internal/mozilla\* | sort > $@ +- +-lib%.so.$(SOVERSION): %.files java-stamp +- $(LINK) -Wl,-soname=lib$*.so.$(CURRENT) \ +- `sed -nre '/\.java$$/{s~.*/(.*)\.java$$~\1.o~;p}' $<` +- +-%.so: %.so.$(SOVERSION) +- $(LN_S) -f $< $@ +- + %-gtk-$(RELEASE).jar: java-stamp + $(JAR) cf $@ `find . -name *.class` + diff --git a/org.handhelds.familiar/packages/swt/swt-gtk_3.1.bb b/org.handhelds.familiar/packages/swt/swt-gtk_3.1.bb new file mode 100644 index 0000000..35a114d --- /dev/null +++ b/org.handhelds.familiar/packages/swt/swt-gtk_3.1.bb @@ -0,0 +1,37 @@ +# swt-gtk OE build file +# Copyright (C) 2006, Rene Wagner. All Rights Reserved +# Released under the MIT license (see org.handhelds.familiar/COPYING.MIT) + +DESCRIPTION = "The Standard Widget Toolkit" +HOMEPAGE = "http://www.eclipse.org/swt/" +LICENSE = "CPL/MPL/LGPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "libs" + +DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst" + +SRC_URI = "${DEBIAN_MIRROR}/main/s/swt-gtk/swt-gtk_3.1.orig.tar.gz \ + ${DEBIAN_MIRROR}/main/s/swt-gtk/swt-gtk_3.1-2.diff.gz;patch=1 \ + file://no-native-no-files-cruft.patch;patch=1" + +inherit autotools java + +S = "${WORKDIR}/swt-gtk-${PV}.orig" + +FILES_${PN} += "${datadir}/java ${libdir}/*.so" + +do_compile () { + oe_runmake + oe_runmake -f make_linux.mak make_swt make_atk +} + +do_install () { + install -d ${D}${datadir}/java + install -m 0644 swt-gtk-*.jar ${D}${datadir}/java/ + (cd ${D}${datadir}/java/ && ln -sf swt-gtk-*.jar swt.jar) + + for i in *.so; do + install -D -m 0755 $i ${D}${libdir}/$i + done +} |