Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gdal: 3.0.1 -> 3.0.3 #78774

Merged
merged 1 commit into from Jan 31, 2020
Merged

gdal: 3.0.1 -> 3.0.3 #78774

merged 1 commit into from Jan 31, 2020

Conversation

das-g
Copy link
Member

@das-g das-g commented Jan 29, 2020 •
edited

Update GDAL/OGR to 3.0.3

001.3_0_1.darwin.patch isn't needed anymore, because the change it made is part of the QGIS 3.0.3 code: OSGeo/gdal@db66632

CVE-2019-17545.patch isn't needed anymore, because the change it made (OSGeo/gdal@148115f) is part of the QGIS 3.0.3 code.

Motivation for this change

GDAL/OGR 3.0.3 contains bugfixes to be shipped with QGIS 3.10.2 (#78755)

See mailing list post about lib versions in QGIS and blog post recommending to upgrade QGIS.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using LC_ALL=C.utf-8 nix run nixpkgs.nixpkgs-review -c nixpkgs-review wip (output see below)
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Output of nixpkgs-review wip
(click to expand) 
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
$ git worktree add /home/das-g/.cache/nixpkgs-review/rev-45e01e508a792077c77067467e07bce757932fb6-dirty/nixpkgs 45e01e508a792077c77067467e07bce757932fb6
Preparing worktree (detached HEAD 45e01e508a7)
Updating files: 100% (20862/20862), done.
HEAD is now at 45e01e508a7 Merge pull request #78716 from Ma27/bump-matrix-synapse
$ nix-env -f /home/das-g/.cache/nixpkgs-review/rev-45e01e508a792077c77067467e07bce757932fb6-dirty/nixpkgs -qaP --xml --out-path --show-trace
Applying `nixpkgs` diff...
$ nix-env -f /home/das-g/.cache/nixpkgs-review/rev-45e01e508a792077c77067467e07bce757932fb6-dirty/nixpkgs -qaP --xml --out-path --show-trace --meta
$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/das-g/.cache/nixpkgs-review/rev-45e01e508a792077c77067467e07bce757932fb6-dirty/build.nix
builder for '/nix/store/ajbkxbxrrfdz0gbcszslhq41h2arjaar-mysql-workbench-8.0.15.drv' failed with exit code 1; last 10 log lines:
  In file included from ../tools/genobj/genobj.cpp:31:
  ../library/grt/src/grt.h: In member function 'grt::DictRef& grt::DictRef::operator=(const grt::DictRef&)':
  ../library/grt/src/grt.h:1628:20: error: implicitly-declared 'grt::DictRef::DictRef(const grt::DictRef&)' is deprecated [-Werror=deprecated-copy]
   1628 |       DictRef tmp(o);
        |                    ^
  ../library/grt/src/grt.h:1627:21: note: because 'grt::DictRef' has user-provided 'grt::DictRef& grt::DictRef::operator=(const grt::DictRef&)'
   1627 |     inline DictRef &operator=(const DictRef &o) {
        |                     ^~~~~~~~
  cc1plus: all warnings being treated as errors
  ninja: build stopped: subcommand failed.
cannot build derivation '/nix/store/yjbli48jah0hdnrlk5v4g7bs4rkzh4kf-env.drv': 1 dependencies couldn't be built
[33 built (1 failed), 904 copied (5030.3 MiB), 975.7 MiB DL]
error: build of '/nix/store/yjbli48jah0hdnrlk5v4g7bs4rkzh4kf-env.drv' failed
1 package failed to build:
mysqlWorkbench

26 package built:
gdal grass libLAS mapnik merkaartor openorienteering-mapper perl528Packages.Tirex perl530Packages.Tirex postgis python27Packages.cartopy python27Packages.python-mapnik python27Packages.tilestache python27Packages.worldengine python37Packages.cartopy python37Packages.gdal python37Packages.python-mapnik python37Packages.worldengine python38Packages.cartopy python38Packages.gdal python38Packages.python-mapnik python38Packages.worldengine qgis qgis-unwrapped qlandkartegt qmapshack saga

$ nix-shell /home/das-g/.cache/nixpkgs-review/rev-45e01e508a792077c77067467e07bce757932fb6-dirty/shell.nix
these paths will be fetched (0.51 MiB download, 2.47 MiB unpacked):
  /nix/store/b4c1yyiyqwakm37j3z4jqn65ca2c6cv6-bash-interactive-4.4-p23-man
  /nix/store/h3iim69ysaha4v7lgk6s26i57vmwffaw-bash-interactive-4.4-p23-dev
  /nix/store/nf4vz5409fv2pakm64rhm2n2qhivjxfq-bash-interactive-4.4-p23-info
  /nix/store/xnx5rkfhb355d0jczyxpj523hzvksgmj-bash-interactive-4.4-p23-doc
copying path '/nix/store/xnx5rkfhb355d0jczyxpj523hzvksgmj-bash-interactive-4.4-p23-doc' from 'https://cache.nixos.org'...
copying path '/nix/store/nf4vz5409fv2pakm64rhm2n2qhivjxfq-bash-interactive-4.4-p23-info' from 'https://cache.nixos.org'...
copying path '/nix/store/b4c1yyiyqwakm37j3z4jqn65ca2c6cv6-bash-interactive-4.4-p23-man' from 'https://cache.nixos.org'...
copying path '/nix/store/h3iim69ysaha4v7lgk6s26i57vmwffaw-bash-interactive-4.4-p23-dev' from 'https://cache.nixos.org'...

The build failure of mysql-workbench-8.0.15 is unrelated to this change. See #78770.

@das-g das-g mentioned this pull request Jan 29, 2020
Closed
6 tasks
lsix
lsix approved these changes Jan 30, 2020
View reviewed changes
Copy link
Member

@lsix lsix left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good for me. Thanks for the PR !

Everything builds fine (except for mysql-workbench which is also broken on master)

1 package failed to build:
mysql-workbench

26 package built:
gdal grass libLAS mapnik merkaartor openorienteering-mapper perl528Packages.Tirex perl530Packages.Tirex postgresqlPackages.postgis python27Packages.cartopy python27Packages.python-mapnik python27Packages.tilestache python27Packages.worldengine python37Packages.cartopy python37Packages.gdal python37Packages.python-mapnik worldengine-cli python38Packages.cartopy python38Packages.gdal python38Packages.python-mapnik python38Packages.worldengine qgis qgis-unwrapped qlandkartegt qmapshack saga

@lsix lsix merged commit a5a93e6 into NixOS:master Jan 31, 2020
anna328p pushed a commit to anna328p/nixpkgs that referenced this pull request Feb 2, 2020
@lsix @anna328p
Merge pull request NixOS#78774 from das-g/gdal-3.0.3
7df2448 
gdal: 3.0.1 -> 3.0.3
@das-g das-g deleted the gdal-3.0.3 branch February 5, 2020 00:15
@das-g das-g mentioned this pull request Feb 5, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vbgl vbgl vbgl left review comments

@lsix lsix lsix approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@das-g @lsix @vbgl