dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: update the master flatpak. 

As per state in the wip/release/2-99-8 branch of the beta flatpak.
In particular, we update some dependencies (poppler, ghostscript and
SuiteSparse).

It should also fix the master flatpak build which seemed to fail on
downloading SuiteSparse sources. Since their upstream moved their
tarballs to be downloaded from Github, it should take care of this issue
by side effect.
This commit is contained in:
Jehan 2021-07-22 12:59:56 +02:00
parent 3b3f34cd22
commit 3e2207e1e0
2 changed files with 72 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/flatpak/org.gimp.GIMP-nightly.json
View File

@ -123,15 +123,15 @@
}
],
"config-opts": [ "-DENABLE_GOBJECT_INTROSPECTION=OFF", "-DENABLE_CPP=OFF",
"-DOpenJPEG_DIR=/usr/lib64/openjpeg-2.3" ],
"-DOpenJPEG_DIR=/usr/lib64/openjpeg-2.3", "-DENABLE_BOOST=OFF" ],
"cleanup": [ "/bin", "/share" ],
"buildsystem": "cmake-ninja",
"builddir": true,
"sources": [
{
"type": "archive",
"url": "https://poppler.freedesktop.org/poppler-21.04.0.tar.xz",
"sha256": "5e2219656c6bbd36154133fef2e12b7d0938464518827098b29a10b1697ea79c"
"url": "https://poppler.freedesktop.org/poppler-21.06.1.tar.xz",
"sha256": "86b09e5a02de40081a3916ef8711c5128eaf4b1fc59d5f87d0ec66f04f595db4"
}
]
},
@ -188,8 +188,8 @@
"sources": [
{
"type": "archive",
"url": "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/ghostscript-9.53.3.tar.gz",
"sha512": "c142ef9d83896aa8fd18c8e412220fe8f4950614be00d327d27ab051fe85e16524bf2ee00f46c2aca7a352ce47bc3acf2c4de0f7bbea7e4c55474b8af6cdc0a6"
"url": "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9540/ghostscript-9.54.0.tar.gz",
"sha512": "93cfac3a754d4a7fa94112f3e04ba2ae633c40bb924734db72229096aac2f07c95877737f37f2bfef6be1b1d074af79e75cde3d589ea102def7f4654403e4804"
},
{
"type": "shell",
@ -255,13 +255,13 @@
/* Shamelessly taken from org.octave.Octave manifest! */
"name": "SuiteSparse",
"no-autogen": true,
"make-args": [ "LAPACK=", "library" ],
"make-install-args": [ "LAPACK=", "INSTALL_LIB=/app/lib", "INSTALL_INCLUDE=/app/include", "library" ],
"make-args": [ "BLAS=-lopenblas", "LAPACK=", "library" ],
"make-install-args": [ "BLAS=-lopenblas", "LAPACK=", "INSTALL_LIB=/app/lib", "INSTALL_INCLUDE=/app/include/suitesparse", "library" ],
"sources": [
{
"type": "archive",
"url": "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-5.4.0.tar.gz",
"sha256": "374dd136696c653e34ef3212dc8ab5b61d9a67a6791d5ec4841efb838e94dbd1"
"url": "https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.10.1.tar.gz",
"sha256": "acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee"
},
{
"type": "patch",
@ -277,8 +277,8 @@
"sources": [
{
"type": "archive",
"url": "https://github.com/xianyi/OpenBLAS/archive/v0.3.15.tar.gz",
"sha256": "30a99dec977594b387a17f49904523e6bc8dd88bd247266e83485803759e4bbe"
"url": "https://github.com/xianyi/OpenBLAS/archive/v0.3.17.tar.gz",
"sha256": "df2934fa33d04fd84d839ca698280df55c690c86a5a1133b3f7266fce1de279f"
}
]
}

71
build/flatpak/patches/suitesparse-reduce-build.patch
View File

@ -1,13 +1,20 @@
diff -Naur SuiteSparse.ori/Makefile SuiteSparse/Makefile
--- SuiteSparse.ori/Makefile 2018-12-23 14:31:36.000000000 +0100
+++ SuiteSparse/Makefile 2019-04-05 15:21:59.287341367 +0200
@@ -38,24 +38,24 @@
diff -Naur SuiteSparse-5.10.1/Makefile SuiteSparse-5.10.1.patched/Makefile
--- SuiteSparse-5.10.1/Makefile 2021-05-18 15:01:16.000000000 +0200
+++ SuiteSparse-5.10.1.patched/Makefile 2021-07-22 02:03:40.698984882 +0200
@@ -35,7 +35,7 @@
endif
( cd SPQR && $(MAKE) )
( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
- ( cd SLIP_LU && $(MAKE) )
+# ( cd SLIP_LU && $(MAKE) )
# ( cd PIRO_BAND && $(MAKE) )
# ( cd SKYLINE_SVD && $(MAKE) )
@@ -46,27 +46,27 @@
# (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 )
@ -30,17 +37,30 @@ diff -Naur SuiteSparse.ori/Makefile SuiteSparse/Makefile
( cd GPUQREngine && $(MAKE) install )
endif
- ( cd SPQR && $(MAKE) install )
- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
+# ( cd SPQR && $(MAKE) install )
+# ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
# ( cd PIRO_BAND && $(MAKE) install )
# ( cd SKYLINE_SVD && $(MAKE) install )
$(CP) README.txt $(INSTALL_DOC)/SuiteSparse_README.txt
@@ -116,25 +116,25 @@
- ( cd SLIP_LU && $(MAKE) install )
+# ( cd SLIP_LU && $(MAKE) install )
$(CP) README.md $(INSTALL_DOC)/SuiteSparse_README.md
chmod 644 $(INSTALL_DOC)/SuiteSparse_README.md
@@ -110,7 +110,7 @@
( cd SuiteSparse_GPURuntime && $(MAKE) uninstall )
( cd GPUQREngine && $(MAKE) uninstall )
( cd SPQR && $(MAKE) uninstall )
- ( cd SLIP_LU && $(MAKE) uninstall )
+# ( cd SLIP_LU && $(MAKE) uninstall )
# ( cd PIRO_BAND && $(MAKE) uninstall )
# ( cd SKYLINE_SVD && $(MAKE) uninstall )
ifeq (,$(MY_METIS_LIB))
@@ -126,26 +126,26 @@
# 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 )
@ -64,7 +84,38 @@ diff -Naur SuiteSparse.ori/Makefile SuiteSparse/Makefile
( cd GPUQREngine && $(MAKE) library )
endif
- ( cd SPQR && $(MAKE) library )
- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
- ( cd SLIP_LU && $(MAKE) library )
+# ( cd SPQR && $(MAKE) library )
+# ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
+# ( cd SLIP_LU && $(MAKE) library )
# ( cd PIRO_BAND && $(MAKE) library )
# ( cd SKYLINE_SVD && $(MAKE) library )
@@ -173,7 +173,7 @@
endif
( cd SPQR && $(MAKE) static )
( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static )
- ( cd SLIP_LU && $(MAKE) static )
+# ( cd SLIP_LU && $(MAKE) static )
# ( cd PIRO_BAND && $(MAKE) static )
# ( cd SKYLINE_SVD && $(MAKE) static )
@@ -200,7 +200,7 @@
- ( cd SuiteSparse_GPURuntime && $(MAKE) purge )
- ( cd GPUQREngine && $(MAKE) purge )
- ( cd SPQR && $(MAKE) purge )
- - ( cd SLIP_LU && $(MAKE) purge )
+# - ( cd SLIP_LU && $(MAKE) purge )
# - ( cd PIRO_BAND && $(MAKE) purge )
# - ( cd SKYLINE_SVD && $(MAKE) purge )
- $(RM) MATLAB_Tools/*/*.mex* MATLAB_Tools/spok/private/*.mex*
@@ -227,7 +227,7 @@
- ( cd SuiteSparse_GPURuntime && $(MAKE) clean )
- ( cd GPUQREngine && $(MAKE) clean )
- ( cd SPQR && $(MAKE) clean )
- - ( cd SLIP_LU && $(MAKE) clean )
+# - ( cd SLIP_LU && $(MAKE) clean )
# - ( cd PIRO_BAND && $(MAKE) clean )
# - ( cd SKYLINE_SVD && $(MAKE) clean )