From c03f1ed9fb1895aa2876d4ba473fc8049f17d0dc Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Feb 2018 07:40:21 +0800
Subject: zeal: 0.5.0 -> 0.6.0

---
 pkgs/data/documentation/zeal/default.nix      |  4 ++--
 pkgs/data/documentation/zeal/remove_ads.patch | 32 ++++++++++++++++-----------
 2 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'pkgs/data/documentation/zeal')

diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 68a1fb92cc86..e9225900cb7b 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "zeal-${version}";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner  = "zealdocs";
     repo   = "zeal";
     rev    = "v${version}";
-    sha256 = "14gm9n2zmqgig4nz5i3089dhn0a7c175g1szr0zg9yzr9j2hk0mr";
+    sha256 = "0zsrb89jz04b8in1d69p7mg001yayyljc47vdlvm48cjbhvxwj0k";
   };
 
   # while ads can be disabled from the user settings, by default they are not so
diff --git a/pkgs/data/documentation/zeal/remove_ads.patch b/pkgs/data/documentation/zeal/remove_ads.patch
index 1c0b3c081f16..be0cab305eb5 100644
--- a/pkgs/data/documentation/zeal/remove_ads.patch
+++ b/pkgs/data/documentation/zeal/remove_ads.patch
@@ -1,17 +1,23 @@
+commit 1b61397175b6e60f23224db463301c9057830859
+Author: Peter Hoeg <peter@hoeg.com>
+Date:   Mon Feb 19 07:38:03 2018 +0800
+
+    strip container with ads
+
 diff --git a/src/app/resources/browser/welcome.html b/src/app/resources/browser/welcome.html
-index 22e6278..ec09771 100644
+index bb3f511..67382b2 100644
 --- a/src/app/resources/browser/welcome.html
 +++ b/src/app/resources/browser/welcome.html
-@@ -35,12 +35,6 @@
-     <div class="hero-foot">
-       <div class="container">
-         <div class="content has-text-centered">
--          <div id="carboncontainer">
--            <div id="carbon" class="box">
--              <script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=zealdocsforwindowsorg"
--                onerror="document.getElementById('carboncontainer').style.display = 'none';" id="_carbonads_js"></script>
+@@ -20,12 +20,6 @@
+               <span id="version" class="has-text-weight-light is-size-5"></span>
+             </p>
+             <p class="subtitle">Docs for everyone</p>
+-            <div id="carboncontainer" style="margin-top: 75px;">
+-              <div id="carbon" class="box">
+-                <script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=zealdocsforwindowsorg"
+-                  onerror="document.getElementById('carboncontainer').style.display = 'none';" id="_carbonads_js"></script>
+-              </div>
 -            </div>
--          </div>
-           <p>
-             <a class="icon" href="https://github.com/zealdocs/zeal">
-               <i class="fa fa-github"></i>
+           </div>
+           <div class="column">
+             <p class="subtitle is-5">Customize</p>
-- 
cgit 1.4.1