| 1 |
commit: 18ba2d4d735c6770079293930280778752494b67 |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 27 21:50:58 2013 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 27 21:52:49 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=18ba2d4d |
| 7 |
|
| 8 |
Basic fix for extensions installation for >=firefox-21.0 |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mozcoreconf-2.eclass | 19 ++++++++++++++++--- |
| 12 |
eclass/mozextension.eclass | 16 ++++++++++++++-- |
| 13 |
2 files changed, 30 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass |
| 16 |
index 986c252..67f4947 100644 |
| 17 |
--- a/eclass/mozcoreconf-2.eclass |
| 18 |
+++ b/eclass/mozcoreconf-2.eclass |
| 19 |
@@ -1,6 +1,6 @@ |
| 20 |
# Copyright 1999-2013 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
-# $Header: $ |
| 23 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.29 2013/03/25 13:08:39 anarchy Exp $ |
| 24 |
# |
| 25 |
# mozcoreconf.eclass : core options for mozilla |
| 26 |
# inherit mozconfig-2 if you need USE flags |
| 27 |
@@ -66,12 +66,12 @@ mozconfig_use_extension() { |
| 28 |
mozversion_is_new_enough() { |
| 29 |
case ${PN} in |
| 30 |
firefox|thunderbird) |
| 31 |
- if [[ $(get_version_component_range 1) -ge 21 ]] ; then |
| 32 |
+ if [[ $(get_version_component_range 1) -ge 17 ]] ; then |
| 33 |
return 0 |
| 34 |
fi |
| 35 |
;; |
| 36 |
seamonkey) |
| 37 |
- if [[ $(get_version_component_range 1) -eq 2 ]] && [[ $(get_version_component_range 2) -ge 18 ]] ; then |
| 38 |
+ if [[ $(get_version_component_range 1) -eq 2 ]] && [[ $(get_version_component_range 2) -ge 14 ]] ; then |
| 39 |
return 0 |
| 40 |
fi |
| 41 |
;; |
| 42 |
@@ -208,16 +208,29 @@ mozconfig_init() { |
| 43 |
--with-system-zlib \ |
| 44 |
--enable-pango \ |
| 45 |
--enable-system-cairo |
| 46 |
+ if ! $(mozversion_is_new_enough) ; then |
| 47 |
+ mozconfig_annotate system-libs --enable-svg |
| 48 |
+ fi |
| 49 |
|
| 50 |
mozconfig_annotate disable_update_strip \ |
| 51 |
--disable-pedantic \ |
| 52 |
--disable-updater \ |
| 53 |
--disable-strip \ |
| 54 |
--disable-install-strip |
| 55 |
+ if ! $(mozversion_is_new_enough) ; then |
| 56 |
+ mozconfig_annotate disable_update_strip \ |
| 57 |
+ --disable-installer \ |
| 58 |
+ --disable-strip-libs |
| 59 |
+ fi |
| 60 |
|
| 61 |
if [[ ${PN} != seamonkey ]]; then |
| 62 |
mozconfig_annotate basic_profile \ |
| 63 |
--disable-profilelocking |
| 64 |
+ if ! $(mozversion_is_new_enough) ; then |
| 65 |
+ mozconfig_annotate basic_profile \ |
| 66 |
+ --enable-single-profile \ |
| 67 |
+ --disable-profilesharing |
| 68 |
+ fi |
| 69 |
fi |
| 70 |
|
| 71 |
# Here is a strange one... |
| 72 |
|
| 73 |
diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass |
| 74 |
index 08c1b53..42cee2f 100644 |
| 75 |
--- a/eclass/mozextension.eclass |
| 76 |
+++ b/eclass/mozextension.eclass |
| 77 |
@@ -8,10 +8,22 @@ |
| 78 |
# @BLURB: Install extensions for use in mozilla products. |
| 79 |
|
| 80 |
|
| 81 |
-inherit eutils mozcoreconf-2 |
| 82 |
+inherit eutils |
| 83 |
|
| 84 |
DEPEND="app-arch/unzip" |
| 85 |
|
| 86 |
+mozversion_extension_location() { |
| 87 |
+ case ${PN} in |
| 88 |
+ firefox|firefox-bin) |
| 89 |
+ if [[ $(get_version_component_range 1) -ge 21 ]] ; then |
| 90 |
+ return 0 |
| 91 |
+ fi |
| 92 |
+ ;; |
| 93 |
+ esac |
| 94 |
+ |
| 95 |
+ return 1 |
| 96 |
+} |
| 97 |
+ |
| 98 |
xpi_unpack() { |
| 99 |
local xpi xpiname srcdir |
| 100 |
|
| 101 |
@@ -53,7 +65,7 @@ xpi_install() { |
| 102 |
# determine id for extension |
| 103 |
emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)" \ |
| 104 |
|| die "failed to determine extension id" |
| 105 |
- if $(mozversion_is_new_enough) ; then |
| 106 |
+ if $(mozversion_extension_location) ; then |
| 107 |
insinto "${MOZILLA_FIVE_HOME}"/browser/extensions/${emid} |
| 108 |
else |
| 109 |
insinto "${MOZILLA_FIVE_HOME}"/extensions/${emid} |
Archives