From 76610a807f35625d7aef97d26bd5a8d2238d70c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 16 Jun 2017 04:54:16 +0200
Subject: [PATCH] icecat: update to 52.1.0

---
 srcpkgs/icecat/patches/fix-python-foo.patch | 23 ---------------------
 srcpkgs/icecat/patches/fix-tools.patch      | 22 +++-----------------
 srcpkgs/icecat/template                     | 17 +++++++--------
 3 files changed, 11 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/icecat/patches/fix-python-foo.patch

diff --git a/srcpkgs/icecat/patches/fix-python-foo.patch b/srcpkgs/icecat/patches/fix-python-foo.patch
deleted file mode 100644
index 58505775f23..00000000000
--- a/srcpkgs/icecat/patches/fix-python-foo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-reverted from https://hg.mozilla.org/mozilla-central/rev/aa63a2a40325
---- dom/bindings/GenerateCSS2PropertiesWebIDL.py.orig
-+++ dom/bindings/GenerateCSS2PropertiesWebIDL.py
-@@ -16,7 +16,7 @@
-     return "  [%s] attribute DOMString %s;\n" % (", ".join(extendedAttrs),
-                                                  propName)
- def generate(output, idlFilename, preprocessorHeader):
--    cpp = list(buildconfig.substs['CPP'])
-+    cpp = shellutil.split(buildconfig.substs['CPP'])
-     cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
-     cpp.append(preprocessorHeader)
-     preprocessed = subprocess.check_output(cpp)
---- layout/style/GenerateCSSPropsGenerated.py.orig
-+++ layout/style/GenerateCSSPropsGenerated.py
-@@ -10,7 +10,7 @@
- from mozbuild import shellutil
- 
- def get_properties(preprocessorHeader):
--    cpp = list(buildconfig.substs['CPP'])
-+    cpp = shellutil.split(buildconfig.substs['CPP'])
-     cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
-     cpp.append(preprocessorHeader)
-     preprocessed = subprocess.check_output(cpp)
diff --git a/srcpkgs/icecat/patches/fix-tools.patch b/srcpkgs/icecat/patches/fix-tools.patch
index 1f6df6d9214..e64ce3c185a 100644
--- a/srcpkgs/icecat/patches/fix-tools.patch
+++ b/srcpkgs/icecat/patches/fix-tools.patch
@@ -6,9 +6,9 @@
  
 +#include <sys/types.h>
 +
- #ifdef ANDROID
- #include <android/log.h>
- #else
+ #include <stdint.h>
+ #include <math.h>
+ #include "MainThreadUtils.h"
 --- tools/profiler/lul/LulElf.cpp
 +++ tools/profiler/lul/LulElf.cpp
 @@ -579,10 +579,10 @@
@@ -26,19 +26,3 @@
    return base;
  }
  
---- tools/profiler/core/platform-linux.cc.orig	2015-06-11 18:39:35.689739054 +0200
-+++ tools/profiler/core/platform-linux.cc	2015-06-11 18:40:04.479706749 +0200
-@@ -651,11 +651,13 @@ void OS::Startup() {
- void TickSample::PopulateContext(void* aContext)
- {
-   MOZ_ASSERT(aContext);
-+#if defined(__GLIBC__)
-   ucontext_t* pContext = reinterpret_cast<ucontext_t*>(aContext);
-   if (!getcontext(pContext)) {
-     context = pContext;
-     SetSampleContext(this, aContext);
-   }
-+#endif
- }
- 
- void OS::SleepMicro(int microseconds)
diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index 3ea76e8bf1d..ffbd62f3c57 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -1,28 +1,27 @@
 # Template build file for 'icecat'.
 pkgname=icecat
-version=52.0.2
-revision=2
+version=52.1.0
+revision=1
 short_desc="GNU version of the Firefox browser"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 homepage="https://www.gnu.org/software/${pkgname}/"
 license="MPL-1.1, GPL-2, LGPL-2.1"
 distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2"
-checksum=8901a4ab7f2b87d5516c77cbdec6d276cdde64421725d4ed613c1b4f805a4a2b
+checksum=0beff2a04fdc1b56d274133cd22ff546fd609c929954132ff6bf1b800a5b24f3
 
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 nopie=yes
 lib32disabled=yes
 
-hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm"
+hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm rust cargo"
 makedepends="
- nss-devel libjpeg-turbo-devel gtk+-devel icu-devel pixman-devel
- sqlite-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel
-  hunspell-devel libXcomposite-devel libSM-devel libXt-devel libXdamage-devel
+ nss-devel gtk+-devel sqlite-devel libevent-devel libnotify-devel
+ libvpx-devel hunspell-devel libXt-devel
  $(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel)
  $(vopt_if gtk3 gtk+3-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if startup_notification startup-notification-devel)
  $(vopt_if xscreensaver libXScrnSaver-devel)"
-depends="nss>=3.27 desktop-file-utils hicolor-icon-theme"
+depends="nss>=3.29 desktop-file-utils hicolor-icon-theme"
 
 build_options="alsa dbus gtk3 pulseaudio startup_notification xscreensaver"
 build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver"
@@ -70,7 +69,7 @@ do_build() {
 		export MOZ_BUILD_DATE=$(date --date "@$SOURCE_DATE_EPOCH" "+%Y%m%d%H%M%S")
 	fi
 
-        cat >>.mozconfig <<EOF
+	cat >>.mozconfig <<EOF
 ac_add_options --with-google-api-keyfile="${wrksrc}/google-api-key"
 ac_add_options --enable-default-toolkit=cairo-gtk$(vopt_if gtk3 '3' '2')
 ac_add_options $(vopt_enable alsa)