Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 693074 - sci-geosciences/qgis-9999 - fix qml path, grass path and proj version
Summary: sci-geosciences/qgis-9999 - fix qml path, grass path and proj version
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Sci-geo Project
URL:
Whiteboard:
Keywords: PATCH, PullRequest
Depends on:
Blocks:
 
Reported: 2019-08-29 16:19 UTC by José de Paula Rodrigues
Modified: 2021-06-19 00:03 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
e-build patch against qgis-9999 (qgis-live.patch,1.19 KB, patch)
2019-08-29 16:19 UTC, José de Paula Rodrigues
Details | Diff
Update of Gentoo ebuild commit 5906613bbbf , QML path (qgis-9999-default-qmldir.patch,512 bytes, patch)
2019-08-29 16:23 UTC, José de Paula Rodrigues
Details | Diff
qgis-9999.ebuild (qgis-9999.ebuild,6.06 KB, text/plain)
2019-09-01 05:05 UTC, José de Paula Rodrigues
Details
qgis-9999.ebuild with scipy flag (qgis-9999.ebuild,6.29 KB, text/plain)
2019-09-10 01:20 UTC, José de Paula Rodrigues
Details
qgis-9999-saga-provider.patch (qgis-9999-saga-provider.patch,444 bytes, patch)
2019-09-10 01:25 UTC, José de Paula Rodrigues
Details | Diff
qgis-9999.ebuild (qgis-9999.ebuild,6.25 KB, text/plain)
2019-09-11 12:43 UTC, José de Paula Rodrigues
Details
Reverting last one. (qgis-9999.ebuild,6.29 KB, text/plain)
2019-09-11 13:02 UTC, José de Paula Rodrigues
Details

Note You need to log in before you can comment on or make changes to this bug.
Description José de Paula Rodrigues 2019-08-29 16:19:46 UTC
Created attachment 588510 [details, diff]
e-build patch against qgis-9999

The attached ebuild/patch against sci-geosciences/qgis makes it possible to emerge the latest version (as of 2019-08-29) of upstream QGIS.

First, it builds against >=sci-libs/proj-6.1.1 (upstream refuses to work with 6.0.0), for which I reported this bump request: https://bugs.gentoo.org/693070 . I could use some help here, because I couldn't find a way to restrict proj versions that are strictly > 4.9.2 && strictly < 6.1* .

Second, I changed the patch for default qmldir commited here: https://gitweb.gentoo.org/repo/gentoo.git/commit/sci-geosciences/qgis?id=5906613bbbf6fe18757fdd1045aef9e3774a628a so that it works against upstream commit c0da9057ebc . I've also reported a bug to upstream QGIS here: https://github.com/qgis/QGIS/issues/31483

Last, I've made a small improvement to the GRASS install detection; instead of looking for it on /usr/lib64/grass70 (hardcoded), it will change according to the installed version in the system.

I've found that I can enable OpenCL if I install dev-libs/ocl-icd (dev-util/nvidia-cuda-toolkit alone isn't enough for building QGIS; it will be detected  later, on run time).
Comment 1 José de Paula Rodrigues 2019-08-29 16:23:05 UTC
Created attachment 588512 [details, diff]
Update of Gentoo ebuild commit 5906613bbbf , QML path

This is to be placed under sci-geosciences/qgis/files/
Comment 2 José de Paula Rodrigues 2019-08-29 16:39:41 UTC
Tested with not-in-repo-yet sci-geosciences/grass-7.6.1  (for which I asked a version bump here: https://bugs.gentoo.org/693078)
Comment 3 José de Paula Rodrigues 2019-08-29 19:24:13 UTC
There should be a way to enable debug symbols on qgis-9999 ebuild.
Comment 4 Chris Mayo 2019-08-31 11:44:30 UTC
qgis-3.4.7-default-qmldir.patch still applies on 5d26ff3b6 for me, with patch -p1 (haven't tried from an ebuild)? 

For detecting GRASS_PREFIX7, can it be got using pkg-config or grass --config? Just speculating, I haven't got grass installed at the moment. That would avoid making assumptions based on the version number alone.
Comment 5 José de Paula Rodrigues 2019-09-01 05:04:00 UTC
Indeed the QML patch from qgis-3.4.7 still works, my bad. 

GRASS, OTH, is a different beast: 1. It provides a pkg-config file (both version 7.4 and 7.6); however, the paths provided are wrong (maybe I should file a bug against grass). For instance, "pkg-config --variable=libdir grass " returns "/usr/grass-7.6.1/lib"on my system. 2. There is no "grass --config", but there is either "gras74 --config" or "grass76 --config", so we still would have to muck around the version number of the installed package.

If there is a better way to manipulate the version numbers of installed packages, please let me know, I'm very new to this ebuild making thing.

I'm uploading a full qgis-9999.ebuild restoring the usage of the 3.4.7 qml patch.
Comment 6 José de Paula Rodrigues 2019-09-01 05:05:01 UTC
Created attachment 588616 [details]
qgis-9999.ebuild
Comment 7 Chris Mayo 2019-09-01 16:09:18 UTC
Sorry those ideas for getting the grass version turned out to be a waste of time.

Hopefully a better tip would be to see how other ebuilds use best_version, with:
qgrep -v best_version
(qgrep from app-portage/portage-utils).
Comment 8 José de Paula Rodrigues 2019-09-02 03:46:53 UTC
Not a waste of time at all; you uncovered a bug in grass (either in Gentoo or upstream, I'm not sure yet). .pc files should be generated with correct information. I'll take a look at grass, see if I can do something about it.
Comment 9 José de Paula Rodrigues 2019-09-10 01:20:40 UTC
Created attachment 589596 [details]
qgis-9999.ebuild with scipy flag
Comment 10 José de Paula Rodrigues 2019-09-10 01:25:16 UTC
Created attachment 589598 [details, diff]
qgis-9999-saga-provider.patch

This complements attachment 589596 [details], and helps enabling SAGA version 7+ provider (beware! don't rely on this for production systems, needs testing!)
Comment 11 José de Paula Rodrigues 2019-09-11 12:43:43 UTC
Created attachment 589684 [details]
qgis-9999.ebuild

Upstream QGIS no longer depends on dev-python/future since it moved to Python 3. Removing dependence on dev-python/future in my quest to eradicate the soon-to-be-EOLed Python 2.x from my system.
Comment 12 José de Paula Rodrigues 2019-09-11 13:02:26 UTC
Created attachment 589686 [details]
Reverting last one.

I'm sorry, qgis still has explicit dependencies on dev-python/future, and some plugins (such as data explore) won't work without it. Bringing future back.
Comment 13 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2021-05-17 21:04:34 UTC
How much of this is still up to date?

Ideally, could you provide patch(es) from git format-patch with the GCO sign off, and I can apply them then? (or a GitHub PR).
Comment 14 José de Paula Rodrigues 2021-05-31 17:00:07 UTC
(In reply to Sam James from comment #13)
> How much of this is still up to date?
> 
> Ideally, could you provide patch(es) from git format-patch with the GCO sign
> off, and I can apply them then? (or a GitHub PR).

Hi,

Is this PR enough?
https://github.com/gentoo/gentoo/pull/21064
Comment 15 Larry the Git Cow gentoo-dev 2021-06-19 00:03:55 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f77af5ca55b979e14e1466648e57e6ca67ea10

commit 00f77af5ca55b979e14e1466648e57e6ca67ea10
Author:     José de Paula Rodrigues <espinafre@gmail.com>
AuthorDate: 2021-05-28 20:54:12 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2021-06-19 00:03:37 +0000

    sci-geosciences/qgis: fixes for paths, adds PDAL option
    
    Closes: https://bugs.gentoo.org/693074
    Signed-off-by: José de Paula Rodrigues <espinafre@gmail.com>
    Signed-off-by: Sam James <sam@gentoo.org>

 sci-geosciences/qgis/qgis-9999.ebuild | 87 +++++++++++++++++------------------
 1 file changed, 42 insertions(+), 45 deletions(-)