From 261b392c59580d2e284f2facdc8704701e36a08d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Thu, 19 Dec 2013 07:45:28 -0200
Subject: iceweasel-libre: fix bugs from libre.patch, revert changes on
 mozconfig

---
 libre/iceweasel-libre/PKGBUILD    |  4 ++--
 libre/iceweasel-libre/libre.patch | 28 ++++++++++++++++++++++++----
 libre/iceweasel-libre/mozconfig   |  1 -
 3 files changed, 26 insertions(+), 7 deletions(-)

(limited to 'libre')

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 19a70e47b..69abce460 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -61,9 +61,9 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         Fixup-Reset-Firefox-after-bad-merge.patch)
 md5sums=('219cf21e0642e8a364365286f23d0624'
          '2001d0477bcefd0eeaab584402133691'
-         '8fffd40ef3457e74ba2a51a3cdb35c82'
+         '023120a970670dc85cea19393f0b94b6'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
-         'aeb2feb0955248e087f2b0cdd73e3e4c'
+         '74b5e9d9d16cfe9dc7d08fabf1f52c7c'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          '6620e724ec9a1be74e65089d81d802f7'
          '816013881cfc9a1f4f0ede72b014f8b3'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 744ecaef3..a4eb23831 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -114,7 +114,7 @@ index c270318..8a647c7 100644
    #aboutMozilla::before {
      transform: scale(.5);
 diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
-index 432fcdc..bd1692a 100644
+index 432fcdc..0d81017 100644
 --- a/browser/base/content/abouthome/aboutHome.js
 +++ b/browser/base/content/abouthome/aboutHome.js
 @@ -3,152 +3,44 @@
@@ -312,7 +312,18 @@ index 432fcdc..bd1692a 100644
          gInitialized = true;
        }
        return;
-@@ -181,117 +72,6 @@ window.addEventListener("pagehide", function() {
+@@ -170,10 +61,6 @@ window.addEventListener("pageshow", function () {
+   window.gObserver.observe(document.documentElement, { attributes: true });
+   fitToWidth();
+   window.addEventListener("resize", fitToWidth);
+-
+-  // Ask chrome to update snippets.
+-  var event = new CustomEvent("AboutHomeLoad", {bubbles:true});
+-  document.dispatchEvent(event);
+ });
+ 
+ window.addEventListener("pagehide", function() {
+@@ -181,117 +68,6 @@ window.addEventListener("pagehide", function() {
    window.removeEventListener("resize", fitToWidth);
  });
  
@@ -430,10 +441,19 @@ index 432fcdc..bd1692a 100644
  function onSearchSubmit(aEvent)
  {
    let searchTerms = document.getElementById("searchText").value;
-@@ -350,147 +130,6 @@ function loadSucceeded()
-   document.dispatchEvent(event);
+@@ -341,156 +117,6 @@ function setupSearchEngine()
+ 
  }
  
+-/**
+- * Inform the test harness that we're done loading the page.
+- */
+-function loadSucceeded()
+-{
+-  var event = new CustomEvent("AboutHomeLoadSnippetsSucceeded", {bubbles:true});
+-  document.dispatchEvent(event);
+-}
+-
 -/**
 - * Update the local snippets from the remote storage, then show them through
 - * showSnippets.
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index 952f16ce8..957ea0dbf 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -30,7 +30,6 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-installer
 ac_add_options --disable-debug-symbols
-ac_add_options --enable-release
 
 # Parabola features
 ac_add_options --disable-safe-browsing
-- 
cgit v1.2.3-2-g168b