| 1 |
commit: 877cafa591695d148ce3a915043b005d320ce1bf |
| 2 |
Author: Lucas Mitrak <lucas <AT> lucasmitrak <DOT> com> |
| 3 |
AuthorDate: Thu Jun 10 21:11:21 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 11 10:13:18 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=877cafa5 |
| 7 |
|
| 8 |
sci-biology/dcm2niix: add patch |
| 9 |
|
| 10 |
* Disable finding git in cmake |
| 11 |
* Add patch to ebuild |
| 12 |
|
| 13 |
Currently, sci-biology/dcm2niix will not compile if git is not found. |
| 14 |
The patch dcm2niix-disable_find_git.patch comments out the lines which |
| 15 |
attempt to find git and require it to be found. With this patch, the |
| 16 |
package will compile correctly. Without this patch, cmake will throw |
| 17 |
an error if git is not found. |
| 18 |
This commit was tested in a docker image with dev-util/ebuildtester. |
| 19 |
This commit was written, tested, and submitted by Lucas Mitrak. |
| 20 |
|
| 21 |
Closes: https://bugs.gentoo.org/755746 |
| 22 |
Signed-off-by: Lucas Mitrak <lucas <AT> lucasmitrak.com> |
| 23 |
Closes: https://github.com/gentoo/sci/pull/1091 |
| 24 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
| 25 |
|
| 26 |
sci-biology/dcm2niix/dcm2niix-1.0.20201102.ebuild | 4 ++++ |
| 27 |
.../dcm2niix/files/dcm2niix-disable_find_git.patch | 19 +++++++++++++++++++ |
| 28 |
2 files changed, 23 insertions(+) |
| 29 |
|
| 30 |
diff --git a/sci-biology/dcm2niix/dcm2niix-1.0.20201102.ebuild b/sci-biology/dcm2niix/dcm2niix-1.0.20201102.ebuild |
| 31 |
index b7f4166f5..e9d0d7ea0 100644 |
| 32 |
--- a/sci-biology/dcm2niix/dcm2niix-1.0.20201102.ebuild |
| 33 |
+++ b/sci-biology/dcm2niix/dcm2niix-1.0.20201102.ebuild |
| 34 |
@@ -16,6 +16,10 @@ KEYWORDS="~amd64 ~x86" |
| 35 |
DEPEND="" |
| 36 |
RDEPEND="" |
| 37 |
|
| 38 |
+PATCHES=( |
| 39 |
+ "${FILESDIR}"/${PN}-disable_find_git.patch |
| 40 |
+) |
| 41 |
+ |
| 42 |
pkg_postinst() { |
| 43 |
optfeature "parallel gzip support" app-arch/pigz |
| 44 |
} |
| 45 |
|
| 46 |
diff --git a/sci-biology/dcm2niix/files/dcm2niix-disable_find_git.patch b/sci-biology/dcm2niix/files/dcm2niix-disable_find_git.patch |
| 47 |
new file mode 100644 |
| 48 |
index 000000000..ba51997f2 |
| 49 |
--- /dev/null |
| 50 |
+++ b/sci-biology/dcm2niix/files/dcm2niix-disable_find_git.patch |
| 51 |
@@ -0,0 +1,19 @@ |
| 52 |
+disable finding git because it should not be used nor needed |
| 53 |
+Written and tested by Lucas Mitrak. |
| 54 |
+https://bugs.gentoo.org/755746 |
| 55 |
+ |
| 56 |
+--- a/SuperBuild/SuperBuild.cmake |
| 57 |
++++ b/SuperBuild/SuperBuild.cmake |
| 58 |
+@@ -1,8 +1,8 @@ |
| 59 |
+ # Check if git exists |
| 60 |
+-find_package(Git) |
| 61 |
+-if(NOT GIT_FOUND) |
| 62 |
+- message(FATAL_ERROR "Cannot find Git. Git is required for Superbuild") |
| 63 |
+-endif() |
| 64 |
++#find_package(Git) |
| 65 |
++#if(NOT GIT_FOUND) |
| 66 |
++# message(FATAL_ERROR "Cannot find Git. Git is required for Superbuild") |
| 67 |
++#endif() |
| 68 |
+ |
| 69 |
+ # Use git protocol or not |
| 70 |
+ option(USE_GIT_PROTOCOL "If behind a firewall turn this off to use http instead." ON) |
Archives