87.0, override top-sites.json Remote Settings dump87.0-1

3 files changed, 43 insertions, 6 deletions

diff --git a/src/COPYING b/src/COPYING
index 7a191c8..cc68c12 100644
--- a/src/COPYING
+++ b/src/COPYING
@@ -97,7 +97,8 @@ Licenses for:
     Creative Commons Attribution-ShareAlike 2.0 License: https://directory.fsf.org/wiki/License:CC_ASA2.0

 

 

-  tippytop/top_sites.json:

+  tippytop/top_sites.json,

+  services/settings/dumps/main/top-sites.json:

 

     This Source Code Form is subject to the terms of the Mozilla Public

     License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch
index d43e49c..12a4c36 100644
--- a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch
+++ b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch
@@ -14,13 +14,13 @@ index e205cd4c55..d12adbb558 100644
  #else
    pref("urlclassifier.phishTable", "googpub-phish-proto,moztest-phish-simple");
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
-index 9b7620dbca..877ebf9034 100644
+index d3eb77d9b6..aea8056cef 100644
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -157,3 +157,6 @@ else:
-     FINAL_TARGET_PP_FILES += [
-         'greprefs.js',
-     ]
+@@ -171,3 +171,6 @@ else:
+ 
+ if CONFIG["MOZ_BACKGROUNDTASKS"]:
+     DEFINES["MOZ_BACKGROUNDTASKS"] = True
 +
 +if CONFIG['MOZ_OFFICIAL_BRANDING']:
 +    DEFINES['MOZ_OFFICIAL_BRANDING'] = True
diff --git a/src/services/settings/dumps/main/top-sites.json b/src/services/settings/dumps/main/top-sites.json
new file mode 100644
index 0000000..70a8657
--- /dev/null
+++ b/src/services/settings/dumps/main/top-sites.json
@@ -0,0 +1,36 @@
+{
+  "data": [
+    {
+      "url": "https://wiki.parabola.nu/",
+      "order": 1,
+      "title": "ParabolaWiki",
+      "schema": 1599056608911,
+      "id": "4691d148-fe32-49d8-bc4c-5676562dcf60",
+      "last_modified": 1599146777351
+    },
+    {
+      "url": "https://labs.parabola.nu/",
+      "order": 2,
+      "title": "Parabola Issue Tracker",
+      "schema": 1599056608912,
+      "id": "3a927659-b814-4276-ad3d-7c30e1377e37",
+      "last_modified": 1599146777352
+    },
+    {
+      "url": "https://www.gnu.org/",
+      "order": 3,
+      "title": "The GNU Operating System and the Free Software Movement",
+      "schema": 1599056608913,
+      "id": "201d8a3d-c420-450f-a0b4-96a80a4127d8",
+      "last_modified": 1599146777353
+    },
+    {
+      "url": "https://libreplanet.org/",
+      "order": 4,
+      "title": "LibrePlanet",
+      "schema": 1599056608914,
+      "id": "a81f877c-5429-41cd-89d8-68844a46d969",
+      "last_modified": 1599146777354
+    }
+  ]
+}