From 5d1f5bda1f9888a87a17ffb27c04d09a4e3faf98 Mon Sep 17 00:00:00 2001
From: Kelson <kelson@kiwix.org>
Date: Sat, 18 Apr 2020 19:03:34 +0200
Subject: [PATCH 1/2] Update to Mustache v4.1

---
 kiwixbuild/dependencies/mustache.py | 6 +++---
 kiwixbuild/versions.py              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kiwixbuild/dependencies/mustache.py b/kiwixbuild/dependencies/mustache.py
index 820e901..b8d2cd8 100644
--- a/kiwixbuild/dependencies/mustache.py
+++ b/kiwixbuild/dependencies/mustache.py
@@ -10,9 +10,9 @@ class Mustache(Dependency):
     name = "mustache"
 
     class Source(ReleaseDownload):
-        archive = Remotefile('Mustache-3.2.1.tar.gz',
-                             '0d17298a81c08f12ebc446cdee387268a395d34bb724050fe67d5ce8c4e98b7a',
-                             'https://github.com/kainjow/Mustache/archive/v3.2.1.tar.gz')
+        archive = Remotefile('Mustache-4.1.tar.gz',
+                             'acd66359feb4318b421f9574cfc5a511133a77d916d0b13c7caa3783c0bfe167',
+                             'https://github.com/kainjow/Mustache/archive/v4.1.tar.gz')
         patches = ['mustache_virtual_destructor.patch']
 
     class Builder(BaseBuilder):
diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index 72ff40a..7b62cce 100644
--- a/kiwixbuild/versions.py
+++ b/kiwixbuild/versions.py
@@ -42,7 +42,7 @@ release_versions = {
 
 # This is the "version" of the whole base_deps_versions dict.
 # Change this when you change base_deps_versions.
-base_deps_meta_version = '65'
+base_deps_meta_version = '66'
 
 base_deps_versions = {
   'zlib' : '1.2.8',
@@ -50,7 +50,7 @@ base_deps_versions = {
   'zstd' : '1.4.4',
   'uuid' : '1.43.4',
   'xapian-core' : '1.4.14',
-  'mustache' : '3.2',
+  'mustache' : '4.1',
   'pugixml' : '1.2',
   'libmicrohttpd' : '0.9.63',
   'gumbo' : '0.10.1',

From 7f6a8856b7ab4f1f668aefd57fbbd68b9d5eaf7c Mon Sep 17 00:00:00 2001
From: Kelson <kelson@kiwix.org>
Date: Mon, 20 Apr 2020 11:41:54 +0200
Subject: [PATCH 2/2] Remove deprecated Mustache patch

---
 kiwixbuild/dependencies/mustache.py                  |  1 -
 kiwixbuild/patches/mustache_virtual_destructor.patch | 11 -----------
 2 files changed, 12 deletions(-)
 delete mode 100644 kiwixbuild/patches/mustache_virtual_destructor.patch

diff --git a/kiwixbuild/dependencies/mustache.py b/kiwixbuild/dependencies/mustache.py
index b8d2cd8..2c07cdf 100644
--- a/kiwixbuild/dependencies/mustache.py
+++ b/kiwixbuild/dependencies/mustache.py
@@ -13,7 +13,6 @@ class Mustache(Dependency):
         archive = Remotefile('Mustache-4.1.tar.gz',
                              'acd66359feb4318b421f9574cfc5a511133a77d916d0b13c7caa3783c0bfe167',
                              'https://github.com/kainjow/Mustache/archive/v4.1.tar.gz')
-        patches = ['mustache_virtual_destructor.patch']
 
     class Builder(BaseBuilder):
         def build(self):
diff --git a/kiwixbuild/patches/mustache_virtual_destructor.patch b/kiwixbuild/patches/mustache_virtual_destructor.patch
deleted file mode 100644
index 4739005..0000000
--- a/kiwixbuild/patches/mustache_virtual_destructor.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u mustache/mustache.hpp mustache.patched/mustache.hpp
---- mustache/mustache.hpp	2018-07-23 05:13:12.000000000 +0200
-+++ mustache.patched/mustache.hpp	2019-01-07 18:08:24.601917507 +0100
-@@ -423,6 +423,7 @@
- template <typename string_type>
- class basic_context {
- public:
-+    virtual ~basic_context() = default;
-     virtual void push(const basic_data<string_type>* data) = 0;
-     virtual void pop() = 0;
-