Skip to content

Commit

Permalink
#476 working GRASS + qt5webkit patch (3h)
Browse files Browse the repository at this point in the history
  • Loading branch information
pavelToman committed Dec 19, 2024
1 parent 88356d3 commit edecf42
Show file tree
Hide file tree
Showing 6 changed files with 1,718 additions and 10 deletions.
25 changes: 15 additions & 10 deletions 476_QGIS/grass.eb
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,32 @@ dependencies = [
('bzip2', '1.0.8'),
('gettext', '0.21.1'),
('Python', '3.11.3'),
('PROJ', '9.2.0'),
('GDAL', '3.7.1'),
('SQLite', '3.42.0'),
('libxml2', '2.11.4'),
('libpng', '1.6.39'),
('libreadline', '8.2'),
('ncurses', '6.4'),
('netCDF', '4.9.2'),
('GDAL', '3.7.1'),
('libspatialite', '5.1.0'), # UPDATED
('GEOS', '3.12.0'),
('PROJ', '9.2.0'),
('SQLite', '3.42.0'),
('freetype', '2.13.0'),
('LibTIFF', '4.5.0'),
('cairo', '1.17.8'),
('X11', '20230603'),
('Mesa', '23.1.4'),
('libGLU', '9.0.3'),
# ('wxPython', '4.2.1'), # UPDATE -> https://github.com/easybuilders/easybuild-easyconfigs/pull/21949
('wxPython', '4.2.1'), # UPDATE -> https://github.com/easybuilders/easybuild-easyconfigs/pull/21949
('zstd', '1.5.5'),
('PDAL', '2.8.2'),
('FFTW', '3.3.10'),
]

parallel = 1
# parallel = 1

preconfigopts = "sed -e 's/-lblas/$LIBBLAS/g' -e 's/-llapack/$LIBLAPACK/g' -i configure && "
preconfigopts = "sed -i -e 's/-lblas/$LIBBLAS/g' -e 's/-llapack/$LIBLAPACK/g' configure && "
preconfigopts += "sed -i 's/LDFLAGS=\"-Wl,--export-dynamic\"/LDFLAGS=\"-pthread -lm -Wl,--export-dynamic\"/g' configure && "

configopts = '--enable-largefile=yes '
configopts += '--enable-64bit '
Expand All @@ -68,8 +70,8 @@ configopts += '--with-netcdf=$EBROOTNETCDF/bin/nc-config '
configopts += '--without-odbc '
configopts += '--with-opengl '
configopts += '--with-openmp '
# configopts += '--with-png '
# configopts += '--with-png-libs="$EBROOTLIBPNG/lib $EBROOTZLIB/lib" --with-png-includes=$EBROOTLIBPNG/include '
configopts += '--with-png '
configopts += '--with-png-libs="$EBROOTLIBPNG/lib $EBROOTZLIB/lib" --with-png-includes=$EBROOTLIBPNG/include '
configopts += '--without-postgres '
configopts += '--with-proj-libs=$EBROOTPROJ/lib '
configopts += '--with-proj-includes=$EBROOTPROJ/include --with-proj-share=$EBROOTPROJ/share/proj '
Expand All @@ -78,11 +80,12 @@ configopts += '--with-readline '
configopts += '--with-readline-libs=$EBROOTLIBREADLINE/lib --with-readline-includes=$EBROOTLIBREADLINE/include '
configopts += '--with-sqlite '
configopts += '--with-tiff-libs=$EBROOTLIBTIFF/lib --with-tiff-includes=$EBROOTLIBTIFF/include '
# configopts += '--with-wxwidgets=$EBROOTWXWIDGET/bin/wx-config '
configopts += '--with-wxwidgets=$EBROOTWXWIDGET/bin/wx-config '
configopts += '--with-x '
configopts += '--with-zlib-libs=$EBROOTZLIB/lib --with-zlib-includes=$EBROOTZLIB/include '
configopts += '--with-bzlib --with-bzlib-libs=$EBROOTBZIP2/lib --with-bzlib-includes=$EBROOTBZIP2/include '
configopts += '--with-zstd --with-zstd-libs=$EBROOTZSTD/lib --with-zstd-includes=$EBROOTZSTD/include '
configopts += '--with-gdal=$EBROOTGDAL/bin '

postinstallcmds = [
'ln -s grass%(version_major)s%(version_minor)s %(installdir)s/grass%(version_major)s',
Expand All @@ -95,13 +98,15 @@ sanity_check_paths = {

moduleclass = 'geo'

# E2:
# E2: OK
# add parallel = 1 + add wxPython -> OK
# <- build step failed
# No such file or directory: 'g.parser'
# /bin/sh: g.parser: command not found
# ModuleNotFoundError: No module named 'wx'

# E1: OK
# -> PDAL added -> OK
# checking whether to use PDAL... yes
# Package pdal was not found in the pkg-config search path.
# Perhaps you should add the directory containing `pdal.pc'
Expand Down
22 changes: 22 additions & 0 deletions 476_QGIS/parser_rb.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- Source/JavaScriptCore/offlineasm/parser.rb.orig 2024-12-19 13:20:31.710087000 +0100
+++ Source/JavaScriptCore/offlineasm/parser.rb 2024-12-19 13:21:13.276547000 +0100
@@ -584,7 +584,8 @@
firstCodeOrigin = @tokens[@idx].codeOrigin
list = []
loop {
- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
+ token_str = @tokens[@idx].is_a?(Annotation) ? @tokens[@idx].string : @tokens[@idx].to_s
+ if (@idx == @tokens.length && !final) || (final && token_str =~ final)
break
elsif @tokens[@idx].is_a? Annotation
# This is the only place where we can encounter a global
@@ -790,7 +791,8 @@
fileList = []
fileList << @tokens[@idx].codeOrigin.fileName
loop {
- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
+ token_str = @tokens[@idx].is_a?(Annotation) ? @tokens[@idx].string : @tokens[@idx].to_s
+ if (@idx == @tokens.length && !final) || (final && token_str =~ final)
break
elsif @tokens[@idx] == "include"
@idx += 1
Loading

0 comments on commit edecf42

Please sign in to comment.