From 0e6fc5c4e6ceaaf1f4f60089047511b9f94386ba Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 6 Mar 2018 14:06:23 +0100
Subject: [PATCH] =?UTF-8?q?gnome3.bijiben:=203.27.1=20=E2=86=92=203.28.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desktops/gnome-3/apps/bijiben/default.nix | 58 ++++++++++---------
 .../apps/bijiben/no-update-icon-cache.patch   | 22 -------
 2 files changed, 31 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch

diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
index eaf8528b6ff..91b16bbba96 100644
--- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
@@ -1,51 +1,55 @@
-{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, glib
-, evolution-data-server, evolution, sqlite
+{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig
 , wrapGAppsHook, itstool, desktop-file-utils
-, clutter-gtk, libuuid, webkitgtk, zeitgeist
-, gnome3, librsvg, gdk_pixbuf, libxml2 }:
+, glib, gtk3, evolution-data-server
+, libuuid, webkitgtk, zeitgeist
+, gnome3, libxml2 }:
 
-stdenv.mkDerivation rec {
+let
+  version = "3.28.0";
+in stdenv.mkDerivation rec {
   name = "bijiben-${version}";
-  version = "3.27.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "7b4623467f3cb745c4b268d6fb2d9da32cbc96ffb5b1bbf2a153b692e295ac64";
-  };
-
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "bijiben"; attrPath = "gnome3.bijiben"; };
+    sha256 = "047w8kigrdmphd17dma2lldf6r60sgx3zybai9bz9yr0hm601kr6";
   };
 
   doCheck = true;
 
-  patches = [
-    ./no-update-icon-cache.patch
-  ];
-
   postPatch = ''
-    chmod +x meson_post_install.py
-    patchShebangs meson_post_install.py
+    chmod +x build-aux/meson_post_install.py
+    patchShebangs build-aux/meson_post_install.py
   '';
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
   nativeBuildInputs = [
     meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook
   ];
-  buildInputs = [ glib clutter-gtk libuuid webkitgtk gnome3.tracker
-                  gnome3.gnome-online-accounts zeitgeist
-                  gnome3.gsettings-desktop-schemas
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  evolution-data-server evolution sqlite ];
 
-  enableParallelBuilding = true;
+  buildInputs = [
+    glib gtk3 libuuid webkitgtk gnome3.tracker
+    gnome3.gnome-online-accounts zeitgeist
+    gnome3.gsettings-desktop-schemas
+    evolution-data-server
+    gnome3.defaultIconTheme
+  ];
+
+  mesonFlags = [
+    "-Dzeitgeist=true"
+    "-Dupdate_mimedb=false"
+  ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "bijiben";
+      attrPath = "gnome3.bijiben";
+    };
+  };
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Bijiben;
     description = "Note editor designed to remain simple to use";
-    maintainers = gnome3.maintainers;
+    homepage = https://wiki.gnome.org/Apps/Bijiben;
     license = licenses.gpl3;
+    maintainers = gnome3.maintainers;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch b/pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch
deleted file mode 100644
index c8b0043fb45..00000000000
--- a/pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/meson_post_install.py
-+++ b/meson_post_install.py
-@@ -7,10 +7,6 @@
- if not os.environ.get('DESTDIR'):
-   datadir = sys.argv[1]
- 
--  icondir = os.path.join(datadir, 'icons', 'hicolor')
--  print('Update icon cache...')
--  subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir])
--
-   schemadir = os.path.join(datadir, 'glib-2.0', 'schemas')
-   print('Compile gsettings schemas...')
-   subprocess.call(['glib-compile-schemas', schemadir])
-@@ -18,8 +14,3 @@
-   desktop_file = os.path.join(datadir, 'applications', 'org.gnome.bijiben.desktop')
-   print('Validate desktop file...')
-   subprocess.call(['desktop-file-validate', desktop_file])
--
--  if sys.argv[2] == 'update-mimedb':
--    mimedir = os.path.join(datadir, 'mime')
--    print('Update mime database...')
--    subprocess.call(['update-mime-database', mimedir])