From b1a958a54cd73a48afc4d7e25d34d46313489293 Mon Sep 17 00:00:00 2001
From: Dieter Komendera <dieter@komendera.com>
Date: Thu, 15 Nov 2018 18:24:41 +0100
Subject: [PATCH] Update quelpa.el to 2c17c4f9

---
 CHANGELOG.develop   |  2 ++
 core/libs/quelpa.el | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index e3a7e2824..67c640552 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -523,6 +523,8 @@ Benner and Paweł Siudak):
   de Beauchêne)
 - Make query-replace work when frame is split (thanks to Dieter Komendera)
 - Don't skip missing .elc files when recompiling Elpa (thanks to RockyRoad29)
+- Update quelpa.el to fix installing of some recipes on macOS (thanks to Dieter
+  Komendera)
 *** Distribution changes
 - Refactored =spacemacs-bootstrap=, =spacemacs-ui=, and =spacemacs-ui-visual=
   layers:
diff --git a/core/libs/quelpa.el b/core/libs/quelpa.el
index 592b78eef..70b143657 100644
--- a/core/libs/quelpa.el
+++ b/core/libs/quelpa.el
@@ -415,6 +415,13 @@ if `quelpa-build-timeout-executable' is non-nil."
 Certain package names (e.g. \"@\") may not work properly with a BSD tar."
   :type '(file :must-match t))
 
+(defcustom quelpa-build-explicit-tar-format-p nil
+  "If non-nil pass \"--format=gnu\" option to tar command.
+
+Passing the option is necessary on the systems where the default
+tar format isn't gnu."
+  :type 'boolean)
+
 (defcustom quelpa-build-version-regexp "^[rRvV]?\\(.*\\)$"
   "Default pattern for matching valid version-strings within repository tags.
 The string in the capture group should be parsed as valid by `version-to-list'."
@@ -860,6 +867,9 @@ Return a cons cell whose `car' is the root and whose `cdr' is the repository."
                     (let ((branch (plist-get config :branch)))
                       (when branch
                         (concat "origin/" branch))))))
+    (when (string-match (rx bos "file://" (group (1+ anything))) repo)
+      ;; Expand local file:// URLs
+      (setq repo (expand-file-name (match-string 1 repo))))
     (with-current-buffer (get-buffer-create "*quelpa-build-checkout*")
       (goto-char (point-max))
       (cond
@@ -1086,7 +1096,6 @@ Optionally PRETTY-PRINT the data."
          (get-buffer-create "*quelpa-build-checkout*")
          nil "-cvf"
          file
-         "--format=gnu"
          "--exclude=.svn"
          "--exclude=CVS"
          "--exclude=.git"
@@ -1095,7 +1104,8 @@ Optionally PRETTY-PRINT the data."
          "--exclude=_FOSSIL_"
          "--exclude=.bzr"
          "--exclude=.hg"
-         (or (mapcar (lambda (fn) (concat dir "/" fn)) files) (list dir))))
+         (append (and quelpa-build-explicit-tar-format-p '("--format=gnu"))
+                 (or (mapcar (lambda (fn) (concat dir "/" fn)) files) (list dir)))))
 
 (defun quelpa-build--find-package-commentary (file-path)
   "Get commentary section from FILE-PATH."