Page MenuHomeFreeBSD
Differential D24198

databases/grass7, math/saga, graphics/qgis and graphics/qgis-ltr: update to latest versions
ClosedPublic
Actions

Authored by lbartoletti on Mar 26 2020, 7:53 PM.
Tags
None
Referenced Files
F104358671: D24198.diff
Fri, Dec 6, 5:16 PM
Unknown Object (File)
Sat, Nov 30, 11:05 AM
Unknown Object (File)
Sat, Nov 30, 11:05 AM
Unknown Object (File)
Mon, Nov 18, 9:41 AM
Unknown Object (File)
Mon, Nov 18, 12:41 AM
Unknown Object (File)
Fri, Nov 15, 8:25 AM
Unknown Object (File)
Nov 2 2024, 9:47 AM
Unknown Object (File)
Oct 10 2024, 6:40 AM
View All Files
Subscribers
mat
rhurlin

Details

Reviewers
tcberner
swills
Commits
rP530236: databases/grass7, math/saga, graphics/qgis and graphics/qgis-ltr: update to…
Summary

Update of GIS software databases/grass7, math/saga, graphics/qgis-ltr and graphics/qgis

  • math/saga:
    • Update to 7.6.2
    • Use wxWidgets 3.0+ instead of 3.1+ since 3.1 is not a mandatory version and this reduces the number of packages installed when you install saga and qgis/grass (which requires version 3.0).
  • databases/grass7:
    • Update to 7.8.2 first version for python3 only
    • Use ${PY_NUMPY} variable
    • Readd openmp
    • Use wxPython40 for python3
    • Remove bash dependency. You can use any shell.
    • Rework the workaround in post-install (for / touch files). Fix the long (random) standing issue with pkg-plist
    • Alphabetize USES and OPTIONS
    • Replace XX_configure_on by XX_configure_with as possible
  • graphics/qgis:
    • Update to 3.12.1
    • Remove patches (applied upstream or fixed in ports: pyqt5 / sip)
  • graphics/qgis-ltr:
    • Update to 3.10.4
Test Plan
  • math/saga: Poudriere 11/12/head i386/amd64
  • databases/grass7: Poudriere 11/12/head i386/amd64
  • graphics/qgis: Poudriere 11/12/head amd64 (cannot build since qt5-3D requires multimedia/assimp which is broken on i386)
  • graphics/qgis-ltr: Poudriere 11/12/head amd64 (cannot build since qt5-3D requires multimedia/assimp which is broken on i386)

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 30177
Build 27975: arc lint + arc unit

Event Timeline

lbartoletti created this revision.Mar 26 2020, 7:53 PM
Herald added a subscriber: mat. · View Herald TranscriptMar 26 2020, 7:53 PM
Harbormaster completed remote builds in B30121: Diff 69902.Mar 26 2020, 7:54 PM
lbartoletti added a comment.Mar 26 2020, 7:57 PM

@rhurlin_gwdg.de I have a doubt about qgis[-ltr]/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py is it a requirement for saga in processing toolbox?

rhurlin added a comment.Mar 26 2020, 9:17 PM
In D24198#532211, @lbartoletti wrote:

@rhurlin_gwdg.de I have a doubt about qgis[-ltr]/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py is it a requirement for saga in processing toolbox?

Yes, this patch is needed to get plugins like 'Processing Saga NextGen Provider' from North Road to work. Otherwise, only SAGA version 7.2 is accepted by this plugin, nothing newer ...

linimon retitled this revision from databases/grass7, math/saga, graphics/qgis and graphics/qgis-ltr to databases/grass7, math/saga, graphics/qgis and graphics/qgis-ltr: update to latest versions.Mar 27 2020, 7:10 AM
lbartoletti updated this revision to Diff 69908.Mar 27 2020, 10:18 AM

Revert and update qgis[-ltr]/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py
Minor fixes

Harbormaster completed remote builds in B30124: Diff 69908.Mar 27 2020, 10:18 AM
lbartoletti added a comment.Mar 27 2020, 10:23 AM
In D24198#532236, @rhurlin_gwdg.de wrote:
In D24198#532211, @lbartoletti wrote:

@rhurlin_gwdg.de I have a doubt about qgis[-ltr]/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py is it a requirement for saga in processing toolbox?

Yes, this patch is needed to get plugins like 'Processing Saga NextGen Provider' from North Road to work. Otherwise, only SAGA version 7.2 is accepted by this plugin, nothing newer ...

Oh yes! I forgot that our proposal wasn't integrated upstream.

rhurlin added a comment.Mar 27 2020, 10:34 AM
In D24198#532286, @lbartoletti wrote:
In D24198#532236, @rhurlin_gwdg.de wrote:
In D24198#532211, @lbartoletti wrote:

@rhurlin_gwdg.de I have a doubt about qgis[-ltr]/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py is it a requirement for saga in processing toolbox?

Yes, this patch is needed to get plugins like 'Processing Saga NextGen Provider' from North Road to work. Otherwise, only SAGA version 7.2 is accepted by this plugin, nothing newer ...

Oh yes! I forgot that our proposal wasn't integrated upstream.

Ah, thanks for integrating it back!

I just realized, that there is another dependency, which shoud be included in the LIB_DEPENDS sections of both Makefiles, for qgis-ltr and qgis:
+ libqca-qt5.so:devel/qca \

lbartoletti added a comment.Mar 27 2020, 10:57 AM
In D24198#532287, @rhurlin_gwdg.de wrote:
In D24198#532286, @lbartoletti wrote:
In D24198#532236, @rhurlin_gwdg.de wrote:
In D24198#532211, @lbartoletti wrote:

@rhurlin_gwdg.de I have a doubt about qgis[-ltr]/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py is it a requirement for saga in processing toolbox?

Yes, this patch is needed to get plugins like 'Processing Saga NextGen Provider' from North Road to work. Otherwise, only SAGA version 7.2 is accepted by this plugin, nothing newer ...

Oh yes! I forgot that our proposal wasn't integrated upstream.

Ah, thanks for integrating it back!

You're welcome!

I just realized, that there is another dependency, which shoud be included in the LIB_DEPENDS sections of both Makefiles, for qgis-ltr and qgis:
+ libqca-qt5.so:devel/qca \

Now, it's an USES= qca thanks to @tcberner ;)

rhurlin added a comment.Mar 27 2020, 11:18 AM
In D24198#532290, @lbartoletti wrote:
In D24198#532287, @rhurlin_gwdg.de wrote:
In D24198#532286, @lbartoletti wrote:
In D24198#532236, @rhurlin_gwdg.de wrote:
In D24198#532211, @lbartoletti wrote:

@rhurlin_gwdg.de I have a doubt about qgis[-ltr]/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py is it a requirement for saga in processing toolbox?

Yes, this patch is needed to get plugins like 'Processing Saga NextGen Provider' from North Road to work. Otherwise, only SAGA version 7.2 is accepted by this plugin, nothing newer ...

Oh yes! I forgot that our proposal wasn't integrated upstream.

Ah, thanks for integrating it back!

You're welcome!

I just realized, that there is another dependency, which shoud be included in the LIB_DEPENDS sections of both Makefiles, for qgis-ltr and qgis:
+ libqca-qt5.so:devel/qca \

Now, it's an USES= qca thanks to @tcberner ;)

And now, I realized it is already in USES :)

lbartoletti updated this revision to Diff 69914.Mar 27 2020, 12:19 PM

fix propset
remove useless command commented

Harbormaster completed remote builds in B30130: Diff 69914.Mar 27 2020, 12:19 PM
lbartoletti updated this revision to Diff 69917.Mar 27 2020, 1:33 PM

correct grass7 pkg-plist with python suffix and prepare py38. Not available now since py-six and other py ports are not flavored.

Harbormaster completed remote builds in B30133: Diff 69917.Mar 27 2020, 1:33 PM
lbartoletti updated this revision to Diff 69920.Mar 27 2020, 2:16 PM

grass built with py3{6,7,8} but devel/py-six devel/py-pathlib2 x11-toolkits/py-wxPython40 needs to be flavorized

Harbormaster completed remote builds in B30135: Diff 69920.Mar 27 2020, 2:16 PM
tcberner added inline comments.Mar 28 2020, 4:31 PM
databases/grass7/files/pkg-message.in
6

^ wouldn't it make sense to have %%PYTHON_CMD%% or something here, and sub it to be the one that was used during build?

lbartoletti marked an inline comment as done.Mar 29 2020, 8:13 AM
lbartoletti added inline comments.
databases/grass7/files/pkg-message.in
6

Oh yes. It was on my todo list and I forgot it. Thanks!

lbartoletti updated this revision to Diff 69973.Mar 29 2020, 8:15 AM
lbartoletti marked an inline comment as done.

Move pkg-message to files/pkg-message.in and add python_cmd var
Add python alias to fix a potential error building databases/grass7 (still this problem with colortables/*png files...)

Harbormaster completed remote builds in B30163: Diff 69973.Mar 29 2020, 8:15 AM
tcberner added inline comments.Mar 29 2020, 10:43 AM
databases/grass7/Makefile
165–166

^couldn't you use USES=shebangfix here?

lbartoletti updated this revision to Diff 69993.Mar 30 2020, 6:21 AM

Uses shebangfix for py files

Harbormaster completed remote builds in B30177: Diff 69993.Mar 30 2020, 6:21 AM
lbartoletti marked an inline comment as done.Mar 30 2020, 6:21 AM
lbartoletti added inline comments.
databases/grass7/Makefile
165–166

Yes. It's done

lbartoletti marked an inline comment as done.Mar 31 2020, 6:51 PM
tcberner added inline comments.Mar 31 2020, 7:05 PM
databases/grass7/Makefile
165–166

Macro stlgtm:

tcberner accepted this revision.Apr 1 2020, 4:59 PM

Looks good to me

This revision is now accepted and ready to land.Apr 1 2020, 4:59 PM
Closed by commit rP530236: databases/grass7, math/saga, graphics/qgis and graphics/qgis-ltr: update to… (authored by lbartoletti). · Explain WhyApr 1 2020, 8:00 PM
This revision was automatically updated to reflect the committed changes.
lbartoletti added a commit: rP530236: databases/grass7, math/saga, graphics/qgis and graphics/qgis-ltr: update to….

Revision Contents
Changeset List

Diff 69993

View Options

databases/grass7/Makefile

Loading...
View Options

databases/grass7/distinfo

Loading...
View Options

databases/grass7/files/pkg-message.in

Loading...
View Options

databases/grass7/pkg-message

Loading...
View Options

databases/grass7/pkg-plist

Loading...
View Options

graphics/qgis-ltr/Makefile

Loading...
View Options

graphics/qgis-ltr/distinfo

Loading...
View Options

graphics/qgis-ltr/files/patch-cmake_FindGRASS.cmake

Loading...
View Options

graphics/qgis-ltr/files/patch-cmake_FindPyQt5.py

Loading...
View Options

graphics/qgis-ltr/files/patch-cmake_Txt2Tags.cmake

Loading...
View Options

graphics/qgis-ltr/files/patch-doc_INSTALL.html

Loading...
View Options

graphics/qgis-ltr/files/patch-doc_INSTALL.t2t

Loading...
View Options

graphics/qgis-ltr/files/patch-doc_news.html

Loading...
View Options

graphics/qgis-ltr/files/patch-doc_news.t2t

Loading...
View Options

graphics/qgis-ltr/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py

Loading...
View Options

graphics/qgis-ltr/files/patch-scripts_release.pl

Loading...
View Options

graphics/qgis-ltr/files/patch-scripts_update-news.pl

Loading...
View Options

graphics/qgis-ltr/files/patch-src_core_CMakeLists.txt

Loading...
View Options

graphics/qgis-ltr/files/patch-src_core_qgsproject.cpp

Loading...
View Options

graphics/qgis-ltr/files/patch-src_plugins_grass_CMakeLists.txt

Loading...
View Options

graphics/qgis-ltr/pkg-plist

Loading...
View Options

graphics/qgis/Makefile

Loading...
View Options

graphics/qgis/distinfo

Loading...
View Options

graphics/qgis/files/patch-cmake_FindGRASS.cmake

Loading...
View Options

graphics/qgis/files/patch-cmake_FindPyQt5.py

Loading...
View Options

graphics/qgis/files/patch-cmake_Txt2Tags.cmake

Loading...
View Options

graphics/qgis/files/patch-doc_INSTALL.html

Loading...
View Options

graphics/qgis/files/patch-doc_INSTALL.t2t

Loading...
View Options

graphics/qgis/files/patch-doc_news.html

Loading...
View Options

graphics/qgis/files/patch-doc_news.t2t

Loading...
View Options

graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py

Loading...
View Options

graphics/qgis/files/patch-scripts_release.pl

Loading...
View Options

graphics/qgis/files/patch-scripts_update-news.pl

Loading...
View Options

graphics/qgis/files/patch-src_analysis_interpolation_qgsinterpolator.h

Loading...
View Options

graphics/qgis/files/patch-src_core_CMakeLists.txt

Loading...
View Options

graphics/qgis/files/patch-src_plugins_grass_CMakeLists.txt

Loading...
View Options

graphics/qgis/pkg-plist

Loading...
View Options

math/saga/Makefile

Loading...
View Options

math/saga/distinfo

Loading...
View Options

math/saga/files/patch-configure.ac

Loading...
View Options

math/saga/pkg-plist

Loading...