60.6.3

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = icecat
 	pkgdesc = GNU version of the Firefox browser.
-	pkgver = 60.6.2
+	pkgver = 60.6.3
 	pkgrel = 1
 	url = http://www.gnu.org/software/gnuzilla/
 	arch = i686
@@ -52,7 +52,7 @@ pkgbase = icecat
 	source = rust_133-part1.patch::https://bugzilla.mozilla.org/attachment.cgi?id=9046663
 	source = rust_133-part2.patch::https://bugzilla.mozilla.org/attachment.cgi?id=9046664
 	source = deny_missing_docs.patch
-	source = disable_debian.patch
+	source = patch_makeicecat_stuff.patch
 	sha256sums = a99420657f5e92ff4e03f4466d7c075061c3c2e7fe84870b957881bc1e09c249
 	sha256sums = c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3
 	sha256sums = 190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303
@@ -60,7 +60,7 @@ pkgbase = icecat
 	sha256sums = 8b37332dd205946ea95c606103b5b0e1e8498819051ea1c1bce79f04fd88ebca
 	sha256sums = 08ab4293d6008524a38e20b428c750c4c55a2f7189e9a0067871ad723c1efab5
 	sha256sums = cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4
-	sha256sums = 359eac73ebf8a24b2a4f0c523c8d46e488a4c0a40a7def341064277a30bc9e14
+	sha256sums = 947805be92124383e69e022efe62824ef6fabdaec2e9f94cc97e13f75b2e0c1b
 
 pkgname = icecat
 

PKGBUILD

@@ -6,7 +6,7 @@
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
 pkgname=icecat
-pkgver=60.6.2
+pkgver=60.6.3
 _pkgver=60.3.0
 pkgrel=1
 pkgdesc="GNU version of the Firefox browser."
@@ -24,7 +24,8 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 
 source=(http://git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-${_pkgver}.tar.gz
         icecat.desktop icecat-safe.desktop
-        rust_133-part0.patch 'rust_133-part1.patch::https://bugzilla.mozilla.org/attachment.cgi?id=9046663' 'rust_133-part2.patch::https://bugzilla.mozilla.org/attachment.cgi?id=9046664' deny_missing_docs.patch disable_debian.patch)
+        rust_133-part0.patch 'rust_133-part1.patch::https://bugzilla.mozilla.org/attachment.cgi?id=9046663' 'rust_133-part2.patch::https://bugzilla.mozilla.org/attachment.cgi?id=9046664' 
+        deny_missing_docs.patch patch_makeicecat_stuff.patch)
 
 sha256sums=('a99420657f5e92ff4e03f4466d7c075061c3c2e7fe84870b957881bc1e09c249'
             'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
@@ -33,17 +34,17 @@ sha256sums=('a99420657f5e92ff4e03f4466d7c075061c3c2e7fe84870b957881bc1e09c249'
             '8b37332dd205946ea95c606103b5b0e1e8498819051ea1c1bce79f04fd88ebca'
             '08ab4293d6008524a38e20b428c750c4c55a2f7189e9a0067871ad723c1efab5'
             'cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4'
-            '359eac73ebf8a24b2a4f0c523c8d46e488a4c0a40a7def341064277a30bc9e14')
+            '947805be92124383e69e022efe62824ef6fabdaec2e9f94cc97e13f75b2e0c1b')
 
 #validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
 
 prepare() {
   cd gnuzilla-${_pkgver}
-  sed -e 's/prename/perl-rename/g' -i makeicecat
-  patch -Np1 -i ../disable_debian.patch
+  patch -Np1 -i ../patch_makeicecat_stuff.patch
   sed -e "s/^FFMAJOR.*/FFMAJOR=${pkgver:0:2}/g" -i makeicecat
   sed -e "s/^FFMINOR.*/FFMINOR=${pkgver:(-3):(-2)}/g" -i makeicecat
   sed -e "s/^FFSUB.*/FFSUB=${pkgver:(5)}/g" -i makeicecat
+  rm -rf output  # Clean output just in case is already an old build there
   sh makeicecat
   cd output/icecat-${pkgver}
 

patch_makeicecat_stuff.patch

@@ -1,5 +1,16 @@
---- a/makeicecat	2019-05-05 03:44:23.568839764 +0200
-+++ b/makeicecat	2019-05-05 15:19:35.058535696 +0200
+--- a/makeicecat	2018-11-09 21:46:03.000000000 +0100
++++ b/makeicecat	2019-05-08 17:31:10.841599427 +0200
+@@ -20,8 +20,8 @@
+ set -e
+ 
+ FFMAJOR=60
+-FFMINOR=3
+-FFSUB=0
++FFMINOR=6
++FFSUB=3
+ GNUVERSION=1
+ FFVERSION=$FFMAJOR.$FFMINOR.$FFSUB
+ ICECATVERSION=$FFVERSION-gnu$GNUVERSION
 @@ -112,9 +112,9 @@
  #done
  
@@ -109,6 +120,34 @@
  
  # Custom legal about pages
  
+@@ -328,12 +328,12 @@
+ ###############################################################################
+ 
+ # Replace Firefox branding
+-find -type d | grep fennec | xargs prename s/fennec/icecatmobile/
+-find -type f | grep fennec | xargs prename s/fennec/icecatmobile/
+-find -type f | grep Fennec | xargs prename s/Fennec/IceCatMobile/
+-find -type d | grep firefox | xargs prename -f s/firefox/icecat/
+-find -type f | grep firefox | xargs prename -f s/firefox/icecat/
+-find -type f | grep Firefox | xargs prename -f s/Firefox/IceCat/
++find -type d | grep fennec | xargs perl-rename s/fennec/icecatmobile/
++find -type f | grep fennec | xargs perl-rename s/fennec/icecatmobile/
++find -type f | grep Fennec | xargs perl-rename s/Fennec/IceCatMobile/
++find -type d | grep firefox | xargs perl-rename -f s/firefox/icecat/
++find -type f | grep firefox | xargs perl-rename -f s/firefox/icecat/
++find -type f | grep Firefox | xargs perl-rename -f s/Firefox/IceCat/
+ 
+ echo "Running batch rebranding"
+ SEDSCRIPT="
+@@ -395,7 +395,7 @@
+ 
+ sed 's/mozilla-bin/icecat-bin/' -i build/unix/run-mozilla.sh
+ 
+-find -type f | grep run-mozilla | xargs prename s/mozilla/icecat/
++find -type f | grep run-mozilla | xargs perl-rename s/mozilla/icecat/
+ 
+ # do not alter useragent/platform/oscpu/etc with fingerprinting countermeasure, it makes things worse
+ sed '/ShouldResistFingerprinting/,/}/s/^/\/\//' -i ./netwerk/protocol/http/nsHttpHandler.cpp
 @@ -633,8 +633,8 @@
  #sed '/972ce4c6/  s%$%\n/extensions.gnu/* @MOZ_ADDONDIR@/extensions%' -i debian/icecat.install.in