From 5af0a8bfe73143436ed2c802b9fefd82a62bfbf9 Mon Sep 17 00:00:00 2001
From: renaud gaudin <rgaudin@gmail.com>
Date: Tue, 11 Feb 2020 13:10:21 +0000
Subject: [PATCH 1/3] fixed crash in xapian-core configure

use a copy of configure_env to prevent edits on what's being iterated
---
 kiwixbuild/dependencies/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py
index 4278922..1d86a73 100644
--- a/kiwixbuild/dependencies/base.py
+++ b/kiwixbuild/dependencies/base.py
@@ -324,7 +324,7 @@ class MakeBuilder(Builder):
             env['CFLAGS'] = env['CFLAGS'] + ' -fPIC'
             env['CXXFLAGS'] = env['CXXFLAGS'] + ' -fPIC'
         if self.configure_env:
-            for k in self.configure_env:
+            for k in list(self.configure_env):
                 if k.startswith('_format_'):
                     v = self.configure_env.pop(k)
                     v = v.format(buildEnv=self.buildEnv, env=env)

From 3569c277a9f4a4f1368f62526ef34655f2282572 Mon Sep 17 00:00:00 2001
From: renaud gaudin <rgaudin@gmail.com>
Date: Tue, 11 Feb 2020 13:11:39 +0000
Subject: [PATCH 2/3] switch to older version of libmicrohttpd

libmicrohttpd 0.9.69 is not working properly on macOS (catalina)
---
 kiwixbuild/dependencies/libmicrohttpd.py | 6 +++---
 kiwixbuild/versions.py                   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kiwixbuild/dependencies/libmicrohttpd.py b/kiwixbuild/dependencies/libmicrohttpd.py
index e01587a..613e9e8 100644
--- a/kiwixbuild/dependencies/libmicrohttpd.py
+++ b/kiwixbuild/dependencies/libmicrohttpd.py
@@ -9,9 +9,9 @@ class MicroHttpd(Dependency):
     name = "libmicrohttpd"
 
     class Source(ReleaseDownload):
-        archive = Remotefile('libmicrohttpd-0.9.69.tar.gz',
-                             'fb9b6b148b787493e637d3083588711e65cbcb726fa02cee2cd543c5de27e37e',
-                             'https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.69.tar.gz')
+        archive = Remotefile('libmicrohttpd-0.9.63.tar.gz',
+                             '37c36f1be177f0e37ef181a645cd3baac1000bd322a01c2eff70f3cc8c91749c',
+                             'https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.63.tar.gz')
 
     class Builder(MakeBuilder):
         configure_option = "--disable-https --without-libgcrypt --without-libcurl --disable-doc --disable-examples"
diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index b989651..c5087b1 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 = '59'
+base_deps_meta_version = '60'
 
 base_deps_versions = {
   'zlib' : '1.2.8',
@@ -51,7 +51,7 @@ base_deps_versions = {
   'xapian-core' : '1.4.14',
   'mustache' : '3.2',
   'pugixml' : '1.2',
-  'libmicrohttpd' : '0.9.69',
+  'libmicrohttpd' : '0.9.63',
   'gumbo' : '0.10.1',
   'icu4c' : '58.2',
   'libaria2' : '1.33.1',

From b790c00187fbb4388dae5285d570c646af2b8c3c Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 12 Feb 2020 11:25:03 +0100
Subject: [PATCH 3/3] [action] Correctly fetch the right branch in the CI

---
 .github/workflows/base.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index 85ff87d..afef18a 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -103,7 +103,7 @@ jobs:
       shell: bash
       run: |
         cd $HOME
-        git clone https://github.com/${REP} --depth=1 --branch ${GITHUB_REF##*/}
+        git clone https://github.com/${REP} --depth=1 --branch ${GITHUB_REF##*heads/}
         pip3 install --user --no-deps ./${REP##*/}
       env:
         REP: ${{github.repository}}