mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 17:10:48 +00:00
Code Issues Wiki Activity

gdal: 3.0.1 -> 3.0.3

Browse source 
GDAL/OGR 3.0.3 contains bugfixes to be shipped with QGIS 3.10.2
(https://github.com/NixOS/nixpkgs/issues/78755)

See https://lists.osgeo.org/pipermail/qgis-developer/2020-January/060056.html
and https://blog.qgis.org/2020/01/24/public-service-announcement-update-to-the-latest-point-release-now/
This commit is contained in:
Raphael Das Gupta 2020-01-28 19:09:01 +01:00
parent 45e01e508a
commit e8aa909fa7
2 changed files with 2 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkgs/development/libraries/gdal/001.3_0_1.darwin.patch
View file

@ -1,29 +0,0 @@
diff a/swig/python/setup.py b/swig/python/setup.py
--- a/swig/python/setup.py
+++ b/swig/python/setup.py
@@ -268,17 +268,17 @@ class gdal_ext(build_ext):
if ext.name != 'osgeo._gdalconst':
ext.extra_compile_args += [cxx11_flag]
- # Adding arch flags here if OS X and compiler is clang
- if sys.platform == 'darwin' and [int(x) for x in os.uname()[2].split('.')] >= [11, 0, 0]:
- # since MacOS X 10.9, clang no longer accepts -mno-fused-madd
- # extra_compile_args.append('-Qunused-arguments')
- clang_flag = '-Wno-error=unused-command-line-argument-hard-error-in-future'
- if has_flag(self.compiler, clang_flag):
- ext.extra_compile_args += [clang_flag]
- else:
- clang_flag = '-Wno-error=unused-command-line-argument'
- if has_flag(self.compiler, clang_flag):
- ext.extra_compile_args += [clang_flag]
+ # Adding arch flags here if OS X and compiler is clang
+ if sys.platform == 'darwin' and [int(x) for x in os.uname()[2].split('.')] >= [11, 0, 0]:
+ # since MacOS X 10.9, clang no longer accepts -mno-fused-madd
+ # extra_compile_args.append('-Qunused-arguments')
+ clang_flag = '-Wno-error=unused-command-line-argument-hard-error-in-future'
+ if has_flag(self.compiler, clang_flag):
+ ext.extra_compile_args += [clang_flag]
+ else:
+ clang_flag = '-Wno-error=unused-command-line-argument'
+ if has_flag(self.compiler, clang_flag):
+ ext.extra_compile_args += [clang_flag]

14
pkgs/development/libraries/gdal/default.nix
View file

@ -9,27 +9,17 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gdal"; pname = "gdal";
version = "3.0.1"; version = "3.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OSGeo"; owner = "OSGeo";
repo = "gdal"; repo = "gdal";
rev = "v${version}"; rev = "v${version}";
sha256 = "04rraqhygv8b8fy87qvdhkgx87whby9n98p3gxqr7kdrfymwnh8l"; sha256 = "1rbyxmgmp27a5wvm4g70jr79bazhdl8q9rcch2b78m73njdv73xa";
}; };
sourceRoot = "source/gdal"; sourceRoot = "source/gdal";
patches = [
./001.3_0_1.darwin.patch
(fetchpatch {
name = "CVE-2019-17545.patch";
url = "https://github.com/OSGeo/gdal/commit/148115fcc40f1651a5d15fa34c9a8c528e7147bb.patch";
stripLen = 1;
sha256 = "0hai59hhvrci9xwjw4lp3wc1brn00imngmqrbbs8v9yr3b0fzbgs";
})
];
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite