diff --git a/easybuild/easyconfigs/g/Graphviz/Graphviz-7.0.6-GCCcore-12.2.0.eb b/easybuild/easyconfigs/g/Graphviz/Graphviz-7.0.6-GCC-12.2.0.eb similarity index 97% rename from easybuild/easyconfigs/g/Graphviz/Graphviz-7.0.6-GCCcore-12.2.0.eb rename to easybuild/easyconfigs/g/Graphviz/Graphviz-7.0.6-GCC-12.2.0.eb index 12ce0ab50b5..ba8c8c4672f 100644 --- a/easybuild/easyconfigs/g/Graphviz/Graphviz-7.0.6-GCCcore-12.2.0.eb +++ b/easybuild/easyconfigs/g/Graphviz/Graphviz-7.0.6-GCC-12.2.0.eb @@ -11,7 +11,7 @@ description = """Graphviz is open source graph visualization software. Graph vis bioinformatics, software engineering, database and web design, machine learning, and in visual interfaces for other technical domains.""" -toolchain = {'name': 'GCCcore', 'version': '12.2.0'} +toolchain = {'name': 'GCC', 'version': '12.2.0'} source_urls = ['https://gitlab.com/graphviz/graphviz/-/archive/%(version)s'] sources = [SOURCELOWER_TAR_GZ] @@ -44,7 +44,7 @@ dependencies = [ ('expat', '2.4.9'), ('poppler', '23.01.0'), ('librsvg', '2.56.0'), - ('libwebp', '1.3.0'), + ('libwebp', '1.3.1'), ] preconfigopts = './autogen.sh NOCONFIG && ' diff --git a/easybuild/easyconfigs/l/librsvg/librsvg-2.56.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/l/librsvg/librsvg-2.56.0-GCCcore-12.2.0.eb index d17abeae7a5..204d44f1891 100644 --- a/easybuild/easyconfigs/l/librsvg/librsvg-2.56.0-GCCcore-12.2.0.eb +++ b/easybuild/easyconfigs/l/librsvg/librsvg-2.56.0-GCCcore-12.2.0.eb @@ -14,6 +14,7 @@ checksums = ['194b5097d9cd107495f49c291cf0da65ec2b4bb55e5628369751a3f44ba222b3'] builddependencies = [ ('binutils', '2.39'), + ('pkgconfig', '1.5.5', '-python'), ('Rust', '1.65.0'), ] diff --git a/easybuild/easyconfigs/l/libwebp/libwebp-1.3.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/l/libwebp/libwebp-1.3.0-GCCcore-12.2.0.eb deleted file mode 100644 index b055cffc231..00000000000 --- a/easybuild/easyconfigs/l/libwebp/libwebp-1.3.0-GCCcore-12.2.0.eb +++ /dev/null @@ -1,44 +0,0 @@ -easyblock = 'ConfigureMake' - -name = 'libwebp' -version = '1.3.0' - -homepage = 'https://developers.google.com/speed/webp/' -description = """WebP is a modern image format that provides superior -lossless and lossy compression for images on the web. Using WebP, -webmasters and web developers can create smaller, richer images that -make the web faster.""" - -toolchain = {'name': 'GCCcore', 'version': '12.2.0'} - -source_urls = ['https://storage.googleapis.com/downloads.webmproject.org/releases/webp'] -sources = [SOURCELOWER_TAR_GZ] -checksums = ['64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c'] - -builddependencies = [ - ('binutils', '2.39'), -] -dependencies = [ - ('libjpeg-turbo', '2.1.4'), - ('libpng', '1.6.38'), - ('LibTIFF', '4.4.0'), - ('giflib', '5.2.1'), -] - -configopts = '--enable-libwebpmux' - -local_headers, local_libs = ( - ['decode.h', 'demux.h', 'encode.h', 'mux.h', 'mux_types.h', 'types.h'], - ['webp', 'webpdemux', 'webpmux'] -) - -sanity_check_paths = { - 'files': ( - ['include/webp/%s' % h for h in local_headers] + - ['lib/lib%s.a' % s for s in local_libs] + - ['lib/lib%s.%s' % (s, SHLIB_EXT) for s in local_libs] - ), - 'dirs': ['lib/'] -} - -moduleclass = 'lib' diff --git a/easybuild/easyconfigs/p/poppler/poppler-23.01.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/p/poppler/poppler-23.01.0-GCC-12.2.0.eb similarity index 93% rename from easybuild/easyconfigs/p/poppler/poppler-23.01.0-GCCcore-12.2.0.eb rename to easybuild/easyconfigs/p/poppler/poppler-23.01.0-GCC-12.2.0.eb index d0229e544e2..87c41228c2c 100644 --- a/easybuild/easyconfigs/p/poppler/poppler-23.01.0-GCCcore-12.2.0.eb +++ b/easybuild/easyconfigs/p/poppler/poppler-23.01.0-GCC-12.2.0.eb @@ -6,13 +6,13 @@ version = '23.01.0' homepage = 'https://poppler.freedesktop.org' description = "Poppler is a PDF rendering library" -toolchain = {'name': 'GCCcore', 'version': '12.2.0'} +toolchain = {'name': 'GCC', 'version': '12.2.0'} builddependencies = [ ('binutils', '2.39'), ('CMake', '3.24.3'), ('pkgconf', '1.9.3'), - ('Python', '3.10.8', '-bare'), + ('Python', '3.10.8'), ] dependencies = [ @@ -22,7 +22,7 @@ dependencies = [ ('libpng', '1.6.38'), ('NSS', '3.85'), ('LibTIFF', '4.4.0'), - ('Qt6', '6.4.2'), + ('Qt6', '6.5.2'), ('Boost', '1.81.0'), ('cairo', '1.17.4'), ('OpenJPEG', '2.5.0'),