Fennec FDroid: Prepare 36.0.4
This commit is contained in:
Boris Kraut
parent
dd90f58f93
commit
32d4292eab
metadata
org.mozilla.fennec_fdroid.txt
org.mozilla.fennec_fdroid
|
|
@ -374,6 +374,102 @@ Build:36.0.1,360110
|
||||||
mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
|
mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
|
||||||
zip -d fdroid/fennec-unsigned.apk "META-INF*"
|
zip -d fdroid/fennec-unsigned.apk "META-INF*"
|
||||||
|
|
||||||
|
Build:36.0.4,360400
|
||||||
|
commit=FENNEC_36_0_4_RELEASE
|
||||||
|
srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
|
||||||
|
output=fdroid/fennec-unsigned.apk
|
||||||
|
ndk=r10d
|
||||||
|
init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/
|
||||||
|
patch=36.0.4-android-22-a.patch,36.0.4-android-22-b.patch
|
||||||
|
scanignore=mobile/android/base/JavaAddonManager.java
|
||||||
|
prebuild=mkdir fdroid && \
|
||||||
|
vercode=360400 && \
|
||||||
|
fxarch=arm-linux-androideabi && \
|
||||||
|
l10ndir=`readlink -f $$MozLocales$$` && \
|
||||||
|
sed -i -e 's/android:debuggable="true"//g' mobile/android/base/AndroidManifest.xml.in && \
|
||||||
|
sed -i -e '/MOZ_ANDROID_GOOGLE_PLAY_SERVICES/d' configure.in && \
|
||||||
|
echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" > .mozconfig && \
|
||||||
|
echo "ac_add_options --with-android-sdk=\"$$SDK$$/platforms/android-22\"" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --target=${fxarch}" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --disable-tests" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --disable-updater" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --disable-crashreporter" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --disable-debug" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --with-l10n-base=${l10ndir}" >> .mozconfig && \
|
||||||
|
echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
|
||||||
|
echo "mk_add_options 'export ANDROID_VERSION_CODE=${vercode}'" >> .mozconfig && \
|
||||||
|
echo "mk_add_options 'export MOZ_CHROME_MULTILOCALE=$(tr '\n' ' ' < mobile/android/locales/maemo-locales)'" >> .mozconfig && \
|
||||||
|
pushd mobile/android/branding/unofficial/ && \
|
||||||
|
sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
|
||||||
|
echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
|
||||||
|
echo 'MOZ_APP_DISPLAYNAME="Fennec FDroid"' >> configure.sh && \
|
||||||
|
popd && \
|
||||||
|
echo -e 'MOZ_DEVICES=0\nMOZ_NATIVE_DEVICES=0\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=0\nMOZ_SERVICES_HEALTHREPORT=0\n' >> mobile/android/confvars.sh && \
|
||||||
|
echo "==HOTFIX==" && \
|
||||||
|
patch -p1 <$$MozLocales$$/Bug1083116.patch && \
|
||||||
|
sed -i -e 's/size_impl(v/size_impl(const v/g' memory/mozjemalloc/jemalloc.c && \
|
||||||
|
sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
|
||||||
|
rm -R mobile/android/gradle/ && \
|
||||||
|
sed -i -e '/gradle/d' mobile/android/moz.build
|
||||||
|
build=./mach build && \
|
||||||
|
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:36.0.4,360410
|
||||||
|
commit=FENNEC_36_0_4_RELEASE
|
||||||
|
srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
|
||||||
|
output=fdroid/fennec-unsigned.apk
|
||||||
|
ndk=r10d
|
||||||
|
init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/
|
||||||
|
patch=36.0.4-android-22-a.patch,36.0.4-android-22-b.patch
|
||||||
|
scanignore=mobile/android/base/JavaAddonManager.java
|
||||||
|
prebuild=mkdir fdroid && \
|
||||||
|
vercode=360410 && \
|
||||||
|
fxarch=i386-linux-android && \
|
||||||
|
l10ndir=`readlink -f $$MozLocales$$` && \
|
||||||
|
sed -i -e 's/android:debuggable="true"//g' mobile/android/base/AndroidManifest.xml.in && \
|
||||||
|
sed -i -e '/MOZ_ANDROID_GOOGLE_PLAY_SERVICES/d' configure.in && \
|
||||||
|
echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" > .mozconfig && \
|
||||||
|
echo "ac_add_options --with-android-sdk=\"$$SDK$$/platforms/android-22\"" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --target=${fxarch}" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --disable-tests" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --disable-updater" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --disable-crashreporter" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --disable-debug" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --with-l10n-base=${l10ndir}" >> .mozconfig && \
|
||||||
|
echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
|
||||||
|
echo "mk_add_options 'export ANDROID_VERSION_CODE=${vercode}'" >> .mozconfig && \
|
||||||
|
echo "mk_add_options 'export MOZ_CHROME_MULTILOCALE=$(tr '\n' ' ' < mobile/android/locales/maemo-locales)'" >> .mozconfig && \
|
||||||
|
pushd mobile/android/branding/unofficial/ && \
|
||||||
|
sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
|
||||||
|
echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
|
||||||
|
echo 'MOZ_APP_DISPLAYNAME="Fennec FDroid"' >> configure.sh && \
|
||||||
|
popd && \
|
||||||
|
echo -e 'MOZ_DEVICES=0\nMOZ_NATIVE_DEVICES=0\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=0\nMOZ_SERVICES_HEALTHREPORT=0\n' >> mobile/android/confvars.sh && \
|
||||||
|
echo "==HOTFIX==" && \
|
||||||
|
patch -p1 <$$MozLocales$$/Bug1083116.patch && \
|
||||||
|
sed -i -e 's/size_impl(v/size_impl(const v/g' memory/mozjemalloc/jemalloc.c && \
|
||||||
|
sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
|
||||||
|
rm -R mobile/android/gradle/ && \
|
||||||
|
sed -i -e '/gradle/d' mobile/android/moz.build
|
||||||
|
build=./mach build && \
|
||||||
|
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*"
|
||||||
|
|
||||||
Maintainer Notes:
|
Maintainer Notes:
|
||||||
|
|
||||||
Take a look at ./configure --help
|
Take a look at ./configure --help
|
||||||
|
|
|
||||||
60
metadata/org.mozilla.fennec_fdroid/36.0.4-android-22-a.patch
Normal file
60
metadata/org.mozilla.fennec_fdroid/36.0.4-android-22-a.patch
Normal file
|
|
@ -0,0 +1,60 @@
|
||||||
|
diff --git a/mobile/android/base/widget/DateTimePicker.java b/mobile/android/base/widget/DateTimePicker.java
|
||||||
|
--- a/mobile/android/base/widget/DateTimePicker.java
|
||||||
|
+++ b/mobile/android/base/widget/DateTimePicker.java
|
||||||
|
@@ -42,16 +42,19 @@ import android.widget.NumberPicker;
|
||||||
|
|
||||||
|
public class DateTimePicker extends FrameLayout {
|
||||||
|
private static final boolean DEBUG = true;
|
||||||
|
private static final String LOGTAG = "GeckoDateTimePicker";
|
||||||
|
private static final int DEFAULT_START_YEAR = 1;
|
||||||
|
private static final int DEFAULT_END_YEAR = 9999;
|
||||||
|
// Minimal screen width (in inches) for which we can show the calendar;
|
||||||
|
private static final int SCREEN_SIZE_THRESHOLD = 5;
|
||||||
|
+ private static final char DATE_FORMAT_DAY = 'd';
|
||||||
|
+ private static final char DATE_FORMAT_MONTH = 'M';
|
||||||
|
+ private static final char DATE_FORMAT_YEAR = 'y';
|
||||||
|
|
||||||
|
boolean mYearEnabled = true;
|
||||||
|
boolean mMonthEnabled = true;
|
||||||
|
boolean mWeekEnabled;
|
||||||
|
boolean mDayEnabled = true;
|
||||||
|
boolean mHourEnabled = true;
|
||||||
|
boolean mMinuteEnabled = true;
|
||||||
|
boolean mIs12HourMode;
|
||||||
|
@@ -387,31 +390,33 @@ public class DateTimePicker extends Fram
|
||||||
|
public long getTimeInMillis(){
|
||||||
|
return mCurrentDate.getTimeInMillis();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void reorderDateSpinners() {
|
||||||
|
mDateSpinners.removeAllViews();
|
||||||
|
char[] order = DateFormat.getDateFormatOrder(getContext());
|
||||||
|
final int spinnerCount = order.length;
|
||||||
|
+
|
||||||
|
for (int i = 0; i < spinnerCount; i++) {
|
||||||
|
switch (order[i]) {
|
||||||
|
- case DateFormat.DATE:
|
||||||
|
+ case DATE_FORMAT_DAY:
|
||||||
|
mDateSpinners.addView(mDaySpinner);
|
||||||
|
break;
|
||||||
|
- case DateFormat.MONTH:
|
||||||
|
+ case DATE_FORMAT_MONTH:
|
||||||
|
mDateSpinners.addView(mMonthSpinner);
|
||||||
|
break;
|
||||||
|
- case DateFormat.YEAR:
|
||||||
|
+ case DATE_FORMAT_YEAR:
|
||||||
|
mDateSpinners.addView(mYearSpinner);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new IllegalArgumentException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
mDateSpinners.addView(mWeekSpinner);
|
||||||
|
}
|
||||||
|
|
||||||
|
void setDate(Calendar calendar){
|
||||||
|
mCurrentDate = mTempDate;
|
||||||
|
if (mCurrentDate.before(mMinDate)) {
|
||||||
|
mCurrentDate.setTimeInMillis(mMinDate.getTimeInMillis());
|
||||||
|
} else if (mCurrentDate.after(mMaxDate)) {
|
||||||
23
metadata/org.mozilla.fennec_fdroid/36.0.4-android-22-b.patch
Normal file
23
metadata/org.mozilla.fennec_fdroid/36.0.4-android-22-b.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
diff --git a/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java b/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java
|
||||||
|
--- a/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java
|
||||||
|
+++ b/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java
|
||||||
|
@@ -48,16 +48,18 @@ public class SearchBar extends FrameLayo
|
||||||
|
private boolean active;
|
||||||
|
|
||||||
|
public interface TextListener {
|
||||||
|
public void onChange(String text);
|
||||||
|
public void onSubmit(String text);
|
||||||
|
public void onFocusChange(boolean hasFocus);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Deprecation warnings suppressed to allow building with API level 22
|
||||||
|
+ @SuppressWarnings("deprecation")
|
||||||
|
public SearchBar(Context context, AttributeSet attrs) {
|
||||||
|
super(context, attrs);
|
||||||
|
|
||||||
|
LayoutInflater.from(context).inflate(R.layout.search_bar, this);
|
||||||
|
|
||||||
|
editText = (EditText) findViewById(R.id.edit_text);
|
||||||
|
editText.addTextChangedListener(new TextWatcher() {
|
||||||
|
@Override
|
||||||
|
|
||||||
Loading…
Reference in a new issue