Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 204273 Details for
Bug 281695
www-client/mozilla-firefox-3.5.2-r1 with dev-db/sqlite-3.6.17: SIGSEGV adding Bookmark
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
patch against in tree ebuild
firefox.diff (text/plain), 3.96 KB, created by
Jory A. Pratt
on 2009-09-16 01:44:53 UTC
(
hide
)
Description:
patch against in tree ebuild
Filename:
MIME Type:
Creator:
Jory A. Pratt
Created:
2009-09-16 01:44:53 UTC
Size:
3.96 KB
patch
obsolete
>--- /usr/portage/www-client/mozilla-firefox/mozilla-firefox-3.5.3.ebuild 2009-09-13 06:58:22.000000000 -0500 >+++ ../mozilla/www-client/mozilla-firefox/mozilla-firefox-3.5.3-r1.ebuild 2009-09-15 20:26:29.751963473 -0500 >@@ -26,11 +26,10 @@ > KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86" > SLOT="0" > LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" >-IUSE="+alsa bindist iceweasel java mozdevelop restrict-javascript" # qt-experimental >+IUSE="+alsa bindist java mozdevelop restrict-javascript sqlite" # qt-experimental > > REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases" > SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2 >- iceweasel? ( mirror://gentoo/iceweasel-icons-3.0.tar.bz2 ) > http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2" > > for X in ${LANGS} ; do >@@ -60,8 +59,9 @@ > >=dev-libs/nss-3.12.2 > >=dev-libs/nspr-4.7.3 > >=app-text/hunspell-1.2 >+ sqlite? ( >=dev-db/sqlite-3.6.10 ) > alsa? ( media-libs/alsa-lib ) >- >=net-libs/xulrunner-${XUL_PV}[java=] >+ >=net-libs/xulrunner-${XUL_PV}[java=,sqlite=] > >=x11-libs/cairo-1.8.8[X] > x11-libs/pango[X]" > >@@ -101,7 +101,7 @@ > } > > pkg_setup() { >- if ! use bindist && ! use iceweasel ; then >+ if ! use bindist ; then > elog "You are enabling official branding. You may not redistribute this build" > elog "to any users on your network or the internet. Doing so puts yourself into" > elog "a legal problem with Mozilla Foundation" >@@ -112,12 +112,6 @@ > src_unpack() { > unpack ${A} > >- if use iceweasel ; then >- unpack iceweasel-icons-3.0.tar.bz2 >- >- cp -r iceweaselicons/browser "${WORKDIR}" >- fi >- > linguas > for X in ${linguas}; do > # FIXME: Add support for unpacking xpis to portage >@@ -134,11 +128,6 @@ > EPATCH_FORCE="yes" \ > epatch "${WORKDIR}" > >- if use iceweasel ; then >- sed -i -e "s:Minefield:Iceweasel:" browser/locales/en-US/chrome/branding/brand.* \ >- browser/branding/nightly/configure.sh || die "iceweasel sed failed!" >- fi >- > eautoreconf > > cd js/src >@@ -185,7 +174,6 @@ > # Use system libraries > mozconfig_annotate '' --enable-system-cairo > mozconfig_annotate '' --enable-system-hunspell >- # mozconfig_annotate '' --enable-system-sqlite > mozconfig_annotate '' --with-system-nspr > mozconfig_annotate '' --with-system-nss > mozconfig_annotate '' --enable-system-lcms >@@ -193,6 +181,12 @@ > mozconfig_annotate '' --with-system-libxul > mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV} > >+ if use sqlite ; then >+ mozconfig_annotate 'sqlite' --enable-system-sqlite >+ else >+ mozconfig_annotate '-sqlite' --enable-system-sqlite >+ fi >+ > # IUSE mozdevelop > mozconfig_use_enable mozdevelop jsd > mozconfig_use_enable mozdevelop xpctools >@@ -216,7 +210,7 @@ > mozconfig_use_enable alsa ogg > mozconfig_use_enable alsa wave > >- if ! use bindist && ! use iceweasel ; then >+ if ! use bindist ; then > mozconfig_annotate '' --enable-official-branding > fi > >@@ -254,11 +248,7 @@ > done > > # Install icon and .desktop for menu entry >- if use iceweasel ; then >- newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png >- newmenu "${FILESDIR}"/icon/iceweasel.desktop \ >- ${PN}-${DESKTOP_PV}.desktop >- elif ! use bindist ; then >+ if ! use bindist ; then > newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png > newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \ > ${PN}-${DESKTOP_PV}.desktop >@@ -266,7 +256,7 @@ > newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png > newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \ > ${PN}-${DESKTOP_PV}.desktop >- sed -i -e "s:Bon Echo:Minefield:" \ >+ sed -i -e "s:Bon Echo:Shiretoko:" \ > "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop || die "sed failed!" > fi > >@@ -291,7 +281,8 @@ > die "failed to cp xulrunner-default-prefs.js" > > # Plugins dir >- dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die >+ dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \ >+ || die "failed to symlink" > } > > pkg_postinst() {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 281695
:
201521
|
201555
|
201557
|
204270
|
204271
| 204273