diff options
| author |   Florian Boor <florian.boor@kernelconcepts.de> | 2008-03-05 16:11:13 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2008-03-05 16:11:13 +0000 |
| commit | ef531024660d545944a3e4ccf07a757c05895dfe (patch) | |
| tree | 38b34d641b56c98d9330b394b6ae985ffcc82682 | |
| parent | 0a9efb2c12237765ceabfc2a74d519f2cdabc658 (diff) | |
| parent | 3c03ac44b94421eca51af4b0c783d4720b18c7d7 (diff) | |
| download | openembedded-ef531024660d545944a3e4ccf07a757c05895dfe.tar.gz | |
merge of '0c8de9825ca55a0e846e8c00dd29764c73349c6f'
and 'a6f0dbe56289aad3373b7ce56ba4e2434e6da244'
104 files changed, 2090 insertions, 736 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e5a9cf1a98..fd26450557 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -273,8 +273,8 @@ Distros: chinook-compat Recipes: jikes-native, jikes-initial, ecj-initial, ecj-bootstrap-native Recipes: classpath*, cacao*, jamvm* Recipes: swt-gtk, rxtx, dbus-java, libmatthew, kxml2, xmlpull +Recipes: woodstox2 Recipes: midpath*, logic-analyze Recipes: kobodeluxe Recipes: hildon-thumbnail, libhildon*, libosso*, mce-dev, libconic Recipes: libgpsbt, libgpsmgr, osso-gnome-vfs2, osso-gwconnect, osso-ic-oss - diff --git a/classes/base.bbclass b/classes/base.bbclass index 7609c05851..615d02d07e 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1,4 +1,4 @@ -BB_DEFAULT_TASK = "build" +BB_DEFAULT_TASK ?= "build" # like os.path.join but doesn't treat absolute RHS specially def base_path_join(a, *p): diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 97cf036dd9..5ff49cd65e 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -333,12 +333,15 @@ def package_qa_check_staged(path,d): import os, bb sane = True - workdir = os.path.join(bb.data.getVar('TMPDIR', d, True), "work") + tmpdir = bb.data.getVar('TMPDIR', d, True) + workdir = os.path.join(tmpdir, "work") - if bb.data.inherits_class("native", d): + if bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d): installed = "installed=no" + pkgconfigcheck = workdir else: installed = "installed=yes" + pkgconfigcheck = tmpdir # find all .la and .pc files # read the content @@ -356,8 +359,8 @@ def package_qa_check_staged(path,d): sane = package_qa_handle_error(8, error_msg, "staging", path, d) elif file[-2:] == "pc": file_content = open(path).read() - if workdir in file_content: - error_msg = "%s failed sanity test (workdir) in path %s" % (file,root) + if pkgconfigcheck in file_content: + error_msg = "%s failed sanity test (tmpdir) in path %s" % (file,root) sane = package_qa_handle_error(6, error_msg, "staging", path, d) return sane diff --git a/classes/native.bbclass b/classes/native.bbclass index 934303cc0c..8f2b6f3fec 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -47,39 +47,33 @@ export AS = "${HOST_PREFIX}as" export RANLIB = "${HOST_PREFIX}ranlib" export STRIP = "${HOST_PREFIX}strip" - # Path prefixes -base_prefix = "${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}" -prefix = "${base_prefix}" -exec_prefix = "${base_prefix}" +export base_prefix = "${STAGING_DIR_NATIVE}" +export prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" +export exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" # Base paths -base_bindir = "${base_prefix}/bin" -base_sbindir = "${base_prefix}/bin" -base_libdir = "${base_prefix}/lib" +export base_bindir = "${STAGING_DIR_NATIVE}${layout_base_bindir}" +export base_sbindir = "${STAGING_DIR_NATIVE}${layout_base_sbindir}" +export base_libdir = "${STAGING_DIR_NATIVE}${layout_base_libdir}" # Architecture independent paths -sysconfdir = "${prefix}/etc" -sharedstatedir = "${prefix}/com" -localstatedir = "${prefix}/var" -infodir = "${datadir}/info" -mandir = "${datadir}/man" -docdir = "${datadir}/doc" -servicedir = "${prefix}/srv" +export datadir = "${STAGING_DIR_NATIVE}${layout_datadir}" +export sysconfdir = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" +export sharedstatedir = "${STAGING_DIR_NATIVE}${layout_sharedstatedir}" +export localstatedir = "${STAGING_DIR_NATIVE}${layout_localstatedir}" +export infodir = "${STAGING_DIR_NATIVE}${layout_infodir}" +export mandir = "${STAGING_DIR_NATIVE}${layout_mandir}" +export docdir = "${STAGING_DIR_NATIVE}${layout_docdir}" +export servicedir = "${STAGING_DIR_NATIVE}${layout_servicedir}" # Architecture dependent paths -bindir = "${exec_prefix}/bin" -sbindir = "${exec_prefix}/bin" -libexecdir = "${exec_prefix}/libexec" -libdir = "${exec_prefix}/lib" -includedir = "${exec_prefix}/include" -oldincludedir = "${exec_prefix}/include" - -# Datadir is made arch dependent here, primarily -# for autoconf macros, and other things that -# may be manipulated to handle crosscompilation -# issues. -datadir = "${exec_prefix}/share" +export bindir = "${STAGING_DIR_NATIVE}${layout_bindir}" +export sbindir = "${STAGING_DIR_NATIVE}${layout_sbindir}" +export libexecdir = "${STAGING_DIR_NATIVE}${layout_libexecdir}" +export libdir = "${STAGING_DIR_NATIVE}${layout_libdir}" +export includedir = "${STAGING_DIR_NATIVE}${layout_includedir}" +export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}" do_stage () { if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] @@ -93,3 +87,4 @@ do_install () { } PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" +PKG_CONFIG_SYSROOT_DIR = "" diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 29ce72d65c..d822a86820 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -225,5 +225,5 @@ python do_package_stage () { bb.utils.unlockfile(lf) } -addtask package_stage after do_package_write_ipk do_package_write_deb do_package_write do_populate_staging before do_build +addtask package_stage after do_package_write do_populate_staging before do_build diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index d2176d8b39..d65f8a6253 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -2,36 +2,10 @@ inherit base DEPENDS_prepend = "pkgconfig-native " -# The namespaces can clash here hence the two step replace -def get_pkgconfig_mangle(d): - import bb.data - s = "-e ''" - if not bb.data.inherits_class('native', d): - s += " -e 's:=${libdir}:=OELIBDIR:;'" - s += " -e 's:=${includedir}:=OEINCDIR:;'" - s += " -e 's:=${datadir}:=OEDATADIR:'" - s += " -e 's:=${prefix}:=OEPREFIX:'" - s += " -e 's:=${exec_prefix}:=OEEXECPREFIX:'" - s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" - s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" - s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" - s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${layout_prefix}:'" - s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'" - s += " -e 's:-L${WORKDIR}\S*: :g'" - s += " -e 's:-I${WORKDIR}\S*: :g'" - - return s - -do_install_append () { - for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do - sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' -e 's:${STAGING_LIBDIR}:${libdir}:g' -e 's:${STAGING_INCDIR}:${includedir}:g' -e 's:${STAGING_DIR_TARGET}:${prefix}:g' ${pc} - done -} - do_stage_append () { + install -d ${PKG_CONFIG_DIR} for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do pcname=`basename $pc` - install -d ${PKG_CONFIG_DIR} - cat $pc | sed ${@get_pkgconfig_mangle(d)} -e 's:${D}${libdir}\S*:${STAGING_LIBDIR}:g' -e 's:${D}${prefix}/include\S*:${STAGING_INCDIR}:g' > ${PKG_CONFIG_DIR}/$pcname + cat $pc > ${PKG_CONFIG_DIR}/$pcname done } diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index 63f12117eb..71c65a1629 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -6,15 +6,16 @@ OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" HOST_ARCH = "${BUILD_ARCH}" -HOST_VENDOR = "${BUILD_VENDOR}" +# This isn't BUILD_VENDOR since we don't want to clash with native staging +HOST_VENDOR = "${TARGET_VENDOR}" HOST_OS = "${BUILD_OS}" HOST_PREFIX = "${BUILD_PREFIX}" HOST_CC_ARCH = "${BUILD_CC_ARCH}" -CPPFLAGS = "${BUILD_CPPFLAGS}" -CFLAGS = "${BUILD_CFLAGS}" -CXXFLAGS = "${BUILD_CFLAGS}" -LDFLAGS = "${BUILD_LDFLAGS}" +CPPFLAGS = "${BUILDSDK_CPPFLAGS}" +CFLAGS = "${BUILDSDK_CFLAGS}" +CXXFLAGS = "${BUILDSDK_CFLAGS}" +LDFLAGS = "${BUILDSDK_LDFLAGS}" # Path prefixes prefix = "${SDK_PREFIX}" @@ -49,3 +50,4 @@ FILES_${PN}-dbg += "${prefix}/.debug \ ${prefix}/bin/.debug \ " +export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${HOST_SYS}" diff --git a/classes/testlab.bbclass b/classes/testlab.bbclass new file mode 100644 index 0000000000..5a88f3de62 --- /dev/null +++ b/classes/testlab.bbclass @@ -0,0 +1,65 @@ +# +# Performs various tests and analysises on images +# +# Copyright (C) 2007, 2008 Koen Kooi <koen@openembedded.org> + +# The current features are: +# 1) dump a list of installed packages +# 2) dump a list of sizes of installed packages +# 3) dependency graphs of installed packages + +# See +# * http://dominion.thruhere.net/koen/cms/the-testlab-strikes-again +# * http://dominion.thruhere.net/koen/cms/package-relations-inside-images +# for use cases + +# TODO: +# * log information to a server for safekeeping +# * use mtn certs to record this info into the scm +# * add test suite to run on the target device + + +# Needs 'dot', 'ipkg-cl' + +do_testlab() { +if [ -e ${IMAGE_ROOTFS}/etc/ipkg ] ; then + + TESTLAB_DIR="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-testlab" + mkdir -p ${TESTLAB_DIR}/ + ls -laR ${IMAGE_ROOTFS} >& ${TESTLAB_DIR}/files-in-image.txt + + echo > ${TESTLAB_DIR}/installed-packages.txt + echo -e "digraph depends {\n node [shape=plaintext]" > ${TESTLAB_DIR}/depends.dot + + for pkg in $(ipkg-cl -f ${IMAGE_ROOTFS}/etc/ipkg -o ${IMAGE_ROOTFS} list_installed | awk '{print $1}') ; do + ipkg-cl -f ${IMAGE_ROOTFS}/etc/ipkg -o ${IMAGE_ROOTFS} info $pkg | grep Filename | awk -F: '{print $2}' >> ${TESTLAB_DIR}/installed-packages.txt + + for depends in $(ipkg-cl -f ${IMAGE_ROOTFS}/etc/ipkg -o ${IMAGE_ROOTFS} info $pkg | grep Depends) ; do + echo "$pkg OPP $depends;" | grep -v "(" | grep -v ")" | grep -v Depends | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot + done + + for recommends in $(ipkg-cl -f ${IMAGE_ROOTFS}/etc/ipkg -o ${IMAGE_ROOTFS} info $pkg | grep Recom) ; do + echo "$pkg OPP $recommends [style=dotted];" | grep -v "(" | grep -v ")" | grep -v Recom | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot + done + done + + echo "}" >> ${TESTLAB_DIR}/depends.dot + + grep -v kernel_2 ${TESTLAB_DIR}/depends.dot | grep -v kernel_image > ${TESTLAB_DIR}/depends-nokernel.dot + grep -v libc6 ${TESTLAB_DIR}/depends-nokernel.dot | grep -v libgcc > ${TESTLAB_DIR}/depends-nokernel-nolibc.dot + grep -v update_ ${TESTLAB_DIR}/depends-nokernel-nolibc.dot > ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate.dot + grep -v kernel_module ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate.dot > ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate-nomodules.dot + + #dot has some library troubles when run under fakeroot, uncomment at your own risk + #dot -Tpng -o ${TESTLAB_DIR}/image-dependencies.png ${TESTLAB_DIR}/depends.dot + #dot -Tpng -o ${TESTLAB_DIR}/image-dependencies-nokernel-nolibc.png ${TESTLAB_DIR}/depends-nokernel-nolibc.dot + #dot -Tpng -o ${TESTLAB_DIR}/image-dependencies-nokernel-nolibc-noupdate.png ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate.dot + #dot -Tpng -o ${TESTLAB_DIR}/image-dependencies-nokernel-nolibc-noupdate-nomodules.png ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate-nomodules.dot + + for file in $(cat ${TESTLAB_DIR}/installed-packages.txt) ; do + du -k $(find ${DEPLOY_DIR_IPK} -name "$file") + done | grep "\.ipk" | sed -e s:${DEPLOY_DIR_IPK}::g | sort -n -r | awk '{print $1 "\tKiB " $2}' > ${TESTLAB_DIR}/installed-package-sizes.txt +fi +} + +IMAGE_POSTPROCESS_COMMAND += " do_testlab ;" diff --git a/conf/bitbake.conf b/conf/bitbake.conf index de526f0e56..4fe5c21e02 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -2,23 +2,20 @@ # Standard target filesystem layout. ################################################################## -# Note these currently match the existing staging layout but this -# is planned to change, see the oe-dev mailing list - # Path prefixes -layout_prefix = "" -layout_exec_prefix = "" +layout_prefix = "/usr" +layout_exec_prefix = "/usr" layout_base_prefix = "" # Base paths layout_base_bindir = "${layout_base_prefix}/bin" -layout_base_sbindir = "${layout_base_prefix}/bin" +layout_base_sbindir = "${layout_base_prefix}/sbin" layout_base_libdir = "${layout_base_prefix}/lib" # Architecture independent paths -layout_sysconfdir = "/etc" -layout_localstatedir = "/var" -layout_servicedir = "/srv" +layout_sysconfdir = "${layout_base_prefix}/etc" +layout_localstatedir = "${layout_base_prefix}/var" +layout_servicedir = "${layout_base_prefix}/srv" layout_sharedstatedir = "${layout_prefix}/com" layout_datadir = "${layout_prefix}/share" layout_infodir = "${layout_datadir}/info" @@ -27,7 +24,7 @@ layout_docdir = "${layout_datadir}/doc" # Architecture dependent paths layout_bindir = "${layout_exec_prefix}/bin" -layout_sbindir = "${layout_exec_prefix}/bin" +layout_sbindir = "${layout_exec_prefix}/sbin" layout_libdir = "${layout_exec_prefix}/lib" layout_includedir = "${layout_exec_prefix}/include" layout_libexecdir = "${layout_exec_prefix}/libexec" @@ -38,31 +35,31 @@ layout_libexecdir = "${layout_exec_prefix}/libexec" # Path prefixes export base_prefix = "" -export prefix = "/usr" -export exec_prefix = "${prefix}" +export prefix = "${layout_prefix}" +export exec_prefix = "${layout_exec_prefix}" # Base paths -export base_bindir = "${base_prefix}/bin" -export base_sbindir = "${base_prefix}/sbin" -export base_libdir = "${base_prefix}/lib" +export base_bindir = "${layout_base_bindir}" +export base_sbindir = "${layout_base_sbindir}" +export base_libdir = "${layout_base_libdir}" # Architecture independent paths -export datadir = "${prefix}/share" -export sysconfdir = "/etc" -export sharedstatedir = "${prefix}/com" -export localstatedir = "/var" -export infodir = "${datadir}/info" -export mandir = "${datadir}/man" -export docdir = "${datadir}/doc" -export servicedir = "/srv" +export datadir = "${layout_datadir}" +export sysconfdir = "${layout_sysconfdir}" +export sharedstatedir = "${layout_sharedstatedir}" +export localstatedir = "${layout_localstatedir}" +export infodir = "${layout_infodir}" +export mandir = "${layout_mandir}" +export docdir = "${layout_docdir}" +export servicedir = "${layout_servicedir}" # Architecture dependent paths -export bindir = "${exec_prefix}/bin" -export sbindir = "${exec_prefix}/sbin" -export libexecdir = "${exec_prefix}/libexec" -export libdir = "${exec_prefix}/lib" -export includedir = "${exec_prefix}/include" -export oldincludedir = "${exec_prefix}/include" +export bindir = "${layout_bindir}" +export sbindir = "${layout_sbindir}" +export libexecdir = "${layout_libexecdir}" +export libdir = "${layout_libdir}" +export includedir = "${layout_includedir}" +export oldincludedir = "${layout_includedir}" ################################################################## # Architecture-dependent build variables. @@ -511,6 +508,7 @@ SLOT = "0" export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}" +export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${TARGET_SYS}" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index b8685a578e..2c9543abd9 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,8 +1,8 @@ -PREFERRED_VERSION_dbus = "1.1.4" PREFERRED_VERSION_busybox = "1.9.1" +PREFERRED_VERSION_dbus = "1.1.20" +PREFERRED_VERSION_glib-2.0 = "2.15.6" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_libtool = "1.5.10" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_vte = "0.16.10" - diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index d14c6f1b19..f606395f09 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -14,10 +14,15 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm' FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" +FULL_OPTIMIZATION_pn-glibc-intermediate = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" +FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" + BUILD_OPTIMIZATION = "-Os" BUILD_OPTIMIZATION_pn-perl = "-O1" +BUILD_OPTIMIZATION_pn-glibc-intermediate = "-O2" +BUILD_OPTIMIZATION_pn-glibc = "-O2" BUILD_OPTIMIZATION_sparc = "-O2" CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 5fa9ed7e38..b5a04deab8 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -24,16 +24,16 @@ SRCREV_pn-eglibc-initial ?= "4355" SRCREV_pn-eglibc-intermediate ?= "4355" SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" -SRCREV_pn-epiphany ?= "7650" +SRCREV_pn-epiphany ?= "7837" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-ffmpeg ?= "12186" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" -SRCREV_pn-gsm0710muxd ?= "85" +SRCREV_pn-gsm0710muxd ?= "90" SRCREV_pn-gtkhtml2 ?= "1158" -SRCREV_pn-gypsy ?= "56" +SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" @@ -136,6 +136,7 @@ SRCREV_pn-opkg ?= "4142" SRCREV_pn-opkg-native ?= "4142" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" +SRCREV_pn-pylgrim ?= "20" SRCREV_pn-pyneod ?= "88" SRCREV_pn-pyneog ?= "88" SRCREV_pn-python-formencode = "3148" @@ -149,9 +150,9 @@ SRCREV_pn-tmut ?= "60" SRCREV_pn-u-boot-openmoko ?= "4100" SRCREV_pn-usbpath ?= "3108" SRCREV_pn-usbpath-native ?= "3108" -SRCREV_pn-webkit-gtk ?= "28656" +SRCREV_pn-webkit-gtk ?= "30762" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" -SRCREV_pn-xoo ?= "1623" +SRCREV_pn-xoo ?= "1971" diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 0e130a2fd7..463c5d0442 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -37,7 +37,6 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" -PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native" diff --git a/conf/sanity.conf b/conf/sanity.conf index 4af4454e2e..35d9d32de1 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -11,7 +11,7 @@ BB_MIN_VERSION = "1.8.10" # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -SANITY_ABI = "0" +SANITY_ABI = "1" SANITY_ABIFILE = "${TMPDIR}/abi_version" INHERIT += "sanity" diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index 2f882450c8..31dd704994 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -5,6 +5,22 @@ DO_UCLIBC=1 do_build() { echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf + if [ $DO_UCLIBC = 1 ] + then + BUILD_MODE="uclibc" + echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf + + if [ "$BUILD_CLEAN" != "" ] + then + bitbake -c clean $BUILD_CLEAN + fi + + for target in $BUILD_TARGETS + do + bitbake $target && do_report_success + done + fi + BUILD_MODE="glibc" if [ "$BUILD_CLEAN" != "" ] then @@ -15,22 +31,6 @@ do_build() { do bitbake $target && do_report_success done - - if [ $DO_UCLIBC = 1 ] - then - BUILD_MODE="uclibc" - echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf - - if [ "$BUILD_CLEAN" != "" ] - then - bitbake -c clean $BUILD_CLEAN - fi - - for target in $BUILD_TARGETS - do - bitbake $target && do_report_success - done - fi } do_report_success() { @@ -79,7 +79,7 @@ for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 pood do BUILD_CLEAN="base-files" BUILD_MACHINE=$machine - BUILD_TARGETS="base-image console-image minimal-gpe-image x11-image" + BUILD_TARGETS="initramfs-bootmenu-image base-image console-image minimal-gpe-image x11-image" do_build done diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb index 6f739c7b22..d750bf539d 100644 --- a/packages/abiword/abiword-plugins_2.5.2.bb +++ b/packages/abiword/abiword-plugins_2.5.2.bb @@ -20,7 +20,7 @@ PARALLEL_MAKE="" EXTRA_OECONF = " --without-libwmf \ --without-inter7eps \ --with-abiword=${WORKDIR}/abiword-${PV} \ - --with-boost=${STAGINC_INCDIR}/../ \ + --with-boost=${STAGING_INCDIR}/../ \ " PACKAGES_DYNAMIC = "abiword-plugin-*" diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index d4da2c16d4..7a95b55f34 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" RRECOMMENDS_alsa-state = "alsa-states" PV = "0.1.0" -PR = "r10" +PR = "r11" SRC_URI = " \ file://asoundrc \ diff --git a/packages/alsa/alsa-state/fic-gta02/asound.state b/packages/alsa/alsa-state/fic-gta02/asound.state index 04e6f60da9..3b46fc7223 100644 --- a/packages/alsa/alsa-state/fic-gta02/asound.state +++ b/packages/alsa/alsa-state/fic-gta02/asound.state @@ -495,6 +495,16 @@ state.neo1973gta02 { comment.access 'read write' comment.type ENUMERATED comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 comment.item.0 'Mic 1' comment.item.1 'Mic 2' comment.item.2 'Mic 3' @@ -502,7 +512,7 @@ state.neo1973gta02 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973gta02 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973gta02 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973gta02 { name 'Line Mono Mux' value 'Line Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -544,9 +554,9 @@ state.neo1973gta02 { comment.item.1 'Rx Mix' iface MIXER name 'Line Right Mux' - value 'Line 2' + value 'Rx Mix' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -554,9 +564,9 @@ state.neo1973gta02 { comment.item.1 'Rx Mix' iface MIXER name 'Line Left Mux' - value 'Line 1' + value 'Rx Mix' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973gta02 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973gta02 { name 'ALC Mixer Mic2 Capture Switch' value false } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973gta02 { name 'ALC Mixer Mic1 Capture Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973gta02 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973gta02 { name 'Mic Sidetone Mux' value 'Left PGA' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973gta02 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973gta02 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973gta02 { name 'Capture Right Mixer' value Stereo } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973gta02 { name 'Capture Left Mixer' value Stereo } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973gta02 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973gta02 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973gta02 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973gta02 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973gta02 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973gta02 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973gta02 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973gta02 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973gta02 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973gta02 { name 'Mono Mixer Sidetone Playback Sw' value false } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973gta02 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,7 +762,7 @@ state.neo1973gta02 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -760,7 +770,7 @@ state.neo1973gta02 { name 'Right Mixer Sidetone Playback S' value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -768,7 +778,7 @@ state.neo1973gta02 { name 'Right Mixer Right Playback Swit' value true } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -776,7 +786,7 @@ state.neo1973gta02 { name 'Right Mixer Bypass Playback Swi' value false } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973gta02 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,7 +802,7 @@ state.neo1973gta02 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -800,7 +810,7 @@ state.neo1973gta02 { name 'Left Mixer Left Playback Switch' value true } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,7 +818,7 @@ state.neo1973gta02 { name 'Left Mixer Bypass Playback Swit' value false } - control.86 { + control.87 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -816,7 +826,7 @@ state.neo1973gta02 { name 'DAPM Stereo Out Switch' value true } - control.87 { + control.88 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -824,7 +834,7 @@ state.neo1973gta02 { name 'DAPM GSM Line Out Switch' value false } - control.88 { + control.89 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -832,7 +842,7 @@ state.neo1973gta02 { name 'DAPM GSM Line In Switch' value false } - control.89 { + control.90 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -840,7 +850,7 @@ state.neo1973gta02 { name 'DAPM Headset Mic Switch' value false } - control.90 { + control.91 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -848,7 +858,7 @@ state.neo1973gta02 { name 'DAPM Handset Mic Switch' value false } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -856,7 +866,7 @@ state.neo1973gta02 { name 'DAPM Handset Spk Switch' value false } - control.92 { + control.93 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -864,7 +874,7 @@ state.neo1973gta02 { name 'Amp State Switch' value true } - control.93 { + control.94 { comment.access 'read write' comment.type BOOLEAN comment.count 1 diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state index cc0d32a7c7..722ce88425 100644 --- a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state +++ b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state @@ -26,8 +26,8 @@ state.neo1973gta02 { comment.range '0 - 127' iface MIXER name 'Headphone Playback Volume' - value.0 121 - value.1 121 + value.0 0 + value.1 0 } control.4 { comment.access 'read write' @@ -46,7 +46,7 @@ state.neo1973gta02 { comment.range '0 - 127' iface MIXER name 'Mono Playback Volume' - value 115 + value 121 } control.6 { comment.access 'read write' @@ -85,7 +85,7 @@ state.neo1973gta02 { iface MIXER name 'Headphone Playback ZC Switch' value.0 false - value.1 true + value.1 false } control.10 { comment.access 'read write' @@ -94,7 +94,7 @@ state.neo1973gta02 { iface MIXER name 'Speaker Playback ZC Switch' value.0 false - value.1 true + value.1 false } control.11 { comment.access 'read write' @@ -103,7 +103,7 @@ state.neo1973gta02 { comment.range '0 - 7' iface MIXER name 'Mono Bypass Playback Volume' - value 3 + value 2 } control.12 { comment.access 'read write' @@ -112,7 +112,7 @@ state.neo1973gta02 { comment.range '0 - 7' iface MIXER name 'Mono Sidetone Playback Volume' - value 1 + value 2 } control.13 { comment.access 'read write' @@ -121,7 +121,7 @@ state.neo1973gta02 { comment.range '0 - 7' iface MIXER name 'Mono Voice Playback Volume' - value 1 + value 2 } control.14 { comment.access 'read write' @@ -171,7 +171,7 @@ state.neo1973gta02 { comment.range '0 - 15' iface MIXER name 'Treble Volume' - value 7 + value 0 } control.19 { comment.access 'read write' @@ -209,8 +209,8 @@ state.neo1973gta02 { comment.range '0 - 63' iface MIXER name 'Capture Volume' - value.0 24 - value.1 24 + value.0 23 + value.1 23 } control.23 { comment.access 'read write' @@ -276,7 +276,7 @@ state.neo1973gta02 { comment.range '0 - 7' iface MIXER name 'ALC Capture Max Volume' - value 1 + value 7 } control.30 { comment.access 'read write' @@ -288,7 +288,7 @@ state.neo1973gta02 { comment.item.3 Stereo iface MIXER name 'ALC Capture Function' - value Stereo + value Left } control.31 { comment.access 'read write' @@ -305,7 +305,7 @@ state.neo1973gta02 { comment.range '0 - 15' iface MIXER name 'ALC Capture Hold Time' - value 7 + value 15 } control.33 { comment.access 'read write' @@ -495,6 +495,16 @@ state.neo1973gta02 { comment.access 'read write' comment.type ENUMERATED comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 comment.item.0 'Mic 1' comment.item.1 'Mic 2' comment.item.2 'Mic 3' @@ -502,7 +512,7 @@ state.neo1973gta02 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973gta02 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973gta02 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973gta02 { name 'Line Mono Mux' value 'Line Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -546,7 +556,7 @@ state.neo1973gta02 { name 'Line Right Mux' value 'Rx Mix' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -556,7 +566,7 @@ state.neo1973gta02 { name 'Line Left Mux' value 'Rx Mix' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973gta02 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973gta02 { name 'ALC Mixer Mic2 Capture Switch' value true } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973gta02 { name 'ALC Mixer Mic1 Capture Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973gta02 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973gta02 { name 'Mic Sidetone Mux' value 'Left PGA' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973gta02 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973gta02 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973gta02 { name 'Capture Right Mixer' value Stereo } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973gta02 { name 'Capture Left Mixer' value Stereo } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973gta02 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973gta02 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973gta02 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973gta02 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973gta02 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973gta02 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973gta02 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973gta02 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973gta02 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973gta02 { name 'Mono Mixer Sidetone Playback Sw' value true } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973gta02 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,31 +762,31 @@ state.neo1973gta02 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER name 'Right Mixer Sidetone Playback S' - value true + value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER name 'Right Mixer Right Playback Swit' - value false + value true } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER name 'Right Mixer Bypass Playback Swi' - value false + value true } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973gta02 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,15 +802,15 @@ state.neo1973gta02 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER name 'Left Mixer Left Playback Switch' - value false + value true } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,15 +818,15 @@ state.neo1973gta02 { name 'Left Mixer Bypass Playback Swit' value true } - control.86 { + control.87 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER name 'DAPM Stereo Out Switch' - value true + value false } - control.87 { + control.88 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -824,7 +834,7 @@ state.neo1973gta02 { name 'DAPM GSM Line Out Switch' value true } - control.88 { + control.89 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -832,7 +842,7 @@ state.neo1973gta02 { name 'DAPM GSM Line In Switch' value false } - control.89 { + control.90 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -840,7 +850,7 @@ state.neo1973gta02 { name 'DAPM Headset Mic Switch' value false } - control.90 { + control.91 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -848,7 +858,7 @@ state.neo1973gta02 { name 'DAPM Handset Mic Switch' value true } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -856,4 +866,20 @@ state.neo1973gta02 { name 'DAPM Handset Spk Switch' value true } + control.93 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Amp State Switch' + value false + } + control.94 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Amp Spk Switch' + value false + } } diff --git a/packages/alsa/alsa-state/fic-gta02/stereoout.state b/packages/alsa/alsa-state/fic-gta02/stereoout.state index 04e6f60da9..3b46fc7223 100644 --- a/packages/alsa/alsa-state/fic-gta02/stereoout.state +++ b/packages/alsa/alsa-state/fic-gta02/stereoout.state @@ -495,6 +495,16 @@ state.neo1973gta02 { comment.access 'read write' comment.type ENUMERATED comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 comment.item.0 'Mic 1' comment.item.1 'Mic 2' comment.item.2 'Mic 3' @@ -502,7 +512,7 @@ state.neo1973gta02 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973gta02 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973gta02 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973gta02 { name 'Line Mono Mux' value 'Line Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -544,9 +554,9 @@ state.neo1973gta02 { comment.item.1 'Rx Mix' iface MIXER name 'Line Right Mux' - value 'Line 2' + value 'Rx Mix' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -554,9 +564,9 @@ state.neo1973gta02 { comment.item.1 'Rx Mix' iface MIXER name 'Line Left Mux' - value 'Line 1' + value 'Rx Mix' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973gta02 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973gta02 { name 'ALC Mixer Mic2 Capture Switch' value false } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973gta02 { name 'ALC Mixer Mic1 Capture Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973gta02 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973gta02 { name 'Mic Sidetone Mux' value 'Left PGA' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973gta02 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973gta02 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973gta02 { name 'Capture Right Mixer' value Stereo } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973gta02 { name 'Capture Left Mixer' value Stereo } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973gta02 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973gta02 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973gta02 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973gta02 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973gta02 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973gta02 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973gta02 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973gta02 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973gta02 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973gta02 { name 'Mono Mixer Sidetone Playback Sw' value false } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973gta02 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,7 +762,7 @@ state.neo1973gta02 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -760,7 +770,7 @@ state.neo1973gta02 { name 'Right Mixer Sidetone Playback S' value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -768,7 +778,7 @@ state.neo1973gta02 { name 'Right Mixer Right Playback Swit' value true } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -776,7 +786,7 @@ state.neo1973gta02 { name 'Right Mixer Bypass Playback Swi' value false } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973gta02 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,7 +802,7 @@ state.neo1973gta02 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -800,7 +810,7 @@ state.neo1973gta02 { name 'Left Mixer Left Playback Switch' value true } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,7 +818,7 @@ state.neo1973gta02 { name 'Left Mixer Bypass Playback Swit' value false } - control.86 { + control.87 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -816,7 +826,7 @@ state.neo1973gta02 { name 'DAPM Stereo Out Switch' value true } - control.87 { + control.88 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -824,7 +834,7 @@ state.neo1973gta02 { name 'DAPM GSM Line Out Switch' value false } - control.88 { + control.89 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -832,7 +842,7 @@ state.neo1973gta02 { name 'DAPM GSM Line In Switch' value false } - control.89 { + control.90 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -840,7 +850,7 @@ state.neo1973gta02 { name 'DAPM Headset Mic Switch' value false } - control.90 { + control.91 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -848,7 +858,7 @@ state.neo1973gta02 { name 'DAPM Handset Mic Switch' value false } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -856,7 +866,7 @@ state.neo1973gta02 { name 'DAPM Handset Spk Switch' value false } - control.92 { + control.93 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -864,7 +874,7 @@ state.neo1973gta02 { name 'Amp State Switch' value true } - control.93 { + control.94 { comment.access 'read write' comment.type BOOLEAN comment.count 1 diff --git a/packages/at76c503a/at76c503a-modules_0.17.bb b/packages/at76c503a/at76c503a-modules_0.17.bb index affffa39ef..58b782b483 100644 --- a/packages/at76c503a/at76c503a-modules_0.17.bb +++ b/packages/at76c503a/at76c503a-modules_0.17.bb @@ -1,7 +1,10 @@ +DESCRIPTION = "Driver for at76 based usb-wifi devices" SECTION = "base" LICENSE = "GPL" -SRCDATE = "20080116" +PR = "r1" + +RDEPENDS = "at76c503-firmware" SRC_URI = "http://download.berlios.de/at76c503a/at76_usb-0.17.tar.gz" S = "${WORKDIR}/at76_usb-${PV}/" diff --git a/packages/classpath/classpath-minimal_0.96.1.bb b/packages/classpath/classpath-minimal_0.96.1.bb index e71884dc2b..826c5a9479 100644 --- a/packages/classpath/classpath-minimal_0.96.1.bb +++ b/packages/classpath/classpath-minimal_0.96.1.bb @@ -1,8 +1,11 @@ require classpath.inc -PR = "r5" +PR = "r6" -SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0" +SRC_URI += "\ + file://gjar-prefix-patch.diff;patch=1;pnum=0 \ + file://xmlstream-fix.patch;patch=1;pnum=0 \ + " PROVIDES = "${PN} classpath" @@ -15,3 +18,5 @@ EXTRA_OECONF += "\ --disable-dssi \ --disable-examples \ " + +CPPACKAGES = "${PBN}-common ${PBN}-tools" diff --git a/packages/classpath/classpath-minimal_0.97.bb b/packages/classpath/classpath-minimal_0.97.bb index 14495cedff..7a44226940 100644 --- a/packages/classpath/classpath-minimal_0.97.bb +++ b/packages/classpath/classpath-minimal_0.97.bb @@ -1,6 +1,10 @@ require classpath.inc -PR = "r0" +SRC_URI += "\ + file://xmlstream-fix.patch;patch=1;pnum=0 \ + " + +PR = "r1" PROVIDES = "${PN} classpath" @@ -13,3 +17,6 @@ EXTRA_OECONF += "\ --disable-dssi \ --disable-examples \ " + +CPPACKAGES = "${PBN}-common ${PBN}-tools" + diff --git a/packages/classpath/classpath-native_0.96.1.bb b/packages/classpath/classpath-native_0.96.1.bb index e7d1d07a81..b9c3b3a4f1 100644 --- a/packages/classpath/classpath-native_0.96.1.bb +++ b/packages/classpath/classpath-native_0.96.1.bb @@ -1,6 +1,9 @@ require classpath-native.inc -PR = "r1" +PR = "r2" -SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0" +SRC_URI += "\ + file://gjar-prefix-patch.diff;patch=1;pnum=0 \ + file://xmlstream-fix.patch;patch=1;pnum=0 \ + " diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index e5f5170b32..cfb9f1c089 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -44,9 +44,14 @@ do_install() { mv ${D}${libdir}/security ${D}${libdir}/${PBN} } -PACKAGES =+ "${PBN}-common ${PN}-examples \ +# Defines the packages that this classpath recipe creates. +# This allows the classpath-minimal variants to override this +# again. +CPPACKAGES = "${PBN}-common ${PN}-examples \ ${PN}-tools ${PN}-tools-doc \ - ${PN}-gtk ${PN}-gconf " + ${PN}-gtk ${PN}-gconf" + +PACKAGES =+ "${CPPACKAGES}" FILES_${PN}-dev += "${libdir}/${PBN}/*.la ${incdir}/${PBN}" diff --git a/packages/classpath/classpath_0.95.bb b/packages/classpath/classpath_0.95.bb index 6b167a2d47..0b2090f72f 100644 --- a/packages/classpath/classpath_0.95.bb +++ b/packages/classpath/classpath_0.95.bb @@ -1,8 +1,11 @@ require classpath.inc -SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0" +SRC_URI += "\ + file://gjar-prefix-patch.diff;patch=1;pnum=0 \ + file://xmlstream-fix.patch;patch=1;pnum=0 \ + " -PR = "r2" +PR = "r3" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/classpath/classpath_0.96.1.bb b/packages/classpath/classpath_0.96.1.bb index 799b0f31ac..9d347a0303 100644 --- a/packages/classpath/classpath_0.96.1.bb +++ b/packages/classpath/classpath_0.96.1.bb @@ -1,8 +1,11 @@ require classpath.inc -SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0 \ - " -PR = "r4" +SRC_URI += "\ + file://gjar-prefix-patch.diff;patch=1;pnum=0 \ + file://xmlstream-fix.patch;patch=1;pnum=0 \ + " + +PR = "r5" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/classpath/classpath_0.97.bb b/packages/classpath/classpath_0.97.bb index b8cd02084a..4e45dd4350 100644 --- a/packages/classpath/classpath_0.97.bb +++ b/packages/classpath/classpath_0.97.bb @@ -1,6 +1,10 @@ require classpath.inc -PR = "r0" +SRC_URI += "\ + file://xmlstream-fix.patch;patch=1;pnum=0 \ + " + +PR = "r1" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/classpath/files/xmlstream-fix.patch b/packages/classpath/files/xmlstream-fix.patch new file mode 100644 index 0000000000..30b44178d7 --- /dev/null +++ b/packages/classpath/files/xmlstream-fix.patch @@ -0,0 +1,93 @@ +Index: gnu/xml/stream/AttributeImpl.java +=================================================================== +RCS file: /sources/classpath/classpath/gnu/xml/stream/AttributeImpl.java,v +retrieving revision 1.1 +diff -u -r1.1 AttributeImpl.java +--- gnu/xml/stream/AttributeImpl.java 4 Sep 2005 09:52:10 -0000 1.1 ++++ gnu/xml/stream/AttributeImpl.java 4 Mar 2008 16:02:43 -0000 +@@ -56,11 +56,11 @@ + + protected final QName name; + protected final String value; +- protected final QName type; ++ protected final String type; + protected final boolean specified; + + protected AttributeImpl(Location location, +- QName name, String value, QName type, ++ QName name, String value, String type, + boolean specified) + { + super(location); +@@ -85,7 +85,7 @@ + return value; + } + +- public QName getDTDType() ++ public String getDTDType() + { + return type; + } +Index: gnu/xml/stream/XMLEventAllocatorImpl.java +=================================================================== +RCS file: /sources/classpath/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java,v +retrieving revision 1.3 +diff -u -r1.3 XMLEventAllocatorImpl.java +--- gnu/xml/stream/XMLEventAllocatorImpl.java 3 Mar 2006 12:30:59 -0000 1.3 ++++ gnu/xml/stream/XMLEventAllocatorImpl.java 4 Mar 2008 16:02:44 -0000 +@@ -165,7 +165,7 @@ + attributes.add(new AttributeImpl(location, + reader.getAttributeName(i), + reader.getAttributeValue(i), +- QName.valueOf(reader.getAttributeType(i)), ++ reader.getAttributeType(i), + reader.isAttributeSpecified(i))); + return new StartElementImpl(location, + reader.getName(), +Index: gnu/xml/stream/XMLEventFactoryImpl.java +=================================================================== +RCS file: /sources/classpath/classpath/gnu/xml/stream/XMLEventFactoryImpl.java,v +retrieving revision 1.2 +diff -u -r1.2 XMLEventFactoryImpl.java +--- gnu/xml/stream/XMLEventFactoryImpl.java 3 Mar 2006 12:30:59 -0000 1.2 ++++ gnu/xml/stream/XMLEventFactoryImpl.java 4 Mar 2008 16:02:44 -0000 +@@ -79,20 +79,20 @@ + { + return new AttributeImpl(location, + new QName(namespaceURI, localName, prefix), +- value, QName.valueOf("CDATA"), true); ++ value, "CDATA", true); + } + + public Attribute createAttribute(String localName, String value) + { + return new AttributeImpl(location, + new QName(localName), +- value, QName.valueOf("CDATA"), true); ++ value, "CDATA", true); + } + + public Attribute createAttribute(QName name, String value) + { + return new AttributeImpl(location, name, value, +- QName.valueOf("CDATA"), true); ++ "CDATA", true); + } + + public Namespace createNamespace(String namespaceURI) +Index: javax/xml/stream/events/Attribute.java +=================================================================== +RCS file: /sources/classpath/classpath/javax/xml/stream/events/Attribute.java,v +retrieving revision 1.2 +diff -u -r1.2 Attribute.java +--- javax/xml/stream/events/Attribute.java 4 Sep 2005 09:44:30 -0000 1.2 ++++ javax/xml/stream/events/Attribute.java 4 Mar 2008 16:02:48 -0000 +@@ -59,7 +59,7 @@ + /** + * Returns the type of this attribute. + */ +- QName getDTDType(); ++ String getDTDType(); + + /** + * Indicates whether this attribute was specified in the input source, or diff --git a/packages/freesmartphone/enter_0.0.2.bb b/packages/freesmartphone/enter_0.0.2.bb index 7f1dd09a25..2a51af6506 100644 --- a/packages/freesmartphone/enter_0.0.2.bb +++ b/packages/freesmartphone/enter_0.0.2.bb @@ -1,4 +1,4 @@ -DESCRIPTION="A easy-to-use virtual keyboard for small touchscreen displays" +DESCRIPTION = "An easy-to-use virtual keyboard for small touchscreen displays" SECTION = "openmoko/inputmethods" DEPENDS = "ecore evas edje" PR = "r0" diff --git a/packages/freesmartphone/gsm0710muxd_svn.bb b/packages/freesmartphone/gsm0710muxd_svn.bb index 6c3d29aed4..60ea915933 100644 --- a/packages/freesmartphone/gsm0710muxd_svn.bb +++ b/packages/freesmartphone/gsm0710muxd_svn.bb @@ -2,12 +2,12 @@ DESCRIPTION = "gsm 07.10 muxer userspace daemon" HOMEPAGE = "http://www.freesmartphone.org" AUTHOR = "M. Dietrich" SECTION = "console/network" -DEPENDS = "intltool-native dbus" +DEPENDS = "intltool-native dbus dbus-glib" RCONFLICTS = "gsmd" RREPLACES = "gsmd" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd" S = "${WORKDIR}/gsm0710muxd" diff --git a/packages/freesmartphone/pylgrim_svn.bb b/packages/freesmartphone/pylgrim_svn.bb new file mode 100644 index 0000000000..e70c839da8 --- /dev/null +++ b/packages/freesmartphone/pylgrim_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "A GPS moving map application featuring OpenStreetMap tiles" +HOMEPAGE = "http://neo1973-germany.de/wiki/pylgrim" +AUTHOR = "Josch" +LICENSE = "GPL" +SECTION = "x11/navigation" +DEPENDS = "edje-native" +RDEPENDS = "task-python-efl python-textutils" +PV = "0.0+svn${SRCREV}" + +SRC_URI = "svn://neo1973-germany.de/svn;module=pylgrim;proto=http" +S = "${WORKDIR}/pylgrim" + +do_compile() { + edje_cc pylgrim.edc +} + +do_install() { + install -d ${D}${datadir}/pylgrim + for i in *.py pylgrim.edj; do + install -m 0755 $i ${D}${datadir}/pylgrim/ + done +} + +FILES_${PN} += "${datadir}" diff --git a/packages/gcc/gcc3-build-cross.inc b/packages/gcc/gcc3-build-cross.inc index 1d744c1eae..33429e18ef 100644 --- a/packages/gcc/gcc3-build-cross.inc +++ b/packages/gcc/gcc3-build-cross.inc @@ -23,11 +23,6 @@ do_stage_append () { rm -rf ${CROSS_DIR}/$d done - # Hack to be removed when staging layout matches the target layout - if [ ! -e ${STAGING_DIR_TARGET}/usr ]; then - ln -s ${STAGING_DIR_TARGET} ${STAGING_DIR_TARGET}/usr - fi - # Fix a few include links so cross builds are happier if [ ! -e ${STAGING_INCDIR}/c++ ]; then mkdir -p ${STAGING_INCDIR} diff --git a/packages/gcc/gcc3-build-sdk.inc b/packages/gcc/gcc3-build-sdk.inc index aa540212c4..5bc187b745 100644 --- a/packages/gcc/gcc3-build-sdk.inc +++ b/packages/gcc/gcc3-build-sdk.inc @@ -5,6 +5,8 @@ SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1' STAGING_TARGET_INCDIR = "${STAGING_DIR_TARGET}${layout_includedir}" STAGING_TARGET_LIBDIR = "${STAGING_DIR_TARGET}${layout_libdir}" +EXTRA_OECONF += "--with-sysroot=${prefix}/${TARGET_SYS} --with-build-sysroot=${STAGING_DIR_TARGET}" + do_configure () { (cd ${S} && gnu-configize) || die "failure running gnu-configize" (cd ${S}/libstdc++-v3 && autoreconf) diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc index 10526454c3..d6af5fe933 100644 --- a/packages/gcc/gcc4-build-sdk.inc +++ b/packages/gcc/gcc4-build-sdk.inc @@ -4,10 +4,6 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d EXTRA_OECONF += "--with-sysroot=${prefix}/${TARGET_SYS} --with-build-sysroot=${STAGING_DIR_TARGET}" do_configure () { - # Hack to be removed when staging layout matches the target layout - if [ ! -e ${STAGING_DIR_TARGET}/usr ]; then - ln -s ${STAGING_DIR_TARGET} ${STAGING_DIR_TARGET}/usr - fi (cd ${S} && gnu-configize) || die "failure running gnu-configize" (cd ${S}/libstdc++-v3 && autoreconf) oe_runconf diff --git a/packages/gnutls/gnutls-1.4.4/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.15.6/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnutls/gnutls-1.4.4/.mtn2git_empty +++ b/packages/glib-2.0/glib-2.0-2.15.6/.mtn2git_empty diff --git a/packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch new file mode 100644 index 0000000000..a52327c8c9 --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch @@ -0,0 +1,29 @@ +--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100 ++++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100 +@@ -1174,7 +1174,7 @@ + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1265,7 +1265,7 @@ + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile ${CC} -shared \ ++ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ + -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ +@@ -1339,7 +1339,7 @@ + + AC_MSG_CHECKING(for the suffix of shared libraries) + export SED +-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` ++shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='` + eval $shrext_cmds + module=yes eval std_shrext=$shrext_cmds + # chop the initial dot diff --git a/packages/glib-2.0/glib-2.0_2.15.6.bb b/packages/glib-2.0/glib-2.0_2.15.6.bb new file mode 100644 index 0000000000..525a9d23de --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.15.6.bb @@ -0,0 +1,6 @@ +require glib.inc + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.15/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1 \ + " diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc index 3fa6fe26ab..596b3bb90b 100644 --- a/packages/glib-2.0/glib.inc +++ b/packages/glib-2.0/glib.inc @@ -34,11 +34,7 @@ do_configure_prepend () { } do_stage () { - oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} - autotools_stage_includes + autotools_stage_all install -d ${STAGING_INCDIR}/glib-2.0/glib install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h install -d ${STAGING_DATADIR}/aclocal diff --git a/packages/glibc/glibc-2.4/glibc-arm-IO-acquire-lock-fix.diff b/packages/glibc/glibc-2.4/glibc-arm-IO-acquire-lock-fix.diff new file mode 100644 index 0000000000..a552cf0d1f --- /dev/null +++ b/packages/glibc/glibc-2.4/glibc-arm-IO-acquire-lock-fix.diff @@ -0,0 +1,13 @@ +Arm needs a similar fix as http://sourceware.org/ml/libc-ports/2007-12/msg00000.html + +--- /tmp/stdio-lock.h 2008-03-04 18:51:15.555038993 +0100 ++++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/bits/stdio-lock.h 2008-03-04 18:51:28.445035052 +0100 +@@ -50,6 +50,8 @@ + _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \ + _IO_flockfile (_fp) + ++# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp) ++ + # define _IO_release_lock(_fp) \ + _IO_funlockfile (_fp); \ + _IO_cleanup_region_end (0) diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb index 357196e5a7..97ce488df4 100644 --- a/packages/glibc/glibc_2.7.bb +++ b/packages/glibc/glibc_2.7.bb @@ -57,6 +57,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ # file://fixup-aeabi-syscalls.patch;patch=1 \ # file://zecke-sane-readelf.patch;patch=1 \ file://ldd-unbash.patch;patch=1 \ + file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \ file://generic-bits_select.h \ file://generic-bits_types.h \ file://generic-bits_typesizes.h \ diff --git a/packages/gnome/epiphany_2.21.92.bb b/packages/gnome/epiphany_2.21.92.bb new file mode 100644 index 0000000000..c385c1d208 --- /dev/null +++ b/packages/gnome/epiphany_2.21.92.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "GNOME default webbrowser" +DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" +RDEPENDS = "gnome-vfs-plugin-http" + +inherit gnome + +EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}" + +do_configure_prepend() { + touch ${S}/gnome-doc-utils.make + sed -i -e s:help::g Makefile.am +} + +FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" + + diff --git a/packages/gnutls/gnutls-1.4.4/gnutls-openssl.patch b/packages/gnutls/gnutls-1.4.4/gnutls-openssl.patch deleted file mode 100644 index 6eca97efd7..0000000000 --- a/packages/gnutls/gnutls-1.4.4/gnutls-openssl.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- gnutls-1.3.5/libextra/gnutls_openssl.c.orig 2006-04-28 20:01:40.000000000 +0100 -+++ gnutls-1.3.5/libextra/gnutls_openssl.c 2006-04-28 20:10:33.000000000 +0100 -@@ -252,12 +252,17 @@ - ssl->rfd = (gnutls_transport_ptr_t) - 1; - ssl->wfd = (gnutls_transport_ptr_t) - 1; - -+ ssl->ssl_peek_buffer = NULL; -+ ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0; -+ - return ssl; - } - - void - SSL_free (SSL * ssl) - { -+ if (ssl->ssl_peek_buffer) -+ free(ssl->ssl_peek_buffer); - gnutls_certificate_free_credentials (ssl->gnutls_cred); - gnutls_deinit (ssl->gnutls_state); - free (ssl); -@@ -281,6 +286,7 @@ - SSL_set_fd (SSL * ssl, int fd) - { - gnutls_transport_set_ptr (ssl->gnutls_state, (gnutls_transport_ptr_t) fd); -+ ssl->rfd = ssl->wfd = fd; - return 1; - } - -@@ -306,6 +312,17 @@ - return 1; - } - -+int SSL_get_rfd(SSL *ssl) -+{ -+ return ssl->rfd; -+} -+ -+int SSL_get_wfd(SSL *ssl) -+{ -+ return ssl->wfd; -+} -+ -+ - void - SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio) - { -@@ -321,6 +338,8 @@ - int - SSL_pending (SSL * ssl) - { -+ if (ssl->ssl_peek_avail) -+ return ssl->ssl_peek_avail; - return gnutls_record_check_pending (ssl->gnutls_state); - } - -@@ -476,11 +495,50 @@ - return 1; - } - -+int SSL_peek(SSL *ssl, void *buf, int len) -+{ -+ if (len > ssl->ssl_peek_buffer_size) { -+ ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len); -+ ssl->ssl_peek_buffer_size = len; -+ } -+ -+ if (ssl->ssl_peek_avail == 0) { -+ -+ int ret; -+ -+ ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len); -+ ssl->last_error = ret; -+ -+ if (ret > 0) -+ ssl->ssl_peek_avail += ret; -+ } -+ -+ if (len > ssl->ssl_peek_avail) -+ len = ssl->ssl_peek_avail; -+ -+ memcpy (buf, ssl->ssl_peek_buffer, len); -+ -+ return len; -+} -+ - int - SSL_read (SSL * ssl, void *buf, int len) - { - int ret; - -+ if (ssl->ssl_peek_avail) { -+ int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail; -+ -+ memcpy (buf, ssl->ssl_peek_buffer, n); -+ -+ if (ssl->ssl_peek_avail > n) -+ memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n); -+ -+ ssl->ssl_peek_avail -= n; -+ -+ return n; -+ } -+ - ret = gnutls_record_recv (ssl->gnutls_state, buf, len); - ssl->last_error = ret; - ---- gnutls-1.3.5/includes/gnutls/openssl.h.orig 2006-04-28 20:10:55.000000000 +0100 -+++ gnutls-1.3.5/includes/gnutls/openssl.h 2006-04-28 20:11:52.000000000 +0100 -@@ -164,6 +164,11 @@ - - gnutls_transport_ptr_t rfd; - gnutls_transport_ptr_t wfd; -+ -+ char *ssl_peek_buffer; -+ size_t ssl_peek_buffer_size; -+ size_t ssl_peek_avail; -+ - }; - - #define rbio gnutls_state diff --git a/packages/linux/simpad/.mtn2git_empty b/packages/gtk-webcore/midori-0.0.17/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/simpad/.mtn2git_empty +++ b/packages/gtk-webcore/midori-0.0.17/.mtn2git_empty diff --git a/packages/gtk-webcore/midori-0.0.17/webkit-update.patch b/packages/gtk-webcore/midori-0.0.17/webkit-update.patch new file mode 100644 index 0000000000..d3d19123cf --- /dev/null +++ b/packages/gtk-webcore/midori-0.0.17/webkit-update.patch @@ -0,0 +1,676 @@ +Update midori 0.17 to the new pkgconfig and header location. Taken from upstream git + +diff -Nurd midori-0.0.17/src/browser.c midori/src/browser.c +--- midori-0.0.17/src/browser.c 2008-01-23 02:20:22.000000000 +0100 ++++ midori/src/browser.c 2008-03-05 10:43:08.028499025 +0100 +@@ -1,5 +1,5 @@ + /* +- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de> ++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -290,6 +290,15 @@ + g_free(source);*/ + } + ++void on_action_fullscreen_activate(GtkAction* action, CBrowser* browser) ++{ ++ GdkWindowState state = gdk_window_get_state(browser->window->window); ++ if(state & GDK_WINDOW_STATE_FULLSCREEN) ++ gtk_window_unfullscreen(GTK_WINDOW(browser->window)); ++ else ++ gtk_window_fullscreen(GTK_WINDOW(browser->window)); ++} ++ + void on_action_back_activate(GtkAction* action, CBrowser* browser) + { + webkit_web_view_go_back(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); +@@ -1125,13 +1134,35 @@ + update_search_engines(browser); + } + ++static void on_window_state_changed(GtkWidget* widget ++ , GdkEventWindowState* event, CBrowser* browser) ++{ ++ if(event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) ++ { ++ if(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) ++ { ++ gtk_widget_hide(browser->menubar); ++ g_object_set(browser->fullscreen, "stock-id" ++ , GTK_STOCK_LEAVE_FULLSCREEN, NULL); ++ gtk_widget_show(browser->fullscreen); ++ } ++ else ++ { ++ gtk_widget_show(browser->menubar); ++ gtk_widget_hide(browser->fullscreen); ++ g_object_set(browser->fullscreen, "stock-id" ++ , GTK_STOCK_FULLSCREEN, NULL); ++ } ++ } ++} ++ + static void on_window_size_allocate(GtkWidget* widget, GtkAllocation* allocation + , CBrowser* browser) + { + if(GTK_WIDGET_REALIZED(widget)) + { +- if(!(gdk_window_get_state(widget->window) +- & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) ++ GdkWindowState state = gdk_window_get_state(widget->window); ++ if(!(state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) + { + config->winWidth = allocation->width; + config->winHeight = allocation->height; +@@ -1180,6 +1211,8 @@ + + // Setup the window metrics + browser->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); ++ g_signal_connect(browser->window, "window-state-event" ++ , G_CALLBACK(on_window_state_changed), browser); + GdkScreen* screen = gtk_window_get_screen(GTK_WINDOW(browser->window)); + const gint defaultWidth = (gint)gdk_screen_get_width(screen) / 1.7; + const gint defaultHeight = (gint)gdk_screen_get_height(screen) / 1.7; +@@ -1351,6 +1384,13 @@ + gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar) + , GTK_TOOL_ITEM(browser->closedTabs), -1); + sokoke_container_show_children(GTK_CONTAINER(browser->navibar)); ++ action = gtk_action_group_get_action(browser->actiongroup, "Fullscreen"); ++ browser->fullscreen = gtk_action_create_tool_item(action); ++ gtk_widget_hide(browser->fullscreen); ++ g_signal_connect(browser->fullscreen, "clicked" ++ , G_CALLBACK(on_action_fullscreen_activate), browser); ++ gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar) ++ , GTK_TOOL_ITEM(browser->fullscreen), -1); + action_set_active("ToolbarNavigation", config->toolbarNavigation, browser); + + // Bookmarkbar +@@ -1605,6 +1645,7 @@ + browser->location = oldBrowser->location; + browser->webSearch = oldBrowser->webSearch; + browser->closedTabs = oldBrowser->closedTabs; ++ browser->fullscreen = oldBrowser->fullscreen; + browser->bookmarkbar = oldBrowser->bookmarkbar; + browser->panels = oldBrowser->panels; + browser->panels_notebook = oldBrowser->panels_notebook; +@@ -1691,7 +1732,9 @@ + + // Connect signals + #define DOC_CONNECT(__sig, __func) g_signal_connect \ +- (G_OBJECT(browser->webView), __sig, G_CALLBACK(__func), browser); ++ (browser->webView, __sig, G_CALLBACK(__func), browser); ++ #define DOC_CONNECTA(__sig, __func) g_signal_connect_after \ ++ (browser->webView, __sig, G_CALLBACK(__func), browser); + DOC_CONNECT ("navigation-requested" , on_webView_navigation_requested) + DOC_CONNECT ("title-changed" , on_webView_title_changed) + DOC_CONNECT ("icon-loaded" , on_webView_icon_changed) +@@ -1704,11 +1747,13 @@ + DOC_CONNECT ("console-message" , on_webView_console_message) + + DOC_CONNECT ("button-press-event" , on_webView_button_press) ++ DOC_CONNECTA ("button-press-event" , on_webView_button_press_after) + DOC_CONNECT ("popup-menu" , on_webView_popup); + DOC_CONNECT ("scroll-event" , on_webView_scroll); + DOC_CONNECT ("leave-notify-event" , on_webView_leave) + DOC_CONNECT ("destroy" , on_webView_destroy) + #undef DOC_CONNECT ++ #undef DOC_CONNECTA + + webkit_web_view_set_settings(WEBKIT_WEB_VIEW(browser->webView), webSettings); + +diff -Nurd midori-0.0.17/src/browser.h midori/src/browser.h +--- midori-0.0.17/src/browser.h 2008-01-20 19:16:17.000000000 +0100 ++++ midori/src/browser.h 2008-03-05 10:43:08.028499025 +0100 +@@ -39,6 +39,7 @@ + GtkWidget* location; + GtkWidget* webSearch; + GtkWidget* closedTabs; ++ GtkWidget* fullscreen; + GtkWidget* bookmarkbar; + // panels + GtkWidget* panels; +@@ -161,6 +162,9 @@ + on_action_source_view_activate(GtkAction*, CBrowser*); + + void ++on_action_fullscreen_activate(GtkAction*, CBrowser*); ++ ++void + on_action_back_activate(GtkAction*, CBrowser*); + + void +@@ -364,6 +368,9 @@ + { "Properties", GTK_STOCK_PROPERTIES + , NULL, "" + , "hm?", NULL/*G_CALLBACK(on_action_properties_activate)*/ }, ++ { "Fullscreen", GTK_STOCK_FULLSCREEN ++ , NULL, "F11" ++ , "Toggle fullscreen view", G_CALLBACK(on_action_fullscreen_activate) }, + + { "Go", NULL, "_Go" }, + { "Back", GTK_STOCK_GO_BACK +diff -Nurd midori-0.0.17/src/conf.c midori/src/conf.c +--- midori-0.0.17/src/conf.c 2008-01-23 05:12:24.000000000 +0100 ++++ midori/src/conf.c 2008-03-05 10:43:08.028499025 +0100 +@@ -1,5 +1,5 @@ + /* +- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de> ++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -64,6 +64,7 @@ + GET_INT(config->newPages, "NewPages", CONFIG_NEWPAGES_TAB_NEW); + GET_INT(config->openTabsInTheBackground, "OpenTabsInTheBackground", FALSE); + GET_INT(config->openPopupsInTabs, "OpenPopupsInTabs", FALSE); ++ GET_INT(config->middleClickGoto, "MiddleClickGoto", FALSE); + #undef GET_INT + #undef GET_STR + +@@ -73,6 +74,10 @@ + #define GET_STR(var, key, default) \ + var = sokoke_key_file_get_string_default( \ + keyFile, "content", key, default, NULL) ++ GET_STR(config->defaultFontFamily, "DefaultFontFamily", "Sans"); ++ GET_INT(config->defaultFontSize, "DefaultFontSize", 10); ++ GET_INT(config->minimumFontSize, "MinimumFontSize", 5); ++ GET_STR(config->defaultEncoding, "DefaultEncoding", "UTF-8"); + GET_INT(config->autoLoadImages, "AutoLoadImages", TRUE); + GET_INT(config->autoShrinkImages, "AutoShrinkImages", TRUE); + GET_INT(config->printBackgrounds, "PrintBackgrounds", FALSE); +@@ -143,7 +148,12 @@ + g_key_file_set_integer(keyFile, "browser", "NewPages", config->newPages); + g_key_file_set_integer(keyFile, "browser", "OpenTabsInTheBackground", config->openTabsInTheBackground); + g_key_file_set_integer(keyFile, "browser", "OpenPopupsInTabs", config->openPopupsInTabs); ++ g_key_file_set_integer(keyFile, "browser", "MiddleClickGoto", config->middleClickGoto); + ++ g_key_file_set_string (keyFile, "content", "DefaultFontFamily", config->defaultFontFamily); ++ g_key_file_set_integer(keyFile, "content", "DefaultFontSize", config->defaultFontSize); ++ g_key_file_set_integer(keyFile, "content", "MinimumFontSize", config->minimumFontSize); ++ g_key_file_set_string (keyFile, "content", "DefaultEncoding", config->defaultEncoding); + g_key_file_set_integer(keyFile, "content", "AutoLoadImages", config->autoLoadImages); + g_key_file_set_integer(keyFile, "content", "AutoShrinkImages", config->autoShrinkImages); + g_key_file_set_integer(keyFile, "content", "PrintBackgrounds", config->printBackgrounds); +diff -Nurd midori-0.0.17/src/conf.h midori/src/conf.h +--- midori-0.0.17/src/conf.h 2008-01-23 05:11:13.000000000 +0100 ++++ midori/src/conf.h 2008-03-05 10:43:08.028499025 +0100 +@@ -1,5 +1,5 @@ + /* +- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de> ++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -36,8 +36,12 @@ + guint newPages; // where to open new pages + gboolean openTabsInTheBackground; + gboolean openPopupsInTabs; ++ gboolean middleClickGoto; + +- ++ gchar* defaultFontFamily; ++ guint defaultFontSize; ++ guint minimumFontSize; ++ gchar* defaultEncoding; + gboolean autoLoadImages; + gboolean autoShrinkImages; + gboolean printBackgrounds; +diff -Nurd midori-0.0.17/src/global.h midori/src/global.h +--- midori-0.0.17/src/global.h 2008-01-23 03:13:40.000000000 +0100 ++++ midori/src/global.h 2008-03-05 10:43:08.028499025 +0100 +@@ -16,7 +16,7 @@ + #include "../katze/katze.h" + + #include <gtk/gtk.h> +-#include <webkit.h> ++#include <webkit/webkit.h> + + // -- globals + +@@ -81,5 +81,9 @@ + #if !GTK_CHECK_VERSION(2, 10, 0) + #define GTK_STOCK_SELECT_ALL "gtk-select-all" + #endif ++#if !GTK_CHECK_VERSION(2, 8, 0) ++#define GTK_STOCK_FULLSCREEN "gtk-fullscreen" ++#define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen" ++#endif + + #endif /* !__GLOBAL_H__ */ +diff -Nurd midori-0.0.17/src/helpers.c midori/src/helpers.c +--- midori-0.0.17/src/helpers.c 2008-01-20 17:46:16.000000000 +0100 ++++ midori/src/helpers.c 2008-03-05 10:43:08.028499025 +0100 +@@ -16,7 +16,7 @@ + #include "../katze/katze.h" + + #include <string.h> +-#include <webkit.h> ++#include <webkit/webkit.h> + + GtkIconTheme* get_icon_theme(GtkWidget* widget) + { +@@ -417,7 +417,7 @@ + if(!strstr(uri, "://")) + { + // Do we have a domain, ip address or localhost? +- if(strstr(uri, ".") != NULL || !strcmp(uri, "localhost")) ++ if(strchr(uri, '.') != NULL || !strcmp(uri, "localhost")) + return g_strconcat("http://", uri, NULL); + // We don't want to search? So return early. + if(!search) +diff -Nurd midori-0.0.17/src/main.c midori/src/main.c +--- midori-0.0.17/src/main.c 2008-01-23 05:13:21.000000000 +0100 ++++ midori/src/main.c 2008-03-05 10:43:08.031832796 +0100 +@@ -1,5 +1,5 @@ + /* +- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de> ++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -21,6 +21,7 @@ + + #include <string.h> + #include <gtk/gtk.h> ++#include <webkit/webkit.h> + + #include "config.h" + +@@ -58,6 +59,10 @@ + #if !GTK_CHECK_VERSION(2, 10, 0) + { GTK_STOCK_SELECT_ALL, "Select _All", 0, 0, (gchar*)"gtk20" }, + #endif ++ #if !GTK_CHECK_VERSION(2, 8, 0) ++ { GTK_STOCK_FULLSCREEN, "_Fullscreen", 0, 0, (gchar*)"gtk20" }, ++ { GTK_STOCK_FULLSCREEN, "_Leave Fullscreen", 0, 0, (gchar*)"gtk20" }, ++ #endif + }; + GtkIconFactory* factory = gtk_icon_factory_new(); + guint i; +@@ -244,8 +249,11 @@ + stock_items_init(); + browsers = NULL; + +- webSettings = webkit_web_settings_new(); +- g_object_set(webSettings ++ webSettings = g_object_new(WEBKIT_TYPE_WEB_SETTINGS ++ , "default-font-family" , config->defaultFontFamily ++ , "default-font-size" , config->defaultFontSize ++ , "minimum-font-size" , config->minimumFontSize ++ , "default-encoding" , config->defaultEncoding + , "auto-load-images" , config->autoLoadImages + , "auto-shrink-images" , config->autoShrinkImages + , "print-backgrounds" , config->printBackgrounds +diff -Nurd midori-0.0.17/src/prefs.c midori/src/prefs.c +--- midori-0.0.17/src/prefs.c 2008-01-23 05:10:45.000000000 +0100 ++++ midori/src/prefs.c 2008-03-05 10:43:08.031832796 +0100 +@@ -1,5 +1,5 @@ + /* +- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de> ++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -15,7 +15,8 @@ + #include "global.h" + #include "sokoke.h" + +-#include "string.h" ++#include <stdlib.h> ++#include <string.h> + + static gboolean on_prefs_homepage_focus_out(GtkWidget* widget + , GdkEventFocus event, CPrefs* prefs) +@@ -29,11 +30,65 @@ + config->startup = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + } + ++static void on_prefs_defaultFont_changed(GtkWidget* widget, CPrefs* prefs) ++{ ++ const gchar* font = gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget)); ++ gchar** components = g_strsplit(font, " ", 0); ++ guint i, n = g_strv_length(components) - 1; ++ GString* fontName = g_string_new(NULL); ++ for(i = 0; i < n; i++) ++ g_string_append_printf(fontName, "%s ", components[i]); ++ katze_assign(config->defaultFontFamily, g_string_free(fontName, FALSE)); ++ config->defaultFontSize = atoi(components[n]); ++ g_strfreev(components); ++ g_object_set(webSettings, "default-font-family", config->defaultFontFamily ++ , "default-font-size", config->defaultFontSize, NULL); ++} ++ ++static void on_prefs_minimumFontSize_changed(GtkWidget* widget, CPrefs* prefs) ++{ ++ config->minimumFontSize = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget)); ++ g_object_set(webSettings, "minimum-font-size", config->minimumFontSize, NULL); ++} ++ ++static void on_prefs_defaultEncoding_changed(GtkWidget* widget, CPrefs* prefs) ++{ ++ gchar* encoding; ++ switch(gtk_combo_box_get_active(GTK_COMBO_BOX(widget))) ++ { ++ case 0: ++ encoding = g_strdup("BIG5"); ++ break; ++ case 1: ++ encoding = g_strdup("SHIFT_JIS"); ++ break; ++ case 2: ++ encoding = g_strdup("KOI8-R"); ++ break; ++ case 3: ++ encoding = g_strdup("UTF-8"); ++ break; ++ case 4: ++ encoding = g_strdup("ISO-8859-1"); ++ break; ++ default: ++ encoding = g_strdup("UTF-8"); ++ g_warning("Invalid default encoding"); ++ } ++ katze_assign(config->defaultEncoding, encoding); ++ g_object_set(webSettings, "default-encoding", config->defaultEncoding, NULL); ++} ++ + static void on_prefs_newpages_changed(GtkWidget* widget, CPrefs* prefs) + { + config->newPages = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + } + ++void on_prefs_middleClickGoto_toggled(GtkWidget* widget, CPrefs* prefs) ++{ ++ config->middleClickGoto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); ++} ++ + void on_prefs_openTabsInTheBackground_toggled(GtkWidget* widget, CPrefs* prefs) + { + config->openTabsInTheBackground = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); +@@ -302,7 +357,7 @@ + #define WIDGET_ADD(__widget, __left, __right, __top, __bottom)\ + gtk_table_attach(GTK_TABLE(table), __widget\ + , __left, __right, __top, __bottom\ +- , 0, GTK_FILL, 8, 2) ++ , GTK_FILL, GTK_FILL, 8, 2) + #define FILLED_ADD(__widget, __left, __right, __top, __bottom)\ + gtk_table_attach(GTK_TABLE(table), __widget\ + , __left, __right, __top, __bottom\ +@@ -371,30 +426,42 @@ + PAGE_NEW("Appearance"); + FRAME_NEW("Font settings"); + TABLE_NEW(5, 2); +- INDENTED_ADD(gtk_label_new("Standard font"), 0, 1, 0, 1); +- button = gtk_font_button_new_with_font("Sans 10"/*config->sFontStandard*/); +- gtk_widget_set_sensitive(button, FALSE); //... ++ INDENTED_ADD(gtk_label_new_with_mnemonic("Default _font"), 0, 1, 0, 1); ++ gchar* defaultFont = g_strdup_printf("%s %d" ++ , config->defaultFontFamily, config->defaultFontSize); ++ button = gtk_font_button_new_with_font(defaultFont); ++ g_free(defaultFont); ++ g_signal_connect(button, "font-set", G_CALLBACK(on_prefs_defaultFont_changed), prefs); + FILLED_ADD(button, 1, 2, 0, 1); +- INDENTED_ADD(gtk_label_new("Minimum font size"), 0, 1, 1, 2); ++ INDENTED_ADD(gtk_label_new_with_mnemonic("_Minimum font size"), 0, 1, 1, 2); + hbox = gtk_hbox_new(FALSE, 4); +- spinbutton = gtk_spin_button_new_with_range(5, 12, 1); +- gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 5/*config->iFontSizeMin*/); +- gtk_widget_set_sensitive(spinbutton, FALSE); //... ++ spinbutton = gtk_spin_button_new_with_range(1, G_MAXINT, 1); ++ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->minimumFontSize); ++ g_signal_connect(spinbutton, "value-changed" ++ , G_CALLBACK(on_prefs_minimumFontSize_changed), prefs); + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + button = gtk_button_new_with_mnemonic("_Advanced"); + gtk_widget_set_sensitive(button, FALSE); //... + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4); + FILLED_ADD(hbox, 1, 2, 1, 2); +- INDENTED_ADD(gtk_label_new("Default encoding"), 0, 1, 2, 3); ++ INDENTED_ADD(gtk_label_new_with_mnemonic("Default _encoding"), 0, 1, 2, 3); + combobox = gtk_combo_box_new_text(); +- const gchar* encoding = NULL; g_get_charset(&encoding); +- // TODO: Fallback to utf-8 if the encoding is not sane (e.g. when lang=C) +- gchar* sEncodingDefault = g_strdup_printf("System (%s)", encoding); + sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) +- , sEncodingDefault, "Chinese", "Greek", "Japanese (SHIFT_JIS)" +- , "Korean", "Russian", "Unicode (UTF-8)", "Western (ISO-8859-1)", NULL); +- gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); //... +- gtk_widget_set_sensitive(combobox, FALSE); //... ++ , "Chinese (BIG5)", "Japanese (SHIFT_JIS)", "Russian (KOI8-R)" ++ , "Unicode (UTF-8)", "Western (ISO-8859-1)", NULL); ++ if(!strcmp(config->defaultEncoding, "BIG5")) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); ++ else if(!strcmp(config->defaultEncoding, "SHIFT_JIS")) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1); ++ else if(!strcmp(config->defaultEncoding, "KOI8-R")) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 2); ++ else if(!strcmp(config->defaultEncoding, "UTF-8")) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 3); ++ else if(!strcmp(config->defaultEncoding, "ISO-8859-1")) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 4); ++ // FIXME: Provide a 'Custom' item ++ g_signal_connect(combobox, "changed" ++ , G_CALLBACK(on_prefs_defaultEncoding_changed), prefs); + FILLED_ADD(combobox, 1, 2, 2, 3); + button = gtk_button_new_with_label("Advanced settings"); + gtk_widget_set_sensitive(button, FALSE); //... +@@ -427,15 +494,19 @@ + sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) + , "New tab", "New window", "Current tab", NULL); + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->newPages); +- g_signal_connect(combobox, "changed" +- , G_CALLBACK(on_prefs_newpages_changed), prefs); ++ g_signal_connect(combobox, "changed", G_CALLBACK(on_prefs_newpages_changed), prefs); + gtk_widget_set_sensitive(combobox, FALSE); //... + FILLED_ADD(combobox, 1, 2, 0, 1); ++ checkbutton = gtk_check_button_new_with_mnemonic("_Middle click goto"); ++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->middleClickGoto); ++ g_signal_connect(checkbutton, "toggled" ++ , G_CALLBACK(on_prefs_middleClickGoto_toggled), prefs); ++ INDENTED_ADD(checkbutton, 0, 1, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Open tabs in the _background"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openTabsInTheBackground); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_openTabsInTheBackground_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 2, 1, 2); ++ SPANNED_ADD(checkbutton, 1, 2, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Open popups in _tabs"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openPopupsInTabs); + g_signal_connect(checkbutton, "toggled" +@@ -448,7 +519,7 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoLoadImages); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_loadImagesAutomatically_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 1, 0, 1); ++ INDENTED_ADD(checkbutton, 0, 1, 0, 1); + checkbutton = gtk_check_button_new_with_mnemonic("_Shrink images to fit"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoShrinkImages); + g_signal_connect(checkbutton, "toggled" +@@ -458,7 +529,7 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->printBackgrounds); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_printBackgrounds_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 1, 1, 2); ++ INDENTED_ADD(checkbutton, 0, 1, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("_Resizable textareas"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->resizableTextAreas); + g_signal_connect(checkbutton, "toggled" +@@ -468,7 +539,7 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enableScripts); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_enableJavaScript_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 1, 2, 3); ++ INDENTED_ADD(checkbutton, 0, 1, 2, 3); + checkbutton = gtk_check_button_new_with_mnemonic("Enable _plugins"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enablePlugins); + g_signal_connect(checkbutton, "toggled" +@@ -504,7 +575,7 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarSmall); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_toolbarSmall_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 1, 1, 2); ++ INDENTED_ADD(checkbutton, 0, 1, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Show web_search"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarWebSearch); + g_signal_connect(checkbutton, "toggled" +@@ -514,42 +585,34 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarNewTab); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_toolbarNewTab_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 1, 2, 3); ++ INDENTED_ADD(checkbutton, 0, 1, 2, 3); + checkbutton = gtk_check_button_new_with_mnemonic("Show _closed tabs button"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarClosedTabs); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_toolbarClosedTabs_toggled), prefs); + SPANNED_ADD(checkbutton, 1, 2, 2, 3); + FRAME_NEW("Miscellaneous"); +- TABLE_NEW(3, 2); +- checkbutton = gtk_check_button_new_with_mnemonic +- ("Show close _buttons on tabs"); ++ TABLE_NEW(2, 2); ++ checkbutton = gtk_check_button_new_with_mnemonic("Close _buttons on tabs"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->tabClose); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_tabClose_toggled), prefs); +- SPANNED_ADD(checkbutton, 0, 1, 0, 1); ++ INDENTED_ADD(checkbutton, 0, 1, 0, 1); + hbox = gtk_hbox_new(FALSE, 4); + gtk_box_pack_start(GTK_BOX(hbox) +- , gtk_label_new_with_mnemonic("Tab Si_ze"), FALSE, FALSE, 0); ++ , gtk_label_new_with_mnemonic("Tab Si_ze"), FALSE, FALSE, 4); + spinbutton = gtk_spin_button_new_with_range(0, 36, 1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->tabSize); + g_signal_connect(spinbutton, "changed" + , G_CALLBACK(on_prefs_tabSize_changed), prefs); + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + FILLED_ADD(hbox, 1, 2, 0, 1); +- INDENTED_ADD(gtk_label_new_with_mnemonic("Tabbar _placement"), 0, 1, 1, 2); +- combobox = gtk_combo_box_new_text(); +- sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) +- , "Left", "Top", "Right", "Bottom", NULL); +- gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1); //... +- gtk_widget_set_sensitive(combobox, FALSE); //... +- FILLED_ADD(combobox, 1, 2, 1, 2); +- INDENTED_ADD(gtk_label_new_with_mnemonic("_Location search engine"), 0, 1, 2, 3); ++ INDENTED_ADD(gtk_label_new_with_mnemonic("_Location search engine"), 0, 1, 1, 2); + entry = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(entry), config->locationSearch); + g_signal_connect(entry, "focus-out-event" + , G_CALLBACK(on_prefs_locationsearch_focus_out), prefs); +- FILLED_ADD(entry, 1, 2, 2, 3); ++ FILLED_ADD(entry, 1, 2, 1, 2); + + // Page "Network" + PAGE_NEW("Network"); +diff -Nurd midori-0.0.17/src/ui.h midori/src/ui.h +--- midori-0.0.17/src/ui.h 2008-01-20 19:16:17.000000000 +0100 ++++ midori/src/ui.h 2008-03-05 10:43:08.071832738 +0100 +@@ -91,9 +91,8 @@ + "<menuitem action='ZoomOut'/>" + "<menuitem action='ZoomNormal'/>" + "<separator/>" +- "<menuitem action='BackgroundImage'/>" + "<menuitem action='SourceView'/>" +- "<menuitem action='Properties'/>" ++ "<menuitem action='Fullscreen'/>" + "</menu>" + "<menu action='Go'>" + "<menuitem action='Back'/>" +diff -Nurd midori-0.0.17/src/webSearch.h midori/src/webSearch.h +--- midori-0.0.17/src/webSearch.h 2007-12-15 04:09:47.000000000 +0100 ++++ midori/src/webSearch.h 2008-03-05 10:43:08.071832738 +0100 +@@ -16,7 +16,7 @@ + + #include <gtk/gtk.h> + #include <libsexy/sexy.h> +-#include <webkit.h> ++#include <webkit/webkit.h> + + // -- Types + +diff -Nurd midori-0.0.17/src/webView.c midori/src/webView.c +--- midori-0.0.17/src/webView.c 2008-01-13 02:47:38.000000000 +0100 ++++ midori/src/webView.c 2008-03-05 10:43:08.071832738 +0100 +@@ -1,5 +1,5 @@ + /* +- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de> ++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -251,6 +251,27 @@ + return FALSE; + } + ++gboolean on_webView_button_press_after(GtkWidget* webView, GdkEventButton* event ++ , CBrowser* browser) ++{ ++ if(event->button == 2 && config->middleClickGoto) ++ { ++ GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); ++ gchar* text = gtk_clipboard_wait_for_text(clipboard); ++ gchar* uri = NULL; ++ if(text && strchr(text, '.') && !strchr(text, ' ')) ++ uri = magic_uri(text, FALSE); ++ g_free(text); ++ if(uri) ++ { ++ webkit_web_view_open(WEBKIT_WEB_VIEW(browser->webView), uri); ++ g_free(uri); ++ return TRUE; ++ } ++ } ++ return FALSE; ++} ++ + void on_webView_popup(GtkWidget* webView, CBrowser* browser) + { + webView_popup(webView, NULL, browser); +diff -Nurd midori-0.0.17/src/webView.h midori/src/webView.h +--- midori-0.0.17/src/webView.h 2008-01-04 08:46:44.000000000 +0100 ++++ midori/src/webView.h 2008-03-05 10:43:08.071832738 +0100 +@@ -16,7 +16,7 @@ + #include "browser.h" + #include "debug.h" + +-#include <webkit.h> ++#include <webkit/webkit.h> + + WebKitNavigationResponse + on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame +@@ -60,6 +60,9 @@ + gboolean + on_webView_button_press(GtkWidget*, GdkEventButton*, CBrowser*); + ++gboolean ++on_webView_button_press_after(GtkWidget*, GdkEventButton*, CBrowser*); ++ + void + on_webView_popup(GtkWidget*, CBrowser*); + +--- midori-0.0.17/configure.in 2008-01-24 03:47:18.000000000 +0100 ++++ midori/configure.in 2008-03-05 10:43:08.025165254 +0100 +@@ -52,15 +52,15 @@ + GTK_VER=`pkg-config --modversion gtk+-2.0` + AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version]) + +-# Checks for WebKitGtk +-PKG_CHECK_MODULES(WEBKIT, WebKitGtk, have_webkit=true, have_webkit=false) ++# Checks for WebKit ++PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false) + if test "x${have_webkit}" = "xfalse" ; then +- AC_MSG_ERROR([No WebKitGtk package information found]) ++ AC_MSG_ERROR([No WebKit package information found]) + fi + AC_SUBST(WEBKIT_CFLAGS) + AC_SUBST(WEBKIT_LIBS) +-WEBKIT_VER=`pkg-config --modversion WebKitGtk` +-AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version]) ++WEBKIT_VER=`pkg-config --modversion webkit-1.0` ++AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKIT_VER", [WebKit version]) + + # Checks for libsexy + PKG_CHECK_MODULES(LIBSEXY, libsexy, have_libsexy=true, have_libsexy=false) diff --git a/packages/gypsy/gypsy.inc b/packages/gypsy/gypsy.inc index 6d78943bd5..57f88dc3bd 100644 --- a/packages/gypsy/gypsy.inc +++ b/packages/gypsy/gypsy.inc @@ -9,4 +9,8 @@ do_configure_prepend () { touch ${S}/gtk-doc.make } +do_stage() { + autotools_stage_all +} + FILES_${PN} += "${datadir}/dbus-1/services/" diff --git a/packages/gypsy/gypsy_svn.bb b/packages/gypsy/gypsy_svn.bb index 116d39bb4f..45e283b6b7 100644 --- a/packages/gypsy/gypsy_svn.bb +++ b/packages/gypsy/gypsy_svn.bb @@ -3,7 +3,7 @@ require gypsy.inc DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \ - file://fixups.patch;patch=1" + file://fixups.patch;patch=1;maxrev=107" PV = "0.0+svnr${SRCREV}" S = "${WORKDIR}/${PN}" diff --git a/packages/icu/files/.mtn2git_empty b/packages/icu/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/icu/files/.mtn2git_empty diff --git a/packages/icu/files/use-g++-for-linking.patch b/packages/icu/files/use-g++-for-linking.patch new file mode 100644 index 0000000000..4702abc065 --- /dev/null +++ b/packages/icu/files/use-g++-for-linking.patch @@ -0,0 +1,67 @@ +--- + tools/genccode/Makefile.in | 2 +- + tools/gencmn/Makefile.in | 2 +- + tools/genrb/Makefile.in | 2 +- + tools/pkgdata/Makefile.in | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +--- source.orig/tools/genccode/Makefile.in ++++ source/tools/genccode/Makefile.in +@@ -76,11 +76,11 @@ check-local: all-local + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + $(TARGET) : $(OBJECTS) +- $(LINK.c) $(OUTOPT)$@ $^ $(LIBS) ++ $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + + + %.$(SECTION): $(srcdir)/%.$(SECTION).in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +--- source.orig/tools/gencmn/Makefile.in ++++ source/tools/gencmn/Makefile.in +@@ -76,11 +76,11 @@ check-local: all-local + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + $(TARGET) : $(OBJECTS) +- $(LINK.c) $(OUTOPT)$@ $^ $(LIBS) ++ $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + + %.$(SECTION): $(srcdir)/%.$(SECTION).in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +--- source.orig/tools/genrb/Makefile.in ++++ source/tools/genrb/Makefile.in +@@ -84,11 +84,11 @@ Makefile: $(srcdir)/Makefile.in $(top_b + + $(TARGET) : $(OBJECTS) + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + + $(DERB) : $(DERB_OBJ) +- $(LINK.c) $(OUTOPT)$@ $^ $(LIBS) ++ $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + + + # This line is needed to serialize builds when the gmake -j option is used. + $(TARGET_STUB_NAME).$(SECTION): $(DERB_STUB_NAME).$(SECTION) + +--- source.orig/tools/pkgdata/Makefile.in ++++ source/tools/pkgdata/Makefile.in +@@ -81,11 +81,11 @@ check-local: all-local + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + $(TARGET) : $(OBJECTS) +- $(LINK.c) $(OUTOPT)$@ $^ $(LIBS) ++ $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + + + %.$(SECTION): $(srcdir)/%.$(SECTION).in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/packages/icu/icu-3.6.inc b/packages/icu/icu-3.6.inc index b9031e202a..ec95cabb84 100644 --- a/packages/icu/icu-3.6.inc +++ b/packages/icu/icu-3.6.inc @@ -5,6 +5,8 @@ SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-s S = "${WORKDIR}/icu/source" +PARALLEL_MAKE = "" + inherit autotools pkgconfig binconfig do_configure() { diff --git a/packages/icu/icu_3.6.bb b/packages/icu/icu_3.6.bb index 2e8dca925e..91b25adbe9 100644 --- a/packages/icu/icu_3.6.bb +++ b/packages/icu/icu_3.6.bb @@ -1,8 +1,9 @@ require icu-3.6.inc DEPENDS += "icu-native" +PR = "r3" -PR = "r2" +SRC_URI += "file://use-g++-for-linking.patch;patch=1" do_configure_append() { for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do @@ -13,6 +14,10 @@ do_configure_append() { sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true } +do_compile() { + oe_runmake 'CXX=${CXX}' +} + do_install_append() { chmod +x ${D}${libdir}/lib* } diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index c258f4250a..cb2a20b75e 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -10,7 +10,7 @@ DEPENDS = "virtual/kernel \ ${UNSLUNG_EXTRA_DEPENDS}" IMAGE_INSTALL = "kernel update-modules unslung-rootfs \ - libc6-unslung slingbox ipkg libipkg \ + libc6-unslung slingbox ipkg libipkg libgcc \ kernel-module-netconsole \ ${UNSLUNG_EXTRA_INSTALL}" diff --git a/packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch b/packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch index dd5917e900..a4e5a65d65 100644 --- a/packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch +++ b/packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch @@ -44,6 +44,6 @@ Index: libgcrypt-1.4.0/src/libgcrypt.pc.in +Description: GNU crypto library +URL: http://www.gnupg.org +Version: @VERSION@ -+Libs: -L${libdir} @LIBGCRYPT_CONFIG_LIBS@ -+Libs.private: @GPG_ERROR_LIBS@ -+Cflags: -I${includedir} @LIBGCRYPT_CONFIG_CFLAGS@ @GPG_ERROR_CFLAGS@ ++Libs: -L${libdir} -lgcrypt ++Libs.private: -L${libdir} -lgpg-error ++Cflags: -I${includedir} diff --git a/packages/libgcrypt/libgcrypt_1.4.0.bb b/packages/libgcrypt/libgcrypt_1.4.0.bb index 2fe98d62e3..db3389b80e 100644 --- a/packages/libgcrypt/libgcrypt_1.4.0.bb +++ b/packages/libgcrypt/libgcrypt_1.4.0.bb @@ -1,3 +1,3 @@ require libgcrypt.inc -PR = "r2" +PR = "r3" diff --git a/packages/libsexy/files/.mtn2git_empty b/packages/libsexy/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libsexy/files/.mtn2git_empty diff --git a/packages/libsexy/files/libsexy-pkgconfig-fixes.patch b/packages/libsexy/files/libsexy-pkgconfig-fixes.patch new file mode 100644 index 0000000000..331b24bf1b --- /dev/null +++ b/packages/libsexy/files/libsexy-pkgconfig-fixes.patch @@ -0,0 +1,15 @@ +Index: libsexy-0.1.11/libsexy.pc.in +=================================================================== +--- libsexy-0.1.11.orig/libsexy.pc.in 2005-11-10 10:21:18.000000000 +0000 ++++ libsexy-0.1.11/libsexy.pc.in 2008-03-05 14:36:39.000000000 +0000 +@@ -6,7 +6,8 @@ + Name: libsexy + Description: Doing naughty things to good widgets + Version: @VERSION@ +-Libs: -L${libdir} -lsexy @PACKAGE_LIBS@ +-Cflags: -I${includedir} @PACKAGE_CFLAGS@ + ++Requires: pango glib-2.0 gtk+-2.0 libxml ++Libs: -L${libdir} -lsexy ++Cflags: -I${includedir} + diff --git a/packages/libsexy/libsexy.inc b/packages/libsexy/libsexy.inc index 522b7e0d63..27816c0800 100644 --- a/packages/libsexy/libsexy.inc +++ b/packages/libsexy/libsexy.inc @@ -5,7 +5,8 @@ SECTION = "x11/libs" DEPENDS = "gtk+ enchant libxml2" -SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz" +SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz \ + file://libsexy-pkgconfig-fixes.patch;patch=1" inherit autotools pkgconfig diff --git a/packages/libsexy/libsexy_0.1.11.bb b/packages/libsexy/libsexy_0.1.11.bb index 042ea757e9..91784ffb49 100644 --- a/packages/libsexy/libsexy_0.1.11.bb +++ b/packages/libsexy/libsexy_0.1.11.bb @@ -1,2 +1,2 @@ require libsexy.inc -PR = "r0" +PR = "r1" diff --git a/packages/libxslt/libxslt_1.1.22.bb b/packages/libxslt/libxslt_1.1.22.bb new file mode 100644 index 0000000000..53348becc9 --- /dev/null +++ b/packages/libxslt/libxslt_1.1.22.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "GNOME XSLT library" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libxml2 (>=2.6.27)" +LICENSE = "MIT" + +SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz" +S = "${WORKDIR}/libxslt-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" + +# Something is wrong inside configure.ac, so we need to resort to sed in this stage :( +# Koen - 20080305 +do_compile_append() { + sed -i -e s:-L${STAGING_LIBDIR}::g libexslt.pc + sed -i -e s:-L${STAGING_LIBDIR}::g libxslt.pc +} + +do_stage () { + autotools_stage_all +} + +PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" + +FILES_${PN}-dev += "${bindir}/xslt-config" +FILES_${PN}-utils += "${bindir}" diff --git a/packages/linux-libc-headers/linux-libc-headers.inc b/packages/linux-libc-headers/linux-libc-headers.inc index 43f0958863..aaf528dfb5 100644 --- a/packages/linux-libc-headers/linux-libc-headers.inc +++ b/packages/linux-libc-headers/linux-libc-headers.inc @@ -2,4 +2,5 @@ DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." SECTION = "devel" LICENSE = "GPL" -DEPENDS = "cross-linkage"
\ No newline at end of file +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb index 595edde810..0e5debcfa3 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h" diff --git a/packages/linux/linux-2.6.21/simpad/.mtn2git_empty b/packages/linux/linux-2.6.21/simpad/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-2.6.21/simpad/.mtn2git_empty diff --git a/packages/linux/linux/simpad/defconfig b/packages/linux/linux-2.6.21/simpad/defconfig index 420d531dc4..420d531dc4 100644 --- a/packages/linux/linux/simpad/defconfig +++ b/packages/linux/linux-2.6.21/simpad/defconfig diff --git a/packages/linux/linux-2.6.24/simpad/.mtn2git_empty b/packages/linux/linux-2.6.24/simpad/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-2.6.24/simpad/.mtn2git_empty diff --git a/packages/linux/simpad/defconfig b/packages/linux/linux-2.6.24/simpad/defconfig index 971c354133..fb88e108fb 100644 --- a/packages/linux/simpad/defconfig +++ b/packages/linux/linux-2.6.24/simpad/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24 -# Mon Mar 3 12:52:14 2008 +# Mon Mar 3 22:58:54 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -254,10 +254,6 @@ CONFIG_ATAGS_PROC=y # CPU Frequency scaling # # CONFIG_CPU_FREQ is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set # # Floating point emulation @@ -395,7 +391,7 @@ CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m -# CONFIG_IPV6_MIP6 is not set +CONFIG_IPV6_MIP6=m CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m @@ -542,11 +538,6 @@ CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_RAW=m # -# DECnet: Netfilter Configuration -# -CONFIG_DECNET_NF_GRABULATOR=m - -# # Bridge: Netfilter Configuration # CONFIG_BRIDGE_NF_EBTABLES=m @@ -596,85 +587,20 @@ CONFIG_SCTP_HMAC_MD5=y CONFIG_TIPC=m # CONFIG_TIPC_ADVANCED is not set # CONFIG_TIPC_DEBUG is not set -CONFIG_ATM=y -CONFIG_ATM_CLIP=y -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set +# CONFIG_ATM is not set CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m -# CONFIG_DECNET_ROUTER is not set +# CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -# CONFIG_COPS is not set -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -CONFIG_X25=m -CONFIG_LAPB=m -CONFIG_ECONET=m -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y -CONFIG_WAN_ROUTER=m -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_RR=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_INGRESS=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_SCHED is not set CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_TEXT=m -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=y -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_IPT=m -# CONFIG_NET_ACT_NAT is not set -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set CONFIG_NET_SCH_FIFO=y # @@ -733,7 +659,33 @@ CONFIG_IRPORT_SIR=m # CONFIG_SIGMATEL_FIR is not set CONFIG_SA1100_FIR=m # CONFIG_MCS_FIR is not set -# CONFIG_BT is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m # CONFIG_AF_RXRPC is not set CONFIG_FIB_RULES=y @@ -874,28 +826,28 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_MISC_DEVICES is not set -CONFIG_IDE=y +CONFIG_IDE=m CONFIG_IDE_MAX_HWIFS=4 -CONFIG_BLK_DEV_IDE=y +CONFIG_BLK_DEV_IDE=m # # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=y +CONFIG_BLK_DEV_IDEDISK=m CONFIG_IDEDISK_MULTI_MODE=y -CONFIG_BLK_DEV_IDECS=y +CONFIG_BLK_DEV_IDECS=m # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set CONFIG_IDE_TASK_IOCTL=y -CONFIG_IDE_PROC_FS=y +# CONFIG_IDE_PROC_FS is not set # # IDE chipset support/bugfixes # -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_PLATFORM=y +CONFIG_IDE_GENERIC=m +CONFIG_BLK_DEV_PLATFORM=m # CONFIG_IDE_ARM is not set # @@ -926,7 +878,6 @@ CONFIG_IDE_ARCH_OBSOLETE_INIT=y # CONFIG_MD is not set CONFIG_NETDEVICES=y # CONFIG_NETDEVICES_MULTIQUEUE is not set -CONFIG_IFB=m CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_MACVLAN=m @@ -1009,7 +960,6 @@ CONFIG_PCMCIA_SMC91C92=m CONFIG_PCMCIA_XIRC2PS=m CONFIG_PCMCIA_AXNET=m # CONFIG_WAN is not set -# CONFIG_ATM_DRIVERS is not set CONFIG_PPP=m CONFIG_PPP_MULTILINK=y CONFIG_PPP_FILTER=y @@ -1019,7 +969,6 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOE=m -CONFIG_PPPOATM=m CONFIG_PPPOL2TP=m CONFIG_SLIP=m CONFIG_SLIP_COMPRESSED=y @@ -1320,16 +1269,14 @@ CONFIG_FONT_MINI_4x6=y CONFIG_FONT_SUN8x16=y # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set # # Sound # # CONFIG_SOUND is not set # CONFIG_HID_SUPPORT is not set +CONFIG_HID=m CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set @@ -1410,7 +1357,6 @@ CONFIG_USB_MON=y # # USB DSL modem support # -# CONFIG_USB_ATM is not set # # USB Gadget Support @@ -1558,6 +1504,7 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_JFFS2_CMODE_FAVOURLZO is not set CONFIG_CRAMFS=m +# CONFIG_SQUASHFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set diff --git a/packages/linux/linux/simpad/collie-kexec.patch b/packages/linux/linux/simpad/collie-kexec.patch new file mode 100644 index 0000000000..2c8fa9352b --- /dev/null +++ b/packages/linux/linux/simpad/collie-kexec.patch @@ -0,0 +1,13 @@ +--- linux-2.6.20.4.orig/include/asm-arm/kexec.h 2007-04-10 19:16:39.000000000 +0200 ++++ linux-2.6.20.4/include/asm-arm/kexec.h 2007-04-03 05:01:09.000000000 +0200 +@@ -8,8 +8,8 @@ + /* Maximum address we can reach in physical address mode */ + #define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL) + /* Maximum address we can use for the control code buffer */ +-#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE +- ++//#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE ++#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL) + #define KEXEC_CONTROL_CODE_SIZE 4096 + + #define KEXEC_ARCH KEXEC_ARCH_ARM diff --git a/packages/linux/simpad/export_atags-r2.patch b/packages/linux/linux/simpad/export_atags-r2.patch index e6fd85cf20..e6fd85cf20 100644 --- a/packages/linux/simpad/export_atags-r2.patch +++ b/packages/linux/linux/simpad/export_atags-r2.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-GPIO-MMC-mod.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-GPIO-MMC-mod.patch index 70a1555158..70a1555158 100644 --- a/packages/linux/simpad/linux-2.6.24-SIMpad-GPIO-MMC-mod.patch +++ b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-GPIO-MMC-mod.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-battery-old-way-but-also-with-sysfs.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-battery-old-way-but-also-with-sysfs.patch index 35f192ada2..35f192ada2 100644 --- a/packages/linux/simpad/linux-2.6.24-SIMpad-battery-old-way-but-also-with-sysfs.patch +++ b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-battery-old-way-but-also-with-sysfs.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-cs3-simpad.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-cs3-simpad.patch index 51232d55cd..51232d55cd 100644 --- a/packages/linux/simpad/linux-2.6.24-SIMpad-cs3-simpad.patch +++ b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-cs3-simpad.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch index 758ddae7f7..758ddae7f7 100644 --- a/packages/linux/simpad/linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch +++ b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-mq200.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-mq200.patch index ac9fdfbfcf..ac9fdfbfcf 100644 --- a/packages/linux/simpad/linux-2.6.24-SIMpad-mq200.patch +++ b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-mq200.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch index 2568093020..2568093020 100644 --- a/packages/linux/simpad/linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch +++ b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-pcmcia.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-pcmcia.patch index 5560d67494..5560d67494 100644 --- a/packages/linux/simpad/linux-2.6.24-SIMpad-pcmcia.patch +++ b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-pcmcia.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch index 156b87cdbd..156b87cdbd 100644 --- a/packages/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch +++ b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-switches.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-switches.patch index 20cb56d11b..20cb56d11b 100644 --- a/packages/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-switches.patch +++ b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-switches.patch diff --git a/packages/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch index 702bbfbfba..702bbfbfba 100644 --- a/packages/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch +++ b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch diff --git a/packages/linux/simpad/collie-kexec.patch b/packages/linux/simpad/collie-kexec.patch deleted file mode 100644 index 3473b87c6d..0000000000 --- a/packages/linux/simpad/collie-kexec.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- linux-2.6.20.4.orig/include/asm-arm/kexec.h 2007-04-10 19:16:39.000000000 +0200 -+++ linux-2.6.20.4/include/asm-arm/kexec.h 2007-04-03 05:01:09.000000000 +0200 -@@ -8,8 +8,8 @@ - /* Maximum address we can reach in physical address mode */ - #define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL) - /* Maximum address we can use for the control code buffer */ --#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -- -+//#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -+#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL) - #define KEXEC_CONTROL_CODE_SIZE 4096 - - #define KEXEC_ARCH KEXEC_ARCH_ARM ---- linux-2.6.20.4.orig/include/asm-arm/kexec.h 2007-04-10 19:16:39.000000000 +0200 -+++ linux-2.6.20.4/include/asm-arm/kexec.h 2007-04-03 05:01:09.000000000 +0200 -@@ -8,8 +8,8 @@ - /* Maximum address we can reach in physical address mode */ - #define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL) - /* Maximum address we can use for the control code buffer */ --#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -- -+//#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -+#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL) - #define KEXEC_CONTROL_CODE_SIZE 4096 - - #define KEXEC_ARCH KEXEC_ARCH_ARM ---- linux-2.6.20.4.orig/include/asm-arm/kexec.h 2007-04-10 19:16:39.000000000 +0200 -+++ linux-2.6.20.4/include/asm-arm/kexec.h 2007-04-03 05:01:09.000000000 +0200 -@@ -8,8 +8,8 @@ - /* Maximum address we can reach in physical address mode */ - #define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL) - /* Maximum address we can use for the control code buffer */ --#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -- -+//#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE -+#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL) - #define KEXEC_CONTROL_CODE_SIZE 4096 - - #define KEXEC_ARCH KEXEC_ARCH_ARM diff --git a/packages/maemo4/libhildonfm.inc b/packages/maemo4/libhildonfm.inc index b6c20a4499..26c1555e52 100644 --- a/packages/maemo4/libhildonfm.inc +++ b/packages/maemo4/libhildonfm.inc @@ -16,6 +16,11 @@ PARALLEL_MAKE = "" do_stage() { autotools_stage_all + if [ ! -d ${STAGING_INCDIR}/hildon-widgets ] + then + mkdir -p ${STAGING_INCDIR}/hildon-widgets + fi + ln -sf ${STAGING_INCDIR}/hildon-fm-2/hildon/* ${STAGING_INCDIR}/hildon-widgets/ } diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb index 47d9a93a15..03e4403dbe 100644 --- a/packages/meta/external-toolchain.bb +++ b/packages/meta/external-toolchain.bb @@ -12,7 +12,6 @@ PROVIDES = "\ virtual/libintl \ virtual/libiconv \ glibc-thread-db \ - virtual/linux-libc-headers \ " RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" diff --git a/packages/meta/staging-linkage_1.0.bb b/packages/meta/staging-linkage_1.0.bb new file mode 100644 index 0000000000..b718868138 --- /dev/null +++ b/packages/meta/staging-linkage_1.0.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "staging-linkage sets up symlinks in staging so old compilers continue to work with the sysroot staging layout changes" +SECTION = "devel" +PACKAGES = "" + +INHIBIT_DEFAULT_DEPS = "1" +PR = "r0" + +SRC_URI = "" + +do_configure() { + : +} + +do_compile () { + : +} + +do_install() { + : +} + +do_stage () { + if [ -e ${STAGING_DIR_HOST}${layout_base_libdir} ]; then + cp -pPRr ${STAGING_DIR_HOST}${layout_base_libdir}/* ${STAGING_LIBDIR} + mv ${STAGING_DIR_HOST}${layout_base_libdir}/ ${STAGING_DIR_HOST}${layout_libdir}-oldbackup/ + fi + ln -s ${STAGING_LIBDIR}/ ${STAGING_DIR_HOST}${layout_base_libdir} +} diff --git a/packages/misc-binary-only/at76c503-firmware_1.3.bb b/packages/misc-binary-only/at76c503-firmware_1.3.bb new file mode 100644 index 0000000000..161badf318 --- /dev/null +++ b/packages/misc-binary-only/at76c503-firmware_1.3.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Atmel At76c503 802.11b wireless firmware." +SECTION = "base" +LICENSE = "Unknown" + +SRC_URI = "http://www.thekelleys.org.uk/atmel/atmel-firmware-${PV}.tar.gz" + +FILES_${PN} = "/lib" + +do_install() { + install -d ${D}/lib/firmware/ + install -m 0644 ${WORKDIR}/atmel-firmware-1.3/images.usb/atmel_at76c503-rfmd.bin ${D}/lib/firmware/atmel_at76c503-rfmd.bin +} + diff --git a/packages/openmoko2/openmoko-browser2/webkit-update.patch b/packages/openmoko2/openmoko-browser2/webkit-update.patch new file mode 100644 index 0000000000..18e8a88e25 --- /dev/null +++ b/packages/openmoko2/openmoko-browser2/webkit-update.patch @@ -0,0 +1,99 @@ +diff -Nurd openmoko-browser2.orig/configure.ac openmoko-browser2/configure.ac +--- openmoko-browser2.orig/configure.ac 2007-10-02 09:00:38.000000000 +0200 ++++ openmoko-browser2/configure.ac 2008-03-05 12:12:32.954623867 +0100 +@@ -40,7 +40,7 @@ + # base deps + PKG_CHECK_MODULES(OPENMOKO, libmokoui2 >= 0.1.0) + PKG_CHECK_MODULES(GTHREAD, gthread-2.0 ) +-PKG_CHECK_MODULES(WEBKITGTK, WebKitGtk) ++PKG_CHECK_MODULES(WEBKITGTK, webkit-1.0) + + # glib-genmarshal + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` +diff -Nurd openmoko-browser2.orig/src/browser-data.h openmoko-browser2/src/browser-data.h +--- openmoko-browser2.orig/src/browser-data.h 2007-12-12 20:31:07.000000000 +0100 ++++ openmoko-browser2/src/browser-data.h 2008-03-05 12:12:50.497959252 +0100 +@@ -27,7 +27,7 @@ + #ifndef OPENMOKO_BROWSER_DATA_H + #define OPENMOKO_BROWSER_DATA_H + +-#include "webkitwebview.h" ++#include <webkit/webkitwebview.h> + + #include <glib.h> + #include <gtk/gtk.h> +diff -Nurd openmoko-browser2.orig/src/current-page.c openmoko-browser2/src/current-page.c +--- openmoko-browser2.orig/src/current-page.c 2007-12-12 20:31:07.000000000 +0100 ++++ openmoko-browser2/src/current-page.c 2008-03-05 12:13:56.032884030 +0100 +@@ -28,8 +28,8 @@ + #include "current-page.h" + + #include <moko-finger-scroll.h> +-#include <webkitwebframe.h> +-#include <webkitwebview.h> ++#include <webkit/webkitwebframe.h> ++#include <webkit/webkitwebview.h> + + /* + * From a list of BrowserPage's in BrowserData::currentPage show +@@ -42,7 +42,7 @@ + static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data) + { + g_return_if_fail (data->currentPage); +- webkit_web_view_go_backward(data->currentPage->webKitPage); ++ webkit_web_view_go_back(data->currentPage->webKitPage); + } + + static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data) +@@ -66,7 +66,7 @@ + g_assert (page == data->currentPage->webKitPage); + + if (prog == 100) { +- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (page)); ++ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (page)); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (page)); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (page)) != NULL); + } +@@ -176,7 +176,7 @@ + * Update the GtkToolItems + */ + /* XXX ### FIXME TODO check if we should show stop/reload */ +- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (data->currentPage->webKitPage)); ++ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (data->currentPage->webKitPage)); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (data->currentPage->webKitPage)); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (data->currentPage->webKitPage)) != NULL); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentClose), TRUE); +diff -Nurd openmoko-browser2.orig/src/main.c openmoko-browser2/src/main.c +--- openmoko-browser2.orig/src/main.c 2007-12-12 20:31:07.000000000 +0100 ++++ openmoko-browser2/src/main.c 2008-03-05 12:14:46.337942098 +0100 +@@ -33,7 +33,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + +-#include <webkit.h> ++#include <webkit/webkit.h> + + #include <moko-finger-scroll.h> + #include <moko-stock.h> +@@ -55,7 +55,6 @@ + gdk_threads_init (); + gdk_threads_enter (); + gtk_init (&argc, &argv); +- webkit_init (); + moko_stock_register (); + g_set_application_name (_("Browser")); + +diff -Nurd openmoko-browser2.orig/src/open-pages-page.c openmoko-browser2/src/open-pages-page.c +--- openmoko-browser2.orig/src/open-pages-page.c 2007-12-12 20:31:07.000000000 +0100 ++++ openmoko-browser2/src/open-pages-page.c 2008-03-05 12:13:37.671282983 +0100 +@@ -28,8 +28,8 @@ + #include "open-pages-page.h" + #include "current-page.h" + +-#include <webkitwebframe.h> +-#include <webkitwebview.h> ++#include <webkit/webkitwebframe.h> ++#include <webkit/webkitwebview.h> + #include <moko-finger-scroll.h> + + #include <glib/gi18n.h> diff --git a/packages/openmoko2/openmoko-browser2_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb index b9c7efed02..b0b56d3e71 100644 --- a/packages/openmoko2/openmoko-browser2_svn.bb +++ b/packages/openmoko2/openmoko-browser2_svn.bb @@ -2,10 +2,15 @@ DESCRIPTION = "The OpenMoko Webbrowser" SECTION = "openmoko/apps" DEPENDS += "intltool libmokoui2 check webkit-gtk" PV = "0.0.1+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit openmoko2 +SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171" + #SRC_URI += "file://fingerscroll.diff;patch=1" +do_compile_prepend() { + find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g +} diff --git a/packages/openssl/openssl.inc b/packages/openssl/openssl.inc index 8e3f33a96e..9fb8b343b6 100644 --- a/packages/openssl/openssl.inc +++ b/packages/openssl/openssl.inc @@ -14,7 +14,7 @@ export CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}" export CFLAG_mtx-2 := "${@'${CFLAG}'.replace('-O2', '')}" export DIRS = "crypto ssl apps" -export EX_LIBS = "-lgcc -ldl ${TARGET_LDFLAGS}" +export EX_LIBS = "-lgcc -ldl" export AS = "${CC} -c" PACKAGES =+ "libcrypto libssl" diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc index 43b4b1cd3d..d98a7f88df 100644 --- a/packages/roadmap/roadmap.inc +++ b/packages/roadmap/roadmap.inc @@ -1,9 +1,7 @@ DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX." -PRIORITY = "optional" -AUTHOR = "Pascal Martin <pascal.martin@iname.com>" +AUTHOR = "Paul Fox <pgf@foxharp.boston.ma.us>" HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" LICENSE = "GPL" -RRECOMMENDS = "gpsd flite" DEPENDS = "expat" FILES_${PN} += "${datadir}/roadmap" @@ -16,3 +14,6 @@ do_install() { oe_runmake install install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ } + +RRECOMMENDS = "gpsd flite" +FILES_${PN} += "${datadir}/roadmap" diff --git a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb index 051279e33f..e52ab34392 100644 --- a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb +++ b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb @@ -2,14 +2,13 @@ DESCRIPTION = "Precompiled SharpROM toolchain glue package" LICENSE = "GPL" SECTION = "base" # see bug 2199 for the reason the following line is in here -DEPENDS = "virtual/linux-libc-headers" +DEPENDS = "linux-libc-headers cross-linkage staging-linkage" PROVIDES_sharprom-compatible = "\ virtual/arm-linux-gcc-2.95 \ virtual/arm-linux-libc-for-gcc \ virtual/arm-linux-binutils \ virtual/libc \ virtual/arm-linux-gcc \ - virtual/linux-libc-headers \ virtual/arm-linux-gcc-initial " PR = "r1" diff --git a/packages/tasks/task-openmoko-pim.bb b/packages/tasks/task-openmoko-pim.bb index 1eea1a14a1..cef9a25931 100644 --- a/packages/tasks/task-openmoko-pim.bb +++ b/packages/tasks/task-openmoko-pim.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: PIM for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r71" +PR = "r72" inherit task @@ -14,7 +14,7 @@ RDEPENDS_task-openmoko-pim = "\ openmoko-calculator2 \ openmoko-contacts2 \ openmoko-dates2 \ - openmoko-feedreader2 \ +# openmoko-feedreader2 \ openmoko-browser2 \ openmoko-appmanager2 \ openmoko-tasks2 \ diff --git a/packages/vte/files/.mtn2git_empty b/packages/vte/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/vte/files/.mtn2git_empty diff --git a/packages/vte/files/vte-pkgconfig-fixes.patch b/packages/vte/files/vte-pkgconfig-fixes.patch new file mode 100644 index 0000000000..2acc7348e7 --- /dev/null +++ b/packages/vte/files/vte-pkgconfig-fixes.patch @@ -0,0 +1,47 @@ +Index: vte-0.16.9/configure.in +=================================================================== +--- vte-0.16.9.orig/configure.in 2007-09-17 23:07:18.000000000 +0100 ++++ vte-0.16.9/configure.in 2008-03-05 15:59:04.000000000 +0000 +@@ -381,8 +381,6 @@ + + # Search for the required modules. + PKG_CHECK_MODULES(VTE,[$wantedmodules]) +-NEEDEDPACKAGES="$wantedmodules" +-AC_SUBST(NEEDEDPACKAGES) + + # Check for various optional functions within those modules + save_CFLAGS="$CFLAGS" +@@ -403,10 +401,12 @@ + + # Require Freetype2. First see if there is suitable pkgconfig file... + PKG_CHECK_EXISTS(freetype2 >= 6.1.0, +- [PKG_CHECK_MODULES(FT2, freetype2)], [ ++ [PKG_CHECK_MODULES(FT2, freetype2) ++ wantedmodules="$wantedmodules freetype2 >= 6.1.0"], [ + # We use our local copy of the macro because packages of + # freetype's development files don't always include the proper macro. +- VTE_CHECK_FT2(6.1.0,, ++ VTE_CHECK_FT2(6.1.0,[ ++ wantedmodules="$wantedmodules freetype2 >= 6.1.0" ], + [AC_MSG_ERROR([You must have freetype 2.0.2 or later to build vte.])])]) + + # Temporarily pull in the Freetype cflags and libs for checking what's +@@ -508,6 +508,8 @@ + CFLAGS="$savecflags" + CPPFLAGS="$savecppflags" + ++NEEDEDPACKAGES="$wantedmodules" ++AC_SUBST(NEEDEDPACKAGES) + + wcs_funcs_includes=" + #ifdef HAVE_STRING_H +Index: vte-0.16.9/vte.pc.in +=================================================================== +--- vte-0.16.9.orig/vte.pc.in 2007-02-26 21:05:19.000000000 +0000 ++++ vte-0.16.9/vte.pc.in 2008-03-05 15:56:37.000000000 +0000 +@@ -11,4 +11,4 @@ + Requires: @NEEDEDPACKAGES@ + Libs: -L${libdir} -lvte @OTHERLIBS@ + Libs.private: @FT2_LIBS@ +-Cflags: -I${includedir} @FT2_CFLAGS@ @OTHERCFLAGS@ ++Cflags: -I${includedir} @OTHERCFLAGS@ diff --git a/packages/vte/vte.inc b/packages/vte/vte.inc index e575a5a3fb..e9313cd861 100644 --- a/packages/vte/vte.inc +++ b/packages/vte/vte.inc @@ -5,6 +5,8 @@ RDEPENDS = "termcap" inherit gnome +SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1" + EXTRA_OECONF = "--disable-gtk-doc" do_stage() { diff --git a/packages/vte/vte_0.16.9.bb b/packages/vte/vte_0.16.9.bb index f408632430..5875fd317f 100644 --- a/packages/vte/vte_0.16.9.bb +++ b/packages/vte/vte_0.16.9.bb @@ -1,2 +1,2 @@ require vte.inc -PR = "r3" +PR = "r4" diff --git a/packages/webkit/files/GNUmakefile.am b/packages/webkit/files/GNUmakefile.am index f3ec252ee8..977770a1ed 100644 --- a/packages/webkit/files/GNUmakefile.am +++ b/packages/webkit/files/GNUmakefile.am @@ -21,8 +21,10 @@ # # global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any # specific port -# global_cflags = CFLAGS and CXXFLAGS that apply to JSC, WebCore, and to +# global_cflags = CFLAGS that apply to JSC, WebCore, and to # any specific port +# global_cxxflags = CXXFLAGS that apply to JSC, WebCore, and to any +# specific port srcdir = @srcdir@ VPATH = @srcdir@ @@ -34,8 +36,6 @@ GENSOURCES := $(top_builddir)/DerivedSources CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table # Libraries and support components -noinst_LTLIBRARIES := - noinst_HEADERS := noinst_PROGRAMS := @@ -49,140 +49,203 @@ EXTRA_DIST := # # Global flags to CPP -global_cppflags := +global_cppflags := global_cppflags += \ - -I $(srcdir)/JavaScriptCore \ - -I $(srcdir)/JavaScriptCore/ForwardingHeaders \ - -I $(srcdir)/JavaScriptCore/wtf \ - -I $(srcdir)/JavaScriptCore/kjs \ - -I $(top_builddir)/DerivedSources + -I$(srcdir)/JavaScriptCore \ + -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ + -I$(srcdir)/JavaScriptCore/wtf \ + -I$(srcdir)/JavaScriptCore/kjs \ + -I$(top_builddir)/DerivedSources # Default compiler flags global_cflags := \ -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \ -Wformat -Wformat-security -Wno-format-y2k -Wundef \ -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ - -Wno-unused-parameter -fno-exceptions -fno-strict-aliasing + -Wno-unused-parameter -# Libraries -lib_LTLIBRARIES = libJavaScriptCore.la libWebKitGtk.la +global_cxxflags := \ + $(SYMBOL_VISIBILITY_INLINES) + +if !ENABLE_DEBUG +global_cflags += \ + -fno-exceptions \ + $(SYMBOL_VISIBILITY) + +global_cxxflags += \ + -fno-rtti +endif + +# Shared libraries +lib_LTLIBRARIES = \ + libwebkit-1.0.la + +# Convenience libraries +noinst_LTLIBRARIES = \ + libJavaScriptCore.la \ + libWebCore.la # # JavaScriptCore javascriptcore_h_api := javascriptcore_cppflags:= javascriptcore_sources := -javascriptcore_built_sources := +javascriptcore_built_sources := javascriptcore_built_nosources := # The variables above are already included below so no need to touch # these variables unless you really have to -libJavaScriptCore_ladir = $(prefix)/include/WebKit/JavaScriptCore -libJavaScriptCore_la_HEADERS := $(javascriptcore_h_api) +libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore +libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api) -libJavaScriptCore_la_SOURCES := \ +libJavaScriptCore_la_SOURCES = \ $(javascriptcore_built_sources) \ $(javascriptcore_sources) -libJavaScriptCore_la_LDFLAGS := -lpthread +libJavaScriptCore_la_LIBADD = \ + $(ICU_LIBS) \ + $(GLOBALDEPS_LIBS) \ + -lpthread -libJavaScriptCore_la_CXXFLAGS := $(global_cflags) +libJavaScriptCore_la_CXXFLAGS = \ + $(global_cxxflags) \ + $(global_cflags) \ + $(GLOBALDEPS_CFLAGS) \ + -fstrict-aliasing -libJavaScriptCore_la_CFLAGS := $(global_cflags) +libJavaScriptCore_la_CFLAGS = \ + $(global_cflags) \ + $(GLOBALDEPS_CFLAGS) \ + -fstrict-aliasing -libJavaScriptCore_la_CPPFLAGS := $(global_cppflags) $(javascriptcore_cppflags) +libJavaScriptCore_la_CPPFLAGS = \ + $(global_cppflags) \ + $(javascriptcore_cppflags) \ + $(ICU_CPPFLAGS) # # WebCore webcore_cppflags := webcore_sources := webcore_headers := +webcore_libadd := webcore_built_sources := webcore_built_nosources := -# WebKitGtk +webcore_cppflags += $(HILDON_CPPFLAGS) + +# WebKit webkitgtk_h_api := webkitgtk_headers := webkitgtk_sources := webkitgtk_cppflags := -webkitgtk_ldflags := webkitgtk_built_sources := webkitgtk_built_nosources := webkitgtk_cleanfiles := -# No need to touch the following variables unless you have to. If you need to change the values -# for the following variables, use the "webkitgtk_" variables above -libWebKitGtk_ladir := $(prefix)/include/WebKit - -libWebKitGtk_la_HEADERS := $(webkitgtk_h_api) - -libWebKitGtk_la_SOURCES := \ +libWebCore_la_SOURCES = \ $(webcore_built_sources) \ $(webcore_headers) \ - $(webcore_sources) \ - $(webkitgtk_built_sources) \ - $(webkitgtk_headers) \ - $(webkitgtk_sources) + $(webcore_sources) -libWebKitGtk_la_CXXFLAGS := \ - -fno-rtti \ +libWebCore_la_CXXFLAGS = \ + -fno-strict-aliasing \ + $(global_cxxflags) \ $(global_cflags) \ - $(DEPENDENCIES_CFLAGS) \ + $(GLOBALDEPS_CFLAGS) \ + $(WEBKITDEPS_CFLAGS) \ + $(LIBCURL_CFLAGS) \ $(SQLITE3_CFLAGS) \ $(GSTREAMER_CFLAGS) \ $(LIBXSLT_CFLAGS) \ - $(COVERAGE_CFLAGS) + $(COVERAGE_CFLAGS) \ + $(HILDON_CFLAGS) -libWebKitGtk_la_CFLAGS := \ +libWebCore_la_CFLAGS = \ + -fno-strict-aliasing \ $(global_cflags) \ - $(DEPENDENCIES_CFLAGS) \ + $(GLOBALDEPS_CFLAGS) \ + $(WEBKITDEPS_CFLAGS) \ + $(LIBCURL_CFLAGS) \ $(SQLITE3_CFLAGS) \ $(GSTREAMER_CFLAGS) \ $(LIBXSLT_CFLAGS) \ - $(COVERAGE_CFLAGS) + $(COVERAGE_CFLAGS) \ + $(HILDON_CFLAGS) -libWebKitGtk_la_CPPFLAGS := \ +libWebCore_la_CPPFLAGS = \ + $(ICU_CPPFLAGS) \ $(global_cppflags) \ $(webcore_cppflags) \ $(webkitgtk_cppflags) -libWebKitGtk_la_LIBADD := @LTLIBOBJS@ libJavaScriptCore.la - -libWebKitGtk_la_LDFLAGS := \ - $(webkitgtk_ldflags) \ - $(DEPENDENCIES_LIBS) \ +libWebCore_la_LIBADD = \ + libJavaScriptCore.la \ + $(webcore_libadd) \ + $(GLOBALDEPS_LIBS) \ + $(WEBKITDEPS_LIBS) \ + $(LIBCURL_LIBS) \ $(ICU_LIBS) \ $(SQLITE3_LIBS) \ $(GSTREAMER_LIBS) \ $(LIBXSLT_LIBS) \ - $(COVERAGE_LDFLAGS) \ + $(HILDON_LIBS) \ -lpthread \ - -ljpeg \ + -ljpeg + +libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit +libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api) + +libwebkit_1_0_la_SOURCES = \ + $(webkitgtk_built_sources) \ + $(webkitgtk_headers) \ + $(webkitgtk_sources) + +libwebkit_1_0_la_CXXFLAGS = \ + $(libWebCore_la_CXXFLAGS) + +libwebkit_1_0_la_CFLAGS = \ + $(libWebCore_la_CFLAGS) + +libwebkit_1_0_la_CPPFLAGS = \ + $(libWebCore_la_CPPFLAGS) + +libwebkit_1_0_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ -version-info @LIBWEBKITGTK_VERSION@ +libwebkit_1_0_la_LIBADD = \ + libWebCore.la + # # Extra checks and flags global_cppflags += \ -DBUILDING_GTK__=1 \ - -DUSE_SYSTEM_MALLOC \ -DWTF_CHANGES +if !ENABLE_FAST_MALLOC +global_cppflags += \ + -DUSE_SYSTEM_MALLOC +endif + if TARGET_X11 global_cppflags += -DXP_UNIX endif if !ENABLE_DEBUG global_cppflags += -DNDEBUG -else +else webkitgtk_cppflags += \ -DG_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ - -DPANGO_DISABLE_DEPRECATED \ - -DGDK_MULTIHEAD_SAFE \ - -DGTK_MULTIHEAD_SAFE + -DPANGO_DISABLE_DEPRECATED + +# Might be useful in the future +# -DGDK_MULTIHEAD_SAFE \ +# -DGTK_MULTIHEAD_SAFE endif if !ENABLE_DATABASE @@ -200,30 +263,30 @@ global_cppflags += \ endif if ENABLE_VIDEO -webkitgtk_ldflags += -lgstinterfaces-0.10 -lgstvideo-0.10 +webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10 endif -# -# WEBKIT GTK+ webkitgtk_cppflags += \ --I $(top_builddir)/WebKit/gtk/WebView \ +-I$(top_builddir)/WebKit/gtk/webkit \ -DBUILDING_CAIRO__=1 \ -DBUILD_WEBKIT webkitgtk_h_api += \ - WebKit/gtk/WebView/webkit.h \ - WebKit/gtk/WebView/webkitdefines.h \ - WebKit/gtk/WebView/webkitnetworkrequest.h \ - WebKit/gtk/WebView/webkitwebframe.h \ - WebKit/gtk/WebView/webkitwebview.h + WebKit/gtk/webkit/webkit.h \ + WebKit/gtk/webkit/webkitdefines.h \ + WebKit/gtk/webkit/webkitnetworkrequest.h \ + WebKit/gtk/webkit/webkitwebbackforwardlist.h \ + WebKit/gtk/webkit/webkitwebframe.h \ + WebKit/gtk/webkit/webkitwebhistoryitem.h \ + WebKit/gtk/webkit/webkitwebsettings.h \ + WebKit/gtk/webkit/webkitwebview.h webkitgtk_built_sources += \ - WebKit/gtk/WebView/webkit-marshal.h \ - WebKit/gtk/WebView/webkit-marshal.cpp + WebKit/gtk/webkit/webkit-marshal.h \ + WebKit/gtk/webkit/webkit-marshal.cpp webkitgtk_headers += \ - WebKit/gtk/WebView/webkitprivate.h \ - WebKit/gtk/WebView/webkitsettings.h \ + WebKit/gtk/webkit/webkitprivate.h \ WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ WebKit/gtk/WebCoreSupport/DragClientGtk.h \ @@ -233,37 +296,39 @@ webkitgtk_headers += \ WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h webkitgtk_sources += \ - WebKit/gtk/WebView/webkitnetworkrequest.cpp \ - WebKit/gtk/WebView/webkitprivate.cpp \ - WebKit/gtk/WebView/webkitsettings.cpp \ - WebKit/gtk/WebView/webkitwebframe.cpp \ - WebKit/gtk/WebView/webkitwebview.cpp \ + WebKit/gtk/webkit/webkitnetworkrequest.cpp \ + WebKit/gtk/webkit/webkitprivate.cpp \ + WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ + WebKit/gtk/webkit/webkitwebframe.cpp \ + WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ + WebKit/gtk/webkit/webkitwebsettings.cpp \ + WebKit/gtk/webkit/webkitwebview.cpp \ WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp webkitgtk_cleanfiles += \ $(top_builddir)/Programs/GtkLauncher \ - $(top_builddir)/WebKit/gtk/WebKitGtk.pc + $(top_builddir)/WebKit/gtk/webkit-1.0.pc pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc +pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc -WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/WebView/webkit-marshal -WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/WebView/webkit-marshal.list +WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal +WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list stamp_files := \ stamp-webkit-marshal.cpp \ stamp-webkit-marshal.h -WebKit/gtk/WebView/webkit-marshal.cpp: stamp-webkit-marshal.cpp +WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp @true -WebKit/gtk/WebView/webkit-marshal.h: stamp-webkit-marshal.h +WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h @true stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST) @@ -289,7 +354,7 @@ include WebKitTools/GNUmakefile.am # Autogenerated sources -BUILT_SOURCES := \ +BUILT_SOURCES = \ $(javascriptcore_built_sources) \ $(javascriptcore_built_nosources) \ $(webcore_built_sources) \ @@ -302,7 +367,6 @@ CLEANFILES += \ $(webkitgtk_cleanfiles) \ $(top_builddir)/Programs/DumpRenderTree \ $(top_builddir)/Programs/testkjs \ - $(top_builddir)/Programs/dftables \ $(GENSOURCES) MAINTAINERCLEANFILES += \ diff --git a/packages/webkit/files/Makefile b/packages/webkit/files/Makefile index 89344f7a58..fa7ea02426 100644 --- a/packages/webkit/files/Makefile +++ b/packages/webkit/files/Makefile @@ -7,16 +7,23 @@ all: debug d development dev develop: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done - + release r deployment dep deploy: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done - + universal u: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done -clean: +64: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done +64u: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +clean: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done diff --git a/packages/webkit/files/Makefile.shared b/packages/webkit/files/Makefile.shared index a036aacc50..096d32e948 100644 --- a/packages/webkit/files/Makefile.shared +++ b/packages/webkit/files/Makefile.shared @@ -15,6 +15,12 @@ release r deployment dep deploy: force universal u: force ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} ) +64: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} ) + +64u: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} ) + clean: ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri index 640fa34174..36404ac803 100644 --- a/packages/webkit/files/WebKit.pri +++ b/packages/webkit/files/WebKit.pri @@ -58,6 +58,11 @@ CONFIG(release) { DEFINES += NDEBUG } +gtk-port:CONFIG(debug) { + DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED +# maybe useful for debugging DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE +} + BASE_DIR = $$PWD qt-port:INCLUDEPATH += \ $$PWD/WebKit/qt/Api diff --git a/packages/webkit/files/autogen.sh b/packages/webkit/files/autogen.sh index b7f7d37b2f..1c0fc61156 100644 --- a/packages/webkit/files/autogen.sh +++ b/packages/webkit/files/autogen.sh @@ -1,8 +1,11 @@ #! /bin/sh +# Allow invocation from a separate build directory; in that case, we change +# to the source directory to run the auto*, then change back before running configure srcdir=`dirname $0` test -z "$srcdir" && srcdir=. +ORIGDIR=`pwd` cd $srcdir DIE=0 @@ -37,4 +40,6 @@ autoheader || exit $? automake --foreign --add-missing || exit $? autoconf || exit $? -./configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? +cd $ORIGDIR || exit 1 + +$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? diff --git a/packages/webkit/files/configure.ac b/packages/webkit/files/configure.ac index 05c25b94a8..404e5a0d6a 100644 --- a/packages/webkit/files/configure.ac +++ b/packages/webkit/files/configure.ac @@ -9,9 +9,7 @@ AC_CONFIG_SRCDIR([WebCore/config.h]) LIBWEBKITGTK_VERSION=1:0:0 AC_SUBST([LIBWEBKITGTK_VERSION]) -AM_INIT_AUTOMAKE([1.9 foreign tar-ustar subdir-objects]) - -AM_MAINTAINER_MODE +AM_INIT_AUTOMAKE([foreign subdir-objects]) AC_CANONICAL_HOST @@ -35,6 +33,9 @@ case "$host" in *-*-freebsd*) os_freebsd=yes ;; + *-*-darwin*) + os_darwin=yes + ;; esac # If CXXFLAGS and CFLAGS are unset, default to -O2 @@ -53,9 +54,20 @@ AM_PROG_LIBTOOL AC_PROG_INSTALL AM_PROG_CC_STDC AC_PROG_CXX -AC_PROG_CXX_C_O AM_PROG_CC_C_O +# check for -fvisibility=hidden compiler support (GCC >= 4) +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" +AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden]) +AC_COMPILE_IFELSE([char foo;], + [ AC_MSG_RESULT([yes]) + SYMBOL_VISIBILITY="-fvisibility=hidden" SYMBOL_VISIBILITY_INLINES="-fvisibility-inlines-hidden" ], + AC_MSG_RESULT([no])) +CFLAGS="$saved_CFLAGS" +AC_SUBST(SYMBOL_VISIBILITY) +AC_SUBST(SYMBOL_VISIBILITY_INLINES) + AC_PATH_PROG(PERL, perl) if test -z "$PERL"; then AC_MSG_ERROR([You need 'perl' to compile WebKit]) @@ -101,10 +113,12 @@ AC_C_VOLATILE AC_HEADER_STDC AC_HEADER_STDBOOL -# pthread +# pthread (not needed on Windows) +if test "$os_win32" = "no"; then AC_CHECK_HEADERS([pthread.h], AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exist]), AC_MSG_ERROR([pthread support is required to build WebKit])) +fi # libjpeg headers AC_CHECK_HEADERS([jpeglib.h]) @@ -116,75 +130,126 @@ if test "$PKG_CONFIG" = "no"; then fi # check for icu-config +if test "$os_darwin" = "yes"; then +ICU_CPPFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu" +ICU_LIBS="-licucore" +else AC_PATH_PROG(icu_config, icu-config, no) if test "$icu_config" = "no"; then AC_MSG_ERROR([Cannot find icu-config. ICU library is needed.]) fi -ICU_CFLAGS=`$icu_config --cflags` + +# We don't use --cflags as this gives us a lot of things that we don't +# necessarily want, like debugging and optimization flags +# See man (1) icu-config for more info. +ICU_CPPFLAGS=`$icu_config --cppflags` ICU_LIBS=`$icu_config --ldflags` -AC_SUBST([ICU_CFLAGS]) +AC_SUBST([ICU_CPPFLAGS]) AC_SUBST([ICU_LIBS]) +fi # determine the GDK/GTK+ target -AC_MSG_CHECKING([the target for WebKit GTK+]) -AC_ARG_WITH(webkit_target, - AC_HELP_STRING([--with-webkit-target=@<:@x11/win32/quartz/directfb@:>@], +AC_MSG_CHECKING([the target windowing system]) +AC_ARG_WITH(target, + AC_HELP_STRING([--with-target=@<:@x11/win32/quartz/directfb@:>@], [Select webkit target [default=x11]]), - [],[with_webkit_target="x11"]) + [],[with_target="x11"]) -case "$with_webkit_target" in +case "$with_target" in x11|win32|quartz|directfb) ;; *) AC_MSG_ERROR([Invalid target: must be x11, quartz, win32, or directfb.]) ;; esac -AC_MSG_RESULT([$with_webkit_target]) +AC_MSG_RESULT([$with_target]) + +AC_MSG_CHECKING([for Hildon UI extensions]) +AC_ARG_WITH(hildon, + AC_HELP_STRING([--with-hildon], + [Use Hildon UI extensions [default=no]]), + [],[with_hildon="no"]) +AC_MSG_RESULT([$with_hildon]) + +if test "$with_hildon" = "yes"; then + HILDON_CPPFLAGS="-DMAEMO_CHANGES" + PKG_CHECK_MODULES([HILDON], [hildon-1]) + AC_SUBST([HILDON_CPPFLAGS]) + AC_SUBST([HILDON_CFLAGS]) + AC_SUBST([HILDON_LIBS]) +fi + +# determine the http backend +AC_MSG_CHECKING([the HTTP backend to use]) +AC_ARG_WITH(http_backend, + AC_HELP_STRING([--with-http-backend=@<:@curl@:>@], + [Select HTTP backend [default=curl]]), + [],[http_backend="curl"]) + +case "$http_backend" in + curl) ;; + *) AC_MSG_ERROR([Invalid HTTP backend: must be curl.]) ;; +esac + +AC_MSG_RESULT([$http_backend]) # minimum base dependencies +CAIRO_REQUIRED_VERSION=1.4 +FONTCONFIG_REQUIRED_VERSION=2.4 +FREETYPE2_REQUIRED_VERSION=9.0 +LIBXML_REQUIRED_VERSION=2.6 + +# minimum GTK+ base dependencies GLIB_REQUIRED_VERSION=2.0 GOBJECT_REQUIRED_VERSION=2.0 GTHREAD_REQUIRED_VERSION=2.0 PANGO_REQUIRED_VERSION=1.0 -CAIRO_REQUIRED_VERSION=1.2 -FONTCONFIG_REQUIRED_VERSION=2.4 -FREETYPE2_REQUIRED_VERSION=9.0 -LIBCURL_REQUIRED_VERSION=7.15 -LIBXML_REQUIRED_VERSION=2.6 +GTK_REQUIRED_VERSION=2.8 # optional modules -GTK_REQUIRED_VERSION=2.0 +LIBCURL_REQUIRED_VERSION=7.15 LIBXSLT_REQUIRED_VERSION=1.1.7 SQLITE_REQUIRED_VERSION=3.0 GSTREAMER_REQUIRED_VERSION=0.10 GNOME_VFS_REQUIRED_VERSION=2.0 -PKG_CHECK_MODULES([DEPENDENCIES], +PKG_CHECK_MODULES([GLOBALDEPS], [glib-2.0 >= $GLIB_REQUIRED_VERSION gobject-2.0 >= $GOBJECT_REQUIRED_VERSION - gthread-2.0 >= $GTHREAD_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gthread-2.0 >= $GTHREAD_REQUIRED_VERSION]) +AC_SUBST([GLOBALDEPS_CFLAGS]) +AC_SUBST([GLOBALDEPS_LIBS]) + +PKG_CHECK_MODULES([WEBKITDEPS], + [gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION - libcurl >= $LIBCURL_REQUIRED_VERSION cairo >= $CAIRO_REQUIRED_VERSION cairo-ft, fontconfig >= $FONTCONFIG_REQUIRED_VERSION freetype2 >= $FREETYPE2_REQUIRED_VERSION libxml-2.0 >= $LIBXML_REQUIRED_VERSION]) -AC_SUBST([DEPENDENCIES_CFLAGS]) -AC_SUBST([DEPENDENCIES_LIBS]) +AC_SUBST([WEBKITDEPS_CFLAGS]) +AC_SUBST([WEBKITDEPS_LIBS]) # check whether to build with debugging enabled AC_MSG_CHECKING([whether to do a debug build]) AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [turn on debugging [default=no]]), - [enable_debug="yes"],[enable_debug="no"]) + [],[enable_debug="no"]) AC_MSG_RESULT([$enable_debug]) +# check whether to build with cross-document messaging support +AC_MSG_CHECKING([whether to enable HTML5 cross-document messaging support]) +AC_ARG_ENABLE(cross_document_messaging, + AC_HELP_STRING([--enable-cross-document-messaging], + [enable HTML5 cross-document messaging support [default=yes]]), + [],[enable_cross_document_messaging="yes"]) +AC_MSG_RESULT([$enable_cross_document_messaging]) + # check whether to build with database support AC_MSG_CHECKING([whether to enable HTML5 client-side storage support]) AC_ARG_ENABLE(database, AC_HELP_STRING([--enable-database], - [enable HTML5 client-side storage support [default=no]]), + [enable HTML5 client-side storage support [default=yes]]), [],[enable_database="yes"]) AC_MSG_RESULT([$enable_database]) @@ -201,14 +266,14 @@ AC_MSG_CHECKING([whether to enable HTML5 video support]) AC_ARG_ENABLE(video, AC_HELP_STRING([--enable-video], [enable HTML5 video support [default=no]]), - [enable_video="yes"],[enable_video="no"]) + [],[enable_video="no"]) AC_MSG_RESULT([$enable_video]) # check whether to enable XPath support AC_MSG_CHECKING([whether to enable XPath support]) AC_ARG_ENABLE(xpath, AC_HELP_STRING([--enable-xpath], - [enable support for XPath [default=no]]), + [enable support for XPath [default=yes]]), [],[enable_xpath="yes"]) AC_MSG_RESULT([$enable_xpath]) @@ -216,10 +281,29 @@ AC_MSG_RESULT([$enable_xpath]) AC_MSG_CHECKING([whether to enable XSLT support]) AC_ARG_ENABLE(xslt, AC_HELP_STRING([--enable-xslt], - [enable support for XSLT [default=no]]), + [enable support for XSLT [default=yes]]), [],[enable_xslt="yes"]) AC_MSG_RESULT([$enable_xslt]) +# check whether to enable SVG experimental features +# Enable all SVG if it is +AC_MSG_CHECKING([whether to enable SVG experimental features]) +AC_ARG_ENABLE(svg_experimental, + AC_HELP_STRING([--enable-svg-experimental], + [enable support for SVG experimental features [default=no]]), + [],[enable_svg_experimental="no"]) +AC_MSG_RESULT([$enable_svg_experimental]) + +if test "$enable_svg_experimental" = "yes"; then + enable_svg=yes + enable_svg_animation=yes +# enable_svg_filters=yes + enable_svg_fonts=yes + enable_svg_foreign_object=yes + enable_svg_as_image=yes + enable_svg_use_element=yes +fi + # check whether to enable SVG support AC_MSG_CHECKING([whether to enable SVG support]) AC_ARG_ENABLE(svg, @@ -229,10 +313,10 @@ AC_ARG_ENABLE(svg, AC_MSG_RESULT([$enable_svg]) # check whether to enable support for SVG animation -AC_MSG_CHECKING([whether to enable support for SVG animataion]) +AC_MSG_CHECKING([whether to enable support for SVG animation]) AC_ARG_ENABLE(svg_animation, AC_HELP_STRING([--enable-svg-animation], - [enable support for SVG animation feature (experimental) [default=no]]), + [enable support for SVG animation (experimental) [default=no]]), [],[enable_svg_animation="no"]) AC_MSG_RESULT([$enable_svg_animation]) @@ -252,6 +336,14 @@ AC_ARG_ENABLE(svg_fonts, [],[enable_svg_fonts="no"]) AC_MSG_RESULT([$enable_svg_fonts]) +# check whether to enable foreign objects support for SVG +AC_MSG_CHECKING([whether to enable support for SVG foreign objects]) +AC_ARG_ENABLE(svg_foreign_object, + AC_HELP_STRING([--enable-svg-foreign-object], + [enable support for SVG foreign objects (experimental) [default=no]]), + [],[enable_svg_foreign_object="no"]) +AC_MSG_RESULT([$enable_svg_foreign_object]) + # check whether to enable SVG As Image support AC_MSG_CHECKING([whether to enable SVG as Image support]) AC_ARG_ENABLE(svg_as_image, @@ -276,19 +368,35 @@ AC_ARG_ENABLE(coverage, [],[enable_coverage="no"]) AC_MSG_RESULT([$enable_coverage]) +# check whether to enable FastMalloc +AC_MSG_CHECKING([whether to enable optimized memory allocator]) +AC_ARG_ENABLE(fast_malloc, + AC_HELP_STRING([--enable-fast-malloc], + [enable optimized memory allocator default=yes, default=no for debug builds]), + [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi]) +AC_MSG_RESULT([$enable_fast_malloc]) + # Add '-g' flag to gcc if it's debug build if test "$enable_debug" = "yes"; then CXXFLAGS="$CXXFLAGS -g" CFLAGS="$CFLAGS -g" fi +# check if curl is available +if test "$http_backend" = "curl"; then + PKG_CHECK_MODULES([LIBCURL], + [libcurl >= $LIBCURL_REQUIRED_VERSION]) + AC_SUBST([LIBCURL_CFLAGS]) + AC_SUBST([LIBCURL_LIBS]) +fi + # check if sqlite 3 is available if test "$enable_icon_database" = "yes" || test "$enable_database" = "yes"; then PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION]) AC_SUBST([SQLITE3_CFLAGS]) AC_SUBST([SQLITE3_LIBS]) fi - + # check if libxslt is available if test "$enable_xslt" = "yes"; then PKG_CHECK_MODULES([LIBXSLT],[libxslt >= $LIBXSLT_REQUIRED_VERSION]) @@ -316,16 +424,17 @@ if test "$enable_coverage" = "yes"; then fi # check for SVG features, enabling SVG if necessary -if test "$enable_svg" = "no" && (\ - test "$enable_svg_animation" = "yes" || \ +if test "$enable_svg_animation" = "yes" || \ test "$enable_svg_filters" = "yes" || \ test "$enable_svg_fonts" = "yes" || \ + test "$enable_svg_foreign_object" = "yes" || \ test "$enable_svg_as_image" = "yes" || \ - test "$enable_svg_use_element" = "yes"); then - - AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support]) - enable_svg = yes - svg_flags = yes + test "$enable_svg_use_element" = "yes"; then + svg_flags=yes + if test "$enable_svg" = "no"; then + AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support]) + enable_svg=yes + fi fi # OS conditionals @@ -335,13 +444,17 @@ AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"]) AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"]) # target conditionals -AM_CONDITIONAL([TARGET_X11], [test "$with_webkit_target" = "x11"]) -AM_CONDITIONAL([TARGET_WIN32], [test "$with_webkit_target" = "win32"]) -AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_webkit_target" = "quartz"]) -AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_webkit_target" = "directfb"]) +AM_CONDITIONAL([TARGET_X11], [test "$with_target" = "x11"]) +AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"]) +AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"]) +AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"]) + +# HTTP backend conditionals +AM_CONDITIONAL([USE_CURL], [test "$http_backend" = "curl"]) # WebKit feature conditionals AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) +AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "yes"]) AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"]) AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) @@ -351,14 +464,16 @@ AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_FILTERS],[test "$enable_svg_filters" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"]) AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"]) +AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"]) AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"]) AC_CONFIG_FILES([ GNUmakefile -WebKit/gtk/WebKitGtk.pc:WebKit/gtk/WebKitGtk.pc.in +WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in ] ) @@ -367,9 +482,13 @@ AC_OUTPUT echo " WebKit was configured with the following options: - Target : $with_webkit_target - Enable debug : $enable_debug +Build configuration: + Enable debugging (slow) : $enable_debug Code coverage support : $enable_coverage + HTTP backend : $http_backend + Optimized memory allocator : $enable_fast_malloc +Features: + HTML5 cross-document messaging : $enable_cross_document_messaging HTML5 client-side storage support : $enable_database HTML5 video element support : $enable_video Icon database support : $enable_icon_database @@ -377,8 +496,12 @@ WebKit was configured with the following options: SVG animation support : $enable_svg_animation SVG filters support : $enable_svg_filters SVG fonts support : $enable_svg_fonts + SVG foreign object support : $enable_svg_foreign_object SVG as image support : $enable_svg_as_image SVG use element support : $enable_svg_use_element XPATH support : $enable_xpath XSLT support : $enable_xslt +GTK+ configuration: + GDK target : $with_target + Hildon UI extensions : $with_hildon " diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 6a99a96001..4fe9cb8a00 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -1,32 +1,59 @@ -DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+" +DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3" -# If you activate HTML5 media support (ENABLE_VIDEO=1) you'll need: -# DEPENDS += " gstreamer gst-plugins-base gnome-vfs " +SRCREV_FORMAT = "webcore-rwebkit" +# Yes, this is wrong... +PV = "0.1+svnr${SRCREV}" +PR = "r4" -WEBKIT_PORT = "gtk-port" -WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt" - -FILES_webkit-gtklauncher = "${bindir}/GtkLauncher" -FILES_webkit-gtklauncher-dbg += "${bindir}/.debug/GtkLauncher" - -require webkit.inc +SRC_URI = "\ + svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http;name=webcore \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \ + file://Makefile \ + file://Makefile.shared \ + file://autogen.sh \ + file://configure.ac \ + file://GNUmakefile.am \ + " + +S = "${WORKDIR}/" + +inherit autotools pkgconfig + +EXTRA_OECONF = "\ + --enable-debug=no \ + --enable-svg \ + --enable-icon-database=yes \ + " + +do_compile_prepend() { + mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ + mkdir -p ${S}/Programs/ + cd ${S}/JavaScriptCore/pcre + if test -e dftables.c + then + ${BUILD_CC} dftables.c -o dftables -I. -I../wtf + elif test -e dftables.cpp + then + ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf + fi + cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ + cp dftables ${S}/Programs/ + cd ${S} +} -SRC_URI += "file://autogen.sh \ - file://configure.ac \ - file://GNUmakefile.am \ - " +do_stage() { + autotools_stage_all +} -PR = "r4" +PACKAGES =+ "${PN}launcher-dbg ${PN}launcher libjavascriptcore" +FILES_${PN}launcher = "${bindir}/GtkLauncher" +FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" +FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*" -do_install() { - install -d ${D}${bindir} - install -d ${D}${libdir} - install -d ${D}${libdir}/pkgconfig - install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GtkLauncher/GtkLauncher ${D}${bindir} - cd ${S}/WebKitBuilds/Debug - PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro - oe_runmake install -} diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc index 81c2d91bf8..087115de09 100644 --- a/packages/webkit/webkit.inc +++ b/packages/webkit/webkit.inc @@ -1,3 +1,4 @@ +DESCRIPTION = "WebKit browser engine, GTK+ edition" DEPENDS += "flex-native gperf-native perl-native sqlite3" SRCREV_FORMAT = "webcore-rwebkit" diff --git a/packages/woodstox/.mtn2git_empty b/packages/woodstox/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/woodstox/.mtn2git_empty diff --git a/packages/woodstox/woodstox2_2.0.6.bb b/packages/woodstox/woodstox2_2.0.6.bb new file mode 100644 index 0000000000..390c4ff3f0 --- /dev/null +++ b/packages/woodstox/woodstox2_2.0.6.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "High-performance XML processor." +LICENSE = "AL2.0 LGPL2.1" + +AUTHOR = "Codehaus" +HOMEPAGE = "http://woodstox.codehaus.org" + +SRC_URI = "http://woodstox.codehaus.org/2.0.6/wstx-src.tar.gz" + +S = "${WORKDIR}" + +inherit java-library + +DEPENDS = "fastjar-native" + +do_compile() { + mkdir -p build/META-INF/services + + javac -nowarn -sourcepath src/java -d build \ + `find src/java/org -name "*.java"` \ + `find src/java/com -name "*.java"` + + cp -r src/resources/* build/META-INF/services + + fastjar -C build -c -f ${JARFILENAME} . +} diff --git a/packages/xoo/xoo_svn.bb b/packages/xoo/xoo_svn.bb index 231122194b..e9cd7ee9b7 100644 --- a/packages/xoo/xoo_svn.bb +++ b/packages/xoo/xoo_svn.bb @@ -3,7 +3,7 @@ It is intended for embedded developers that want to simulate a target device \ (with an accurate display size, working hardware buttons, etc) on a desktop machine." HOMEPAGE = "http://projects.o-hand.com/xoo" LICENSE = "GPL" -DEPENDS = "virtual/libx11 libxtst gtk+ libglade" +DEPENDS = "virtual/libx11 libxtst gtk+ libglade expat" PV = "0.7+svnr${SRCREV}" PR = "r1" diff --git a/site/arm-linux-uclibc b/site/arm-linux-uclibc index 81d2c54aae..5120795f7a 100644 --- a/site/arm-linux-uclibc +++ b/site/arm-linux-uclibc @@ -4,6 +4,7 @@ ac_cv_func_setgrent_void=yes ac_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_works=yes ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} +ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} ac_cv_sizeof_char=${ac_cv_sizeof_char=1} |