summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mayo <aklhfex@gmail.com>2020-01-10 19:38:40 +0000
committerAndreas Sturmlechner <asturm@gentoo.org>2020-01-29 22:32:36 +0100
commit1ae8b7c7c3790f0a866e57eb44b06a8c014c3c51 (patch)
tree5100e783151f60e7b0bdbba64036036e58c61be7 /sci-libs/gdal/files
parentdev-db/mariadb: Version bump for 10.2.31 (diff)
downloadgentoo-1ae8b7c7c3790f0a866e57eb44b06a8c014c3c51.tar.gz
gentoo-1ae8b7c7c3790f0a866e57eb44b06a8c014c3c51.tar.bz2
gentoo-1ae8b7c7c3790f0a866e57eb44b06a8c014c3c51.zip
sci-libs/gdal: version bump 3.0.2
Bug: https://bugs.gentoo.org/686732 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Chris Mayo <aklhfex@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/14061 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-libs/gdal/files')
-rw-r--r--sci-libs/gdal/files/gdal-3.0.2-complete.patch84
-rw-r--r--sci-libs/gdal/files/gdal-3.0.2-datadir.patch69
2 files changed, 153 insertions, 0 deletions
diff --git a/sci-libs/gdal/files/gdal-3.0.2-complete.patch b/sci-libs/gdal/files/gdal-3.0.2-complete.patch
new file mode 100644
index 00000000000..5d6716c7280
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.2-complete.patch
@@ -0,0 +1,84 @@
+diff --git a/GDALmake.opt.in b/GDALmake.opt.in
+index fd8e8f374d..655c004c56 100644
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
+@@ -63,6 +63,7 @@ INST_INCLUDE = @includedir@
+ INST_DATA = @datadir@
+ INST_LIB = @libdir@
+ INST_BIN = @bindir@
++INST_BASH_COMPLETION = @bashcompdir@
+ INST_PYMOD = @pymoddir@
+ INST_DOCS = @exec_prefix@/doc
+ INST_MAN = @mandir@
+diff --git a/GNUmakefile b/GNUmakefile
+index 92467d6cf6..6d5e7d9fc0 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -229,7 +229,9 @@ endif
+ ifneq ($(BINDINGS),)
+ (cd swig; $(MAKE) install)
+ endif
++ifdef INST_BASH_COMPLETION
+ (cd scripts; $(MAKE) install)
++endif
+ for f in LICENSE.TXT data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
+ $(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB)
+ $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/pkgconfig
+diff --git a/configure.ac b/configure.ac
+index 93ddca84d9..5d0e7ab8be 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1187,6 +1187,24 @@ if test "$am_func_iconv" = "yes"; then
+ AC_DEFINE_UNQUOTED(ICONV_CPP_CONST,$ICONV_CPP_CONST, [For.cpp files, define as const if the declaration of iconv() needs const.])
+ fi
+
++dnl ---------------------------------------------------------------------------
++dnl Bash completions
++dnl ---------------------------------------------------------------------------
++
++AC_ARG_WITH([bash-completion],
++ AS_HELP_STRING([--with-bash-completion[=ARG]],
++ [Install Bash completions (ARG=yes or path)]),,)
++
++if test "x$with_bash_completion" = "xno" -o "x$with_bash_completion" = "x"; then
++ AC_MSG_NOTICE([Bash completions not requested])
++elif test "x$with_bash_completion" = "xyes"; then
++ PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
++ bashcompdir="${sysconfdir}/bash_completion.d")
++ AC_SUBST(bashcompdir)
++else
++ AC_SUBST(bashcompdir, $with_bash_completion)
++fi
++
+ dnl ---------------------------------------------------------------------------
+ dnl PROJ.6 related stuff
+ dnl ---------------------------------------------------------------------------
+diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
+index 8f039e469a..511fbb499c 100644
+--- a/scripts/GNUmakefile
++++ b/scripts/GNUmakefile
+@@ -1,10 +1,20 @@
+ include ../GDALmake.opt
+
++PROGRAMS := gdal2tiles.py gdal2xyz.py gdaladdo gdalbuildvrt gdal_calc.py \
++ gdalchksum.py gdalcompare.py gdal-config gdal_contour gdaldem \
++ gdal_edit.py gdalenhance gdal_fillnodata.py gdal_grid \
++ gdalident.py gdalimport.py gdallocationinfo gdalmanage \
++ gdal_merge.py gdalmove.py gdal_polygonize.py gdal_proximity.py \
++ gdal_rasterize gdal_retile.py gdalserver gdal_sieve.py \
++ gdalsrsinfo gdaltindex gdaltransform gdal_translate gdalwarp \
++ ogr2ogr ogrinfo ogrlineref ogrmerge.py ogrtindex
++
+ completion:
+ PATH=$(GDAL_ROOT)/swig/python/scripts:$(GDAL_ROOT)/apps:$(PATH) python completionFinder.py gdal-bash-completion.sh
+
+ install:
+- if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
+- $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
+- cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
+- fi
++ $(INSTALL_DIR) $(DESTDIR)$(INST_BASH_COMPLETION) ; \
++ $(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo; \
++ for p in $(PROGRAMS); do \
++ ln -rs $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
++ done
diff --git a/sci-libs/gdal/files/gdal-3.0.2-datadir.patch b/sci-libs/gdal/files/gdal-3.0.2-datadir.patch
new file mode 100644
index 00000000000..95c525ca1b8
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.2-datadir.patch
@@ -0,0 +1,69 @@
+diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
+index 655c004c56..7d8f3708d6 100644
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
+@@ -56,18 +56,23 @@ GNM_ENABLED = @GNM_ENABLED@
+ OSX_FRAMEWORK_PREFIX = /Library/Frameworks/GDAL.framework
+ OSX_VERSION_FRAMEWORK_PREFIX = ${OSX_FRAMEWORK_PREFIX}/Versions/@GDAL_VERSION_MAJOR@.@GDAL_VERSION_MINOR@
+
++PACKAGE = @PACKAGE@
++
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++datarootdir = @datarootdir@
++docdir = @docdir@
++htmldir = @htmldir@
+ INST_PREFIX = @exec_prefix@
+ INST_INCLUDE = @includedir@
+-INST_DATA = @datadir@
++INST_DATA = @datadir@/gdal
+ INST_LIB = @libdir@
+ INST_BIN = @bindir@
+ INST_BASH_COMPLETION = @bashcompdir@
+ INST_PYMOD = @pymoddir@
+-INST_DOCS = @exec_prefix@/doc
++INST_DOCS = @htmldir@
+ INST_MAN = @mandir@
+-INST_HTML = $(HOME)/www/gdal
++INST_WEB = $(HOME)/www/gdal
+
+ CPPFLAGS := @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION
+ CFLAGS = @CFLAGS@ @C_WFLAGS@ $(USER_DEFS)
+diff --git a/gdal/configure.ac b/gdal/configure.ac
+index 5d0e7ab8be..afef88fdbd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,6 +33,7 @@ define([AC_CACHE_SAVE], )
+
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(GDALmake.opt.in)
++AC_SUBST(PACKAGE, gdal)
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([port/cpl_config.h:port/cpl_config.h.in])
+ AH_BOTTOM([#include "cpl_config_extras.h"])
+@@ -5167,25 +5168,6 @@ export BINTRUE
+
+ AC_SUBST(BINTRUE,$BINTRUE)
+
+-dnl ---------------------------------------------------------------------------
+-dnl If datadir is set to @prefix@/share, the modify it to be
+-dnl @prefix@/share/gdal. I wish we could default this.
+-dnl ---------------------------------------------------------------------------
+-if test "$datadir" = '${prefix}/share' ; then
+- datadir='${prefix}/share/gdal'
+-fi
+-
+-if test "$datadir" = '${datarootdir}' \
+- -a "$datarootdir" = '${prefix}/share' ; then
+- datarootdir='${prefix}/share/gdal'
+-fi
+-
+-dnl ---------------------------------------------------------------------------
+-dnl By default mandir is $datarootdir/man which would be
+-dnl /usr/local/share/gdal/man but we want man pages in /usr/local/man.
+-dnl ---------------------------------------------------------------------------
+-mandir='${prefix}/man'
+-
+ dnl ---------------------------------------------------------------------------
+ dnl Capture GDAL_PREFIX for the cpl_config.h include file.
+ dnl ---------------------------------------------------------------------------