summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-08-21 09:48:51 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-08-21 09:48:51 +0000
commit60de79c7bae656914aa42424a1bb9cd7f0f62047 (patch)
tree165740c0944887b7aea629f0b534fc52c2475d65
parent7b76801adbc8f161fcb5a96b07e7bded66ad6e4e (diff)
parentd8502e7f3ec9a49c40e71b3ebc4443e8cb129c2f (diff)
merge of '569e7d088bd81d3c7c545ac39e6e807ab3b47b36'
and '85a8198c27d919f7d43639901b8c9925f284d7db'
-rw-r--r--packages/mozilla/firefox-3.0.1/mozconfig2
-rw-r--r--packages/mozilla/firefox.inc12
-rw-r--r--packages/mozilla/firefox_3.0.1.bb2
-rw-r--r--packages/tasks/task-openmoko-feed.bb5
4 files changed, 16 insertions, 5 deletions
diff --git a/packages/mozilla/firefox-3.0.1/mozconfig b/packages/mozilla/firefox-3.0.1/mozconfig
index 5001e588e9..8032ea3a3b 100644
--- a/packages/mozilla/firefox-3.0.1/mozconfig
+++ b/packages/mozilla/firefox-3.0.1/mozconfig
@@ -32,12 +32,12 @@ ac_add_options --enable-necko-small-buffers
# disable debug logging and tests
#ac_add_options --disable-dtd-debug
ac_add_options --disable-logging
-ac_add_options --enable-debug=-ggdb
ac_add_options --disable-gtktest
ac_add_options --disable-tests
ac_add_options --disable-printing
ac_add_options --disable-gnomevfs
ac_add_options --disable-gnomeui
+ac_add_options --enable-debugger-info-modules
# build crypto module (PSM + NSS)
ac_add_options --enable-crypto
diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc
index 182d65dc16..1fae3a759e 100644
--- a/packages/mozilla/firefox.inc
+++ b/packages/mozilla/firefox.inc
@@ -2,13 +2,21 @@ SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop"
PACKAGES =+ "firefox-inspector"
+PACKAGES += "firefox-sdk"
+
FILES_firefox-inspector = " ${libdir}/firefox-${PV}/chrome/inspector* \
${libdir}/firefox-${PV}/components/*nspector* \
${libdir}/firefox-${PV}/extensions/inspector* \
${libdir}/firefox-${PV}/defaults/preferences/inspector* \
"
-FILES_${PN} = "${bindir}/firefox ${datadir}/applications/ ${datadir}/pixmaps/ ${libdir}/firefox-${PV}/* ${bindir}/defaults"
-FILES_${PN}-dev += "${datadir}/idl ${bindir}/firefox-config ${libdir}/firefox-devel-${PV}"
+FILES_${PN} = "${bindir}/firefox \
+ ${datadir}/applications/ \
+ ${datadir}/pixmaps/ \
+ ${libdir}/firefox-${PV}/* \
+ ${libdir}/firefox-${PV}/.autoreg \
+ ${bindir}/defaults"
+FILES_${PN}-dev += "${datadir}/idl ${bindir}/firefox-config"
+FILES_firefox-sdk += "${libdir}/firefox-devel-${PV}"
FILES_${PN}-dbg += " ${libdir}/firefox-*/.debug \
${libdir}/firefox-*/*/.debug \
${libdir}/firefox-*/*/*/.debug \
diff --git a/packages/mozilla/firefox_3.0.1.bb b/packages/mozilla/firefox_3.0.1.bb
index 3bf4f92e35..7a6ce119e1 100644
--- a/packages/mozilla/firefox_3.0.1.bb
+++ b/packages/mozilla/firefox_3.0.1.bb
@@ -1,5 +1,5 @@
DEPENDS += "cairo"
-PR = "r5"
+PR = "r6"
SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
file://jsautocfg.h \
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 207d48d904..af2c85fb2c 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Openmoko: Misc. Feed Items"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r34"
+PR = "r35"
inherit task
@@ -90,4 +90,7 @@ RDEPENDS_task-openmoko-feed = "\
xournal \
openvpn \
python-pygame \
+ irssi \
+ zsh \
+ fbreader \
"