diff options
| -rw-r--r-- | conf/checksums.ini | 8 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 4 | ||||
| -rw-r--r-- | recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch | 18 | ||||
| -rw-r--r-- | recipes/mozilla/fennec_hg.bb | 16 | ||||
| -rw-r--r-- | recipes/sqlite/sqlite3_3.6.5.bb | 3 |
5 files changed, 33 insertions, 16 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index a493226813..937ee3c3c6 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3966,6 +3966,10 @@ sha256=133caca2c4e7c64106555154ee0ff693f5cf5beb9421ce2eb86baee997d22368 md5=0a1b1e67e3c61cda41b41a8886a90e78 sha256=21786abe80f2c06eb9bef107d8c79f50a088a894cddf793112ce0417e83be531 +[http://linux.duke.edu/projects/metadata/generate/createrepo-0.9.tar.gz] +md5=0a1b1e67e3c61cda41b41a8886a90e78 +sha256=21786abe80f2c06eb9bef107d8c79f50a088a894cddf793112ce0417e83be531 + [http://crimson.seul.org/files/crimson-0.4.8.tar.bz2] md5=460920e64b07ea0ef139a0f5d51bd2d9 sha256=95784b14539dec30565b0bf1da8a3b1d51636142bbf1207c6d87256c92172aa7 @@ -21218,6 +21222,10 @@ sha256=1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb md5=46f92e42243bc51aaa3871645ce78bd5 sha256=cb07a9801a128e2f42cf49b7e9d577b092ab54aa05242655af93491a73a91a1f +[http://www.sqlite.org/sqlite-3.6.5.tar.gz] +md5=ed3151ecaeb3f0a484195da5f694c773 +sha256=99bcda2aaf7109a2859ee88aec1f370f61e461343c9bce6cc37f1bed5d933f67 + [http://www.zentus.com/sqlitejdbc/dist/sqlitejdbc-v041-src.tgz] md5=11aad2f368734e1ff8e0ecc37710d4a9 sha256=c04bb15b650ffcda80ccd3526b325b49a1173b3421da22b16845aad4a8945c10 diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index a42ddae0fa..b19794038c 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -4,12 +4,12 @@ PREFERRED_VERSION_cairo = "1.8.0" PREFERRED_VERSION_dbus = "1.2.1" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.6.0" -PREFERRED_VERSION_glib-2.0 = "2.18.3" +PREFERRED_VERSION_glib-2.0 = "2.20.0" PREFERRED_VERSION_glib-2.0-native = "2.18.0" PREFERRED_VERSION_glibmm = "2.18.0" PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_gtk+ = "2.14.2" +PREFERRED_VERSION_gtk+ = "2.16.0" PREFERRED_VERSION_gtkmm = "2.14.1" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" diff --git a/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch b/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch index 39978cfd11..b3188de32f 100644 --- a/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch +++ b/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch @@ -1,17 +1,17 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ +--- /tmp/Makefile.in 2009-03-20 10:34:54.000000000 +0100 ++++ mozilla-central/js/src/Makefile.in 2009-03-20 10:35:18.000000000 +0100 +@@ -507,20 +507,8 @@ - jsopcode.h jsopcode.c: jsopcode.tbl + export:: jsautocfg.h --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) +-ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH))) -jsautocfg.h: - touch $@ -else +-ifeq ($(OS_ARCH),WINCE) + jsautocfg.h: + touch $@ +-else -jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) - @rm -f $@ jsautocfg.tmp - ./jscpucfg > jsautocfg.tmp diff --git a/recipes/mozilla/fennec_hg.bb b/recipes/mozilla/fennec_hg.bb index a714c882c7..fad2203ed5 100644 --- a/recipes/mozilla/fennec_hg.bb +++ b/recipes/mozilla/fennec_hg.bb @@ -1,13 +1,13 @@ DESCRIPTION = "Mozilla Mobile browser" DEPENDS += "cairo alsa-lib " -PV = "0.9+1.0a2" -MOZPV = "1.0a2" -PR = "r2" +PV = "0.9+1.0b2pre" +MOZPV = "1.0b2pre" +PR = "r3" PE = "1" -SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=df94feb90a4f \ - hg://hg.mozilla.org/;module=mobile-browser;rev=0361cd36d50d \ +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=451c1f1753f0 \ + hg://hg.mozilla.org/;module=mobile-browser;rev=9435ee77dda3 \ file://jsautocfg.h \ file://jsautocfg-dontoverwrite.patch;patch=1 \ " @@ -33,6 +33,12 @@ do_configure_prepend() { } do_compile_prepend() { + # A compile time assert is broken: + # http://mxr.mozilla.org/mozilla-central/source/nsprpub/pr/include/prlog.h#259 + for i in $(find ${S} -name "autoconf.mk") ; do + sed -i -e s:fsigned-char:fno-signed-char:g $i + done + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ cp ${WORKDIR}/jsautocfg.h ${S}/objdir/xulrunner/js/src/ sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \ diff --git a/recipes/sqlite/sqlite3_3.6.5.bb b/recipes/sqlite/sqlite3_3.6.5.bb new file mode 100644 index 0000000000..479516d261 --- /dev/null +++ b/recipes/sqlite/sqlite3_3.6.5.bb @@ -0,0 +1,3 @@ +require sqlite3.inc + +PR = "r0" |