diff options
27 files changed, 423 insertions, 25 deletions
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index 1d40bbac56..d32ea7058c 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -13,8 +13,12 @@ DISTRO_TYPE = "debug" FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" + base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ + ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \ + updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \ + locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \ + locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \ + locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de" #SRCDATE = 20050331 #SRCDATE = "now" @@ -41,9 +45,9 @@ PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15" # The CSL compiler is unusable because # 1) certain programs stop to compile # 2) more programs segfault -PREFERRED_VERSION_gcc ?= "3.4.4" -PREFERRED_VERSION_gcc-cross ?= "3.4.4" -PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" +#PREFERRED_VERSION_gcc ?= "3.4.4" +#PREFERRED_VERSION_gcc-cross ?= "3.4.4" +#PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" # # Opie diff --git a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh index 63e984d7f6..bbb5e12211 100644 --- a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh +++ b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh @@ -26,7 +26,7 @@ str() { } convert_desktop_to_eap() { - echo "Converting $1 to $2" + echo "Adding $1 to e menu" for l in `cat $1`; do #on empty line clear vars if [ "$l" = "" ]; then @@ -65,12 +65,17 @@ convert_desktop_to_eap() { str "$Exec" -set-exe if [ ! "$cmd" = "" ]; then - #cp ~/.e/e/applications/all/aterm.eap gpe-othello.eap - ##empty out eap file - ##enlightenment_eapp | grep -- -set- | cut -d " " -f 3 | xargs -iCMD enlightenment_eapp gpe-othello.eap CMD \"\" - #enlightenment_eapp gpe-othello.eap -del-all + eapFile="$PATH_TO_EAP/$2" + if [ -e $eapFile ]; then + echo "EAP file for $2 already created"; + else + echo "Converting $1 to $2" + #cp ~/.e/e/applications/all/aterm.eap gpe-othello.eap + ##empty out eap file + ##enlightenment_eapp | grep -- -set- | cut -d " " -f 3 | xargs -iCMD enlightenment_eapp gpe-othello.eap CMD \"\" + #enlightenment_eapp gpe-othello.eap -del-all - cat <<EOF > /tmp/gpeEap.edc + cat <<EOF > /tmp/gpeEap.edc images { image: "$Icon" COMP; } @@ -93,13 +98,14 @@ collections { } EOF - edje_cc --image_dir "$PATH_TO_PIXMAPS" /tmp/gpeEap.edc "$PATH_TO_EAP/$2" - rm /tmp/gpeEap.edc + edje_cc --image_dir "$PATH_TO_PIXMAPS" /tmp/gpeEap.edc "$eapFile" + rm /tmp/gpeEap.edc - cmd="enlightenment_eapp \"$PATH_TO_EAP/$2\" $cmd" + cmd="enlightenment_eapp \"$eapFile\" $cmd" - #pipe command in sh to allow it to re-interpret quotes - echo $cmd | /bin/sh -s + #pipe command in sh to allow it to re-interpret quotes + echo $cmd | /bin/sh -s + fi if `echo "$Categories" | grep -q "SystemSettings"`; then dir="Settings" @@ -123,7 +129,18 @@ EOF #dir=`echo "$Categories" | sed 'y:;:/:'` mkdir -p "$PATH_TO_E_GPE/$dir" - echo "$2" >> "$PATH_TO_E_GPE/$dir"/.order + orderFile="$PATH_TO_E_GPE/$dir"/.order + add=1 + if [ -e "$orderFile" ]; then + if grep -q "$2" "$orderFile"; then + echo "$2 is already in the $dir menu" + add=0 + fi + fi + if [ "$add" -eq 1 ]; then + echo "Adding $2 to $dir menu" + echo "$2" >> "$orderFile" + fi fi } diff --git a/packages/e17/e17-gpe-menu-convert_0.2.bb b/packages/e17/e17-gpe-menu-convert_0.2.bb index 88eefa774e..a2db9f0686 100644 --- a/packages/e17/e17-gpe-menu-convert_0.2.bb +++ b/packages/e17/e17-gpe-menu-convert_0.2.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Shell script to convert GPE .desktop files into e17 eap files and menus" -DEPENDS = "edje e-wm" +DEPENDS = "edje-utils e-wm" RDEPENDS += "edje-utils e-wm" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -PR = "r2" +PR = "r3" SRC_URI = "file://e17-gpe-menu-convert.sh" @@ -13,6 +13,6 @@ do_install() { install -m 755 ${WORKDIR}/e17-gpe-menu-convert.sh ${D}/usr/bin/e17-gpe-menu-convert.sh } -#pkg_postinst() { -# /usr/bin/e17-gpe-menu-convert.sh -#} +pkg_postinst() { + /usr/bin/e17-gpe-menu-convert.sh +} diff --git a/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-JavaScriptCore.patch b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-JavaScriptCore.patch new file mode 100644 index 0000000000..d48644cf5e --- /dev/null +++ b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-JavaScriptCore.patch @@ -0,0 +1,12 @@ +diff -bur JavaScriptCore~orig/configure.in JavaScriptCore/configure.in +--- JavaScriptCore~orig/configure.in 2006-02-12 01:51:50.000000000 -0600 ++++ JavaScriptCore/configure.in 2006-02-12 22:26:44.000000000 -0600 +@@ -63,7 +63,7 @@ + fi + changequote([,])dnl + +-CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++" ++CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++ -fno-threadsafe-statics" + LDFLAGS="$LDFLAGS $PACKAGE_LIBS" #-nodefaultlibs -lgcc -lc -lm" + + CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS -I\$(top_srcdir)/kjs -I\$(top_srcdir)/pcre -I\$(top_srcdir)/" diff --git a/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCit.patch b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCit.patch new file mode 100644 index 0000000000..bee942fa9a --- /dev/null +++ b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCit.patch @@ -0,0 +1,12 @@ +diff -bur NRCit~orig/configure.in NRCit/configure.in +--- NRCit~orig/configure.in 2005-08-08 18:07:00.000000000 -0500 ++++ NRCit/configure.in 2006-02-12 21:28:53.000000000 -0600 +@@ -37,7 +37,7 @@ + esac + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; +- *) CXXFLAGS="$CXXFLAGS -Wall -Werror" ;; ++ *) CXXFLAGS="$CXXFLAGS -Wall -Werror -fno-threadsafe-statics" ;; + esac + fi + changequote([,])dnl diff --git a/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCore.patch b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCore.patch new file mode 100644 index 0000000000..d3cb8c9b47 --- /dev/null +++ b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCore.patch @@ -0,0 +1,12 @@ +diff -bur NRCore~orig/configure.in NRCore/configure.in +--- NRCore~orig/configure.in 2005-02-16 03:31:43.000000000 -0600 ++++ NRCore/configure.in 2006-02-12 21:03:49.000000000 -0600 +@@ -107,7 +107,7 @@ + esac + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; +- *) CXXFLAGS="$CXXFLAGS -Wall " ;; ++ *) CXXFLAGS="$CXXFLAGS -Wall -fno-threadsafe-statics " ;; + esac + fi + changequote([,])dnl diff --git a/packages/gtk-webcore/osb-browser_20060212.bb b/packages/gtk-webcore/osb-browser_20060212.bb new file mode 100644 index 0000000000..d45319cb8a --- /dev/null +++ b/packages/gtk-webcore/osb-browser_20060212.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Gtk+ WebCore - reference browser" +HOMEPAGE = "http://gtk-webcore.sourceforge.net/" +LICENSE = "GPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "gpe" + +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.5.0+cvs${FIXEDSRCDATE}" +PR = "r0" + +DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade" +RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=osb-browser;date=${FIXEDSRCDATE} \ + file://no-pedantic.patch;patch=1" +S = "${WORKDIR}/osb-browser" + +DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}" + +inherit autotools diff --git a/packages/gtk-webcore/osb-jscore_20060212.bb b/packages/gtk-webcore/osb-jscore_20060212.bb new file mode 100644 index 0000000000..d8e3a9b8f8 --- /dev/null +++ b/packages/gtk-webcore/osb-jscore_20060212.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Gtk+ WebCore - JavaScriptCore" +HOMEPAGE = "http://gtk-webcore.sourceforge.net/" +LICENSE = "GPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "gpe" + +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.5.0+cvs${FIXEDSRCDATE}" +PR = "r0" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDSRCDATE} \ + file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1" +S = "${WORKDIR}/JavaScriptCore" + +DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}" + +inherit autotools pkgconfig + +# zap CPPFLAGS to avoid trouble with internal vs. pcre from staging +CPPFLAGS = "" + +do_configure () { + autotools_do_configure + cd ${S} + + # prevent libtool from linking libs against libstdc++, libgcc, ... + cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp + mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool +} + +do_stage () { + oe_libinstall -so -C kjs libjscore ${STAGING_LIBDIR} + + autotools_stage_includes + + install -d ${STAGING_INCDIR}/osb/JavaScriptCore + for i in ${S}/kjs/*.h ${S}/kjs/new; do + install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore + done +} diff --git a/packages/gtk-webcore/osb-nrcit_20060212.bb b/packages/gtk-webcore/osb-nrcit_20060212.bb new file mode 100644 index 0000000000..7530bb5719 --- /dev/null +++ b/packages/gtk-webcore/osb-nrcit_20060212.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "Gtk+ WebCore - NRCit embeddable browser component" +HOMEPAGE = "http://gtk-webcore.sourceforge.net/" +LICENSE = "nokia" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "gpe" + +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.5.0+cvs${FIXEDSRCDATE}" +PR = "r0" + +DEPENDS = "curl librsvg osb-nrcore" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCit;date=${FIXEDSRCDATE} \ + file://stop-load.image-loading.patch;patch=1 \ + file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1" +S = "${WORKDIR}/NRCit" + +DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}" + +inherit autotools pkgconfig + +do_configure () { + autotools_do_configure + cd ${S} + + # prevent libtool from linking libs against libstdc++, libgcc, ... + cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp + mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool +} + +do_stage () { + oe_libinstall -so -C src libnrcit ${STAGING_LIBDIR} + + autotools_stage_includes + + install -d ${STAGING_INCDIR}/osb + install -m 0644 ${S}/src/gtk/gtk-khtml.h ${STAGING_INCDIR}/osb + install -m 0644 ${S}/src/osb.h ${STAGING_INCDIR}/osb +} diff --git a/packages/gtk-webcore/osb-nrcore_20060212.bb b/packages/gtk-webcore/osb-nrcore_20060212.bb new file mode 100644 index 0000000000..4ab4275071 --- /dev/null +++ b/packages/gtk-webcore/osb-nrcore_20060212.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "Gtk+ WebCore - rendering engine" +HOMEPAGE = "http://gtk-webcore.sourceforge.net/" +LICENSE = "GPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "gpe" + +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.5.0+cvs${FIXEDSRCDATE}" +PR = "r0" + +DEPENDS = "glib-2.0 gtk+ pango osb-jscore" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \ + file://KWIQ-mimetype-segfault.patch;patch=1 \ + file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1" +S = "${WORKDIR}/NRCore" + +DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}" + +LEAD_SONAME = "libnrcore.so" + +inherit autotools pkgconfig + +do_configure () { + autotools_do_configure + cd ${S} + + # prevent libtool from linking libs against libstdc++, libgcc, ... + cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp + mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool +} + +do_stage () { + oe_libinstall -so libnrcore ${STAGING_LIBDIR} + oe_libinstall -so -C kwiq libnrcore_kwiq_gtk ${STAGING_LIBDIR} + + autotools_stage_includes + + install -d ${STAGING_INCDIR}/osb/NRCore + for i in ${S}/kwiq/WebCore*.h ${S}/kwiq/KWIQ*.h; do + install -m 0644 $i ${STAGING_INCDIR}/osb/NRCore + done +} diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb new file mode 100644 index 0000000000..7bb4c7209f --- /dev/null +++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb @@ -0,0 +1,10 @@ + +LICENSE = "GPL" +inherit gpe pkgconfig + +DEPENDS = "apmd virtual/xserver xextensions x11 xau xscrnsaverh libxss" +SECTION = "x11/base" +RDEPENDS = "apm" + +DESCRIPTION = "Automatic sleep/suspend control daemon" + diff --git a/packages/linux/linux-openzaurus-2.6.15/gcc4-ledclass-static-order-hack.patch b/packages/linux/linux-openzaurus-2.6.15/gcc4-ledclass-static-order-hack.patch new file mode 100644 index 0000000000..ea82d9ca97 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.15/gcc4-ledclass-static-order-hack.patch @@ -0,0 +1,29 @@ +diff -bur linux-2.6.15~orig/drivers/ide/ide-disk.c linux-2.6.15/drivers/ide/ide-disk.c +--- linux-2.6.15~orig/drivers/ide/ide-disk.c 2006-02-11 00:02:50.000000000 -0600 ++++ linux-2.6.15/drivers/ide/ide-disk.c 2006-02-11 00:11:20.000000000 -0600 +@@ -158,6 +158,12 @@ + return 0; /* lba_capacity value may be bad */ + } + ++static int ide_end_rw_disk(ide_drive_t *drive, int uptodate, int nr_sectors) ++{ ++ led_trigger_event(ide_led_trigger, LED_OFF); ++ ide_end_request(drive, uptodate, nr_sectors); ++} ++ + /* + * __ide_do_rw_disk() issues READ and WRITE commands to a disk, + * using LBA if supported, or CHS otherwise, to address sectors. +@@ -330,12 +336,6 @@ + return __ide_do_rw_disk(drive, rq, block); + } + +-static int ide_end_rw_disk(ide_drive_t *drive, int uptodate, int nr_sectors) +-{ +- led_trigger_event(ide_led_trigger, LED_OFF); +- ide_end_request(drive, uptodate, nr_sectors); +-} +- + /* + * Queries for true maximum capacity of the drive. + * Returns maximum LBA address (> 0) of the drive, 0 if failed. diff --git a/packages/linux/linux-openzaurus_2.6.15.bb b/packages/linux/linux-openzaurus_2.6.15.bb index cffc0cc673..cfd02bb25c 100644 --- a/packages/linux/linux-openzaurus_2.6.15.bb +++ b/packages/linux/linux-openzaurus_2.6.15.bb @@ -80,6 +80,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ ${RPSRC}/pxa-linking-bug.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://connectplus-remove-ide-HACK.patch;patch=1 \ + file://gcc4-ledclass-static-order-hack.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-ipaq-pxa270 \ file://defconfig-collie \ diff --git a/packages/otpkeygen/.mtn2git_empty b/packages/otpkeygen/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/otpkeygen/.mtn2git_empty diff --git a/packages/otpkeygen/otpkeygen_1.3.0.bb b/packages/otpkeygen/otpkeygen_1.3.0.bb new file mode 100644 index 0000000000..cae160e170 --- /dev/null +++ b/packages/otpkeygen/otpkeygen_1.3.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "OTP S/Key password generator" +SECTION = "opie/applications" +HOMEPAGE = "http://www.bitrot.de/pda_otpkeygen.html" +AUTHOR = "Thomas Driemeyer <thomas@bitrot.de>" +LICENSE = "GPL" +APPTYPE="binary" + +SRC_URI = "ftp://ftp.bitrot.de/pub/otpkeygen/otpkeygen-src_${PV}.tar.gz" + +S = "${WORKDIR}/src/" + +inherit palmtop + +do_configure_prepend() { + cd ${S} && qmake -project +} + +do_install() { + + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/bin/ + install -d ${D}${palmtopdir}/pics/ + + install -m 0755 ${WORKDIR}/bin/otpkeygen ${D}${palmtopdir}/bin/ + install -m 0644 ${WORKDIR}/apps/Applications/otpkeygen.desktop ${D}${palmtopdir}/apps/Applications/ + install -m 0644 ${WORKDIR}/pics/otpkeygen.png ${D}${palmtopdir}/pics/ +} diff --git a/packages/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb index f759831e3a..5e5462a964 100644 --- a/packages/qpf-fonts/qpf-qte_2.3.10.bb +++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb @@ -3,6 +3,7 @@ SECTION = "opie/fonts" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL QPL" +HOMEPAGE = "http://www.trolltech.com" PR = "r1" PROVIDES = "qte-font-helvetica-100 qte-font-helvetica-120" diff --git a/packages/qt/qt-x11-free-native_3.3.5.bb b/packages/qt/qt-x11-free-native_3.3.5.bb index ae12f38ad2..e6340da14a 100644 --- a/packages/qt/qt-x11-free-native_3.3.5.bb +++ b/packages/qt/qt-x11-free-native_3.3.5.bb @@ -3,6 +3,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL QPL" DEPENDS = "qmake-native x11-native" +HOMEPAGE = "http://www.trolltech.com" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free" diff --git a/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb index db4568d48b..5215a3e258 100644 --- a/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb +++ b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb @@ -3,6 +3,7 @@ MAINTAINER = "M&N Solutions <info@mn-solutions.de>" SECTION = "opie/base" LICENSE = "GPL QPL" PACKAGE_ARCH = "all" +HOMEPAGE = "http://www.trolltech.com" PR = "r3" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index e247431282..daf1161ce9 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Qt/Embedded Version ${PV}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" @@ -9,7 +10,7 @@ DEPENDS_append_c7x0 = " sharp-aticore-oss" PROVIDES = "virtual/qte virtual/libqte2" PR = "r28" -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5=1f7ad30113afc500cab7f5b2f4dec0d7 \ +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5sum=af7ad30113afc500cab7f5b2f4dec0d7 \ file://qpe.patch;patch=1 \ file://vt-switch.patch;patch=1 \ file://daemonize.patch;patch=1 \ diff --git a/packages/qte/qte_4.0.0-snapshot.bb b/packages/qte/qte_4.0.0-snapshot.bb index 9b98f7f4b1..25dc949edd 100644 --- a/packages/qte/qte_4.0.0-snapshot.bb +++ b/packages/qte/qte_4.0.0-snapshot.bb @@ -6,6 +6,7 @@ DEPENDS = "zlib libpng jpeg tslib qmake-native-1.08a uicmoc4-native" PROVIDES = "virtual/qte4 virtual/libqte4" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" PR = "ml1" +HOMEPAGE = "http://www.trolltech.com" BROKEN = "1" diff --git a/packages/sqlite/sqlite-2.8.17/.mtn2git_empty b/packages/sqlite/sqlite-2.8.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sqlite/sqlite-2.8.17/.mtn2git_empty diff --git a/packages/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch b/packages/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch new file mode 100644 index 0000000000..e936f81c72 --- /dev/null +++ b/packages/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch @@ -0,0 +1,30 @@ +diff -bur sqlite-2.8.17~orig/main.mk sqlite-2.8.17/main.mk +--- sqlite-2.8.17~orig/main.mk 2005-04-23 17:43:23.000000000 -0500 ++++ sqlite-2.8.17/main.mk 2006-02-13 03:31:03.000000000 -0600 +@@ -139,7 +139,7 @@ + # This is the default Makefile target. The objects listed here + # are what get build when you type just "make" with no arguments. + # +-all: sqlite.h config.h libsqlite.a sqlite$(EXE) ++all: sqlite.h config.h libsqlite.so sqlite$(EXE) + + # Generate the file "last_change" which contains the date of change + # of the most recently modified source code file +@@ -148,13 +148,12 @@ + cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \ + | awk '{print $$5,$$6}' >last_change + +-libsqlite.a: $(LIBOBJ) +- $(AR) libsqlite.a $(LIBOBJ) +- $(RANLIB) libsqlite.a ++libsqlite.so: $(LIBOBJ) ++ $(CC) -shared -o libsqlite.so -Wl,-soname,libsqlite.so.0 $(LIBOBJ) + +-sqlite$(EXE): $(TOP)/src/shell.c libsqlite.a sqlite.h ++sqlite$(EXE): $(TOP)/src/shell.c libsqlite.so sqlite.h + $(TCCX) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \ +- libsqlite.a $(LIBREADLINE) $(THREADLIB) ++ -lsqlite $(LIBREADLINE) $(THREADLIB) + + sqlite_analyzer$(EXE): $(TOP)/src/tclsqlite.c libsqlite.a $(TESTSRC) \ + $(TOP)/tool/spaceanal.tcl diff --git a/packages/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch b/packages/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch new file mode 100644 index 0000000000..b84b6486ef --- /dev/null +++ b/packages/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch @@ -0,0 +1,20 @@ +diff -bur sqlite-2.8.17~orig/main.mk sqlite-2.8.17/main.mk +--- sqlite-2.8.17~orig/main.mk 2006-02-13 04:09:33.000000000 -0600 ++++ sqlite-2.8.17/main.mk 2006-02-13 04:15:42.000000000 -0600 +@@ -58,7 +58,7 @@ + expr.o func.o hash.o insert.o \ + main.o opcodes.o os.o pager.o parse.o pragma.o printf.o random.o \ + select.o table.o tokenize.o trigger.o update.o util.o \ +- vacuum.o vdbe.o vdbeaux.o where.o tclsqlite.o ++ vacuum.o vdbe.o vdbeaux.o where.o + + # All of the source code files. + # +@@ -91,7 +91,6 @@ + $(TOP)/src/sqlite.h.in \ + $(TOP)/src/sqliteInt.h \ + $(TOP)/src/table.c \ +- $(TOP)/src/tclsqlite.c \ + $(TOP)/src/tokenize.c \ + $(TOP)/src/trigger.c \ + $(TOP)/src/update.c \ diff --git a/packages/sqlite/sqlite-2.8.17/sqlite.pc b/packages/sqlite/sqlite-2.8.17/sqlite.pc new file mode 100644 index 0000000000..6bc742eecb --- /dev/null +++ b/packages/sqlite/sqlite-2.8.17/sqlite.pc @@ -0,0 +1,12 @@ +# Package Information for pkg-config + +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: SQLite +Description: SQL database engine +Version: 2.8.17 +Libs: -L${libdir} -lsqlite +Cflags: -I${includedir} diff --git a/packages/sqlite/sqlite_2.8.16.bb b/packages/sqlite/sqlite_2.8.16.bb index a820a1bf74..fcbca7153f 100644 --- a/packages/sqlite/sqlite_2.8.16.bb +++ b/packages/sqlite/sqlite_2.8.16.bb @@ -25,7 +25,7 @@ do_compile() { TOP="${S}" \ BCC="${BUILD_CC}" \ TCC="${CC}" \ - OPTS="-fPIC" \ + OPTS="-fPIC -D'INTPTR_TYPE=int'" \ TCL_FLAGS= LIBTCL= \ READLINE_FLAGS="-DHAVE_READLINE=1 -I${STAGING_INCDIR}" \ LIBREADLINE="-L. -L${STAGING_LIBDIR} -lreadline -lncurses" diff --git a/packages/sqlite/sqlite_2.8.17.bb b/packages/sqlite/sqlite_2.8.17.bb new file mode 100644 index 0000000000..7e44ac87ae --- /dev/null +++ b/packages/sqlite/sqlite_2.8.17.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "An Embeddable SQL Database Engine" +HOMEPAGE = "http://www.sqlite.org/" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "readline ncurses" +LICENSE = "PD" +PR = "r0" + +SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \ + file://mainmk_build_dynamic.patch;patch=1 \ + file://mainmk_no_tcl.patch;patch=1 \ + file://sqlite.pc" + +SOURCES = "attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o \ + expr.o func.o hash.o insert.o main.o opcodes.o os.o pager.o \ + parse.o pragma.o printf.o random.o select.o table.o tokenize.o \ + trigger.o update.o util.o vacuum.o vdbe.o vdbeaux.o where.o" + +inherit autotools pkgconfig + +do_configure() { + echo "main.mk is patched, no need to configure" +} + +do_compile() { + oe_runmake -f Makefile.linux-gcc \ + TOP="${S}" \ + BCC="${BUILD_CC}" \ + TCC="${CC}" \ + OPTS="-fPIC -D'INTPTR_TYPE=int'" \ + TCL_FLAGS= LIBTCL= \ + READLINE_FLAGS="-DHAVE_READLINE=1 -I${STAGING_INCDIR}" \ + LIBREADLINE="-L. -L${STAGING_LIBDIR} -lreadline -lncurses" +} + +do_stage() { + install -m 0755 libsqlite.so ${STAGING_LIBDIR}/libsqlite.so.0.8.6 + ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so + ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so.0 + ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so.0.8 + install -m 0644 sqlite.h ${STAGING_INCDIR} + + # make pkgconfig.bbclass pick this up + mv ${WORKDIR}/sqlite.pc ${S} +} + +do_install() { + install -d ${D}${libdir} ${D}${bindir} + install sqlite ${D}${bindir} + install -m 0755 libsqlite.so ${D}${libdir}/libsqlite.so.0.8.6 + ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so + ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0 + ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0.8 + install -d ${D}${includedir} + install -m 0644 sqlite.h ${D}${includedir}/sqlite.h +} + +PACKAGES += "${PN}-bin" +FILES_${PN}-bin = "${bindir}" +FILES_${PN} = "${libdir}/*.so.*" + diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb index 2888dd9511..8c87c3b797 100644 --- a/packages/xqt/xqt_0.0.9.bb +++ b/packages/xqt/xqt_0.0.9.bb @@ -1,6 +1,6 @@ HOMEPAGE = "http://xqt.sourceforge.jp" LICENSE = "GPL" -SECTION = "x11/base" +SECTION = "x11" SRCDATE = "20041111" |