From e584ed36b17c360000b222768adc875ac7e92741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Thu, 1 May 2014 20:02:24 -0300
Subject: iceweasel-libre-1:29.0.deb1-2: fix issue #520 =>
 https://labs.parabola.nu/issues/520

---
 libre/iceweasel-libre/PKGBUILD  | 9 +++++++--
 libre/iceweasel-libre/vendor.js | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'libre')

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 57da4aba7..020c6f9a5 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -23,7 +23,7 @@ _pkgname=iceweasel
 pkgname=iceweasel-libre
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -68,7 +68,7 @@ md5sums=('2cc40f481ca7b8421925a1def5fe14a0'
          'b03a979a78484503ba8dddad4f2c96d1'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          '1c42509891cf6843660a5f3c69896e80'
-         '816013881cfc9a1f4f0ede72b014f8b3'
+         '783a5927246f014855b96a3abb92566b'
          '6e335a517c68488941340ee1c23f97b0'
          '9d1cc7b80085a4438305e9e37d42745b'
          '8e165ef85ddd72491f0b48f8954afca6')
@@ -105,6 +105,11 @@ prepare() {
   sed -i 's|Adobe 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
   sed -i '\|URL of the GeoLocation backend|d;
           \|geo[.]wifi[.]uri|d;
          ' browser/app/profile/firefox.js \
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index 6510944a7..da8118138 100644
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -20,3 +20,6 @@ pref("dom.storage.enabled", false);
 
 // Disable missing nonfree flash notification
 pref("plugins.notifyMissingFlash", false);
+
+// Disable "alt" as a shortcut key to open full menu bar. Conflicts with "alt" as a modifier
+pref("ui.key.menuAccessKeyFocuses", false);
-- 
cgit v1.2.3-2-g168b