From db83555f2a27fabfc51a274ec83a8abdcd8ff766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Wed, 15 Mar 2023 15:06:17 +0100
Subject: [PATCH] fix prefixes

---
 patches/ui-patches/pref-naming.patch         | 4 ++--
 patches/ui-patches/privacy-preferences.patch | 8 ++++----
 patches/ui-patches/remove-cfrprefs.patch     | 4 ++--
 scripts/fix-patch.sh                         | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/patches/ui-patches/pref-naming.patch b/patches/ui-patches/pref-naming.patch
index 98e7909..88a0a53 100644
--- a/patches/ui-patches/pref-naming.patch
+++ b/patches/ui-patches/pref-naming.patch
@@ -1,5 +1,5 @@
---- browser/locales/en-US/browser/preferences/preferences.ftl
-+++ browser/locales/en-US/browser/preferences/preferences.ftl
+--- a/browser/locales/en-US/browser/preferences/preferences.ftl
++++ b/browser/locales/en-US/browser/preferences/preferences.ftl
 @@ -128,6 +128,8 @@ search-results-help-link = Need help? Visit <a data-l10n-name="url">{ -brand-sho
  
  startup-header = Startup
diff --git a/patches/ui-patches/privacy-preferences.patch b/patches/ui-patches/privacy-preferences.patch
index 5773146..b69cbae 100644
--- a/patches/ui-patches/privacy-preferences.patch
+++ b/patches/ui-patches/privacy-preferences.patch
@@ -1,5 +1,5 @@
---- browser/components/preferences/privacy.inc.xhtml
-+++ browser/components/preferences/privacy.inc.xhtml
+--- a/browser/components/preferences/privacy.inc.xhtml
++++ b/browser/components/preferences/privacy.inc.xhtml
 @@ -53,7 +53,7 @@
          </description>
        </vbox>
@@ -50,8 +50,8 @@
      <checkbox id="blockDownloads"
                data-l10n-id="security-block-downloads"/>
      <checkbox id="blockUncommonUnwanted"
---- browser/locales/en-US/browser/preferences/preferences.ftl
-+++ browser/locales/en-US/browser/preferences/preferences.ftl
+--- a/browser/locales/en-US/browser/preferences/preferences.ftl
++++ b/browser/locales/en-US/browser/preferences/preferences.ftl
 @@ -1190,7 +1190,7 @@ addressbar-quickactions-learn-more = Learn more
  
  content-blocking-enhanced-tracking-protection = Enhanced Tracking Protection
diff --git a/patches/ui-patches/remove-cfrprefs.patch b/patches/ui-patches/remove-cfrprefs.patch
index d65d37a..69b257a 100644
--- a/patches/ui-patches/remove-cfrprefs.patch
+++ b/patches/ui-patches/remove-cfrprefs.patch
@@ -1,5 +1,5 @@
---- browser/components/preferences/main.inc.xhtml
-+++ browser/components/preferences/main.inc.xhtml
+--- a/browser/components/preferences/main.inc.xhtml
++++ b/browser/components/preferences/main.inc.xhtml
 @@ -742,7 +742,7 @@
            support-page="media-keyboard-control"
      />
diff --git a/scripts/fix-patch.sh b/scripts/fix-patch.sh
index e80e26f..1849df7 100755
--- a/scripts/fix-patch.sh
+++ b/scripts/fix-patch.sh
@@ -40,7 +40,7 @@ read
 
 echo "-> Updating patch"
 sed -i '/^[^#]/d' "../$1"
-git diff --no-prefix | sed '/^diff --git /,+1 d' >>"../$1"
+git diff | sed '/^diff --git /,+1 d' >>"../$1"
 sed -i '1{/^$/d}' "../$1"
 
 echo "-> Cleaning up"