[gimp/bochecha/fix-flatpak] flatpak: Fix the build, adding the missing patch
- From: Mathieu Bridon <mbridon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/bochecha/fix-flatpak] flatpak: Fix the build, adding the missing patch
- Date: Sat, 6 Jul 2019 11:07:39 +0000 (UTC)
commit 905cfea0c4566d9a5e0bf3ef36bb5e7036e211eb
Author: Mathieu Bridon <bochecha daitauha fr>
Date: Sat Jul 6 12:38:17 2019 +0200
flatpak: Fix the build, adding the missing patch
SuiteSparse was added as a dependency in 8ee11d8d7576e446e1d62ac37b949833270f09cb,
but with a missing patch. It's probably only in the developer clone and
was left uncommitted.
Fortunately, a comment indicates that the module definition was copied
from Octave, which is on Flathub:
https://github.com/flathub/org.octave.Octave
This commit just adds the patch as it is in the Octave repository,
fixing the Flatpak build of this project.
build/flatpak/org.gimp.GIMP-nightly.json | 2 +-
build/flatpak/suitesparse-reduce-build.patch | 65 ++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 1 deletion(-)
---
diff --git a/build/flatpak/org.gimp.GIMP-nightly.json b/build/flatpak/org.gimp.GIMP-nightly.json
index d571a0ef54..a26d6b0aa9 100644
--- a/build/flatpak/org.gimp.GIMP-nightly.json
+++ b/build/flatpak/org.gimp.GIMP-nightly.json
@@ -226,7 +226,7 @@
},
{
"type": "patch",
- "path": "patches/suitesparse-reduce-build.patch"
+ "path": "suitesparse-reduce-build.patch"
}
],
"modules": [
diff --git a/build/flatpak/suitesparse-reduce-build.patch b/build/flatpak/suitesparse-reduce-build.patch
new file mode 100644
index 0000000000..5ec7d3dcf9
--- /dev/null
+++ b/build/flatpak/suitesparse-reduce-build.patch
@@ -0,0 +1,65 @@
+diff --git a/Makefile b/Makefile
+index 7d7d12d665bd..e7ec5c048309 100644
+--- a/Makefile
++++ b/Makefile
+@@ -38,8 +38,8 @@
+ # (note that CSparse is not installed; CXSparse is installed instead)
+ install: metisinstall
+ ( cd SuiteSparse_config && $(MAKE) install )
+- ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
+- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
++# ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
++# ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
+ ( cd AMD && $(MAKE) install )
+ ( cd BTF && $(MAKE) install )
+ ( cd CAMD && $(MAKE) install )
+@@ -47,15 +47,15 @@
+ ( cd COLAMD && $(MAKE) install )
+ ( cd CHOLMOD && $(MAKE) install )
+ ( cd CXSparse && $(MAKE) install )
+- ( cd LDL && $(MAKE) install )
++# ( cd LDL && $(MAKE) install )
+ ( cd KLU && $(MAKE) install )
+ ( cd UMFPACK && $(MAKE) install )
+- ( cd RBio && $(MAKE) install )
++# ( cd RBio && $(MAKE) install )
+ ifneq (,$(GPU_CONFIG))
+ ( cd SuiteSparse_GPURuntime && $(MAKE) install )
+ ( cd GPUQREngine && $(MAKE) install )
+ endif
+- ( cd SPQR && $(MAKE) install )
++# ( cd SPQR && $(MAKE) install )
+ # ( cd PIRO_BAND && $(MAKE) install )
+ # ( cd SKYLINE_SVD && $(MAKE) install )
+ $(CP) README.txt $(INSTALL_DOC)/SuiteSparse_README.txt
+@@ -116,8 +116,8 @@
+ # the static library
+ library: metis
+ ( cd SuiteSparse_config && $(MAKE) )
+- ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
+- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
++# ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
++# ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
+ ( cd AMD && $(MAKE) library )
+ ( cd BTF && $(MAKE) library )
+ ( cd CAMD && $(MAKE) library )
+@@ -125,16 +125,16 @@
+ ( cd COLAMD && $(MAKE) library )
+ ( cd CHOLMOD && $(MAKE) library )
+ ( cd KLU && $(MAKE) library )
+- ( cd LDL && $(MAKE) library )
++# ( cd LDL && $(MAKE) library )
+ ( cd UMFPACK && $(MAKE) library )
+ ( cd CSparse && $(MAKE) library )
+ ( cd CXSparse && $(MAKE) library )
+- ( cd RBio && $(MAKE) library )
++# ( cd RBio && $(MAKE) library )
+ ifneq (,$(GPU_CONFIG))
+ ( cd SuiteSparse_GPURuntime && $(MAKE) library )
+ ( cd GPUQREngine && $(MAKE) library )
+ endif
+- ( cd SPQR && $(MAKE) library )
++# ( cd SPQR && $(MAKE) library )
+ # ( cd PIRO_BAND && $(MAKE) library )
+ # ( cd SKYLINE_SVD && $(MAKE) library )
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]