diff options
Diffstat (limited to 'recipes/mozilla')
23 files changed, 91 insertions, 36 deletions
diff --git a/recipes/mozilla/fennec_hg.bb b/recipes/mozilla/fennec_hg.bb index ef4cedd70b..ada5fa8e87 100644 --- a/recipes/mozilla/fennec_hg.bb +++ b/recipes/mozilla/fennec_hg.bb @@ -19,8 +19,6 @@ require firefox.inc DEPENDS += "libnotify autoconf213-native cairo alsa-lib sqlite3" -PARALLEL_MAKE = "" - FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" export LIBXUL_DIST="${S}/objdir/xulrunner/dist/" diff --git a/recipes/mozilla/firefox-3.5.2/firefox-plugin.pc b/recipes/mozilla/firefox-3.5.2/firefox-plugin.pc new file mode 100644 index 0000000000..611acd5944 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.2/firefox-plugin.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=/usr +libdir=/usr/lib +includedir=/usr/include/firefox-3.5.2 + +Name: Mozilla Plug-In API +Description: Mozilla Plug-In API +Version: 3.5 +Requires: firefox-xpcom = 3.5 +Cflags: -I${includedir}/java -I${includedir}/plugin diff --git a/recipes/mozilla/firefox-3.5.2/firefox-xpcom.pc b/recipes/mozilla/firefox-3.5.2/firefox-xpcom.pc new file mode 100644 index 0000000000..935d357d84 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.2/firefox-xpcom.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=/usr +libdir=/usr/lib +includedir=/usr/include +mozdir=${includedir}/firefox-3.5.2 +idldir=${includedir}/firefox-3.5.2 + +Name: XPCOM +Description: The Mozilla Cross Platform Component Library +Version: 3.5 +Requires: nspr >= 4.8 +Libs: -L${libdir} -lxpcom -Wl,-R${libdir} +Cflags: -I${mozdir} -I${mozdir}/xpcom -I${mozdir}/string diff --git a/recipes/mozilla/firefox-3.5.2/mozconfig b/recipes/mozilla/firefox-3.5.2/mozconfig index d8d3f3923d..7e2ade0b71 100644 --- a/recipes/mozilla/firefox-3.5.2/mozconfig +++ b/recipes/mozilla/firefox-3.5.2/mozconfig @@ -26,6 +26,7 @@ ac_add_options --disable-jsd ac_add_options --disable-installer ac_add_options --disable-xprint ac_add_options --disable-necko-disk-cache +ac_add_options --disable-necko-wifi ac_add_options --disable-updater # configure necko to allocate smaller network buffers diff --git a/recipes/mozilla/firefox-3.5.2/nspr.pc b/recipes/mozilla/firefox-3.5.2/nspr.pc new file mode 100644 index 0000000000..ba3d131978 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.2/nspr.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=/usr +libdir=/usr/lib +includedir=/usr/include/firefox-3.5.2 + +Name: NSPR +Description: The Netscape Portable Runtime +Version: 4.8 +Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Wl,-R${libdir} +Cflags: -I${includedir} diff --git a/recipes/mozilla/firefox-3.5.4/mozconfig b/recipes/mozilla/firefox-3.5.4/mozconfig index d8d3f3923d..7e2ade0b71 100644 --- a/recipes/mozilla/firefox-3.5.4/mozconfig +++ b/recipes/mozilla/firefox-3.5.4/mozconfig @@ -26,6 +26,7 @@ ac_add_options --disable-jsd ac_add_options --disable-installer ac_add_options --disable-xprint ac_add_options --disable-necko-disk-cache +ac_add_options --disable-necko-wifi ac_add_options --disable-updater # configure necko to allocate smaller network buffers diff --git a/recipes/mozilla/firefox-3.5.5/mozconfig b/recipes/mozilla/firefox-3.5.5/mozconfig index d8d3f3923d..7e2ade0b71 100644 --- a/recipes/mozilla/firefox-3.5.5/mozconfig +++ b/recipes/mozilla/firefox-3.5.5/mozconfig @@ -26,6 +26,7 @@ ac_add_options --disable-jsd ac_add_options --disable-installer ac_add_options --disable-xprint ac_add_options --disable-necko-disk-cache +ac_add_options --disable-necko-wifi ac_add_options --disable-updater # configure necko to allocate smaller network buffers diff --git a/recipes/mozilla/firefox-3.6/firefox-plugin.pc b/recipes/mozilla/firefox-3.6/firefox-plugin.pc new file mode 100644 index 0000000000..f6ad141f9f --- /dev/null +++ b/recipes/mozilla/firefox-3.6/firefox-plugin.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=/usr +libdir=/usr/lib +includedir=/usr/include/firefox-3.6 + +Name: Mozilla Plug-In API +Description: Mozilla Plug-In API +Version: 3.5 +Requires: firefox-xpcom = 3.6 +Cflags: -I${includedir}/java -I${includedir}/plugin diff --git a/recipes/mozilla/firefox-3.6/firefox-xpcom.pc b/recipes/mozilla/firefox-3.6/firefox-xpcom.pc new file mode 100644 index 0000000000..6eb1289cda --- /dev/null +++ b/recipes/mozilla/firefox-3.6/firefox-xpcom.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=/usr +libdir=/usr/lib +includedir=/usr/include +mozdir=${includedir}/firefox-3.6 +idldir=${includedir}/firefox-3.6 + +Name: XPCOM +Description: The Mozilla Cross Platform Component Library +Version: 3.6 +Requires: nspr >= 4.8 +Libs: -L${libdir} -lxpcom -Wl,-R${libdir} +Cflags: -I${mozdir} -I${mozdir}/xpcom -I${mozdir}/string diff --git a/recipes/mozilla/firefox-3.6/mozconfig b/recipes/mozilla/firefox-3.6/mozconfig index b561f067b8..883a396e53 100644 --- a/recipes/mozilla/firefox-3.6/mozconfig +++ b/recipes/mozilla/firefox-3.6/mozconfig @@ -26,6 +26,7 @@ ac_add_options --disable-jsd ac_add_options --disable-installer ac_add_options --disable-xprint ac_add_options --enable-necko-disk-cache +ac_add_options --disable-necko-wifi ac_add_options --disable-updater # configure necko to allocate smaller network buffers diff --git a/recipes/mozilla/firefox-3.6/nspr.pc b/recipes/mozilla/firefox-3.6/nspr.pc new file mode 100644 index 0000000000..b73ffc04f7 --- /dev/null +++ b/recipes/mozilla/firefox-3.6/nspr.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=/usr +libdir=/usr/lib +includedir=/usr/include/firefox-3.6 + +Name: NSPR +Description: The Netscape Portable Runtime +Version: 4.8 +Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Wl,-R${libdir} +Cflags: -I${includedir} diff --git a/recipes/mozilla/firefox.inc b/recipes/mozilla/firefox.inc index b0e79f96c4..024858a64d 100644 --- a/recipes/mozilla/firefox.inc +++ b/recipes/mozilla/firefox.inc @@ -2,7 +2,6 @@ DESCRIPTION ?= "Browser made by mozilla" DEPENDS += "alsa-lib" SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop" -PARALLEL_MAKE = "" ARM_INSTRUCTION_SET = "arm" MOZPV ?= "${PV}" @@ -31,13 +30,6 @@ FILES_${PN}-dbg += " ${libdir}/${PN}-*/.debug \ ${bindir}/.debug \ " -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" - -# Due to sysroot we need to sed out references to the target staging when building the native version of xpidl -# Symptons of the failure include "gthread.h:344: error: size of array 'type name' is negative" -export HOST_LIBIDL_CFLAGS = "`${HOST_LIBIDL_CONFIG} --cflags | sed -e s:${STAGING_DIR_TARGET}:${STAGING_DIR_NATIVE}:g`" - - do_install() { oe_runmake DESTDIR="${D}" destdir="${D}" install install -d ${D}${datadir}/applications @@ -56,6 +48,15 @@ do_install() { grep -Rl app.update.enabled ${D}${libdir}/${PN}-*/ \ | grep '.js$' \ | xargs -n 1 sed -i 's/\(pref("app.update.enabled",\s*\)true)/\1false)/g' + + for pc in ${WORKDIR}/*.pc ; do + sed -i s:3.5.2:${PV}:g $pc + done + + install -d ${D}${libdir}/pkgconfig + install -m 0644 ${WORKDIR}/firefox-plugin.pc ${D}${libdir}/pkgconfig + install -m 0644 ${WORKDIR}/firefox-xpcom.pc ${D}${libdir}/pkgconfig + install -m 0644 ${WORKDIR}/nspr.pc ${D}${libdir}/pkgconfig } pkg_postinst_${PN}() { @@ -63,10 +64,6 @@ pkg_postinst_${PN}() { chmod -R a+w ${libdir}/${PN}* ||true } -do_stage() { - autotools_stage_all -} - # Force feed mozilla our ldflags TARGET_CC_ARCH += " ${LDFLAGS} " diff --git a/recipes/mozilla/firefox_3.0.1.bb b/recipes/mozilla/firefox_3.0.1.bb index ee60fc026e..72c72bd13f 100644 --- a/recipes/mozilla/firefox_3.0.1.bb +++ b/recipes/mozilla/firefox_3.0.1.bb @@ -23,7 +23,6 @@ S = "${WORKDIR}/mozilla" inherit mozilla require firefox.inc -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" do_compile_prepend() { diff --git a/recipes/mozilla/firefox_3.0.4.bb b/recipes/mozilla/firefox_3.0.4.bb index 7cfebfc554..f783000d24 100644 --- a/recipes/mozilla/firefox_3.0.4.bb +++ b/recipes/mozilla/firefox_3.0.4.bb @@ -23,7 +23,6 @@ DEFAULT_PREFERENCE = "-1" inherit mozilla require firefox.inc -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" do_compile_prepend() { diff --git a/recipes/mozilla/firefox_3.0.8.bb b/recipes/mozilla/firefox_3.0.8.bb index 541a542c92..5ce6f95340 100644 --- a/recipes/mozilla/firefox_3.0.8.bb +++ b/recipes/mozilla/firefox_3.0.8.bb @@ -23,7 +23,6 @@ S = "${WORKDIR}/mozilla" inherit mozilla require firefox.inc -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" do_compile_prepend() { diff --git a/recipes/mozilla/firefox_3.1b1.bb b/recipes/mozilla/firefox_3.1b1.bb index 7a41491ea7..54113f4985 100644 --- a/recipes/mozilla/firefox_3.1b1.bb +++ b/recipes/mozilla/firefox_3.1b1.bb @@ -17,7 +17,6 @@ DEFAULT_PREFERENCE = "-1" inherit mozilla require firefox.inc -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" do_configure_prepend() { diff --git a/recipes/mozilla/firefox_3.1b2.bb b/recipes/mozilla/firefox_3.1b2.bb index 2d661ea5f9..7be8baa32e 100644 --- a/recipes/mozilla/firefox_3.1b2.bb +++ b/recipes/mozilla/firefox_3.1b2.bb @@ -16,7 +16,6 @@ DEFAULT_PREFERENCE = "-1" inherit mozilla require firefox.inc -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" do_configure_prepend() { diff --git a/recipes/mozilla/firefox_3.5.2.bb b/recipes/mozilla/firefox_3.5.2.bb index 3d940d7af5..b6e265b7d3 100644 --- a/recipes/mozilla/firefox_3.5.2.bb +++ b/recipes/mozilla/firefox_3.5.2.bb @@ -1,5 +1,6 @@ -DEPENDS += "cairo sqlite3" -PR = "r3" +DEPENDS += "cairo sqlite3 libnotify" + +PR = "r4" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ file://jsautocfg.h \ @@ -25,7 +26,6 @@ require firefox.inc EXTRA_OECONF += " --enable-official-branding " -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" do_compile_prepend() { diff --git a/recipes/mozilla/firefox_3.5.4.bb b/recipes/mozilla/firefox_3.5.4.bb index 8ba6ba15db..b1b2af372a 100644 --- a/recipes/mozilla/firefox_3.5.4.bb +++ b/recipes/mozilla/firefox_3.5.4.bb @@ -1,6 +1,6 @@ -DEPENDS += "cairo sqlite3" +DEPENDS += "cairo sqlite3 libnotify" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \ file://jsautocfg.h \ @@ -26,7 +26,6 @@ require firefox.inc EXTRA_OECONF += " --enable-official-branding " -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" do_compile_prepend() { diff --git a/recipes/mozilla/firefox_3.5.5.bb b/recipes/mozilla/firefox_3.5.5.bb index da54872046..ea3d4fc4b5 100644 --- a/recipes/mozilla/firefox_3.5.5.bb +++ b/recipes/mozilla/firefox_3.5.5.bb @@ -1,6 +1,6 @@ -DEPENDS += "cairo sqlite3" +DEPENDS += "cairo sqlite3 libnotify" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \ file://jsautocfg.h \ @@ -26,7 +26,6 @@ require firefox.inc EXTRA_OECONF += " --enable-official-branding --disable-crashreporter" -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" do_compile_prepend() { diff --git a/recipes/mozilla/firefox_3.5b4.bb b/recipes/mozilla/firefox_3.5b4.bb index 4a12329231..0418c3b257 100644 --- a/recipes/mozilla/firefox_3.5b4.bb +++ b/recipes/mozilla/firefox_3.5b4.bb @@ -1,8 +1,8 @@ -DEPENDS += "cairo sqlite" +DEPENDS += "cairo sqlite libnotify" PV = "3.0.1+3.5b4" MOZPV = "3.5b4" -PR = "r2" +PR = "r3" SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build1/source/firefox-${MOZPV}-source.tar.bz2 \ file://jsautocfg.h \ @@ -16,7 +16,6 @@ DEFAULT_PREFERENCE = "-10" inherit mozilla require firefox.inc -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" do_configure_prepend() { diff --git a/recipes/mozilla/firefox_3.6.bb b/recipes/mozilla/firefox_3.6.bb index 82e92be128..573154f3aa 100644 --- a/recipes/mozilla/firefox_3.6.bb +++ b/recipes/mozilla/firefox_3.6.bb @@ -1,7 +1,8 @@ -DEPENDS += "cairo sqlite3" +DEPENDS += "cairo sqlite3 libnotify" -PR = "r1" +PR = "r4" +# The .pc files below have "3.6" hardcoded, fix that before using them in a newer FF version! SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \ file://jsautocfg.h \ file://security-cross.patch;patch=1 \ @@ -28,7 +29,6 @@ require firefox.inc EXTRA_OECONF += " --enable-official-branding --disable-crashreporter" -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" do_compile_prepend() { diff --git a/recipes/mozilla/firefox_hg.bb b/recipes/mozilla/firefox_hg.bb index 17a46ee1c8..37bb2608bd 100644 --- a/recipes/mozilla/firefox_hg.bb +++ b/recipes/mozilla/firefox_hg.bb @@ -17,8 +17,6 @@ S = "${WORKDIR}/mozilla-central" inherit mozilla require firefox.inc -PARALLEL_MAKE = "" -export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" export LIBXUL_DIST="${S}/objdir/xulrunner/dist/" |