From c0cd493be7872427cbd53a991605039fa4cbb207 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Thu, 15 Jan 2015 17:48:50 +0100 Subject: [PATCH] Fennec Fdroid: Fix locales. --- metadata/org.mozilla.fennec.fdroid.txt | 11 +++++------ srclibs/MozLocales.txt | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/metadata/org.mozilla.fennec.fdroid.txt b/metadata/org.mozilla.fennec.fdroid.txt index ddcb0f87c1..171584a48e 100644 --- a/metadata/org.mozilla.fennec.fdroid.txt +++ b/metadata/org.mozilla.fennec.fdroid.txt @@ -1,4 +1,4 @@ -Disabled:wip +#Disabled:wip AntiFeatures:NonFreeAdd,Tracking Provides:org.mozilla.firefox Categories:Internet @@ -32,7 +32,7 @@ Repo:https://hg.mozilla.org/releases/mozilla-release/ Build:35.0,350000 commit=FENNEC_35_0_RELEASE - srclibs=MozLocales@73695c0b79ff7d7684fb29debb7d89b324b4f23a + srclibs=MozLocales@214c475d output=fdroid/fennec-unsigned.apk init=\ rm -R docshell/test/ && \ @@ -72,18 +72,17 @@ Build:35.0,350000 sed -i -e '/MOZ_DEVICES/d' -e '/MOZ_NATIVE_DEVICES/d' mobile/android/confvars.sh && \ echo -e 'MOZ_DEVICES=0\nMOZ_NATIVE_DEVICES=0\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=0\n' >> mobile/android/confvars.sh build=./mach build && \ - ./mach package && \ fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \ pushd obj-${fxarch}/mobile/android/locales && \ for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \ popd && \ + ./mach package && \ mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \ zip -d fdroid/fennec-unsigned.apk "META-INF*" Build:35.0,350010 - disable=123 commit=FENNEC_35_0_RELEASE - srclibs=MozLocales@73695c0b79ff7d7684fb29debb7d89b324b4f23a + srclibs=MozLocales@214c475d output=fdroid/fennec-unsigned.apk init=\ rm -R docshell/test/ && \ @@ -123,11 +122,11 @@ Build:35.0,350010 sed -i -e '/MOZ_DEVICES/d' -e '/MOZ_NATIVE_DEVICES/d' mobile/android/confvars.sh && \ echo -e 'MOZ_DEVICES=0\nMOZ_NATIVE_DEVICES=0\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=0\n' >> mobile/android/confvars.sh build=./mach build && \ - ./mach package && \ fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \ pushd obj-${fxarch}/mobile/android/locales && \ for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \ popd && \ + ./mach package && \ mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \ zip -d fdroid/fennec-unsigned.apk "META-INF*" diff --git a/srclibs/MozLocales.txt b/srclibs/MozLocales.txt index d1d374bb0d..feba09a792 100644 --- a/srclibs/MozLocales.txt +++ b/srclibs/MozLocales.txt @@ -1,3 +1,3 @@ Repo Type:git -Repo:https://github.com/translate/mozilla-l10n +Repo:https://gitlab.com/Manizuca/fenneclocales.git #http://hg.mozilla.org/releases/l10n/mozilla-aurora/$LOCAL