| 1 |
commit: 9d752a3e18cf6b4d928f4e1ffba67c44058b785f |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 12 19:41:51 2016 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 12 19:41:51 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=9d752a3e |
| 7 |
|
| 8 |
www-client/seamonkey - fix locale generation issue when chatzilla is not enabled |
| 9 |
|
| 10 |
Although the build of chatzilla can be enabled or disabled via the useflag, upstream's |
| 11 |
build system for the locales had no such conditional and so failed if chatzilla wasn't built. |
| 12 |
This patch addresses that issue. |
| 13 |
|
| 14 |
...2.42.2.0-fix-chatzillaless-locale-building.patch | 12 ++++++++++++ |
| 15 |
www-client/seamonkey/seamonkey-2.42.2.0_p0.ebuild | 21 ++++++++++++++++++++- |
| 16 |
2 files changed, 32 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/www-client/seamonkey/files/seamonkey-2.42.2.0-fix-chatzillaless-locale-building.patch b/www-client/seamonkey/files/seamonkey-2.42.2.0-fix-chatzillaless-locale-building.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..e73d0e6 |
| 21 |
--- /dev/null |
| 22 |
+++ b/www-client/seamonkey/files/seamonkey-2.42.2.0-fix-chatzillaless-locale-building.patch |
| 23 |
@@ -0,0 +1,12 @@ |
| 24 |
+--- a/suite/locales/Makefile.in 2016-06-30 10:08:29.000000000 -0400 |
| 25 |
++++ b/suite/locales/Makefile.in 2016-07-12 12:00:22.491851899 -0400 |
| 26 |
+@@ -123,7 +123,9 @@ |
| 27 |
+ @$(MAKE) -C $(DEPTH)/toolkit/locales libs-$* |
| 28 |
+ @$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$* |
| 29 |
+ @$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$* |
| 30 |
++ifneq ($(MOZ_EXTENSIONS),$(subst irc,,$(MOZ_EXTENSIONS))) |
| 31 |
+ @$(MAKE) -C $(DEPTH)/extensions/irc/locales libs-$* |
| 32 |
++endif |
| 33 |
+ @$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* |
| 34 |
+ @$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$* |
| 35 |
+ @$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$* |
| 36 |
|
| 37 |
diff --git a/www-client/seamonkey/seamonkey-2.42.2.0_p0.ebuild b/www-client/seamonkey/seamonkey-2.42.2.0_p0.ebuild |
| 38 |
index 7928610..98d052c 100644 |
| 39 |
--- a/www-client/seamonkey/seamonkey-2.42.2.0_p0.ebuild |
| 40 |
+++ b/www-client/seamonkey/seamonkey-2.42.2.0_p0.ebuild |
| 41 |
@@ -134,7 +134,8 @@ src_unpack() { |
| 42 |
|
| 43 |
src_prepare() { |
| 44 |
# Apply our patches |
| 45 |
- eapply "${WORKDIR}"/seamonkey |
| 46 |
+ eapply "${WORKDIR}"/seamonkey \ |
| 47 |
+ "${FILESDIR}"/${MY_MOZ_P}-fix-chatzillaless-locale-building.patch |
| 48 |
|
| 49 |
# browser patches go here |
| 50 |
pushd "${S}"/mozilla &>/dev/null || die |
| 51 |
@@ -346,6 +347,24 @@ src_install() { |
| 52 |
rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} |
| 53 |
fi |
| 54 |
|
| 55 |
+ if use chatzilla ; then |
| 56 |
+ local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}' |
| 57 |
+ |
| 58 |
+ # remove the en_US-only xpi file so a version with all requested locales can be installed |
| 59 |
+ if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then |
| 60 |
+ rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die |
| 61 |
+ fi |
| 62 |
+ |
| 63 |
+ # merge the extra locales into the main extension |
| 64 |
+ mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla |
| 65 |
+ |
| 66 |
+ # install the merged extension |
| 67 |
+ mkdir -p "${T}/${emid}" || die |
| 68 |
+ cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die |
| 69 |
+ insinto ${MOZILLA_FIVE_HOME}/distribution/extensions |
| 70 |
+ doins -r "${T}/${emid}" |
| 71 |
+ fi |
| 72 |
+ |
| 73 |
# Handle plugins dir through nsplugins.eclass |
| 74 |
share_plugins_dir |
Archives