Merge pull request #91913 from peterhoeg/u/zeal

zeal: 0.6.1 -> 0.6.999

pkgs/data/documentation/zeal/default.nix

@@ -1,40 +1,44 @@
 { stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig
-, qtbase, qtimageformats, qtwebkit, qtx11extras, mkDerivation
+, qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation
 , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms  }:
 
 mkDerivation rec {
   pname = "zeal";
-  version = "0.6.1";
+  version = "0.6.999";
 
   src = fetchFromGitHub {
-    owner  = "zealdocs";
+    owner = "zealdocs";
-    repo   = "zeal";
+    repo = "zeal";
-    rev    = "v${version}";
+    rev = "1ce0e2e446232e7647c5588c1f603f1dd88e0f67";
-    sha256 = "05qcjpibakv4ibhxgl5ajbkby3w7bkxsv3nfv2a0kppi1z0f8n8v";
+    sha256 = "0gj5qcm7ck8m5zfmiabay2f7wbxldmrkw8m3xi7v9i8y8hx0jkxr";
   };
 
-  # while ads can be disabled from the user settings, by default they are not so
+  # we only need this if we are using a version that hasn't been released. We
-  # we patch it out completely instead
+  # could also match on the "VERSION x.y.z" bit but then it would have to be
-  patches = [ ./remove_ads.patch ];
+  # updated based on whatever is the latest release, so instead just rewrite the
+  # line.
+  postPatch = ''
+    sed -i CMakeLists.txt \
+      -e 's@^project.*@project(Zeal VERSION ${version})@'
+  '';
 
   nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
+
   buildInputs = [
-    qtbase qtimageformats qtwebkit qtx11extras
+    qtbase qtimageformats qtwebengine qtx11extras
     libarchive
     libXdmcp libpthreadstubs xcbutilkeysyms
   ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "A simple offline API documentation browser";
     longDescription = ''
       Zeal is a simple offline API documentation browser inspired by Dash (macOS
       app), available for Linux and Windows.
     '';
-    homepage    = "https://zealdocs.org/";
+    homepage = "https://zealdocs.org/";
-    license     = licenses.gpl3;
+    license = licenses.gpl3;
     maintainers = with maintainers; [ skeidel peterhoeg ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }

pkgs/data/documentation/zeal/remove_ads.patch

@@ -1,23 +0,0 @@
-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 bb3f511..67382b2 100644
---- a/src/app/resources/browser/welcome.html
-+++ b/src/app/resources/browser/welcome.html
-@@ -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>
-           <div class="column">
-             <p class="subtitle is-5">Customize</p>