From 09d521943434c41731efd440e4fa9c3c4c1449c1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 1 Jan 2022 10:00:22 +0800
Subject: [PATCH] notejot: 3.2.0 -> 3.3.3 (tagged 3.4.9)

---
 pkgs/applications/misc/notejot/default.nix    | 24 ++++++++++++-------
 .../notejot/use-gtk4-update-icon-cache.patch  | 20 ----------------
 2 files changed, 15 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch

diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix
index aad182bd1875..245254439355 100644
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/pkgs/applications/misc/notejot/default.nix
@@ -17,21 +17,27 @@
 
 stdenv.mkDerivation rec {
   pname = "notejot";
-  version = "3.2.0";
+  version = "3.3.3"; # make sure to recheck src.rev
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
-    rev = version;
-    hash = "sha256-WyW1tGhO3+OykNa8BRavi93cBMOSBJw0M+0bwQHJOjU=";
+    # Note from Fedora spec file:
+    # https://src.fedoraproject.org/rpms/notejot/blob/bbe621cef4d5a2c27eed029063b8e8cfd7c8d400/f/notejot.spec
+    # Upstream confusingly made several bugfix post-releases of version 3.3.3,
+    # tagged as 3.4.x, but with prominent notices like "This is still 3.3.3". We
+    # respect upstream’s wishes (and the version numbers inside the source tarball)
+    # by packaging these releases as 3.3.3 with appropriate snapshot info.
+    # https://github.com/lainsce/notejot/releases/tag/3.4.9
+    #
+    # Note that sometimes upstream don't update their version in meson.build
+    # (https://github.com/lainsce/notejot/issues/236), always follow the version
+    # from Fedora Rawhide.
+    # https://github.com/lainsce/notejot/blob/3.4.9/meson.build#L1
+    rev = "3.4.9";
+    hash = "sha256-42k9CAnXAb7Ic580SIa95MDCkCWtso1F+0eD69HX8WI=";
   };
 
-  patches = [
-    # build: use gtk4-update-icon-cache
-    # https://github.com/lainsce/notejot/pull/307
-    ./use-gtk4-update-icon-cache.patch
-  ];
-
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch b/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch
deleted file mode 100644
index 9431c43cef69..000000000000
--- a/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/build-aux/post_install.py b/build-aux/post_install.py
-index 1278304..fface6d 100644
---- a/build-aux/post_install.py
-+++ b/build-aux/post_install.py
-@@ -2,11 +2,13 @@
- import os
- import subprocess
- 
--schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas')
-+install_prefix = os.environ['MESON_INSTALL_PREFIX']
-+icondir = os.path.join(install_prefix, 'share', 'icons', 'hicolor')
-+schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas')
- 
- if not os.environ.get('DESTDIR'):
-     print('Compiling gsettings schemas…')
-     subprocess.call(['glib-compile-schemas', schemadir], shell=False)
- 
-     print('Rebuilding desktop icons cache...')
--    subprocess.call(['gtk-update-icon-cache', '/usr/share/icons/hicolor/'], shell=False)
-+    subprocess.call(['gtk4-update-icon-cache', '-qtf', icondir], shell=False)