icecat-38.2.0_gnu1-1: move package to [libre]

7 files changed, 101 insertions, 260 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index db70b8c2c..462ccb6b7 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -13,9 +13,9 @@
 _pgo=true
 
 pkgname=icecat
-_pkgver=31.8.0-gnu1
+_pkgver=38.2.0-gnu1
 pkgver=${_pkgver//-/_}
-pkgrel=5
+pkgrel=1
 
 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64)
@@ -32,32 +32,28 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'gst-libav: h.264 video')
 url="http://www.gnu.org/software/gnuzilla/"
 install=$pkgname.install
-source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig}
+#source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig}
+source=(http://jenkins.trisquel.info/$pkgname/$pkgname-$_pkgver.tar.bz2
         mozconfig
-        mozconfig.pgo
         libre.patch
         gnu_headshadow.png
         $pkgname.desktop
         $pkgname-install-dir.patch
         freetype26.patch
         vendor.js
-        rhbz-966424.patch
         $pkgname-fixed-loading-icon.png
-        fixing_nullptr_31.7.0.patch)
-sha256sums=('370087d0adadf8b1c1e6a9920e26488a8902b9dc461d305f258fddb26a129d87'
-            'SKIP'
-            '541532698e04563ac60cb4d6c75891a8eec828df8dc19e2c20c6f84e560efb56'
-            '92d7ea9feb8d2814d1abaf5cf4012983a2fb9cc56b26a5d7c7c3898aedf06fb4'
-            'df92188c828c104bd52e4eb090fbf3ffd745d890f9252edbf6be6edc6d5ba790'
+        remove-google-play-services-support.patch)
+sha256sums=('eef4addf37f6fc885f28eea936cee7258d42f0cb11d79703ec7ec1fe2b80ef8d'
+            '33a8cf07373c63a0bea70ec2c3983d2cca990752c0f946cb5dbd91f1e2b6410f'
+            'e333901df4fc8a881d08c9434e3c302885ed4a989316114e13af828417510410'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745'
             '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47'
             'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85'
             '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33'
-            'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
-            'd57d0e4d5bc66323388e8f3c9999ed443abfd304a28a1696cc6f4518ed0d0f2a')
-validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez
+            '9e651b0f7e7d9d663e8b24077d52bad15f011871747743aff60d6e2d7a45ae5b')
+#validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez
 
 prepare() {
   export GNU_BUILD="gnuzilla-release"
@@ -75,22 +71,9 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
   patch -Np1 -i "$srcdir/freetype26.patch"
 
-  # https://bugs.archlinux.org/task/41689
-  patch -Np1 -i "$srcdir/rhbz-966424.patch"
-
-  # Patch for GCC 5.1
-  patch -Np1 -i "$srcdir/fixing_nullptr_31.7.0.patch"
-
   # Patch and remove anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
-  sed -i '\|return| s|Flash|SWF Player|g;
-         ' browser/base/content/pageinfo/permissions.js \
-           browser/base/content/browser-plugins.js
-  sed -i '\|["]displayName["][:] ["]Flash["]| s|Flash|SWF Player|
-          \|["]displayName["][:] ["]Shockwave["]| s|Shockwave|DCR Player|
-          \|["]displayName["][:] ["]QuickTime["]| s|QuickTime|MOV Player|
-          \|installLinux| s|true|false|
-         ' browser/base/content/browser-plugins.js
+  patch -Np1 -i "$srcdir/remove-google-play-services-support.patch"
   rm -v browser/base/content/abouthome/snippet*.png || true
   sed -i '\|abouthome/snippet|d
          ' browser/base/jar.mn
@@ -111,19 +94,6 @@ prepare() {
   # Load our build config, disable SafeSearch
   cp "$srcdir/mozconfig" .mozconfig
 
-  if $_pgo; then
-    cat "$srcdir/mozconfig.pgo" >> .mozconfig
-  fi
-
-  # Fixing for libvpx >= 1.4.0
-  sed -i 's|IMG_FMT_I420|VPX_IMG_FMT_I420|;
-          s|PLANE_U|VPX_PLANE_U|;
-          s|PLANE_V|VPX_PLANE_V|;
-          s|PLANE_Y|VPX_PLANE_Y|;
-          s|VPX_VPX_PLANE_|VPX_PLANE_|;
-         ' content/media/encoder/VP8TrackEncoder.cpp \
-           media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
-
   mkdir "$srcdir/path"
 
   # WebRTC build tries to execute "python" and expects Python 2
@@ -133,15 +103,10 @@ prepare() {
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
 
-  # Fix tab loading icon (flickers with libpng 1.6)
+  # Fix tab loading icon (doesn't work with libpng 1.6)
   # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
-  # TODO: Remove this; IceCat 36 might use CSS animations for the loading icon
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=759252
   cp "$srcdir/$pkgname-fixed-loading-icon.png" \
     browser/themes/linux/tabbrowser/loading.png
-
-  # Remove non-existent file on Makefile.in
-  sed -i '\|build/pgo/blueprint/valid.png|d' build/Makefile.in
 }
 
 build() {
@@ -150,7 +115,6 @@ build() {
   cd "$srcdir/$GNU_BUILD"
 
   export PATH="$srcdir/path:$PATH"
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
   export PYTHON="/usr/bin/python2"
 
   if $_pgo; then
diff --git a/libre/icecat/fixing_nullptr_31.7.0.patch b/libre/icecat/fixing_nullptr_31.7.0.patch
deleted file mode 100644
index ecfca4138..000000000
--- a/libre/icecat/fixing_nullptr_31.7.0.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- a/js/src/builtin/TypedObject.cpp    2015-06-03 22:48:47.000000000 +0200
-+++ b/js/src/builtin/TypedObject.cpp    2015-06-08 16:45:30.918154529 +0200
-@@ -710,12 +710,12 @@
-     contents.append(")");
-     RootedAtom stringRepr(cx, contents.finishAtom());
-     if (!stringRepr)
--        return nullptr;
-+        return false;
- 
-     // Extract ArrayType.prototype
-     RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal));
-     if (!arrayTypePrototype)
--        return nullptr;
-+        return false;
- 
-     // Create the instance of ArrayType
-     Rooted<UnsizedArrayTypeDescr*> obj(cx);
-@@ -728,7 +728,7 @@
-     if (!JSObject::defineProperty(cx, obj, cx->names().length,
-                                   UndefinedHandleValue, nullptr, nullptr,
-                                   JSPROP_READONLY | JSPROP_PERMANENT))
--        return nullptr;
-+        return false;
- 
-     args.rval().setObject(*obj);
-     return true;
-@@ -762,7 +762,7 @@
-     if (!size.isValid()) {
-         JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
-                              JSMSG_TYPEDOBJECT_TOO_BIG);
--        return nullptr;
-+        return false;
-     }
- 
-     // Construct a canonical string `new ArrayType(<elementType>).dimension(N)`:
-@@ -775,7 +775,7 @@
-     contents.append(")");
-     RootedAtom stringRepr(cx, contents.finishAtom());
-     if (!stringRepr)
--        return nullptr;
-+        return false;
- 
-     // Create the sized type object.
-     Rooted<SizedArrayTypeDescr*> obj(cx);
-@@ -793,7 +793,7 @@
-     if (!JSObject::defineProperty(cx, obj, cx->names().length,
-                                   lengthVal, nullptr, nullptr,
-                                   JSPROP_READONLY | JSPROP_PERMANENT))
--        return nullptr;
-+        return false;
- 
-     // Add `unsized` property, which is a link from the sized
-     // array to the unsized array.
-@@ -801,7 +801,7 @@
-     if (!JSObject::defineProperty(cx, obj, cx->names().unsized,
-                                   unsizedTypeDescrValue, nullptr, nullptr,
-                                   JSPROP_READONLY | JSPROP_PERMANENT))
--        return nullptr;
-+        return false;
- 
-     args.rval().setObject(*obj);
-     return true;
-@@ -1253,7 +1253,7 @@
-     Rooted<TypedProto*> proto(cx);
-     proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, TenuredObject);
-     if (!proto)
--        return nullptr;
-+        return false;
-     proto->initTypeDescrSlot(*descr);
-     descr->initReservedSlot(JS_DESCR_SLOT_TYPROTO, ObjectValue(*proto));
- 
-@@ -1358,14 +1358,14 @@
- #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_)                       \
-     if (!DefineSimpleTypeDescr<ScalarTypeDescr>(cx, global, module, constant_,      \
-                                             cx->names().name_))                 \
--        return nullptr;
-+        return false;
-     JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE)
- #undef BINARYDATA_SCALAR_DEFINE
- 
- #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_)                    \
-     if (!DefineSimpleTypeDescr<ReferenceTypeDescr>(cx, global, module, constant_,   \
-                                                cx->names().name_))              \
--        return nullptr;
-+        return false;
-     JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE)
- #undef BINARYDATA_REFERENCE_DEFINE
- 
-@@ -1375,14 +1375,14 @@
-     arrayType = DefineMetaTypeDescr<ArrayMetaTypeDescr>(
-         cx, global, module, TypedObjectModuleObject::ArrayTypePrototype);
-     if (!arrayType)
--        return nullptr;
-+        return false;
- 
-     RootedValue arrayTypeValue(cx, ObjectValue(*arrayType));
-     if (!JSObject::defineProperty(cx, module, cx->names().ArrayType,
-                                   arrayTypeValue,
-                                   nullptr, nullptr,
-                                   JSPROP_READONLY | JSPROP_PERMANENT))
--        return nullptr;
-+        return false;
- 
-     // StructType.
- 
-@@ -1390,14 +1390,14 @@
-     structType = DefineMetaTypeDescr<StructMetaTypeDescr>(
-         cx, global, module, TypedObjectModuleObject::StructTypePrototype);
-     if (!structType)
--        return nullptr;
-+        return false;
- 
-     RootedValue structTypeValue(cx, ObjectValue(*structType));
-     if (!JSObject::defineProperty(cx, module, cx->names().StructType,
-                                   structTypeValue,
-                                   nullptr, nullptr,
-                                   JSPROP_READONLY | JSPROP_PERMANENT))
--        return nullptr;
-+        return false;
- 
-     // Everything is setup, install module on the global object:
-     RootedValue moduleValue(cx, ObjectValue(*module));
-@@ -1407,7 +1407,7 @@
-                                   nullptr, nullptr,
-                                   0))
-     {
--        return nullptr;
-+        return false;
-     }
- 
-     return module;
-@@ -2466,7 +2466,7 @@
-         if (length < 0) {
-             JS_ReportErrorNumber(cx, js_GetErrorMessage,
-                                  nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS);
--            return nullptr;
-+            return false;
-         }
-         Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length));
-         if (!obj)
-
---- a/js/src/frontend/BytecodeCompiler.cpp	2015-06-03 22:48:48.000000000 +0200
-+++ b/js/src/frontend/BytecodeCompiler.cpp	2015-06-08 01:15:08.080302638 +0200
-@@ -544,7 +544,7 @@
- 
-     RootedScriptSource sourceObject(cx, CreateScriptSourceObject(cx, options));
-     if (!sourceObject)
--        return nullptr;
-+        return false;
-     ScriptSource* ss = sourceObject->source();
- 
-     SourceCompressionTask sct(cx);
---- a/js/xpconnect/wrappers/XrayWrapper.cpp	2015-06-03 22:48:45.000000000 +0200
-+++ b/js/xpconnect/wrappers/XrayWrapper.cpp	2015-06-08 01:15:35.672193557 +0200
-@@ -351,7 +351,7 @@
-         {
-             JSAutoCompartment ac(cx, target);
-             if (!JS_GetClassPrototype(cx, key, protop))
--                return nullptr;
-+                return false;
-         }
-         return JS_WrapObject(cx, protop);
-     }
---- a/netwerk/ipc/NeckoParent.cpp	2015-06-03 22:46:41.000000000 +0200
-+++ b/netwerk/ipc/NeckoParent.cpp	2015-06-08 01:16:10.200055747 +0200
-@@ -359,7 +359,7 @@
-   RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor);
-   return p->Init(aConnectArgs);
- #else
--  return nullptr;
-+  return false;
- #endif
- }
- 
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 8138985ad..ee88c6d56 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,19 +1,19 @@
 diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js
---- a/browser/app/profile/icecat.js	2015-07-13 19:14:27.000000000 -0300
-+++ b/browser/app/profile/icecat.js	2015-08-18 02:36:42.167590967 -0300
-@@ -281,11 +281,6 @@
- pref("browser.slowStartup.timeThreshold", 50000);
+--- a/browser/app/profile/icecat.js	2015-08-23 17:05:03.000000000 -0300
++++ b/browser/app/profile/icecat.js	2015-08-25 04:49:18.450526750 -0300
+@@ -279,11 +279,6 @@
+ pref("browser.slowStartup.timeThreshold", 40000);
  pref("browser.slowStartup.maxSamples", 5);
  
 -// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
 -// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
 -// repackager of this code using an alternate snippet url, please keep your users safe
--pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
+-pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
 -
  pref("browser.enable_automatic_image_resizing", true);
+ pref("browser.casting.enabled", false);
  pref("browser.chrome.site_icons", true);
- pref("browser.chrome.favicons", true);
-@@ -1746,11 +1741,6 @@
+@@ -2080,12 +2075,6 @@
  pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%");
  pref("pfs.filehint.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%");
  
@@ -21,6 +21,7 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js
 -pref("keyword.URL", "https://duckduckgo.com/html?t=gnu&q=!+");
 -pref("browser.search.defaultenginename", "DuckDuckGo");
 -pref("browser.search.order.extra.duckduckgo", "DuckDuckGo");
+-pref("browser.search.showOneOffButtons", false);
 -
  // https://directory.fsf.org/wiki/Disable_DHE
  pref("security.ssl3.dhe_rsa_aes_128_sha", false);
@@ -690,8 +691,8 @@ diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn
          content/browser/abouthome/snippet2@2x.png      (content/abouthome/snippet2@2x.png)
          content/browser/abouthome/downloads@2x.png     (content/abouthome/downloads@2x.png)
 diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd	2015-01-27 16:19:19.000000000 -0200
-+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd	2015-01-29 12:19:21.741429014 -0200
+--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd	2015-08-23 17:05:01.000000000 -0300
++++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd	2015-08-25 04:47:50.321608830 -0300
 @@ -13,17 +13,6 @@
  
  <!ENTITY abouthome.searchEngineButton.label "Search">
@@ -709,7 +710,7 @@ diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales
 -
  <!ENTITY abouthome.bookmarksButton.label "Bookmarks">
  <!ENTITY abouthome.historyButton.label   "History">
- <!ENTITY abouthome.settingsButton.label  "Settings">
+ <!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the
 diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
 --- a/browser/locales/en-US/chrome/browser-region/region.properties	2015-07-13 19:14:26.000000000 -0300
 +++ b/browser/locales/en-US/chrome/browser-region/region.properties	2015-08-18 02:43:13.382178053 -0300
@@ -788,8 +789,8 @@ diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/
      </DL><p>
  </DL><p>
 diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm
---- a/browser/modules/AboutHome.jsm	2014-10-09 12:53:30.000000000 -0200
-+++ b/browser/modules/AboutHome.jsm	2014-10-21 14:54:12.086062616 -0200
+--- a/browser/modules/AboutHome.jsm	2015-08-23 17:04:41.000000000 -0300
++++ b/browser/modules/AboutHome.jsm	2015-08-25 04:52:43.993422621 -0300
 @@ -8,7 +8,7 @@
  let Ci = Components.interfaces;
  let Cu = Components.utils;
@@ -799,9 +800,9 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm
  
  Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
  Components.utils.import("resource://gre/modules/Services.jsm");
-@@ -18,66 +18,6 @@
- XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
-   "resource://gre/modules/FxAccounts.jsm");
+@@ -20,68 +20,6 @@
+ XPCOMUtils.defineLazyModuleGetter(this, "Promise",
+   "resource://gre/modules/Promise.jsm");
  
 -// Url to fetch snippets, in the urlFormatter service format.
 -const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl";
@@ -810,7 +811,9 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm
 -const STARTPAGE_VERSION = 4;
 -
 -this.AboutHomeUtils = {
--  get snippetsVersion() STARTPAGE_VERSION,
+-  get snippetsVersion() {
+-    return STARTPAGE_VERSION;
+-  },
 -
 -  /*
 -   * showKnowYourRights - Determines if the user should be shown the
@@ -866,14 +869,14 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm
  /**
   * This code provides services to the about:home page. Whenever
   * about:home needs to do something chrome-privileged, it sends a
-@@ -202,18 +142,9 @@
-     ss.promiseInitialized.then(function() {
+@@ -246,18 +184,9 @@
+     }).then(function(engineName) {
        let data = {
          showRestoreLastSession: ss.canRestoreLastSession,
 -        snippetsURL: AboutHomeUtils.snippetsURL,
 -        showKnowYourRights: AboutHomeUtils.showKnowYourRights,
 -        snippetsVersion: AboutHomeUtils.snippetsVersion,
-         defaultEngineName: Services.search.defaultEngine.name
+         defaultEngineName: engineName
        };
  
 -      if (AboutHomeUtils.showKnowYourRights) {
@@ -882,6 +885,6 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm
 -        Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true);
 -      }
 -
-       if (target) {
+       if (target && target.messageManager) {
          target.messageManager.sendAsyncMessage("AboutHome:Update", data);
        } else {
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index 974fcce4d..d85989194 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -14,7 +14,7 @@ ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
 ac_add_options --with-system-png
 ac_add_options --with-system-libevent
-#ac_add_options --with-system-libvpx
+ac_add_options --with-system-libvpx
 ac_add_options --with-system-icu
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
@@ -35,3 +35,4 @@ ac_add_options --disable-debug-symbols
 # Parabola features
 ac_add_options --disable-safe-browsing
 ac_add_options --disable-url-classifier
+ac_add_options --disable-eme
diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo
deleted file mode 100644
index 71ba205a4..000000000
--- a/libre/icecat/mozconfig.pgo
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
diff --git a/libre/icecat/remove-google-play-services-support.patch b/libre/icecat/remove-google-play-services-support.patch
new file mode 100644
index 000000000..f184b15ad
--- /dev/null
+++ b/libre/icecat/remove-google-play-services-support.patch
@@ -0,0 +1,64 @@
+diff -Nur a/configure b/configure
+--- a/configure	2015-08-23 17:05:16.000000000 -0300
++++ b/configure	2015-08-25 17:13:48.155780403 -0300
+@@ -18883,46 +18883,6 @@
+ 
+ 
+ 
+-if test -n "$MOZ_NATIVE_DEVICES" ; then
+-    
+-
+-    echo $ac_n "checking for google play services""... $ac_c" 1>&6
+-echo "configure:18891: checking for google play services" >&5
+-    GOOGLE_PLAY_SERVICES_LIB="${ANDROID_SDK_ROOT}/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"
+-    GOOGLE_PLAY_SERVICES_RES="${ANDROID_SDK_ROOT}/extras/google/google_play_services/libproject/google-play-services_lib/res"
+-    
+-    
+-    if ! test -e $GOOGLE_PLAY_SERVICES_LIB ; then
+-        { echo "configure: error: You must download Google Play Services to build with native video casting support enabled.  Run the Android SDK tool and install Google Play Services under Extras.  See http://developer.android.com/google/play-services/setup.html for more info. (looked for $GOOGLE_PLAY_SERVICES_LIB) " 1>&2; echo "configure: error: You must download Google Play Services to build with native video casting support enabled.  Run the Android SDK tool and install Google Play Services under Extras.  See http://developer.android.com/google/play-services/setup.html for more info. (looked for $GOOGLE_PLAY_SERVICES_LIB) " 1>&5; exit 1; }
+-    fi
+-    echo "$ac_t""$GOOGLE_PLAY_SERVICES_LIB" 1>&6
+-
+-    ANDROID_APPCOMPAT_LIB="$ANDROID_COMPAT_DIR_BASE/v7/appcompat/libs/android-support-v7-appcompat.jar"
+-    ANDROID_APPCOMPAT_RES="$ANDROID_COMPAT_DIR_BASE/v7/appcompat/res"
+-    echo $ac_n "checking for v7 appcompat library""... $ac_c" 1>&6
+-echo "configure:18904: checking for v7 appcompat library" >&5
+-    if ! test -e $ANDROID_APPCOMPAT_LIB ; then
+-        { echo "configure: error: You must download the v7 app compat Android support library when targeting Android with native video casting support enabled.  Run the Android SDK tool and install Android Support Library under Extras.  See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_APPCOMPAT_LIB)" 1>&2; echo "configure: error: You must download the v7 app compat Android support library when targeting Android with native video casting support enabled.  Run the Android SDK tool and install Android Support Library under Extras.  See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_APPCOMPAT_LIB)" 1>&5; exit 1; }
+-    fi
+-    echo "$ac_t""$ANDROID_APPCOMPAT_LIB" 1>&6
+-    
+-    
+-
+-    ANDROID_MEDIAROUTER_LIB="$ANDROID_COMPAT_DIR_BASE/v7/mediarouter/libs/android-support-v7-mediarouter.jar"
+-    ANDROID_MEDIAROUTER_RES="$ANDROID_COMPAT_DIR_BASE/v7/mediarouter/res"
+-    echo $ac_n "checking for v7 mediarouter library""... $ac_c" 1>&6
+-echo "configure:18915: checking for v7 mediarouter library" >&5
+-    if ! test -e $ANDROID_MEDIAROUTER_LIB ; then
+-        { echo "configure: error: You must download the v7 media router Android support library when targeting Android with native video casting support enabled.  Run the Android SDK tool and install Android Support Library under Extras.  See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_MEDIAROUTER_LIB)" 1>&2; echo "configure: error: You must download the v7 media router Android support library when targeting Android with native video casting support enabled.  Run the Android SDK tool and install Android Support Library under Extras.  See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_MEDIAROUTER_LIB)" 1>&5; exit 1; }
+-    fi
+-    echo "$ac_t""$ANDROID_MEDIAROUTER_LIB" 1>&6
+-    
+-    
+-fi
+-
+-
+-
+-
+ if test "$MOZ_ENABLE_GTK" -o "$MOZ_ENABLE_QT"
+ then
+     succeeded=no
+@@ -29180,13 +29140,6 @@
+     (''' MOZ_OFFICIAL_BRANDING ''', r''' $MOZ_OFFICIAL_BRANDING ''')
+     (''' MOZ_BRANDING_DIRECTORY ''', r''' $MOZ_BRANDING_DIRECTORY ''')
+     (''' MOZ_DISTRIBUTION_ID ''', r''' $MOZ_DISTRIBUTION_ID ''')
+-    (''' MOZ_NATIVE_DEVICES ''', r''' $MOZ_NATIVE_DEVICES ''')
+-    (''' GOOGLE_PLAY_SERVICES_LIB ''', r''' $GOOGLE_PLAY_SERVICES_LIB ''')
+-    (''' GOOGLE_PLAY_SERVICES_RES ''', r''' $GOOGLE_PLAY_SERVICES_RES ''')
+-    (''' ANDROID_APPCOMPAT_LIB ''', r''' $ANDROID_APPCOMPAT_LIB ''')
+-    (''' ANDROID_APPCOMPAT_RES ''', r''' $ANDROID_APPCOMPAT_RES ''')
+-    (''' ANDROID_MEDIAROUTER_LIB ''', r''' $ANDROID_MEDIAROUTER_LIB ''')
+-    (''' ANDROID_MEDIAROUTER_RES ''', r''' $ANDROID_MEDIAROUTER_RES ''')
+     (''' _PANGOCHK_CFLAGS ''', list(r''' $_PANGOCHK_CFLAGS '''.split()))
+     (''' _PANGOCHK_LIBS ''', list(r''' $_PANGOCHK_LIBS '''.split()))
+     (''' MOZ_PANGO_CFLAGS ''', list(r''' $MOZ_PANGO_CFLAGS '''.split()))
diff --git a/libre/icecat/rhbz-966424.patch b/libre/icecat/rhbz-966424.patch
deleted file mode 100644
index 9a1c9e2b4..000000000
--- a/libre/icecat/rhbz-966424.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur mozilla-release.orig/toolkit/modules/CertUtils.jsm mozilla-release/toolkit/modules/CertUtils.jsm
---- mozilla-release.orig/toolkit/modules/CertUtils.jsm	2014-10-11 07:06:48.000000000 -0200
-+++ mozilla-release/toolkit/modules/CertUtils.jsm	2014-10-16 03:44:30.226448002 -0200
-@@ -174,7 +174,9 @@
- }
- 
- function isBuiltinToken(tokenName) {
--  return tokenName == "Builtin Object Token";
-+  return tokenName == "Builtin Object Token" ||
-+         tokenName == "Default Trust" ||
-+         tokenName == "System Trust";
- }
- 
- /**