| 1 |
commit: f50652d2e2e95edc9a1cca4d4ecf66c95005299f |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 12 19:43:37 2016 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 12 19:43:37 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=f50652d2 |
| 7 |
|
| 8 |
mozlinguas-v2.eclass: adjust mozlinguas_xpistage_langpacks to support new forms |
| 9 |
|
| 10 |
The packaging of locales in the chatzilla extension uses a form that was not taken |
| 11 |
into account yet in mozlinguas_xpistage_langpacks(), some additional code was added |
| 12 |
to take this new form into account and be more careful about extension-langpack |
| 13 |
processing in general. |
| 14 |
|
| 15 |
eclass/mozlinguas-v2.eclass | 12 ++++++++++++ |
| 16 |
1 file changed, 12 insertions(+) |
| 17 |
|
| 18 |
diff --git a/eclass/mozlinguas-v2.eclass b/eclass/mozlinguas-v2.eclass |
| 19 |
index 215141c..df4c8b2 100644 |
| 20 |
--- a/eclass/mozlinguas-v2.eclass |
| 21 |
+++ b/eclass/mozlinguas-v2.eclass |
| 22 |
@@ -331,6 +331,18 @@ mozlinguas_xpistage_langpacks() { |
| 23 |
cp -RLp -t "${modpath}/chrome" "${srcprefix}-${l}/chrome/${c}-${l}" || die |
| 24 |
grep "locale ${c} ${l} chrome/" "${srcprefix}-${l}/chrome.manifest" \ |
| 25 |
>>"${modpath}/chrome.manifest" || die |
| 26 |
+ elif [[ -e "${srcprefix}-${l}/chrome/${c}/locale" ]]; then |
| 27 |
+ if grep "locale ${c} ${l}" "${srcprefix}-${l}/chrome.manifest" &>/dev/null; then |
| 28 |
+ grep "locale ${c} ${l} chrome/" "${srcprefix}-${l}/chrome.manifest" \ |
| 29 |
+ >>"${modpath}/chrome.manifest" || die |
| 30 |
+ cp -RLp -t "${modpath}/chrome" "${srcprefix}-${l}/chrome/${c}" || die |
| 31 |
+ elif grep "locale ${c} ${l}" "${srcprefix}-${l}/chrome/${c}.manifest" &>/dev/null ; then |
| 32 |
+ grep "locale ${c} ${l}" "${srcprefix}-${l}/chrome/${c}.manifest" \ |
| 33 |
+ >>"${modpath}/chrome/${c}.manifest" || die |
| 34 |
+ cp -RLp -t "${modpath}/chrome" "${srcprefix}-${l}/chrome/${c}" || die |
| 35 |
+ else |
| 36 |
+ ewarn "Locale ${l} could not be processed for ${c}, skipping." |
| 37 |
+ fi |
| 38 |
elif [[ -e "${srcprefix}/chrome/${c}-${l}" ]]; then |
| 39 |
cp -RLp -t "${modpath}/chrome" "${srcprefix}/chrome/${c}-${l}" || die |
| 40 |
grep "locale ${c} ${l} chrome/" "${srcprefix}/chrome.manifest" \ |
Archives