From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 85C541386CA for ; Mon, 7 Sep 2015 20:23:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42C0B141A1; Mon, 7 Sep 2015 20:23:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7988141A1 for ; Mon, 7 Sep 2015 20:23:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92DD23407D7 for ; Mon, 7 Sep 2015 20:23:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5DC1170 for ; Mon, 7 Sep 2015 20:23:51 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1441655930.afb616410f45238e36c444097b2c10dd753e9325.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/firefox/firefox-40.0.3.ebuild www-client/firefox/firefox-41.0_beta6.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: afb616410f45238e36c444097b2c10dd753e9325 X-VCS-Branch: master Date: Mon, 7 Sep 2015 20:23:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9bce0ccc-199e-4d15-92e0-f84a22442610 X-Archives-Hash: 543121e515aed9b08f54dd47b81cb431 commit: afb616410f45238e36c444097b2c10dd753e9325 Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Sep 3 21:14:17 2015 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Mon Sep 7 19:58:50 2015 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=afb61641 unset MOZ_DEV_EDITION define but add back some of the pref's when USE=bindist Since firefox-35, USE=bindist has enabled codepaths that completely change how profiles are handled, as per bug 536682. This patch attempts to address that by disabling this codepath, but keeping some of the pref() entries that the codepath enables. The pref() entries may not necessarily be a good idea to keep either, but we may not want a dev-edition branded firefox to act exactly like a firefox-branded one either (in terms of crashreporting, feedback, and so forth). www-client/firefox/firefox-40.0.3.ebuild | 15 +++++++++++++++ www-client/firefox/firefox-41.0_beta6.ebuild | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/www-client/firefox/firefox-40.0.3.ebuild b/www-client/firefox/firefox-40.0.3.ebuild index c1b7bbf..a467abf 100644 --- a/www-client/firefox/firefox-40.0.3.ebuild +++ b/www-client/firefox/firefox-40.0.3.ebuild @@ -174,6 +174,10 @@ src_prepare() { sed 's@\(xargs rm\)$@\1 -f@' \ -i "${S}"/toolkit/mozapps/installer/packager.mk || die + # Keep codebase the same even if not using official branding + sed '/^MOZ_DEV_EDITION=1/d' \ + -i "${S}"/browser/branding/aurora/configure.sh || die + eautoreconf # Must run autoconf in js/src @@ -332,6 +336,17 @@ src_install() { # Let's just stick with this one... icon="aurora" name="Aurora" + + # Override preferences to set the MOZ_DEV_EDITION defaults, since we + # don't define MOZ_DEV_EDITION to avoid profile debaucles. + # (source: browser/app/profile/firefox.js) + cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <