Switch to completely non-released build of IceCat, using directly makeicecat script by GNU

4 files changed, 324 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea96aa01a837..f6b4b29ebd70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = icecat
 	pkgdesc = GNU version of the Firefox browser.
-	pkgver = 60.3.0
-	pkgrel = 3
+	pkgver = 60.6.1
+	pkgrel = 1
 	url = http://www.gnu.org/software/gnuzilla/
 	arch = i686
 	arch = x86_64
@@ -22,6 +22,8 @@ pkgbase = icecat
 	makedepends = rust
 	makedepends = llvm
 	makedepends = clang
+	makedepends = bzr
+	makedepends = wget
 	depends = gtk3
 	depends = gtk2
 	depends = mozilla-common
@@ -41,21 +43,22 @@ pkgbase = icecat
 	optdepends = libnotify: Notification integration
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
-	source = http://ftpmirror.gnu.org/gnuzilla/60.3.0/icecat-60.3.0-gnu1.tar.bz2
-	source = http://ftpmirror.gnu.org/gnuzilla/60.3.0/icecat-60.3.0-gnu1.tar.bz2.sig
+	source = http://git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-60.3.0.tar.gz
 	source = icecat.desktop
 	source = icecat-safe.desktop
+	source = rust_133-part0.patch
 	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
-	validpgpkeys = A57369A8BABC2542B5A0368C3C76EED7D7E04784
-	sha256sums = 6145327092b4b195a4f63d0e86f4857eeba5607ffeb69b6f3bceb36e89a19645
-	sha256sums = SKIP
+	source = disable_debian.patch
+	sha256sums = a99420657f5e92ff4e03f4466d7c075061c3c2e7fe84870b957881bc1e09c249
 	sha256sums = c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3
 	sha256sums = 190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303
+	sha256sums = c10521badc262b476e844d3f3045ddf27e28d83d49b5db0d0e19431f06386e4d
 	sha256sums = 8b37332dd205946ea95c606103b5b0e1e8498819051ea1c1bce79f04fd88ebca
 	sha256sums = 08ab4293d6008524a38e20b428c750c4c55a2f7189e9a0067871ad723c1efab5
 	sha256sums = cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4
+	sha256sums = 359eac73ebf8a24b2a4f0c523c8d46e488a4c0a40a7def341064277a30bc9e14
 
 pkgname = icecat
 
diff --git a/PKGBUILD b/PKGBUILD
index c741db55e9bc..90b486ddb7fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,9 @@
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
 pkgname=icecat
-pkgver=60.3.0
-_pkgver=${pkgver}-gnu1
-_pkgverbase=${pkgver%%.*}
-pkgrel=3
+pkgver=60.6.1
+_pkgver=60.3.0
+pkgrel=1
 pkgdesc="GNU version of the Firefox browser."
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/gnuzilla/"
@@ -17,36 +16,36 @@ license=('GPL' 'MPL' 'LGPL')
 depends=('gtk3' 'gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'ffmpeg'
          'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'ttf-font')
 makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'autoconf2.13'
-             'libpulse' 'gst-plugins-base-libs' 'inetutils' 'rust' 'llvm' 'clang')
+             'libpulse' 'gst-plugins-base-libs' 'inetutils' 'rust' 'llvm' 'clang' 'bzr' 'wget')
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
             'speech-dispatcher: Text-to-Speech')
 
-## Set this variable to 1 if you want to build with clang compiler ##
-#_CLANG=0
-
-source=(http://ftpmirror.gnu.org/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}
-#source=(https://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}      ## Main upstream download site
-#source=(https://mirrors.kernel.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2      ## Good mirror
-#source=(http://jenkins.trisquel.info/icecat/${pkgname}-${_pkgver}.tar.bz2      ## Official developer (Ruben Rodriguez) site. Probably only has developer releases.
-#source=(http://alpha.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}
+source=(http://git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-${_pkgver}.tar.gz
         icecat.desktop icecat-safe.desktop
-        '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)
+        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)
 
-sha256sums=('6145327092b4b195a4f63d0e86f4857eeba5607ffeb69b6f3bceb36e89a19645'
-            'SKIP'
+sha256sums=('a99420657f5e92ff4e03f4466d7c075061c3c2e7fe84870b957881bc1e09c249'
             'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
             '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303'
+            'c10521badc262b476e844d3f3045ddf27e28d83d49b5db0d0e19431f06386e4d'
             '8b37332dd205946ea95c606103b5b0e1e8498819051ea1c1bce79f04fd88ebca'
             '08ab4293d6008524a38e20b428c750c4c55a2f7189e9a0067871ad723c1efab5'
-            'cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4')
+            'cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4'
+            '359eac73ebf8a24b2a4f0c523c8d46e488a4c0a40a7def341064277a30bc9e14')
 
-validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
+#validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
 
 prepare() {
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd gnuzilla-${_pkgver}
+  sed -e 's/prename/perl-rename/g' -i makeicecat
+  patch -Np1 -i ../disable_debian.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
+  sh makeicecat
+  cd output/icecat-${pkgver}
 
   # Patch to move files directly to /usr/lib/icecat. No more symlinks.
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk
@@ -54,9 +53,10 @@ prepare() {
 
   # Bug 1521249 --enable-rust-simd fails to build using Rust 1.33
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
-  patch -Np1 -i ../rust_133-part1.patch || true
-  patch -Np1 -i ../rust_133-part2.patch
-  patch -Np1 -i ../deny_missing_docs.patch
+  patch -Np1 -i ${srcdir}/rust_133-part0.patch
+  patch -Np1 -i ${srcdir}/rust_133-part1.patch || true
+  patch -Np1 -i ${srcdir}/rust_133-part2.patch
+  patch -Np1 -i ${srcdir}/deny_missing_docs.patch
 
   printf '%b' "  \e[1;36m->\e[0m\033[1m Starting build...\n"
   
@@ -99,18 +99,14 @@ END
 }
 
 build() {
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd gnuzilla-${_pkgver}/output/icecat-${pkgver}
   ICECATDIR="/usr/lib/${pkgname}" && export ICECATDIR
 
-  # Build with clang
-  if [ "$_CLANG" -eq "1" ]; then
-    export CC=clang
-    export CXX=clang++
-    export AR=llvm-ar
-    export NM=llvm-nm
-    export RANLIB=llvm-ranlib
-  fi
+  export CC=clang
+  export CXX=clang++
+  export AR=llvm-ar
+  export NM=llvm-nm
+  export RANLIB=llvm-ranlib
 
   # Do PGO
   #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \
@@ -120,7 +116,7 @@ build() {
 }
 
 package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd gnuzilla-${_pkgver}/output/icecat-${pkgver}
   DESTDIR="$pkgdir" ./mach install
 
   _vendorjs="$pkgdir/usr/lib/${pkgname}/browser/defaults/preferences/vendor.js"
@@ -140,10 +136,10 @@ END
   install -m755 -d ${pkgdir}/usr/share/pixmaps
 
   for i in 16 32 48; do
-      install -Dm644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/official/default${i}.png \
+      install -Dm644 browser/branding/official/default${i}.png \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/icecat.png"
   done
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/official/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png
+  install -Dm644 browser/branding/official/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png
   install -Dm644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/
   install -Dm644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/
 }
diff --git a/disable_debian.patch b/disable_debian.patch
new file mode 100644
index 000000000000..3d8f10925b30
--- /dev/null
+++ b/disable_debian.patch
@@ -0,0 +1,267 @@
+--- a/makeicecat	2019-05-05 03:44:23.568839764 +0200
++++ b/makeicecat	2019-05-05 15:19:35.058535696 +0200
+@@ -112,9 +112,9 @@
+ #done
+ 
+ cp $DATA/Changelog.IceCat $DATA/README.IceCat .
+-cp $DATA/Changelog.IceCat $DATA/README.IceCat debian
+-echo 'debian/README.IceCat
+-debian/Changelog.IceCat' >>  debian/docs
++#cp $DATA/Changelog.IceCat $DATA/README.IceCat debian
++#echo 'debian/README.IceCat
++#debian/Changelog.IceCat' >>  debian/docs
+ 
+ ###############################################################################
+ # Functions
+@@ -182,17 +182,17 @@
+ ADDONSURL="www.gnu.org/software/gnuzilla/addons.html"
+ LISTURL="lists.gnu.org/mailman/listinfo/bug-gnuzilla"
+ 
+-cat << EOF > debian/distribution.ini
+-[Global]
+-id=gnu
+-version=$ICECATVERSION
+-about=GNU IceCat
+-
+-[Preferences]
+-app.distributor = "GNU"
+-app.distributor.channel = "GNU"
+-app.partner.ubuntu = "GNU"
+-EOF
++#cat << EOF > debian/distribution.ini
++#[Global]
++#id=gnu
++#version=$ICECATVERSION
++#about=GNU IceCat
++#
++#[Preferences]
++#app.distributor = "GNU"
++#app.distributor.channel = "GNU"
++#app.partner.ubuntu = "GNU"
++#EOF
+ 
+ ###############################################################################
+ # Custom settings and features
+@@ -201,7 +201,7 @@
+ # Disable EME
+ echo "ac_add_options --disable-eme" >> build/mozconfig.common.override
+ echo "ac_add_options --disable-eme" >> build/mozconfig.common
+-echo "ac_add_options --disable-eme" >> debian/config/mozconfig.in
++#echo "ac_add_options --disable-eme" >> debian/config/mozconfig.in
+ 
+ # Disable healthreport
+ sed '/mozilla.org\/legal/d' -i toolkit/components/telemetry/healthreport-prefs.js
+@@ -213,7 +213,7 @@
+ sed "s%https://www.mozilla.org/legal/privacy/%https://$LEGALINFOURL%" -i ./browser/app/profile/firefox.js ./toolkit/content/aboutRights.xhtml
+ 
+ # Set vendor string
+-sed 's/com.ubuntu/org.gnu/' -i debian/config/mozconfig.in
++#sed 's/com.ubuntu/org.gnu/' -i debian/config/mozconfig.in
+ 
+ # Copy custom ddg search plugin
+ find |grep -e ddg.xml -e duckduckgo.*.xml | xargs -i cp $DATA/searchplugins/duckduckgo.xml {}
+@@ -233,8 +233,8 @@
+ 
+ # contact link
+ #sed "s_https://input.mozilla.org/feedback_https://${LISTURL}_" -i browser/base/content/utilityOverlay.js
+-sed  "s/^MOZ_APP_NAME\t.*/MOZ_APP_NAME\t\t:= icecat/;" debian/build/config.mk -i
+-sed  "s/^MOZ_PKG_NAME\t.*/MOZ_PKG_NAME\t\t:= icecat/;" debian/build/config.mk -i
++#sed  "s/^MOZ_APP_NAME\t.*/MOZ_APP_NAME\t\t:= icecat/;" debian/build/config.mk -i
++#sed  "s/^MOZ_PKG_NAME\t.*/MOZ_PKG_NAME\t\t:= icecat/;" debian/build/config.mk -i
+ 
+ # Disable activity-stream antifeatures.
+ # These are not condensed into a single sed script to make it fail on individual commands that didn't change the source
+@@ -269,16 +269,16 @@
+ cp -a $DATA/branding/icecatmobile/ mobile/android/branding/nightly
+ # Disable preprocessor
+ sed 's/_PP//' -i browser/branding/branding-common.mozbuild
+-cat << EOF > debian/config/branch.mk
+-CHANNEL                 = release
+-MOZ_WANT_UNIT_TESTS     = 0
+-MOZ_BUILD_OFFICIAL      = 0
+-MOZ_ENABLE_BREAKPAD     = 0
+-MOZ_ENABLE_TELEMETRY    = 0
+-
+-MOZILLA_REPO = http://hg.mozilla.org/releases/mozilla-release
+-L10N_REPO = http://hg.mozilla.org/releases/l10n/mozilla-release
+-EOF
++#cat << EOF > debian/config/branch.mk
++#CHANNEL                 = release
++#MOZ_WANT_UNIT_TESTS     = 0
++#MOZ_BUILD_OFFICIAL      = 0
++#MOZ_ENABLE_BREAKPAD     = 0
++#MOZ_ENABLE_TELEMETRY    = 0
++#
++#MOZILLA_REPO = http://hg.mozilla.org/releases/mozilla-release
++#L10N_REPO = http://hg.mozilla.org/releases/l10n/mozilla-release
++#EOF
+ 
+ # Delete stuff we don't use and that may contain trademaked logos
+ rm -rf ./browser/metro ./addon-sdk/source/doc/static-files/media ./b2g
+@@ -286,8 +286,8 @@
+ # Custom bookmarks
+ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in
+ 
+-[ -d $DATA/searchplugins ] && cp $DATA/searchplugins debian/search -a
+-[ -d $DATA/searchplugins ] && echo "debian/search/* /usr/lib/icecat-addons/searchplugins" >> debian/firefox.install.in
++#[ -d $DATA/searchplugins ] && cp $DATA/searchplugins debian/search -a
++#[ -d $DATA/searchplugins ] && echo "debian/search/* /usr/lib/icecat-addons/searchplugins" >> debian/firefox.install.in
+ 
+ # Custom legal about pages
+ 
+@@ -633,8 +633,8 @@
+ #sed '/972ce4c6/  s%$%\n/extensions.gnu/* @MOZ_ADDONDIR@/extensions%' -i debian/icecat.install.in
+ 
+ 
+-sed '/972ce4c6/d;' -i debian/icecat.install.in
+-echo "@MOZ_LIBDIR@/browser/extensions @MOZ_ADDONDIR@" >> debian/icecat.install.in
++#sed '/972ce4c6/d;' -i debian/icecat.install.in
++#echo "@MOZ_LIBDIR@/browser/extensions @MOZ_ADDONDIR@" >> debian/icecat.install.in
+ 
+ # Add extensions to allowed-dupes.mn
+ cat << EOF >> ./browser/installer/allowed-dupes.mn
+@@ -658,70 +658,70 @@
+ ###############################################################################
+ # Deb generation specifics
+ ###############################################################################
+-cat << EOF >> debian/abrowser.postinst.in
+-
+-if [ "\$1" = "configure" ] || [ "\$1" = "abort-upgrade" ] ; then
+-
+-[ -f /usr/bin/mozilla ] || ln -s /usr/bin/icecat /usr/bin/mozilla && true
+-
+-for USER in \$(grep -v /bin/false /etc/passwd|grep :/home|cut -d: -f1)
+-do
+-    [ -d /home/\$USER/.mozilla/ ] || continue
+-    [ -d /home/\$USER/.mozilla/icecat ] && continue
+-    [ -d /home/\$USER/.mozilla/firefox ] && DIR=/home/\$USER/.mozilla/firefox
+-    [ -d /home/\$USER/.mozilla/abrowser ] && DIR=/home/\$USER/.mozilla/abrowser
+-    [ \$DIR ] || continue
+-    echo Copying \$DIR into /home/\$USER/.mozilla/icecat
+-    cp -a \$DIR /home/\$USER/.mozilla/icecat
+-done
+-fi
+-EOF
+-
+-cat << EOF >> debian/icecat.preinst.in
+-
+-EOF
+-
+-cat << EOF >> debian/icecat.postrm.in
+-
+-[ -L /usr/bin/mozilla ] && rm /usr/bin/mozilla -f || true
+-EOF
+-
+-echo "This package generated from Mozilla Firefox by $DEBFULLNAME <$DEBEMAIL> on
+-$(date)
+-More info at http://www.gnu.org/software/gnuzilla/
+-
+-===
+-
+-$(cat debian/copyright)" > debian/copyright
+-
+-# Remove icecat-globalmenu package
+-sed '/Package:.*globalmenu/,/^$/d' -i debian/control.in
+-
+-# Don't recommend ubufox
+-sed 's/xul-ext-ubufox//' -i debian/control.in
+-
+-# Provide iceweasel, firefox
+-sed 's/iceweasel,/iceweasel, firefox,/' -i debian/control.in
+-
+-# Locale packages should provide firefox-locale-$LANG
+-sed "s/Provides.*/Provides: firefox-locale-@LANGCODE@, abrowser-locale-@LANGCODE@/" -i debian/control.langpacks
+-
+-# icecat-dev should provide firefox-dev
+-sed '/Package: @MOZ_PKG_NAME@-dev/ s/$/\nProvides: firefox-dev/' debian/control.in -i
+-# icacat should provide and replace abrowser and firefox
+-sed '/Package: @MOZ_PKG_NAME@$/,/Description:/ s/Provides:/Provides:firefox, abrowser, /' debian/control.in -i
+-sed '/Package: @MOZ_PKG_NAME@$/,/Description:/ s/Replaces:/Replaces:firefox, abrowser, /' debian/control.in -i
+-
+-sed '/Vcs-Bzr/d; s/from Mozilla/from GNU/' debian/control.in -i
+-
+-sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i debian/control.in
+-rm debian/control
+-debian/rules debian/control
+-touch -d "yesterday" debian/control
+-debian/rules debian/control
+-
+-echo | dch -b -D stable -v "$ICECATVERSION"  "Converted into IceCat (http://www.gnu.org/software/gnuzilla/)"
+-sed "1s/firefox/icecat/" -i debian/changelog
++#cat << EOF >> debian/abrowser.postinst.in
++#
++#if [ "\$1" = "configure" ] || [ "\$1" = "abort-upgrade" ] ; then
++#
++#[ -f /usr/bin/mozilla ] || ln -s /usr/bin/icecat /usr/bin/mozilla && true
++#
++#for USER in \$(grep -v /bin/false /etc/passwd|grep :/home|cut -d: -f1)
++#do
++#    [ -d /home/\$USER/.mozilla/ ] || continue
++#    [ -d /home/\$USER/.mozilla/icecat ] && continue
++#    [ -d /home/\$USER/.mozilla/firefox ] && DIR=/home/\$USER/.mozilla/firefox
++#    [ -d /home/\$USER/.mozilla/abrowser ] && DIR=/home/\$USER/.mozilla/abrowser
++#    [ \$DIR ] || continue
++#    echo Copying \$DIR into /home/\$USER/.mozilla/icecat
++#    cp -a \$DIR /home/\$USER/.mozilla/icecat
++#done
++#fi
++#EOF
++#
++#cat << EOF >> debian/icecat.preinst.in
++#
++#EOF
++#
++#cat << EOF >> debian/icecat.postrm.in
++#
++#[ -L /usr/bin/mozilla ] && rm /usr/bin/mozilla -f || true
++#EOF
++#
++#echo "This package generated from Mozilla Firefox by $DEBFULLNAME <$DEBEMAIL> on
++#$(date)
++#More info at http://www.gnu.org/software/gnuzilla/
++#
++#===
++#
++#$(cat debian/copyright)" > debian/copyright
++#
++## Remove icecat-globalmenu package
++#sed '/Package:.*globalmenu/,/^$/d' -i debian/control.in
++#
++## Don't recommend ubufox
++#sed 's/xul-ext-ubufox//' -i debian/control.in
++#
++## Provide iceweasel, firefox
++#sed 's/iceweasel,/iceweasel, firefox,/' -i debian/control.in
++#
++## Locale packages should provide firefox-locale-$LANG
++#sed "s/Provides.*/Provides: firefox-locale-@LANGCODE@, abrowser-locale-@LANGCODE@/" -i debian/control.langpacks
++#
++## icecat-dev should provide firefox-dev
++#sed '/Package: @MOZ_PKG_NAME@-dev/ s/$/\nProvides: firefox-dev/' debian/control.in -i
++## icacat should provide and replace abrowser and firefox
++#sed '/Package: @MOZ_PKG_NAME@$/,/Description:/ s/Provides:/Provides:firefox, abrowser, /' debian/control.in -i
++#sed '/Package: @MOZ_PKG_NAME@$/,/Description:/ s/Replaces:/Replaces:firefox, abrowser, /' debian/control.in -i
++#
++#sed '/Vcs-Bzr/d; s/from Mozilla/from GNU/' debian/control.in -i
++#
++#sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i debian/control.in
++#rm debian/control
++#debian/rules debian/control
++#touch -d "yesterday" debian/control
++#debian/rules debian/control
++#
++#echo | dch -b -D stable -v "$ICECATVERSION"  "Converted into IceCat (http://www.gnu.org/software/gnuzilla/)"
++#sed "1s/firefox/icecat/" -i debian/changelog
+ 
+ touch configure js/src/configure
+ 
+@@ -734,6 +734,6 @@
+ /bin/sed 's/chmod a+w/chmod u+w/' -i ./js/src/ctypes/libffi/Makefile.in ./toolkit/crashreporter/google-breakpad/Makefile.in ./toolkit/crashreporter/google-breakpad/src/third_party/glog/Makefile.in || true
+ 
+ 
+-cd ..
+-echo Packaging tarball
+-tar cfj icecat-$ICECATVERSION.tar.bz2 $SOURCEDIR
++#cd ..
++#echo Packaging tarball
++#tar cfj icecat-$ICECATVERSION.tar.bz2 $SOURCEDIR
diff --git a/rust_133-part0.patch b/rust_133-part0.patch
new file mode 100644
index 000000000000..139e11c91b4e
--- /dev/null
+++ b/rust_133-part0.patch
@@ -0,0 +1,15 @@
+--- a/toolkit/moz.configure	2019-03-13 22:33:54.000000000 +0100
++++ b/toolkit/moz.configure	2019-03-19 10:18:15.769460797 +0100
+@@ -856,9 +856,9 @@
+     # x86 and x86_64. It's meant to work on 32-bit ARM, too,
+     # but currently does not.
+     if target.cpu in ('aarch64', 'x86', 'x86_64') and value:
+-        if rustc_info and rustc_info.version >= Version('1.33.0'):
+-            die('--enable-rust-simd does not work with Rust 1.33 or later. '
+-                'See https://bugzilla.mozilla.org/show_bug.cgi?id=1521249 .')
++        #if rustc_info and rustc_info.version >= Version('1.33.0'):
++        #    die('--enable-rust-simd does not work with Rust 1.33 or later. '
++        #        'See https://bugzilla.mozilla.org/show_bug.cgi?id=1521249 .')
+         return True
+ 
+ set_config('MOZ_RUST_SIMD', rust_simd)