diff options
| -rw-r--r-- | data/patches/do-not-warn-of-preinstalled-unsigned-extensions.patch | 29 | ||||
| -rw-r--r-- | data/patches/reorder-android-services.mozbuild.patch | 35 | ||||
| -rw-r--r-- | makeicecat | 8 |
3 files changed, 4 insertions, 68 deletions
diff --git a/data/patches/do-not-warn-of-preinstalled-unsigned-extensions.patch b/data/patches/do-not-warn-of-preinstalled-unsigned-extensions.patch deleted file mode 100644 index c4f5c77..0000000 --- a/data/patches/do-not-warn-of-preinstalled-unsigned-extensions.patch +++ /dev/null @@ -1,29 +0,0 @@ -Only in firefox-45.3.0esr: do-not-warn-of-preinstalled-unsigned-extensions.patch -diff -ru firefox-45.3.0esr-orig/toolkit/mozapps/extensions/content/extensions.js firefox-45.3.0esr/toolkit/mozapps/extensions/content/extensions.js ---- firefox-45.3.0esr-orig/toolkit/mozapps/extensions/content/extensions.js 2016-05-12 13:10:05.000000000 -0400 -+++ firefox-45.3.0esr/toolkit/mozapps/extensions/content/extensions.js 2016-08-28 18:24:46.897231960 -0400 -@@ -3204,7 +3204,9 @@ - [this._addon.name, gStrings.brandShortName, gStrings.appVersion], 3 - ); - document.getElementById("detail-warning-link").hidden = true; -- } else if (!isCorrectlySigned(this._addon)) { -+ } else if (!isCorrectlySigned(this._addon && ["abouticecat@gnu.org", -+ "html5-video-everywhere@lejenome.me", "https-everywhere-eff@eff.org", -+ "jid1-KtlZuoiikVfFew@jetpack", "spyblock@gnu.org"].indexOf(this._addon.id) < 0)) { - this.node.setAttribute("notification", "warning"); - document.getElementById("detail-warning").textContent = gStrings.ext.formatStringFromName( - "details.notification.unsigned", [this._addon.name, gStrings.brandShortName], 2 -diff -ru firefox-45.3.0esr-orig/toolkit/mozapps/extensions/content/extensions.xml firefox-45.3.0esr/toolkit/mozapps/extensions/content/extensions.xml ---- firefox-45.3.0esr-orig/toolkit/mozapps/extensions/content/extensions.xml 2016-05-12 13:10:05.000000000 -0400 -+++ firefox-45.3.0esr/toolkit/mozapps/extensions/content/extensions.xml 2016-08-28 18:28:09.241231936 -0400 -@@ -1255,7 +1255,9 @@ - ); - this._warningLink.hidden = true; - this._warningBtn.hidden = true; -- } else if (!isUpgrade && !isCorrectlySigned(this.mAddon)) { -+ } else if (!isUpgrade && !isCorrectlySigned(this.mAddon) && ["abouticecat@gnu.org", -+ "html5-video-everywhere@lejenome.me", "https-everywhere-eff@eff.org", -+ "jid1-KtlZuoiikVfFew@jetpack", "spyblock@gnu.org"].indexOf(this.mAddon.id) < 0) { - this.setAttribute("notification", "warning"); - this._warning.textContent = gStrings.ext.formatStringFromName( - "notification.unsigned", [this.mAddon.name, gStrings.brandShortName], 2 diff --git a/data/patches/reorder-android-services.mozbuild.patch b/data/patches/reorder-android-services.mozbuild.patch deleted file mode 100644 index 0c8b736..0000000 --- a/data/patches/reorder-android-services.mozbuild.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- ./mobile/android/base/android-services.mozbuild.orig 2015-07-16 12:27:52.808996807 -0500 -+++ ./mobile/android/base/android-services.mozbuild 2015-07-16 12:28:32.980996043 -0500 -@@ -870,8 +870,8 @@ - 'fxa/authenticator/FxAccountLoginDelegate.java', - 'fxa/authenticator/FxAccountLoginException.java', - 'fxa/authenticator/FxADefaultLoginStateMachineDelegate.java', -- 'fxa/FirefoxAccounts.java', - 'fxa/FxAccountConstants.java', -+ 'fxa/FirefoxAccounts.java', - 'fxa/login/BaseRequestDelegate.java', - 'fxa/login/Cohabiting.java', - 'fxa/login/Doghouse.java', -@@ -1024,8 +1024,8 @@ - 'sync/repositories/android/CachedSQLiteOpenHelper.java', - 'sync/repositories/android/ClientsDatabase.java', - 'sync/repositories/android/ClientsDatabaseAccessor.java', -- 'sync/repositories/android/FennecTabsRepository.java', - 'sync/repositories/android/FormHistoryRepositorySession.java', -+ 'sync/repositories/android/FennecTabsRepository.java', - 'sync/repositories/android/PasswordsRepositorySession.java', - 'sync/repositories/android/RepoUtils.java', - 'sync/repositories/BookmarkNeedsReparentingException.java', -@@ -1117,11 +1117,11 @@ - 'sync/stage/CompletedStage.java', - 'sync/stage/EnsureClusterURLStage.java', - 'sync/stage/EnsureCrypto5KeysStage.java', -- 'sync/stage/FennecTabsServerSyncStage.java', - 'sync/stage/FetchInfoCollectionsStage.java', - 'sync/stage/FetchMetaGlobalStage.java', - 'sync/stage/FormHistoryServerSyncStage.java', - 'sync/stage/GlobalSyncStage.java', -+ 'sync/stage/FennecTabsServerSyncStage.java', - 'sync/stage/NoSuchStageException.java', - 'sync/stage/NoSyncIDException.java', - 'sync/stage/PasswordsServerSyncStage.java', @@ -114,10 +114,10 @@ mv compare-locales $SOURCEDIR/l10n cd $SOURCEDIR -for patch in $DATA/patches/*; do - echo Patching with file: $patch - patch -p1 < $patch -done +#for patch in $DATA/patches/*; do +# echo Patching with file: $patch +# patch -p1 < $patch +#done cp $DATA/Changelog.IceCat $DATA/README.IceCat . cp $DATA/Changelog.IceCat $DATA/README.IceCat debian |