updated pref-pane patch

patches/librewolf-pref-pane.patch

@@ -30,10 +30,10 @@ index 4f3babe..97c7ec2 100644
     content/browser/preferences/experimental.js
 diff --git a/browser/components/preferences/librewolf.inc.xhtml b/browser/components/preferences/librewolf.inc.xhtml
 new file mode 100644
-index 0000000..f27541d
+index 0000000..9d905e1
 --- /dev/null
 +++ b/browser/components/preferences/librewolf.inc.xhtml
-@@ -0,0 +1,224 @@
+@@ -0,0 +1,236 @@
 +# 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
 +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -78,6 +78,18 @@ index 0000000..f27541d
 +    </vbox>
 +  </vbox>
 +
++  <hbox>
++    <checkbox id="librewolf-sync-checkbox" data-l10n-id="librewolf-sync-checkbox" preference="identity.fxaccounts.enabled" flex="1" />
++    <html:label for="librewolf-sync-collapse" class="sidebar-footer-link" pack="end"> <image class="sidebar-footer-icon help-icon"/> </html:label>
++  </hbox>
++  <vbox class="librewolf-collapse indent">
++    <html:input type="checkbox" id="librewolf-sync-collapse" />
++    <vbox class="librewolf-collapsed tracking-protection-ui content-blocking-category">
++      <label data-l10n-id="librewolf-sync-description" />
++      <html:div> <image src="chrome://browser/skin/warning.svg" /> <label data-l10n-id="librewolf-sync-warning1" class="librewolf-warning" /> </html:div>
++      <checkbox preference="identity.fxaccounts.enabled" label="identity.fxaccounts.enabled" />
++    </vbox>
++  </vbox>
 +  
 +  <hbox>
 +    <checkbox id="librewolf-autocopy-checkbox" data-l10n-id="librewolf-autocopy-checkbox" preference="clipboard.autocopy" flex="1" />
@@ -260,10 +272,10 @@ index 0000000..f27541d
 +</html:template>
 diff --git a/browser/components/preferences/librewolf.js b/browser/components/preferences/librewolf.js
 new file mode 100644
-index 0000000..ee49f0f
+index 0000000..e97a726
 --- /dev/null
 +++ b/browser/components/preferences/librewolf.js
-@@ -0,0 +1,240 @@
+@@ -0,0 +1,248 @@
 +/* 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 file,
 + * You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -280,9 +292,12 @@ index 0000000..ee49f0f
 +});
 +
 +Preferences.addAll([
-+  // IPv6
++    // IPv6
-+  { id: "network.dns.disableIPv6", type: "bool" },
++    { id: "network.dns.disableIPv6", type: "bool" },
-+  { id: "security.OCSP.require", type: "bool" },
++    // ocsp hard-fail
++    { id: "security.OCSP.require", type: "bool" },
++    // ocsp hard-fail
++    { id: "identity.fxaccounts.enabled", type: "bool" },
 +  // WebGL
 +  { id: "webgl.disabled", type: "bool" },
 +  // RFP
@@ -335,6 +350,11 @@ index 0000000..ee49f0f
 +      [true,                   ],
 +    );
 +    setBoolSyncListeners(
++      "librewolf-sync-checkbox",
++      ["identity.fxaccounts.enabled"],
++      [false,                   ],
++    );
++    setBoolSyncListeners(
 +      "librewolf-autocopy-checkbox",
 +      ["clipboard.autocopy", "middlemouse.paste"],
 +      [true,                 true               ],
@@ -563,10 +583,10 @@ index aab4a9e..907a631 100644
  #include sync.inc.xhtml
  #include experimental.inc.xhtml
 diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
-index d276f7a..127c8e1 100644
+index d276f7a..06787cd 100644
 --- a/browser/locales/en-US/browser/preferences/preferences.ftl
 +++ b/browser/locales/en-US/browser/preferences/preferences.ftl
-@@ -1347,3 +1347,82 @@ choose-download-folder-title = Choose Download Folder:
+@@ -1347,3 +1347,86 @@ choose-download-folder-title = Choose Download Folder:
  #   $service-name (String) - Name of a cloud storage provider like Dropbox, Google Drive, etc...
  save-files-to-cloud-storage =
      .label = Save files to { $service-name }
@@ -601,6 +621,8 @@ index d276f7a..127c8e1 100644
 +    .label = Enable WebGL
 +librewolf-ocsp-checkbox =
 +    .label = Enforce OCSP hard-fail
++librewolf-sync-checkbox =
++    .label = Enable Firefox Sync
 +librewolf-rfp-checkbox =
 +    .label = Enable ResistFingerprinting
 +librewolf-auto-decline-canvas-checkbox =
@@ -622,6 +644,8 @@ index d276f7a..127c8e1 100644
 +librewolf-ipv6-warning1 = Before you change this, make sure your OS uses the IPv6 privacy extension.
 +librewolf-ocsp-description = Prevent connecting to a website if the OCSP check cannot be performed.
 +librewolf-ocsp-warning1 = This increases security, but it will cause breakage when a OCSP server is down.
++librewolf-sync-description = Enable Firefox Sync.
++librewolf-sync-warning1 = If you enable this, Mozilla knows more about you then when disabled.
 +
 +librewolf-autocopy-description = Select some text to copy it, then paste it with a middle-mouse click.
 +

scripts/librewolf-patches.py

@@ -92,7 +92,7 @@ def librewolf_patches():
     exec('cp -v ../assets/mozconfig .')
 
     # copy branding files..
-    exec("cp -vr ../themes/browser .")
+    exec("cp -r ../themes/browser .")
 
     # copy the right search-config.json file
     exec('cp -v ../assets/search-config.json services/settings/dumps/main/search-config.json')