56.2.10.1

3 files changed, 19 insertions, 129 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f127f7c1baa..c029b08ff4c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = waterfox-kde
 	pkgdesc = Free, open and private browser with openSUSE's patches for better integration with KDE
-	pkgver = 56.2.10
+	pkgver = 56.2.10.1
 	pkgrel = 1
 	url = https://www.waterfox.net/
 	arch = x86_64
@@ -41,39 +41,30 @@ pkgbase = waterfox-kde
 	optdepends = alsa-lib: Audio support
 	optdepends = jack: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
-	provides = waterfox=56.2.10
+	provides = waterfox=56.2.10.1
 	conflicts = waterfox
 	options = !emptydirs
 	options = !makeflags
 	options = zipman
-	source = git+https://github.com/MrAlex94/Waterfox.git#commit=08473aef38ecac750042cc70a112047db0007568
+	source = git+https://github.com/MrAlex94/Waterfox.git#commit=d7201d404758aa6222f80502e3dcdf016fc87a31
 	source = waterfox.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/waterfox.desktop
 	source = waterfox-install-dir.patch
-	source = waterfoxproject-kde-56.2.0.patch
-	source = firefox-kde-7339b115a221.patch::http://www.rosenauer.org/hg/mozilla/raw-file/7339b115a221/firefox-kde.patch
-	source = fix_waterfox_browser-kde_xul.patch
-	source = pgo_fix_missing_kdejs.patch
 	source = kde.js::https://raw.githubusercontent.com/hawkeye116477/Waterfox/plasma/_Plasma_Build/kde.js
 	source = distribution.ini::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/distribution.ini
 	source = waterfox.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/waterfox.1
 	source = jack-system-ports.patch
-	source = fix_crash_e10s_upload_cancel.patch::https://raw.githubusercontent.com/hawkeye116477/Waterfox/plasma/_Plasma_Build/fix_crash_e10s_upload_cancel.patch
 	source = no-plt.diff
-	source = unity-menubar-56.2.10.patch::https://bazaar.launchpad.net/~mozillateam/firefox/firefox.xenial/download/1222/unitymenubar.patch-20130215095938-1n6mqqau8tdfqwhg-1/unity-menubar.patch
+	source = waterfox-kde-56.2.10.1.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/patches/waterfox-kde-56.2.10.1.patch
 	sha256sums = SKIP
 	sha256sums = 6e9ec5f9c6fc5b191f9dec85b82d58eb2a51577b989bc7852e6b254d56ff13e8
 	sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd
-	sha256sums = 911e07ecb0095337c580c94f16b5414c243b26b1080cf0bfd2fac7f76c9a6a43
-	sha256sums = f672e60e22869381e9c4cdd90353a053a0171778eca40d4664bc733822fd535f
-	sha256sums = 33a8e89e504067914665b7858061f34dc81057961f365024c891aa386afc28ce
 	sha256sums = bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e
 	sha256sums = 0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc
 	sha256sums = 3961c09993c442df97832866ddaea5bcc1ade1313beb313b5ceba60166933016
-	sha256sums = e520e4e40a7b4c09d9da3bc0179619bc595347e23a38a5bbd578df82f8c9aa12
+	sha256sums = 065244d3f6d88c48b7afec313b7da5a3a04377076e198954cda7951500530b84
 	sha256sums = be19426cd658ea0ff0dedbdd80da6bf84580c80d92f9b3753da107011dfdd85c
-	sha256sums = 73e13bf689838e4b27cdb08f040fbafb308aaf2990f5e1bf193a69a9dd736794
 	sha256sums = ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa
-	sha256sums = 5903f99dce010279e2a2f0e56d98e756c5abf9a57e27df5e2239076038868d3d
+	sha256sums = f7c6e58117e4dab6a54a2b60452897e2b2036a1f1c5f7e1116ba090d65e23bae
 
 pkgname = waterfox-kde
 
diff --git a/PKGBUILD b/PKGBUILD
index c138d0fdff98..07aad9a9f67c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Based on firefox-kde Manjaro's PKGBUILD
 
 pkgname=waterfox-kde
-pkgver=56.2.10
+pkgver=56.2.10.1
 pkgrel=1
 pkgdesc="Free, open and private browser with openSUSE's patches for better integration with KDE"
 arch=('x86_64')
@@ -24,35 +24,26 @@ conflicts=('waterfox')
 options=('!emptydirs' '!makeflags' 'zipman')
 _patchrev=7339b115a221
 _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
-_commit=08473aef38ecac750042cc70a112047db0007568
+_commit=d7201d404758aa6222f80502e3dcdf016fc87a31
 source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
         "waterfox.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/waterfox.desktop"
         waterfox-install-dir.patch
-        waterfoxproject-kde-56.2.0.patch
-        "firefox-kde-$_patchrev.patch::$_patchurl/firefox-kde.patch"
-        fix_waterfox_browser-kde_xul.patch
-        pgo_fix_missing_kdejs.patch
         "kde.js::https://raw.githubusercontent.com/hawkeye116477/Waterfox/plasma/_Plasma_Build/kde.js"
         "distribution.ini::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/distribution.ini"
         "waterfox.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/waterfox.1"
         jack-system-ports.patch
-        "fix_crash_e10s_upload_cancel.patch::https://raw.githubusercontent.com/hawkeye116477/Waterfox/plasma/_Plasma_Build/fix_crash_e10s_upload_cancel.patch"
         no-plt.diff
-        "unity-menubar-$pkgver.patch::https://bazaar.launchpad.net/~mozillateam/firefox/firefox.xenial/download/1222/unitymenubar.patch-20130215095938-1n6mqqau8tdfqwhg-1/unity-menubar.patch")
+        "waterfox-kde-56.2.10.1.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-kde/patches/waterfox-kde-56.2.10.1.patch")
 sha256sums=('SKIP'
             '6e9ec5f9c6fc5b191f9dec85b82d58eb2a51577b989bc7852e6b254d56ff13e8'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
-            '911e07ecb0095337c580c94f16b5414c243b26b1080cf0bfd2fac7f76c9a6a43'
-            'f672e60e22869381e9c4cdd90353a053a0171778eca40d4664bc733822fd535f'
-            '33a8e89e504067914665b7858061f34dc81057961f365024c891aa386afc28ce'
             'bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e'
             '0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc'
             '3961c09993c442df97832866ddaea5bcc1ade1313beb313b5ceba60166933016'
-            'e520e4e40a7b4c09d9da3bc0179619bc595347e23a38a5bbd578df82f8c9aa12'
+            '065244d3f6d88c48b7afec313b7da5a3a04377076e198954cda7951500530b84'
             'be19426cd658ea0ff0dedbdd80da6bf84580c80d92f9b3753da107011dfdd85c'
-            '73e13bf689838e4b27cdb08f040fbafb308aaf2990f5e1bf193a69a9dd736794'
             'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa'
-            '5903f99dce010279e2a2f0e56d98e756c5abf9a57e27df5e2239076038868d3d')
+            'f7c6e58117e4dab6a54a2b60452897e2b2036a1f1c5f7e1116ba090d65e23bae')
 
 prepare() {
   mkdir path
@@ -63,7 +54,7 @@ prepare() {
   #sed -i 's/KMOZILLAHELPER/KWATERFOXHELPER/g' $srcdir/mozilla-kde-$_patchrev.patch
   #sed -i 's|/usr/lib/mozilla/kmozillahelper|/usr/lib/waterfox/kwaterfoxhelper|g' $srcdir/mozilla-kde-$_patchrev.patch
   #sed -i 's/kmozillahelper/kwaterfoxhelper/g' $srcdir/mozilla-kde-$_patchrev.patch
-  sed -i 's/firefox/waterfox/g' $srcdir/firefox-kde-$_patchrev.patch
+  #sed -i 's/firefox/waterfox/g' $srcdir/firefox-kde-$_patchrev.patch
 
   cd Waterfox
   patch -Np1 -i ../waterfox-install-dir.patch
@@ -162,16 +153,11 @@ END
 
   msg "Patching for KDE"
   #patch -Np1 -i "../mozilla-kde-$_patchrev.patch"
-  patch -Np1 -i "../waterfoxproject-kde-56.2.0.patch"
-  patch -Np1 -i "../firefox-kde-$_patchrev.patch"
-  patch -Np1 -i "../fix_waterfox_browser-kde_xul.patch"
-  patch -Np1 -i "../fix_crash_e10s_upload_cancel.patch"
-
-  # Global Menu support
-  patch -Np1 -i "../unity-menubar-$pkgver.patch"
-
-  msg "Add missing file in Makefile for pgo builds"
-  patch -Np1 -i "../pgo_fix_missing_kdejs.patch"
+  #patch -Np1 -i "../waterfoxproject-kde-56.2.0.patch"
+  #patch -Np1 -i "../firefox-kde-$_patchrev.patch"
+  #patch -Np1 -i "../fix_waterfox_browser-kde_xul.patch"
+  #patch -Np1 -i "../fix_crash_e10s_upload_cancel.patch"
+  patch -Np1 -i "../waterfox-kde-56.2.10.1.patch"
 
   # https://bugs.archlinux.org/task/52183
   msg "Patching for Jack"
@@ -212,6 +198,8 @@ pref("intl.locale.matchOS", true);
 // Fall back to en-US search plugins if none exist for the current locale
 pref("distribution.searchplugins.defaultLocale", "en-US");
 
+// Use OS regional settings for date and time
+pref("intl.regional_prefs.use_os_locales", true);
 END
 
   install -Dm644 "$srcdir/kde.js" "$pkgdir/usr/lib/waterfox/browser/defaults/preferences/kde.js"
diff --git a/fix_waterfox_browser-kde_xul.patch b/fix_waterfox_browser-kde_xul.patch
deleted file mode 100644
index e76c88f37f94..000000000000
--- a/fix_waterfox_browser-kde_xul.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
-index 0f446c81f1f4..f4ffd8cb9c4f 100644
---- a/browser/base/content/browser-kde.xul
-+++ b/browser/base/content/browser-kde.xul
-@@ -80,6 +80,8 @@
-       <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
-                 oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
-       <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/>
-+      <menuitem id="context_duplicateTab" label="Duplicate Tab" accesskey="D"
-+                oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
-       <menuseparator/>
-       <menuitem id="context_pinTab" label="&pinTab.label;"
-                 accesskey="&pinTab.accesskey;"
-@@ -228,62 +230,6 @@
-       </hbox>
-     </panel>
- 
--    <!-- UI tour experience -->
--    <panel id="UITourTooltip"
--           type="arrow"
--           hidden="true"
--           noautofocus="true"
--           noautohide="true"
--           align="start"
--           orient="vertical"
--           role="alert">
--     <vbox>
--      <hbox id="UITourTooltipBody">
--        <image id="UITourTooltipIcon"/>
--        <vbox flex="1">
--          <hbox id="UITourTooltipTitleContainer">
--            <label id="UITourTooltipTitle" flex="1"/>
--            <toolbarbutton id="UITourTooltipClose" class="close-icon"
--                           tooltiptext="&uiTour.infoPanel.close;"/>
--          </hbox>
--          <description id="UITourTooltipDescription" flex="1"/>
--        </vbox>
--      </hbox>
--      <hbox id="UITourTooltipButtons" flex="1" align="center"/>
--     </vbox>
--    </panel>
--    <!-- type="default" forces frames to be created so that the panel's size can be determined -->
--    <panel id="UITourHighlightContainer"
--           type="default"
--           hidden="true"
--           noautofocus="true"
--           noautohide="true"
--           flip="none"
--           consumeoutsideclicks="false"
--           mousethrough="always">
--      <box id="UITourHighlight"></box>
--    </panel>
--
--    <panel id="social-share-panel"
--           class="social-panel"
--           type="arrow"
--           orient="vertical"
--           onpopupshowing="SocialShare.onShowing()"
--           onpopuphidden="SocialShare.onHidden()"
--           hidden="true">
--      <hbox class="social-share-toolbar">
--        <toolbarbutton id="manage-share-providers" class="share-provider-button"
--                       tooltiptext="&social.addons.label;"
--                       oncommand="BrowserOpenAddonsMgr('addons://list/service');
--                                  this.parentNode.parentNode.hidePopup();"/>
--        <arrowscrollbox id="social-share-provider-buttons" orient="horizontal" flex="1" pack="end">
--          <toolbarbutton id="add-share-provider" class="share-provider-button" type="radio"
--                         group="share-providers" tooltiptext="&findShareServices.label;"
--                         oncommand="SocialShare.showDirectory()"/>
--        </arrowscrollbox>
--      </hbox>
--      <hbox id="share-container" flex="1"/>
--    </panel>
-     <panel id="sidebarMenu-popup"
-            class="cui-widget-panel"
-            role="group"
-@@ -501,11 +447,6 @@
- #endif
-     </tooltip>
- 
--    <tooltip id="share-button-tooltip" onpopupshowing="SocialShare.createTooltip(event);">
--      <label class="tooltip-label"/>
--      <label class="tooltip-label"/>
--    </tooltip>
--
- #include popup-notifications.inc
- 
- #include ../../components/customizableui/content/panelUI.inc.xul
-