From 5bebc7c5a7ad1e05c7a00951f23bccd88e64c91d Mon Sep 17 00:00:00 2001
From: Matthijs Brobbel <m1brobbel@gmail.com>
Date: Wed, 23 Feb 2022 09:10:56 +0100
Subject: [PATCH 1/3] Direct download Substrait source tarball instead of using
 git clone

---
 cpp/src/arrow/engine/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cpp/src/arrow/engine/CMakeLists.txt b/cpp/src/arrow/engine/CMakeLists.txt
index 1e66e7fb5f7..efd4f0b1f9b 100644
--- a/cpp/src/arrow/engine/CMakeLists.txt
+++ b/cpp/src/arrow/engine/CMakeLists.txt
@@ -48,8 +48,7 @@ set(SUBSTRAIT_PROTOS
     type_expressions)
 
 externalproject_add(substrait_ep
-                    GIT_REPOSITORY "${ARROW_SUBSTRAIT_REPO}"
-                    GIT_TAG "${ARROW_SUBSTRAIT_TAG}"
+                    URL "https://github.com/${ARROW_SUBSTRAIT_REPO}/archive/${ARROW_SUBSTRAIT_TAG}.tar.gz"
                     SOURCE_DIR "${SUBSTRAIT_LOCAL_DIR}"
                     CONFIGURE_COMMAND ""
                     BUILD_COMMAND ""

From c173a8b557168c9cedd2c8d2bbc924c2c56b7a87 Mon Sep 17 00:00:00 2001
From: Matthijs Brobbel <m1brobbel@gmail.com>
Date: Wed, 23 Feb 2022 09:32:42 +0100
Subject: [PATCH 2/3] Update cpp/src/arrow/engine/CMakeLists.txt

Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
---
 cpp/src/arrow/engine/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/src/arrow/engine/CMakeLists.txt b/cpp/src/arrow/engine/CMakeLists.txt
index efd4f0b1f9b..9e3336ec8cd 100644
--- a/cpp/src/arrow/engine/CMakeLists.txt
+++ b/cpp/src/arrow/engine/CMakeLists.txt
@@ -48,7 +48,7 @@ set(SUBSTRAIT_PROTOS
     type_expressions)
 
 externalproject_add(substrait_ep
-                    URL "https://github.com/${ARROW_SUBSTRAIT_REPO}/archive/${ARROW_SUBSTRAIT_TAG}.tar.gz"
+                    URL "${ARROW_SUBSTRAIT_REPO}/archive/${ARROW_SUBSTRAIT_TAG}.tar.gz"
                     SOURCE_DIR "${SUBSTRAIT_LOCAL_DIR}"
                     CONFIGURE_COMMAND ""
                     BUILD_COMMAND ""

From 8613684c7acef169e00c2dffb71538a7d9b726f3 Mon Sep 17 00:00:00 2001
From: Matthijs Brobbel <m1brobbel@gmail.com>
Date: Wed, 23 Feb 2022 10:35:52 +0100
Subject: [PATCH 3/3] ARROW_SUBSTRAIT_REPO URL download is GitHub specific

---
 cpp/cmake_modules/DefineOptions.cmake | 7 ++++---
 cpp/src/arrow/engine/CMakeLists.txt   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cpp/cmake_modules/DefineOptions.cmake b/cpp/cmake_modules/DefineOptions.cmake
index 30b1d0e075b..7283de4f9f1 100644
--- a/cpp/cmake_modules/DefineOptions.cmake
+++ b/cpp/cmake_modules/DefineOptions.cmake
@@ -478,10 +478,11 @@ advised that if this is enabled 'install' will fail silently on components;\
 that have not been built"
                 OFF)
 
-  set(ARROW_SUBSTRAIT_REPO_DEFAULT "https://github.com/substrait-io/substrait")
+  set(ARROW_SUBSTRAIT_REPO_DEFAULT "substrait-io/substrait")
   define_option_string(ARROW_SUBSTRAIT_REPO
-                       "Custom git repository URL for downloading Substrait sources.;\
-See also ARROW_SUBSTRAIT_TAG" "${ARROW_SUBSTRAIT_REPO_DEFAULT}")
+                       "Custom GitHub user/repository pair for downloading Substrait sources.;\
+See also ARROW_SUBSTRAIT_TAG"
+                       "${ARROW_SUBSTRAIT_REPO_DEFAULT}")
 
   set(ARROW_SUBSTRAIT_TAG_DEFAULT "e1b4c04a1b518912f4c4065b16a1b2c0ac8e14cf")
   define_option_string(ARROW_SUBSTRAIT_TAG
diff --git a/cpp/src/arrow/engine/CMakeLists.txt b/cpp/src/arrow/engine/CMakeLists.txt
index 9e3336ec8cd..efd4f0b1f9b 100644
--- a/cpp/src/arrow/engine/CMakeLists.txt
+++ b/cpp/src/arrow/engine/CMakeLists.txt
@@ -48,7 +48,7 @@ set(SUBSTRAIT_PROTOS
     type_expressions)
 
 externalproject_add(substrait_ep
-                    URL "${ARROW_SUBSTRAIT_REPO}/archive/${ARROW_SUBSTRAIT_TAG}.tar.gz"
+                    URL "https://github.com/${ARROW_SUBSTRAIT_REPO}/archive/${ARROW_SUBSTRAIT_TAG}.tar.gz"
                     SOURCE_DIR "${SUBSTRAIT_LOCAL_DIR}"
                     CONFIGURE_COMMAND ""
                     BUILD_COMMAND ""