diff options
Diffstat (limited to 'packages')
50 files changed, 505 insertions, 130 deletions
diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb index 7f84ebe4fe..1db1e19be7 100644 --- a/packages/enca/enca_1.9.bb +++ b/packages/enca/enca_1.9.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Enca is an Extremely Naive Charset Analyser" -LICENSE = "GPL2" SECTION = "libs" PRIORITY = "optional" +LICENSE = "GPLv2" HOMEPAGE = "http://trific.ath.cx/software/enca/" PR = "r2" diff --git a/packages/fbreader/fbreader_0.7.3d.bb b/packages/fbreader/fbreader_0.7.3d.bb index 9fe9c3190c..a326180997 100644 --- a/packages/fbreader/fbreader_0.7.3d.bb +++ b/packages/fbreader/fbreader_0.7.3d.bb @@ -1,5 +1,5 @@ DESCRIPTION = "FBreader is an ebook reader" -LICENSE = "GPL2" +LICENSE = "GPLv2" HOMEPAGE = "http://only.mawhrin.net/fbreader/" SECTION = "x11/utils" PRIORITY = "optional" diff --git a/packages/fbreader/fbreader_0.7.4q.bb b/packages/fbreader/fbreader_0.7.4q.bb index bcea83a4a1..de2bf358a4 100644 --- a/packages/fbreader/fbreader_0.7.4q.bb +++ b/packages/fbreader/fbreader_0.7.4q.bb @@ -1,5 +1,5 @@ DESCRIPTION = "FBreader is an ebook reader" -LICENSE = "GPL2" +LICENSE = "GPLv2" HOMEPAGE = "http://only.mawhrin.net/fbreader/" SECTION = "x11/utils" PRIORITY = "optional" diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb index ca25bdc620..fa982040f9 100644 --- a/packages/fbreader/fbreader_0.8.2a.bb +++ b/packages/fbreader/fbreader_0.8.2a.bb @@ -1,5 +1,5 @@ DESCRIPTION = "FBreader is an ebook reader" -LICENSE = "GPL2" +LICENSE = "GPLv2" HOMEPAGE = "http://only.mawhrin.net/fbreader/" SECTION = "x11/utils" PRIORITY = "optional" diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass index 0cb8497733..a859ac2ca9 100644 --- a/packages/glibc/eglibc-package.bbclass +++ b/packages/glibc/eglibc-package.bbclass @@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0" BINARY_LOCALE_ARCHES ?= "arm.*" PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" -PACKAGES_DYNAMIC = "eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*" +PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*" RPROVIDES_eglibc = "glibc" RPROVIDES_eglibc-utils = "glibc-utils" @@ -210,6 +210,7 @@ python package_do_split_gconvs () { f.close() if deps != []: bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) + bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group, d) do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d) @@ -261,6 +262,7 @@ python package_do_split_gconvs () { else: eglibc_name = name bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d) + bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % group, d) rprovides = 'virtual-locale-%s' % legitimize_package_name(name) m = re.match("(.*)_(.*)", name) if m: diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index da33cca3fa..ff68185bcc 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -2,8 +2,8 @@ require glibc.inc DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" -PV = "2.6+svnr${SRCREV}" -PR = "r1" +PV = "2.7+svnr${SRCREV}" +PR = "r2" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://etc/ld.so.conf \ file://generate-supported.mk" diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index cc69079c3a..e7875dc72e 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -7,7 +7,7 @@ RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" PV = "2.16.0+svnr${SRCREV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ file://69gconfd-dbus" @@ -19,6 +19,7 @@ PARALLEL_MAKE = "" FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*" FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug" +FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd" EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static" diff --git a/packages/gnome/libart-lgpl/armeb/.mtn2git_empty b/packages/gnome/libart-lgpl/armeb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gnome/libart-lgpl/armeb/.mtn2git_empty diff --git a/packages/gnome/libart-lgpl/armeb/art_config.h b/packages/gnome/libart-lgpl/armeb/art_config.h new file mode 100644 index 0000000000..b0e74ad6ae --- /dev/null +++ b/packages/gnome/libart-lgpl/armeb/art_config.h @@ -0,0 +1,10 @@ +/* Automatically generated by gen_art_config.c */ + +#define ART_SIZEOF_CHAR 1 +#define ART_SIZEOF_SHORT 2 +#define ART_SIZEOF_INT 4 +#define ART_SIZEOF_LONG 4 + +typedef unsigned char art_u8; +typedef unsigned short art_u16; +typedef unsigned int art_u32; diff --git a/packages/gpephone/gpe-applauncher_0.11.bb b/packages/gpephone/gpe-applauncher_0.11.bb index 1efcd793e0..204f7828f9 100644 --- a/packages/gpephone/gpe-applauncher_0.11.bb +++ b/packages/gpephone/gpe-applauncher_0.11.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" -PR = "r1" +PR = "r2" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" @@ -18,7 +18,7 @@ inherit gpephone autotools SRC_URI += "file://hotkeys.conf \ file://softkeys.conf" -EXTRA_OECONF = "--disable-gridlayout" +EXTRA_OECONF = "--enable-gridlayout" FILES_${PN} = '${datadir} ${bindir}' FILES_gpe-applauncher-config = '${sysconfdir}/gpe/' diff --git a/packages/gpephone/gpe-applauncher_svn.bb b/packages/gpephone/gpe-applauncher_svn.bb index 4fe82877e3..311d2eef60 100644 --- a/packages/gpephone/gpe-applauncher_svn.bb +++ b/packages/gpephone/gpe-applauncher_svn.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" PV = "0.11+svn-${SRCREV}" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" @@ -24,7 +24,7 @@ RDEPENDS_${PN} += "gpe-applauncher-config" SRC_URI += "file://hotkeys.conf \ file://softkeys.conf" -EXTRA_OECONF = "--disable-gridlayout" +EXTRA_OECONF = "--enable-gridlayout" FILES_${PN} = '${datadir} ${bindir}' FILES_gpe-applauncher-config = '${sysconfdir}/gpe/' diff --git a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb index 6b07f78074..1b009b5380 100644 --- a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb +++ b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb @@ -1,6 +1,6 @@ SECTION = "x11/base" DESCRIPTION = "Clearlooks theme engine for GTK" -LICENSE = "GPL2" +LICENSE = "GPLv2" DEPENDS = "gtk+" PR = "r1" diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb index 68a5119aa1..d6e6de5037 100644 --- a/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb +++ b/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb @@ -1,6 +1,6 @@ SECTION = "x11/base" DESCRIPTION = "Industrial theme engine for GTK" -LICENSE = "GPL2" +LICENSE = "GPLv2" DEPENDS = "gtk+" SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \ diff --git a/packages/gtk-webcore/midori_0.0.13.bb b/packages/gtk-webcore/midori_0.0.13.bb new file mode 100644 index 0000000000..23d0179375 --- /dev/null +++ b/packages/gtk-webcore/midori_0.0.13.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Midori is a lightweight web browser." +LICENSE = "GPLv2" + +DEPENDS = "webkit-gtk libsexy" + +inherit autotools pkgconfig + +SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ + " + + diff --git a/packages/lua/lua-gtk2_0.3.bb b/packages/lua/lua-gtk2_0.3.bb index 3abca0e88a..083e9a6ca1 100644 --- a/packages/lua/lua-gtk2_0.3.bb +++ b/packages/lua/lua-gtk2_0.3.bb @@ -1,9 +1,9 @@ DESCRIPTION = "GTK bindings for LUA" -LICENSE = "GPL2" +SECTION = "libs" PRIORITY = "optional" +LICENSE = "GPLv2" DEPENDS = "gtk+ lua-native perl-native readline libffi" RDEPENDS = "lua" -SECTION = "libs" inherit gpe diff --git a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch index 3a09ac5bc2..c25aa74ca4 100644 --- a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch +++ b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch @@ -1,12 +1,12 @@ Index: matchbox-keyboard/src/matchbox-keyboard.c =================================================================== ---- matchbox-keyboard.orig/src/matchbox-keyboard.c 2007-08-19 17:26:59.000000000 +0200 -+++ matchbox-keyboard/src/matchbox-keyboard.c 2007-08-19 17:27:06.000000000 +0200 -@@ -52,7 +52,7 @@ +--- matchbox-keyboard.orig/src/matchbox-keyboard.c ++++ matchbox-keyboard/src/matchbox-keyboard.c +@@ -54,7 +54,7 @@ kb->row_spacing = 5; kb->font_family = strdup("sans"); -- kb->font_pt_size = 5; +- kb->font_pt_size = 6; + kb->font_pt_size = 3; kb->font_variant = strdup("bold"); diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index 2b84a19bd7..4384b6db7d 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -3,21 +3,21 @@ LICENSE = "GPL" DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" RCONFLICTS_${PN} = "matchbox-keyboard" RPROVIDES_${PN} = "matchbox-keyboard" -#DEFAULT_PREFERENCE = "-1" SECTION = "x11" PV = "0.0+svnr${SRCREV}" -PR = "r9" +PR = "r10" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ - file://smallscreen-fontsize.patch;patch=1 \ + file://smallscreen-fontsize.patch;patch=1 \ file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \ file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \ file://4-Add-rendering-debug-logging.patch;patch=1 \ file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \ file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \ - file://80matchboxkeyboard" + file://80matchboxkeyboard" SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1" +SRC_URI_append_fic-gta02 = " file://fic-gta01-font-size.patch;patch=1" S = "${WORKDIR}/matchbox-keyboard" diff --git a/packages/meta/meta-angstrom-2007.bb b/packages/meta/meta-angstrom-2007.bb new file mode 100644 index 0000000000..a3a2c78a79 --- /dev/null +++ b/packages/meta/meta-angstrom-2007.bb @@ -0,0 +1,32 @@ +# Meta file to inform the autobuilder which packages to build for the feeds +# Any changes should be discussed first on the angstrom-distro-devel mailinglist + +# Try to keep it alphabetically sorted please + +inherit meta + +RDEPENDS = "" + +# Basic tools +RDEPENDS += " \ + task-proper-tools \ + screen \ + " + +# Browsers know to work on all archs +RDEPENDS += " \ + gpe-mini-browser \ + midori \ + minimo \ + openmoko-browser2 \ + webkit-gtklauncher \ + " + +# Webservers +RDEPENDS += " \ + apache2 \ + boa \ + cherokee \ + lighttpd \ + thttpd \ + " diff --git a/packages/mono/files/mono-libgc-configure.patch b/packages/mono/files/mono-libgc-configure.patch new file mode 100644 index 0000000000..641635da3c --- /dev/null +++ b/packages/mono/files/mono-libgc-configure.patch @@ -0,0 +1,20 @@ +Index: mono-1.2.6/libgc/configure.in +=================================================================== +--- mono-1.2.6.orig/libgc/configure.in 2007-12-12 15:02:31.000000000 -0500 ++++ mono-1.2.6/libgc/configure.in 2007-12-12 15:05:10.000000000 -0500 +@@ -17,6 +17,15 @@ + AC_PREREQ(2.53) + AC_INIT(libgc-mono, 6.6, Hans_Boehm@hp.com) + ++# the following is a very strange bug. CPPFLAGS does not get set correctly ++# if CPPFLAGS is set in the environment. The top level configure script ++# appends to the CPPFLAGS variable, and then exports it. This change should ++# be picked up by this configure script, but it is not. The original ++# env variable is still used for some reason. If CPPFLAGS is not set in the ++# environment, everything works fine. ++# Someone more experienced with autoconf will have to come up with a better fix. ++CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DUSE_COMPILER_TLS" ++echo "CPPFLAGS verify: start of libgc/configure.in, CPPFLAGS = $CPPFLAGS" + AM_INIT_AUTOMAKE(libgc-mono, 6.6, no-define) + + AC_CONFIG_SRCDIR(gcj_mlc.c) diff --git a/packages/mono/mono-1.2.6/.mtn2git_empty b/packages/mono/mono-1.2.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mono/mono-1.2.6/.mtn2git_empty diff --git a/packages/mono/mono-1.2.6/configure.patch b/packages/mono/mono-1.2.6/configure.patch new file mode 100644 index 0000000000..f033248621 --- /dev/null +++ b/packages/mono/mono-1.2.6/configure.patch @@ -0,0 +1,23 @@ +Index: mono-1.2.6/configure.in +=================================================================== +--- mono-1.2.6.orig/configure.in 2007-11-08 17:07:57.000000000 -0500 ++++ mono-1.2.6/configure.in 2007-12-12 15:27:52.000000000 -0500 +@@ -1150,6 +1150,8 @@ + ], [ + AC_MSG_RESULT(no) + with_tls=pthread ++ ], [ ++ AC_MSG_RESULT(yes) + ]) + fi + +@@ -1252,6 +1254,9 @@ + ], [ + with_sigaltstack=no + AC_MSG_RESULT(no) ++ ], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) + ]) + fi + diff --git a/packages/mono/mono-mcs-intermediate_1.2.6.bb b/packages/mono/mono-mcs-intermediate_1.2.6.bb new file mode 100644 index 0000000000..53ff1b25aa --- /dev/null +++ b/packages/mono/mono-mcs-intermediate_1.2.6.bb @@ -0,0 +1,10 @@ +# This is a straw-man recipe for step 1 in the two-step build of +# mono. Because it's impossible to build the mcs directory +# in cross-compile mode, this recipe will do a native build, +# then tar the resulting install tree for usage by the mono +# package in step 2. +# See http://www.mono-project.com/Mono:ARM + +require mono_1.2.6.inc +require mono-mcs-intermediate.inc + diff --git a/packages/mono/mono_1.2.6.bb b/packages/mono/mono_1.2.6.bb new file mode 100644 index 0000000000..5c5d8476bb --- /dev/null +++ b/packages/mono/mono_1.2.6.bb @@ -0,0 +1,78 @@ +require mono_1.2.6.inc + +DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" + +PR = "r1" + +SRC_URI += "file://configure.patch;patch=1" + +# Per http://www.mono-project.com/Mono:ARM +EXTRA_OECONF += " --disable-mcs-build " +# Instead, get the mcs tree from a different build (see mono-mcs-intermediate) + +do_install_prepend() { + install -d ${D} + pushd ${D} + tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + popd +} + +do_install_append() { + # mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#), + # however, jay is not being cross-compiled and thus only + # available for the buildhost architecture, so remove it + # entirely + pushd ${D} + rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ + ./usr/share/jay/README.jay \ + ./usr/bin/jay + popd + + # Not packaged with the default rules and apparently + # not used for anything + rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml +} + +inherit mono + +# Import file definitions from Debian +require mono_1.2.5.1-files.inc + +# Add some packages +PACKAGES_append = " mono-doc mono mono-runtime" + +FILES_mono-doc_append = " /usr/share/libgc-mono/ " + +FILES_mono = "" +ALLOW_EMPTY_mono = "1" +RDEPENDS_mono = "mono-common mono-jit" + +FILES_mono-runtime = "" +ALLOW_EMPTY_mono-runtime = "1" +RDEPENDS_mono-runtime = "mono-jit mono-gac" + +RDEPENDS_mono-jit = "mono-common" + +FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \ + /usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la" +FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \ + /usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so" + +# Packages not included in Debian +PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \ + libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \ + libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil" + +FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll" +FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc" +FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb" + +FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*" +FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb" + +FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll" +FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb" + +# Move .pc files +FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc" +PACKAGES =+ " libmono-cairo1.0-cil-dev " diff --git a/packages/mono/mono_1.2.6.inc b/packages/mono/mono_1.2.6.inc new file mode 100644 index 0000000000..c9644cbce5 --- /dev/null +++ b/packages/mono/mono_1.2.6.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Mono Programming Language" +SECTION = "devel/mono" +LICENSE = "GPL LGPL X11" + +SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2 \ + file://mono-libgc-configure.patch;patch=1" + +S = "${WORKDIR}/mono-1.2.6" + +inherit autotools +EXTRA_OECONF_arm = "--without-tls" +EXTRA_OECONF_mipsel = "--without-tls" + diff --git a/packages/opie-citytime/opie-citytime.inc b/packages/opie-citytime/opie-citytime.inc index a2fe0972af..529eba0d7f 100644 --- a/packages/opie-citytime/opie-citytime.inc +++ b/packages/opie-citytime/opie-citytime.inc @@ -2,7 +2,8 @@ DESCRIPTION = "Opie Time-zone / world clock settings" SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" -RRECOMMENDS = "timezones" +RRECOMMENDS = "tzdata" +PR = "r1" APPNAME = "citytime" diff --git a/packages/pointercal/files/e680/.mtn2git_empty b/packages/pointercal/files/e680/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pointercal/files/e680/.mtn2git_empty diff --git a/packages/pointercal/files/e680/pointercal b/packages/pointercal/files/e680/pointercal new file mode 100644 index 0000000000..8b0651dd21 --- /dev/null +++ b/packages/pointercal/files/e680/pointercal @@ -0,0 +1 @@ +-19857 -412 18085522 189 -23922 22734294 65536 diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb index 4fa8c1cc0e..e79ee0b889 100644 --- a/packages/pointercal/pointercal_0.0.bb +++ b/packages/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -PR = "r4" +PR = "r5" SRC_URI = "file://pointercal" S = "${WORKDIR}" diff --git a/packages/python/python-pyqt_4.3.1.bb b/packages/python/python-pyqt_4.3.3.bb index d9c45ec14c..74a16c4720 100644 --- a/packages/python/python-pyqt_4.3.1.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -22,7 +22,8 @@ inherit qt4x11 sip distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_1 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +# NOTE: match with qt version we have in OE +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" diff --git a/packages/python/python-sip_4.7.1.bb b/packages/python/python-sip_4.7.3.bb index fc87b01e53..fc87b01e53 100644 --- a/packages/python/python-sip_4.7.1.bb +++ b/packages/python/python-sip_4.7.3.bb diff --git a/packages/roadmap/files/qt/.mtn2git_empty b/packages/roadmap/files/qt/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/roadmap/files/qt/.mtn2git_empty diff --git a/packages/roadmap/files/qt/qt2-fixes.patch b/packages/roadmap/files/qt/qt2-fixes.patch new file mode 100644 index 0000000000..63c1c96e53 --- /dev/null +++ b/packages/roadmap/files/qt/qt2-fixes.patch @@ -0,0 +1,10 @@ +--- src/qt/Makefile~qt2-fixes.patch ++++ src/qt/Makefile +@@ -19,7 +19,7 @@ + + ifeq ($(DESKTOP),QPE) + CFLAGS += -I$(QTDIR)/include -DQWS +- LIBS += -lqte -lqpe ++ LIBS += -lqpe + INSTALLDIR=$(QTDIR) + endif diff --git a/packages/roadmap/files/qt/qt_canvas.patch b/packages/roadmap/files/qt/qt_canvas.patch new file mode 100644 index 0000000000..13c775c8cb --- /dev/null +++ b/packages/roadmap/files/qt/qt_canvas.patch @@ -0,0 +1,20 @@ +--- src/qt/qt_canvas.cc.old 2007-12-08 20:29:52.000000000 -0600 ++++ src/qt/qt_canvas.cc 2007-12-13 02:34:22.000000000 -0600 +@@ -122,7 +122,7 @@ void RMapCanvas::getTextExtents(const ch + *w = r.width(); + *ascent = fm.ascent(); + *descent = fm.descent(); +-#ifdef QT_NO_ROTATE ++#ifdef QT_NO_TRANSFORMATIONS + if (can_tilt) *can_tilt = 0; + #else + if (can_tilt) *can_tilt = 1; +@@ -169,7 +169,7 @@ void RMapCanvas::drawString(RoadMapGuiPo + + void RMapCanvas::drawStringAngle(RoadMapGuiPoint* position, + int center, const char* text, int angle) { +-#ifndef QT_NO_ROTATE ++#ifndef QT_NO_TRANSFORMATIONS + if (!pixmap) { + return; + } diff --git a/packages/roadmap/files/qt/qt_main.patch b/packages/roadmap/files/qt/qt_main.patch new file mode 100644 index 0000000000..2f81128b34 --- /dev/null +++ b/packages/roadmap/files/qt/qt_main.patch @@ -0,0 +1,61 @@ +--- src/qt/qt_main.cc.old 2007-12-08 20:32:34.000000000 -0600 ++++ src/qt/qt_main.cc 2007-12-08 20:34:38.000000000 -0600 +@@ -27,6 +27,7 @@ + #include <signal.h> + #include <sys/types.h> + #include <sys/socket.h> ++#include <unistd.h> + #include "qt_main.h" + + static int signalFd[2]; +@@ -168,12 +169,6 @@ void RMapMainWindow::addTool(const char* + const char* tip, + RoadMapCallback callback) { + +-#ifndef QWS +- // For some unknown reason, this toolbar crashes RoadMap +- // on the Sharp Zaurus. +- // This should be fixed and the ifndef removed. +- // Pascal: I believe this has been fixed now. +- + if (toolBar == 0) { + addToolbar(""); + } +@@ -193,20 +188,13 @@ void RMapMainWindow::addTool(const char* + + connect(b, SIGNAL(clicked()), cb, SLOT(fire())); + } +-#endif + } + + void RMapMainWindow::addToolSpace(void) { + +-#ifndef QWS +- // For some unknown reason, this toolbar crashes RoadMap +- // on the Sharp Zaurus. This should be fixed and the ifndef +- // removed. +- + addTool (NULL, NULL, NULL, NULL); + + toolBar->addSeparator(); +-#endif + } + + +@@ -299,14 +287,14 @@ void RMapMainWindow::closeEvent(QCloseEv + + void RMapMainWindow::signalHandler(int sig) + { +- ::write(signalFd[0], &sig, sizeof(sig)); ++ write(signalFd[0], &sig, sizeof(sig)); + } + + void RMapMainWindow::handleSignal() + { + snSignal->setEnabled(false); + int tmp; +- ::read(signalFd[1], &tmp, sizeof(tmp)); ++ read(signalFd[1], &tmp, sizeof(tmp)); + QString action; + switch (tmp) { + case SIGTERM: action="SIGTERM"; break; diff --git a/packages/roadmap/files/qt/roadmap.desktop.patch b/packages/roadmap/files/qt/roadmap.desktop.patch new file mode 100644 index 0000000000..98d5b06130 --- /dev/null +++ b/packages/roadmap/files/qt/roadmap.desktop.patch @@ -0,0 +1,16 @@ +--- src/roadmap.desktop.old 2007-12-08 23:15:45.000000000 -0600 ++++ src/roadmap.desktop 2007-12-08 23:17:48.000000000 -0600 +@@ -1,11 +1,8 @@ + [Desktop Entry] +-Comment=RoadMap + Comment=Car Navigation System + Exec=roadmap +-Icon=roadmap.png ++Icon=roadmap + Type=Application + Name=RoadMap + GenericName=Map Viewer +-Categories=Application;Other;VectorGraphics;Graphics;Viewer;GTK; +-FilePattern=*roadmap;*.rdm +- ++Categories=VectorGraphics;Graphics;Viewer;GTK; diff --git a/packages/roadmap/files/qt/roadmap_main.patch b/packages/roadmap/files/qt/roadmap_main.patch new file mode 100644 index 0000000000..7b16ce28fc --- /dev/null +++ b/packages/roadmap/files/qt/roadmap_main.patch @@ -0,0 +1,16 @@ +--- src/qt/roadmap_main.cc.old 2007-12-08 15:47:05.000000000 -0600 ++++ src/qt/roadmap_main.cc 2007-12-07 20:39:15.000000000 -0600 +@@ -195,11 +195,11 @@ void roadmap_main_set_cursor (int newcur + break; + + case ROADMAP_CURSOR_WAIT: +- mainWindow->setCursor (QCursor(Qt::WaitCursor)); ++ mainWindow->setCursor (QCursor(Qt::waitCursor)); + break; + + case ROADMAP_CURSOR_CROSS: +- mainWindow->setCursor (QCursor(Qt::CrossCursor)); ++ mainWindow->setCursor (QCursor(Qt::crossCursor)); + break; + } + } diff --git a/packages/roadmap/zroadmap-1.0.12/zroadgps.png b/packages/roadmap/files/zroadgps.png Binary files differindex a77b3729b7..a77b3729b7 100644 --- a/packages/roadmap/zroadmap-1.0.12/zroadgps.png +++ b/packages/roadmap/files/zroadgps.png diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb index cb81a44ae8..557c4a1096 100644 --- a/packages/roadmap/roadmap-gtk2_cvs.bb +++ b/packages/roadmap/roadmap-gtk2_cvs.bb @@ -1,13 +1,8 @@ -DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ -It displays a map of the streets, tracks the position provided by a NMEA-compliant \ -GPS receiver, identifies the street matching this GPS position and announces the name \ -of the crossing street at the next intersection." -AUTHOR = "Pascal Martin <pascal.martin@iname.com>" -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -DEPENDS = "popt expat gtk+" -LICENSE = "GPL" +require roadmap.inc + +DEPENDS = "expat gtk+" PV = "1.0.12+cvs${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ @@ -16,7 +11,6 @@ SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ S = "${WORKDIR}/roadmap/src" -PARALLEL_MAKE = "" CFLAGS += " -I${S} " @@ -39,6 +33,5 @@ do_install() { install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ } - FILES_${PN} += "${datadir}/roadmap" diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc new file mode 100644 index 0000000000..43577badb9 --- /dev/null +++ b/packages/roadmap/roadmap.inc @@ -0,0 +1,7 @@ +DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX." +PRIORITY = "optional" +AUTHOR = "Pascal Martin <pascal.martin@iname.com>" +HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" +LICENSE = "GPL" + +PARALLEL_MAKE = "" diff --git a/packages/roadmap/zroadmap.inc b/packages/roadmap/zroadmap.inc new file mode 100644 index 0000000000..acee708837 --- /dev/null +++ b/packages/roadmap/zroadmap.inc @@ -0,0 +1,13 @@ +require roadmap.inc + +SECTION = "opie/applications" + +inherit palmtop + +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' +QT_LIBRARY_append_c7x0 = " -laticore" + +do_configure() { + echo removing pregenerated stuff + find . -name "moc*"|xargs rm -f +} diff --git a/packages/roadmap/zroadmap_1.0.12.bb b/packages/roadmap/zroadmap_1.0.12.bb index 5b9161cfce..9a7b73d1a1 100644 --- a/packages/roadmap/zroadmap_1.0.12.bb +++ b/packages/roadmap/zroadmap_1.0.12.bb @@ -1,15 +1,6 @@ -DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ -It displays a map of the streets, tracks the position provided by a NMEA-compliant \ -GPS receiver, identifies the street matching this GPS position and announces the name \ -of the crossing street at the next intersection. A rudimentary trip feature allows \ -RoadMap to display some basic navigation information (distance to the destination, \ -direction, speed, etc..). Voice messages are generated that duplicate some of the screen information." -SECTION = "opie/applications" -PRIORITY = "optional" -AUTHOR = "Pascal Martin <pascal.martin@iname.com>" -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -LICENSE = "GPL" -PR = "r0" +require zroadmap.inc + +PR = "r1" SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ file://qt2-fixes.patch;pnum=2;patch=1 \ @@ -17,20 +8,9 @@ SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar. file://zroadgps.png" S = "${WORKDIR}/roadmap-${PV}/src" -inherit palmtop - -QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' -QT_LIBRARY_append_c7x0 = " -laticore" - EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \ GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"' -PARALLEL_MAKE = "" - -do_configure() { - echo removing pregenerated stuff - find . -name "moc*"|xargs rm -f -} do_compile() { oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a @@ -38,16 +18,16 @@ do_compile() { } do_install() { - cd qt install -d ${D}${palmtopdir}/bin install -d ${D}${palmtopdir}/apps/Applications install -d ${D}${palmtopdir}/pics - install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap - install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps - install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap + install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ + install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ + install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ install -d ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb new file mode 100644 index 0000000000..42184ce62b --- /dev/null +++ b/packages/roadmap/zroadmap_1.1.0.bb @@ -0,0 +1,40 @@ +require zroadmap.inc + +DEPENDS += "expat" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ + file://cross.patch;patch=1;pnum=2 \ + file://qt/qt2-fixes.patch;patch=1 \ + file://qt/qt_canvas.patch;patch=1 \ + file://qt/qt_main.patch;patch=1 \ + file://qt/roadmap_main.patch;patch=1 \ + file://qt/roadmap.desktop.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ + file://zroadgps.png" +S = "${WORKDIR}/roadmap-${PV}/src" + +EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \ + CFLAGS="-DQWS -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a + oe_runmake -C gpx libgpx.a + oe_runmake -C unix libosroadmap.a + oe_runmake -C qt qtroadmap qtroadgps +} + +do_install() { + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap + install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ + install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ +} diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb index fd9cc5e95f..5b39faf071 100644 --- a/packages/roadmap/zroadmap_cvs.bb +++ b/packages/roadmap/zroadmap_cvs.bb @@ -1,36 +1,24 @@ -DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ -It displays a map of the streets, tracks the position provided by a NMEA-compliant \ -GPS receiver, identifies the street matching this GPS position and announces the name \ -of the crossing street at the next intersection." -SECTION = "opie/applications" -PRIORITY = "optional" -AUTHOR = "Pascal Martin <pascal.martin@iname.com>" -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -DEPENDS = "popt expat" -LICENSE = "GPL" -PV = "1.0.12+cvs-${SRCDATE}" +require zroadmap.inc + +DEPENDS += "expat" +SRCDATE = "20071212" +PV = "1.1.0+cvs-${SRCDATE}" PR = "r0" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ - file://qt2-fixes-r1.patch;pnum=1;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + file://cross.patch;patch=1;pnum=2 \ + file://qt/qt2-fixes.patch;patch=1 \ + file://qt/qt_canvas.patch;patch=1 \ +#upstream file://qt/qt_main.patch;patch=1 \ + file://qt/roadmap_main.patch;patch=1 \ +#upstream file://qt/roadmap.desktop.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ file://zroadgps.png" S = "${WORKDIR}/roadmap/src" -inherit palmtop - -QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' -QT_LIBRARY_append_c7x0 = " -laticore" - EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ - CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' -PARALLEL_MAKE = "" - -do_configure() { - echo removing pregenerated stuff - find . -name "moc*"|xargs rm -f -} do_compile() { oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a @@ -45,10 +33,10 @@ do_install() { install -d ${D}${palmtopdir}/pics install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps - install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ install -d ${D}${palmtopdir}/share/roadmap/ - install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } diff --git a/packages/sip/sip-native_4.7.1.bb b/packages/sip/sip-native_4.7.3.bb index b47a3a7539..b47a3a7539 100644 --- a/packages/sip/sip-native_4.7.1.bb +++ b/packages/sip/sip-native_4.7.3.bb diff --git a/packages/uboot/files/glamo-ram-init.patch b/packages/uboot/files/glamo-ram-init.patch deleted file mode 100644 index 4c12074347..0000000000 --- a/packages/uboot/files/glamo-ram-init.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/board/neo1973/common/lowlevel_init.S b/board/neo1973/common/lowlevel_init.S -index 582aa0e..92a9c7b 100644 ---- a/board/neo1973/common/lowlevel_init.S -+++ b/board/neo1973/common/lowlevel_init.S -@@ -67,11 +67,11 @@ - #define B0_PMC 0x0 /* normal */ - - /* BANK1CON */ --#define B1_Tacs 0x0 /* 0clk */ --#define B1_Tcos 0x1 /* 1clk */ --#define B1_Tacc 0x4 /* 4clk */ --#define B1_Tcoh 0x1 /* 1clk */ --#define B1_Tah 0x0 /* 0clk */ -+#define B1_Tacs 0x3 /* 4clk */ -+#define B1_Tcos 0x3 /* 4clk */ -+#define B1_Tacc 0x7 /* 14clk */ -+#define B1_Tcoh 0x3 /* 4clk */ -+#define B1_Tah 0x3 /* 4clk */ - #define B1_Tacp 0x0 - #define B1_PMC 0x0 - diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb index 36ec1e130e..2ce92ad4a9 100644 --- a/packages/uboot/uboot-openmoko_svn.bb +++ b/packages/uboot/uboot-openmoko_svn.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" PROVIDES = "virtual/bootloader" LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}" PV = "1.3.0${LOCALVERSION}" -PR = "r0" +PR = "r1" SRCREV_FORMAT = "patches" @@ -20,7 +20,6 @@ SRC_URI = "\ file://uboot-eabi-fix-HACK.patch \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ file://makefile-no-dirafter.patch;patch=1 \ - file://glamo-ram-init.patch;patch=1 \ " S = "${WORKDIR}/git" diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri index 0c47afe7fd..640fa34174 100644 --- a/packages/webkit/files/WebKit.pri +++ b/packages/webkit/files/WebKit.pri @@ -11,12 +11,47 @@ qt-port:DEFINES += BUILDING_QT__=1 qt-port:!building-libs { QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR LIBS += -lQtWebKit + DEPENDPATH += $$PWD/WebKit/qt/Api +} + +gtk-port:!building-libs { + QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR + LIBS += -lWebKitGtk + DEPENDPATH += $$PWD/WebKit/gtk/WebView $$PWD/WebKit/gtk/WebCoreSupport +} + +gtk-port { + CONFIG += link_pkgconfig + + DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1 + + # We use FreeType directly with Cairo + PKGCONFIG += cairo-ft + + directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0 + else: PKGCONFIG += cairo gtk+-2.0 + + # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb) + CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG) + + # We use the curl http backend on all platforms + PKGCONFIG += libcurl + + LIBS += -lWebKitGtk -ljpeg -lpng + + QMAKE_CXXFLAGS += $$system(icu-config --cppflags) + QMAKE_LIBS += $$system(icu-config --ldflags) + + # This set of warnings is borrowed from the Mac build + QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef + + # These flags are based on optimization experience from the Mac port: + # Helps code size significantly and speed a little + QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti + + DEPENDPATH += $$PWD/JavaScriptCore/API + INCLUDEPATH += $$PWD } -gtk-port:CONFIG += link_pkgconfig -gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl -gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__ -gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng -gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) DEFINES += USE_SYSTEM_MALLOC CONFIG(release) { @@ -32,7 +67,7 @@ gtk-port:INCLUDEPATH += \ $$BASE_DIR/WebCore/platform/graphics/cairo \ $$BASE_DIR/WebCore/loader/gtk \ $$BASE_DIR/WebCore/page/gtk \ - $$BASE_DIR/WebKit/gtk/Api \ + $$BASE_DIR/WebKit/gtk/WebView \ $$BASE_DIR/WebKit/gtk/WebCoreSupport INCLUDEPATH += \ $$BASE_DIR/JavaScriptCore/ \ diff --git a/packages/webkit/files/WebKit.pro b/packages/webkit/files/WebKit.pro index aab0209a93..027017bd8d 100644 --- a/packages/webkit/files/WebKit.pro +++ b/packages/webkit/files/WebKit.pro @@ -3,9 +3,15 @@ CONFIG += ordered !gtk-port:CONFIG += qt-port qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins SUBDIRS += \ - WebCore + WebCore \ + JavaScriptCore/kjs/testkjs.pro + +qt-port { + SUBDIRS += WebKit/qt/QtLauncher + + !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro +} -qt-port:SUBDIRS += \ - WebKit/qt/QtLauncher gtk-port:SUBDIRS += \ - WebKitTools/GtkLauncher + WebKitTools/GtkLauncher \ + WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 262c6820db..c726020d1a 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -1,5 +1,8 @@ DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+" +# If you activate HTML5 media support (ENABLE_VIDEO=1) you'll need: +# DEPENDS += " gstreamer gst-plugins-base gnome-vfs " + WEBKIT_PORT = "gtk-port" WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt" @@ -9,7 +12,7 @@ FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher" require webkit.inc -PR = "r3" +PR = "r4" do_install() { install -d ${D}${bindir} diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc index 2ff61091c3..81c2d91bf8 100644 --- a/packages/webkit/webkit.inc +++ b/packages/webkit/webkit.inc @@ -34,7 +34,13 @@ do_configure() { do_compile_prepend() { mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ cd ${S}/JavaScriptCore/pcre - ${BUILD_CC} dftables.c -o dftables -I. -I../wtf + 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/ cd ${S}/WebKitBuilds/Debug } |
