Fix QGIS in release-19.09 #72249
Merged
Fix QGIS in release-19.09 #72249
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We strip the library suffix as we don't need it and it confuses various downstream consumers. Also replace calls to sed with substituteInPlace as the latter will complain in case it doesn't perform a substitution. (cherry picked from commit 76ad279)
Make sure that the both libqscintilla2_qt5.so and libqscintilla2.so are present in `$out/lib` so all the dependant packages can find the most appropriate library (some except the empty suffix, such as sqlitebrowser, other expect the _qt5 suffix such as python3Packages.qscintilla-qt5). The mechanism would also work work for qt4 build, but it is broken at the moment. Also make sure python*Packages.qscintilla* are up to date (cherry picked from commit 4bf49d9)
(cherry picked from commit b27bdf4)
(cherry picked from commit edc638c)
(cherry picked from commit 5d8ec9b)
See http://changelog.qgis.org/en/qgis/version/3.10/ (cherry picked from commit c803971)
lsix
force-pushed
the
backport-qgis-19.09
branch
from
9443b34
to
1c3c88c
Compare
|
Why also update the minor version? Does it not function at 3.8.3? |
|
Yes it does, but since qgis was broken since release-19.09 went out, this acts more like a new package than an update within the context of this channel. But if you prefer, I can use pin it at 3.8.3. |
10 tasks
jonringer
approved these changes
Oct 31, 2019
There was a problem hiding this comment.
nix-review passes on NixOS
diff LGTM
qgis, openscad, and tora open up fine
[11 built, 311 copied (1565.8 MiB), 288.8 MiB DL]
https://github.com/NixOS/nixpkgs/pull/72249
9 package are marked as broken and were skipped:
minc_widgets octave octaveFull python27Packages.qscintilla python27Packages.qscintilla-qt4 qscintilla sonic-pi sqliteman tortoisehg
8 package were build:
libsForQt5.qscintilla libsForQt511.qscintilla openscad python27Packages.qscintilla-qt5 python37Packages.qscintilla-qt5 qgis qgis-unwrapped tora
das-g
approved these changes
Nov 3, 2019
|
I'm assuming there's no outstanding objections, I re-did the nix-review and everything still passes as it did a week ago. |
13 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
qgis is currently broken on release-19.09.
This PR backports all necessary fixes to have it up to date and running.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @