iceweasel-1:38.0.1.deb5-2: drm feature disabled in vendor.js; new logo added

4 files changed, 45 insertions, 15 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 4685e76d6..0ad2695a1 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 pkgname=iceweasel
 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)
@@ -48,6 +48,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         mozconfig
         libre.patch
         gnu_headshadow.png
+        drm-free.png
         $pkgname.desktop
         $pkgname-install-dir.patch
         vendor.js
@@ -55,11 +56,12 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
 sha256sums=('a0011a4e9078cc2e50a48f76fef3506360d3ab32507b0eef47404dc6d3bd022c'
             '9c08a16c2da8070eef76db0789cf893c30365a25d4c92f7f2ac3b912f886d4bb'
             'aa354e7d4ebe6bc7618dd4bee86c17a55911df27684a7e47b2f4189bb1fc5832'
-            '659d7740dd7ace5cc4b806a414245e52322492f0b19b45084b2957839c677255'
+            '6b02da204b03eec5cbec9d18d0822b4f0869be4415af5a8b9baf37ecafc270b6'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
+            '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
             '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3'
             '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
-            'bc9f421975efd04e437849bda7f78529835647419fdd847f109ac0a775abb5c0'
+            '9aa77d5ff08385a2a4d6cb354380aa055c8709829030f326cdcbc64acdfadb64'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 
 prepare() {
@@ -77,8 +79,8 @@ prepare() {
 
   quilt push -av
 
-  # Put gnu_headshadow.png on the source code
-  install -m644 "$srcdir/gnu_headshadow.png" \
+  # Put gnu_headshadow.png and drm-free.png in the source code
+  install -m644 "$srcdir/"{gnu_headshadow,drm-free}.png \
     browser/base/content/abouthome
 
   # Install to /usr/lib/$pkgname
diff --git a/libre/iceweasel/drm-free.png b/libre/iceweasel/drm-free.png
new file mode 100644
index 000000000..e30994e67
--- /dev/null
+++ b/libre/iceweasel/drm-free.png
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index dea9cc18e..c21f4b57c 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -15,7 +15,7 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
  pref("browser.chrome.site_icons", true);
 diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
 --- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2015-01-09 02:38:12.000000000 -0200
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.css	2015-01-16 15:03:01.408257268 -0200
++++ mozilla-release/browser/base/content/abouthome/aboutHome.css	2015-06-26 18:10:33.415681146 -0300
 @@ -49,11 +49,6 @@
    background-repeat: no-repeat;
  }
@@ -87,7 +87,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  #launcher {
    display: -moz-box;
    -moz-box-align: center;
-@@ -365,26 +317,25 @@
+@@ -365,26 +317,46 @@
    width: 32px;
  }
  
@@ -117,10 +117,31 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
 -  height: 19px;
 +  width: 200px;
 +  height: 110px;
++}
++
++#aboutDRMfree {
++  display: block;
++  -moz-box-ordinal-group: 0;
++  opacity: .5;
++  transition: opacity 150ms;
++}
++
++#aboutDRMfree:hover {
++  opacity: 1;
++}
++
++#aboutDRMfree::before {
++  content: url("chrome://browser/content/abouthome/drm-free.png");
++  display: block;
++  position: absolute;
++  top: 12px;
++  left: 12px;
++  width: 120px;
++  height: 120px;
  }
  
  /* [HiDPI]
-@@ -400,26 +351,6 @@
+@@ -400,26 +372,6 @@
      background-image: url("chrome://browser/skin/magnifier@2x.png");
    }
  
@@ -147,7 +168,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
    .launchButton:-moz-dir(rtl)::before,
    #aboutMozilla:-moz-dir(rtl)::before {
      transform: scale(.5) translateX(32px);
-@@ -465,9 +396,5 @@
+@@ -465,9 +417,5 @@
      transform: scale(-0.5, 0.5) translateX(24px);
      transform-origin: top center;
    }
@@ -625,7 +646,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
      document.body.setAttribute("narrow", "true");
 diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml
 --- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml	2015-01-09 02:38:12.000000000 -0200
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml	2015-01-16 15:03:01.408257268 -0200
++++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml	2015-06-26 18:04:38.166559250 -0300
 @@ -48,15 +48,6 @@
            <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
          </form>
@@ -642,27 +663,29 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mo
      </div>
      <div class="spacer"/>
  
-@@ -76,6 +67,6 @@
+@@ -76,6 +67,7 @@
        <button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>
      </div>
  
 -    <a id="aboutMozilla" href="https://www.mozilla.org/about/?utm_source=about-home&amp;utm_medium=Referral"/>
-+    <a id="aboutGNU" href="http://gnu.org"></a>
++    <a id="aboutGNU" href="https://www.gnu.org"></a>
++    <a id="aboutDRMfree" href="https://defectivebydesign.org/drm-free"></a>
    </body>
  </html>
 diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/jar.mn
 --- mozilla-release.orig/browser/base/jar.mn	2015-01-09 02:38:12.000000000 -0200
-+++ mozilla-release/browser/base/jar.mn	2015-01-16 15:03:01.408257268 -0200
-@@ -32,7 +32,7 @@
++++ mozilla-release/browser/base/jar.mn	2015-06-27 05:45:29.662372681 -0300
+@@ -32,7 +32,8 @@
          content/browser/abouthome/settings.png        (content/abouthome/settings.png)
          content/browser/abouthome/restore.png         (content/abouthome/restore.png)
          content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
 -        content/browser/abouthome/mozilla.png         (content/abouthome/mozilla.png)
 +        content/browser/abouthome/gnu_headshadow.png  (content/abouthome/gnu_headshadow.png)
++        content/browser/abouthome/drm-free.png        (content/abouthome/drm-free.png)
          content/browser/abouthome/snippet1@2x.png      (content/abouthome/snippet1@2x.png)
          content/browser/abouthome/snippet2@2x.png      (content/abouthome/snippet2@2x.png)
          content/browser/abouthome/downloads@2x.png     (content/abouthome/downloads@2x.png)
-@@ -44,7 +44,6 @@
+@@ -44,7 +45,6 @@
          content/browser/abouthome/settings@2x.png      (content/abouthome/settings@2x.png)
          content/browser/abouthome/restore@2x.png       (content/abouthome/restore@2x.png)
          content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js
index c4f729b34..adf633ac2 100644
--- a/libre/iceweasel/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -66,3 +66,8 @@ pref("loop.throttled2", false);
 
 // Make sure that the request URL of the Discover Apps is empty
 pref("browser.apps.URL", "");
+
+// Disable Freedom Violating DRM Feature
+pref("browser.eme.ui.enabled", false);
+pref("media.eme.enabled", false);
+pref("media.eme.apiVisible", false);