From e8aa909fa7536862d7636f4035a777e0f3ef8f33 Mon Sep 17 00:00:00 2001
From: Raphael Das Gupta <raphael.das.gupta@hsr.ch>
Date: Tue, 28 Jan 2020 19:09:01 +0100
Subject: [PATCH] gdal: 3.0.1 -> 3.0.3

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/
---
 .../libraries/gdal/001.3_0_1.darwin.patch     | 29 -------------------
 pkgs/development/libraries/gdal/default.nix   | 14 ++-------
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/development/libraries/gdal/001.3_0_1.darwin.patch

diff --git a/pkgs/development/libraries/gdal/001.3_0_1.darwin.patch b/pkgs/development/libraries/gdal/001.3_0_1.darwin.patch
deleted file mode 100644
index 3d34f689120f..000000000000
--- a/pkgs/development/libraries/gdal/001.3_0_1.darwin.patch
+++ /dev/null
@@ -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]
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 922877f6f461..7a00a5aa94e6 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -9,27 +9,17 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "gdal";
-  version = "3.0.1";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "gdal";
     rev = "v${version}";
-    sha256 = "04rraqhygv8b8fy87qvdhkgx87whby9n98p3gxqr7kdrfymwnh8l";
+    sha256 = "1rbyxmgmp27a5wvm4g70jr79bazhdl8q9rcch2b78m73njdv73xa";
   };
 
   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 ];
 
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite