[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
commit: 37de76d39fbddf96349d29aeeec9338b809052ed
Author: Mario Haustein hrz tu-chemnitz de>
AuthorDate: Sat Jun 18 11:16:37 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Jun 20 02:49:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37de76d3
sci-geosciences/grass: remove old
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/25953
Signed-off-by: Sam James gentoo.org>
sci-geosciences/grass/Manifest | 1 -
.../grass/files/grass-8.0.1-lib_imagery.patch | 11 -
sci-geosciences/grass/grass-8.0.1-r1.ebuild| 282 -
3 files changed, 294 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 4fa939f09a8e..745b3b8081b9 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,5 +1,4 @@
DIST grass-7.8.6.tar.gz 66331264 BLAKE2B
bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761
SHA512
6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
DIST grass-7.8.7.tar.gz 66333084 BLAKE2B
809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42
SHA512
8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303
-DIST grass-8.0.1.tar.gz 64928098 BLAKE2B
81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc
SHA512
ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f
DIST grass-8.0.2.tar.gz 65665825 BLAKE2B
496dab376b38c74d2206096f8b1bf84c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f
SHA512
fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c
DIST grass-8.2.0.tar.gz 66819726 BLAKE2B
e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3
SHA512
8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930
diff --git a/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch
b/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch
deleted file mode 100644
index 1eca86750ecd..
--- a/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://github.com/OSGeo/grass/pull/2269
a/lib/imagery/Makefile
-+++ b/lib/imagery/Makefile
-@@ -7,7 +7,6 @@
-
- include $(MODULE_TOPDIR)/include/Make/Lib.make
- include $(MODULE_TOPDIR)/include/Make/Doxygen.make
--include $(MODULE_TOPDIR)/include/Make/Grass.make
-
- # images
- IMGSRC := $(wildcard *.png) $(wildcard *.jpg) $(wildcard *.gif)
diff --git a/sci-geosciences/grass/grass-8.0.1-r1.ebuild
b/sci-geosciences/grass/grass-8.0.1-r1.ebuild
deleted file mode 100644
index 3d92d0c246f7..
--- a/sci-geosciences/grass/grass-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite" # bug 572440
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D
vizualization"
-HOMEPAGE="https://grass.osgeo.org/;
-
-LICENSE="GPL-2"
-SLOT="0/8.0"
-
-GVERSION=${SLOT#*/}
-MY_PM="${PN}${GVERSION}"
-MY_PM="${MY_PM/.}"
-
-if [[ ${PV} =~ "" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/OSGeo/grass.git;
-else
- MY_P="${P/_rc/RC}"
- SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz;
- if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="amd64 ~ppc x86"
- fi
-
- S="${WORKDIR}/${MY_P}"
-fi
-
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl
openmp png postgres readline sqlite threads tiff truetype X zstd"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- opengl? ( X )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=app-admin/eselect-1.2
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- ')
- sci-libs/gdal:=
- sys-libs/gdbm:=
- sys-libs/ncurses:0=
- sci-libs/proj:=
- sci-libs/xdrfile
- sys-libs/zlib
- media-libs/libglvnd
- media-libs/glu
- blas? (
- virtual/cblas[eselect-ldso(+)]
-
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
commit: dbee876ddee6b184f5b21b877d3de462fefe6202 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Mon May 23 10:04:35 2022 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon May 23 11:59:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbee876d sci-geosciences/grass: remove old Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/25605 Signed-off-by: Conrad Kostecki gentoo.org> sci-geosciences/grass/Manifest | 1 - .../grass/files/grass-8.0.0-mkhtml.patch | 316 - sci-geosciences/grass/grass-8.0.0.ebuild | 274 -- sci-geosciences/grass/grass-8.0.1.ebuild | 281 -- 4 files changed, 872 deletions(-) diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index a0364e0e9b96..cd51431391bf 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,5 +1,4 @@ DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303 -DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42 DIST grass-8.0.1.tar.gz 64928098 BLAKE2B 81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc SHA512 ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f DIST grass-8.0.2.tar.gz 65665825 BLAKE2B 496dab376b38c74d2206096f8b1bf84c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f SHA512 fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c diff --git a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch deleted file mode 100644 index 1eb46012f6a4.. --- a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch +++ /dev/null @@ -1,316 +0,0 @@ a/lib/init/variables.html -+++ b/lib/init/variables.html -@@ -234,12 +234,7 @@ PERMANENT - GRASS_PERL - [used during install process for generating man pages] - set Perl with path. -- -- GRASS_PROXY -- [used during addon install/reinstall process for generating man --pages (download commit from GitHub API server and remote modules.xml file)] --set the proxy with: GRASS_PROXY="http=value,ftp=value". -- -+ - GRASS_SKIP_MAPSET_OWNER_CHECK - By default it is not possible to work with MAPSETs that are - not owned by current user. Setting this variable to any non-empty value a/scripts/g.extension/g.extension.py -+++ b/scripts/g.extension/g.extension.py -@@ -354,6 +354,7 @@ def download_addons_paths_file(url, response_format, *args, **kwargs): - ), - ) - return response -+ - except HTTPError as err: - if err.code == 403 and err.msg == "rate limit exceeded": - gscript.warning( -@@ -2588,8 +2589,6 @@ def main(): - proxy = urlrequest.ProxyHandler(PROXIES) - opener = urlrequest.build_opener(proxy) - urlrequest.install_opener(opener) --# Required for mkhtml.py script (get addon git commit from GitHub API server) --os.environ["GRASS_PROXY"] = options["proxy"] - - # define path - options["prefix"] = resolve_install_prefix( a/utils/mkhtml.py -+++ b/utils/mkhtml.py -@@ -16,7 +16,6 @@ - # - # - --import http - import sys - import os - import string -@@ -25,9 +24,6 @@ from datetime import datetime - import locale - import json - import pathlib --import shutil --import subprocess --import time - - try: - # Python 2 import -@@ -35,26 +31,11 @@ try: - except ImportError: - # Python 3 import - from html.parser import HTMLParser -- --from six.moves.urllib import request as urlrequest --from six.moves.urllib.error import HTTPError, URLError -- - try: - import urlparse - except ImportError: - import urllib.parse as urlparse - --try: --
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
commit: 7c473887fbc1dfbc393930e612cfc811e0f7e077
Author: Mario Haustein hrz tu-chemnitz de>
AuthorDate: Fri Jan 28 22:59:57 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Jan 29 06:18:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c473887
sci-geosciences/grass: version bump 8.0.0
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/24003
Signed-off-by: Sam James gentoo.org>
sci-geosciences/grass/Manifest | 2 +-
.../grass/files/grass-8.0.0-mkhtml.patch | 316 +
.../{grass-8.0.0_rc2.ebuild => grass-8.0.0.ebuild} | 1 +
3 files changed, 318 insertions(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index ff32202d3394..85de9606c6e5 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1,2 @@
DIST grass-7.8.6.tar.gz 66331264 BLAKE2B
bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761
SHA512
6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
-DIST grass-8.0.0RC2.tar.gz 64942585 BLAKE2B
fc7499def2029acb9b547c688eaaad986daae5c80b085bbe876d7bca4d4c7547867375edee752705e30ab215d0b8e0c7f017e94802a549569a525196bbd7bcb4
SHA512
9e624c54974e253dce1b93a0ce1c51eaa421d8baacdf61b03893d34c5cd36af76915ab035fb9bb78af4c16e1efc12bb501a707e335e312a12cf2c17a2b0d6f61
+DIST grass-8.0.0.tar.gz 64944539 BLAKE2B
61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1
SHA512
29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42
diff --git a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
new file mode 100644
index ..1eb46012f6a4
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
@@ -0,0 +1,316 @@
+--- a/lib/init/variables.html
b/lib/init/variables.html
+@@ -234,12 +234,7 @@ PERMANENT
+ GRASS_PERL
+ [used during install process for generating man pages]
+ set Perl with path.
+-
+- GRASS_PROXY
+- [used during addon install/reinstall process for generating man
+-pages (download commit from GitHub API server and remote modules.xml
file)]
+-set the proxy with:
GRASS_PROXY="http=value,ftp=value".
+-
++
+ GRASS_SKIP_MAPSET_OWNER_CHECK
+ By default it is not possible to work with MAPSETs that are
+ not owned by current user. Setting this variable to any non-empty value
+--- a/scripts/g.extension/g.extension.py
b/scripts/g.extension/g.extension.py
+@@ -354,6 +354,7 @@ def download_addons_paths_file(url, response_format,
*args, **kwargs):
+ ),
+ )
+ return response
++
+ except HTTPError as err:
+ if err.code == 403 and err.msg == "rate limit exceeded":
+ gscript.warning(
+@@ -2588,8 +2589,6 @@ def main():
+ proxy = urlrequest.ProxyHandler(PROXIES)
+ opener = urlrequest.build_opener(proxy)
+ urlrequest.install_opener(opener)
+-# Required for mkhtml.py script (get addon git commit from GitHub API
server)
+-os.environ["GRASS_PROXY"] = options["proxy"]
+
+ # define path
+ options["prefix"] = resolve_install_prefix(
+--- a/utils/mkhtml.py
b/utils/mkhtml.py
+@@ -16,7 +16,6 @@
+ #
+ #
+
+-import http
+ import sys
+ import os
+ import string
+@@ -25,9 +24,6 @@ from datetime import datetime
+ import locale
+ import json
+ import pathlib
+-import shutil
+-import subprocess
+-import time
+
+ try:
+ # Python 2 import
+@@ -35,26 +31,11 @@ try:
+ except ImportError:
+ # Python 3 import
+ from html.parser import HTMLParser
+-
+-from six.moves.urllib import request as urlrequest
+-from six.moves.urllib.error import HTTPError, URLError
+-
+ try:
+ import urlparse
+ except ImportError:
+ import urllib.parse as urlparse
+
+-try:
+-import grass.script as gs
+-except ImportError:
+-# During compilation GRASS GIS
+-gs = None
+-
+-HEADERS = {
+-"User-Agent": "Mozilla/5.0",
+-}
+-HTTP_STATUS_CODES = list(http.HTTPStatus)
+-
+ if sys.version_info[0] == 2:
+ PY2 = True
+ else:
+@@ -65,24 +46,6 @@ if not PY2:
+ unicode = str
+
+
+-grass_version = os.getenv("VERSION_NUMBER", "unknown")
+-trunk_url = ""
+-addons_url = ""
+-if grass_version != "unknown":
+-major, minor, patch = grass_version.split(".")
+-grass_git_branch = "releasebranch_{major}_{minor}".format(
+-major=major,
+-minor=minor,
+-)
+-base_url = "https://github.com/OSGeo;
+-trunk_url =
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/
commit: 6098e0d0f5b07be22c74f49841a29cd930ab5de8
Author: Mario Haustein hrz tu-chemnitz de>
AuthorDate: Sat Jan 15 18:44:03 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 16 01:46:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6098e0d0
sci-geosciences/grass: remove old files
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mario Haustein hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/23811
Signed-off-by: Sam James gentoo.org>
sci-geosciences/grass/files/grass-7.8.5-bool.patch | 164 -
1 file changed, 164 deletions(-)
diff --git a/sci-geosciences/grass/files/grass-7.8.5-bool.patch
b/sci-geosciences/grass/files/grass-7.8.5-bool.patch
deleted file mode 100644
index fddcb9f6df88..
--- a/sci-geosciences/grass/files/grass-7.8.5-bool.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff --git a/include/gis.h b/include/gis.h
-index 46bb06c52f..333651b938 100644
a/include/gis.h
-+++ b/include/gis.h
-@@ -23,6 +23,8 @@
- /* System include files */
- #include
- #include
-+#include
-+
-
- /* Grass and local include files */
- #include
-@@ -51,13 +53,14 @@ static const char *GRASS_copyright __attribute__ ((unused))
- #define G_gisinit(pgm) G__gisinit(GIS_H_VERSION, (pgm))
- #define G_no_gisinit() G__no_gisinit(GIS_H_VERSION)
-
--/* Define TRUE and FALSE for boolean comparisons */
-+/* For boolean values and comparisons use the C99 type 'bool' with values
'true' */
-+/* and 'false' For historical reasons 'TRUE' and 'FALSE' are still valid.
*/
- #ifndef TRUE
--#define TRUE 1
-+#define TRUE true
- #endif
-
- #ifndef FALSE
--#define FALSE 0
-+#define FALSE false
- #endif
-
- #if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || (__APPLE__ &&
__LP64__)
-diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
-index 89a25de3bf..978894ea74 100644
a/lib/lidar/lidar.h
-+++ b/lib/lidar/lidar.h
-@@ -62,9 +62,6 @@
- /* INTERPOLATOR */
- #define P_BILINEAR1
- #define P_BICUBIC 0
--/* Boolean definitions */
--#define TRUE 1
--#define FALSE 0
-
-
/*--*/
- /*STRUCTS DECLARATION */
-diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
-index 9c1dab4e81..2512fedaa2 100644
a/raster/r.param.scale/param.h
-+++ b/raster/r.param.scale/param.h
-@@ -18,8 +18,6 @@
- /* 'blank' edge around raster. */
- #define MAX_WSIZE 499 /* Maximum dimensions of window.*/
- /* Some useful labels. */
--#define TRUE 1
--#define FALSE 0
-
- #define RAD2DEG M_R2D
- #define DEG2RAD M_D2R
-diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
-index 33164f43cb..47028e7444 100644
a/raster/r.surf.idw/main.h
-+++ b/raster/r.surf.idw/main.h
-@@ -1,8 +1,6 @@
- #include
-
- #define SHORT short
--#define TRUE1
--#define FALSE 0
-
- #define MELEMENTstruct Melement
- MELEMENT {
-diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
-index fb3b79882f..ae3ec3933a 100644
a/raster3d/r3.showdspf/Ball.c
-+++ b/raster3d/r3.showdspf/Ball.c
-@@ -7,8 +7,6 @@
- #include "Ball.h"
- #include "BallMath.h"
- #include
--#define TRUE 1
--#define FALSE 0
-
- HMatrix mId = { {1, 0, 0, 0}
- , {0, 1, 0, 0}
-diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
-index 589f243a8d..b48236b33f 100644
a/raster3d/r3.showdspf/togif.c
-+++ b/raster3d/r3.showdspf/togif.c
-@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g,
unsigned short *b,
- *
-
*/
-
--#define TRUE 1
--#define FALSE 0
--
-
- /** BumpPixel() /
- /*
-diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
-index 1ad97396fa..584af5d8ba 100644
a/vector/v.hull/chull.c
-+++ b/vector/v.hull/chull.c
-@@ -29,10 +29,6 @@
-
- #include "globals.h"
-
--/*Define Boolean type */
--typedef enum
--{ BFALSE, BTRUE } bool;
--
- /* Define vertex indices. */
- #define X 0
- #define Y 1
-@@ -76,10 +72,10 @@ struct tFaceStructure
- };
-
- /* Define flags */
--#define ONHULLBTRUE
--#define REMOVED BTRUE
--#define VISIBLE BTRUE
--#define PROCESSED BTRUE
-+#define ONHULLtrue
-+#define REMOVED true
-+#define VISIBLE true
-+#define PROCESSED true
-
- /* Global variable definitions */
- tVertex vertices = NULL;
-@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
- tFace f;
- tEdge e, temp;
- long int vol;
--bool vis = BFALSE;
-+bool vis = false;
-
-
- /* Mark faces visible from p. */
-@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
-
- if (vol <
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
commit: 5c4e2c2692b53050f93dcd5afd349dd34df64797
Author: Mario Haustein hrz tu-chemnitz de>
AuthorDate: Thu Dec 30 20:11:45 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 2 07:02:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c4e2c26
sci-geosciences/grass: rename patch file
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mario Haustein hrz.tu-chemnitz.de>
Signed-off-by: Sam James gentoo.org>
.../grass/files/{grass-7.8-flock.patch => grass-flock.patch}| 0
sci-geosciences/grass/grass-7.8.6-r1.ebuild | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/files/grass-7.8-flock.patch
b/sci-geosciences/grass/files/grass-flock.patch
similarity index 100%
rename from sci-geosciences/grass/files/grass-7.8-flock.patch
rename to sci-geosciences/grass/files/grass-flock.patch
diff --git a/sci-geosciences/grass/grass-7.8.6-r1.ebuild
b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
index 4332f826c81a..c751961cabf0 100644
--- a/sci-geosciences/grass/grass-7.8.6-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
@@ -81,7 +81,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
# bug 746590
- "${FILESDIR}/${PN}-7.8-flock.patch"
+ "${FILESDIR}/${PN}-flock.patch"
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
commit: d849efc7539748cecb34c3d6e69ca30e0a58f5b4
Author: Mario Haustein hrz tu-chemnitz de>
AuthorDate: Sat May 29 17:35:48 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat May 29 17:45:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d849efc7
sci-geosciences/grass: fix build failure with GCC 11
Closes: https://bugs.gentoo.org/792801
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mario Haustein hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/21039
Signed-off-by: Sam James gentoo.org>
sci-geosciences/grass/files/grass-7.8.5-bool.patch | 164 +
sci-geosciences/grass/grass-7.8.5.ebuild | 4 +-
2 files changed, 167 insertions(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/files/grass-7.8.5-bool.patch
b/sci-geosciences/grass/files/grass-7.8.5-bool.patch
new file mode 100644
index 000..fddcb9f6df8
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.8.5-bool.patch
@@ -0,0 +1,164 @@
+diff --git a/include/gis.h b/include/gis.h
+index 46bb06c52f..333651b938 100644
+--- a/include/gis.h
b/include/gis.h
+@@ -23,6 +23,8 @@
+ /* System include files */
+ #include
+ #include
++#include
++
+
+ /* Grass and local include files */
+ #include
+@@ -51,13 +53,14 @@ static const char *GRASS_copyright __attribute__ ((unused))
+ #define G_gisinit(pgm) G__gisinit(GIS_H_VERSION, (pgm))
+ #define G_no_gisinit() G__no_gisinit(GIS_H_VERSION)
+
+-/* Define TRUE and FALSE for boolean comparisons */
++/* For boolean values and comparisons use the C99 type 'bool' with values
'true' */
++/* and 'false' For historical reasons 'TRUE' and 'FALSE' are still valid.
*/
+ #ifndef TRUE
+-#define TRUE 1
++#define TRUE true
+ #endif
+
+ #ifndef FALSE
+-#define FALSE 0
++#define FALSE false
+ #endif
+
+ #if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || (__APPLE__ &&
__LP64__)
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+ /* INTERPOLATOR */
+ #define P_BILINEAR1
+ #define P_BICUBIC 0
+-/* Boolean definitions */
+-#define TRUE 1
+-#define FALSE 0
+
+
/*--*/
+ /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+ /* 'blank' edge around raster. */
+ #define MAX_WSIZE 499 /* Maximum dimensions of window.*/
+ /* Some useful labels. */
+-#define TRUE 1
+-#define FALSE 0
+
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include
+
+ #define SHORT short
+-#define TRUE1
+-#define FALSE 0
+
+ #define MELEMENTstruct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include
+-#define TRUE 1
+-#define FALSE 0
+
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g,
unsigned short *b,
+ *
+
*/
+
+-#define TRUE 1
+-#define FALSE 0
+-
+
+ /** BumpPixel() /
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+
+ #include "globals.h"
+
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X 0
+ #define Y 1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+
+ /* Define flags */
+-#define ONHULLBTRUE
+-#define REMOVED BTRUE
+-#define VISIBLE BTRUE
+-#define PROCESSED BTRUE
++#define ONHULLtrue
++#define REMOVED true
++#define VISIBLE true
++#define PROCESSED true
+
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+ tFace f;
+ tEdge e, temp;
+ long int vol;
+-bool vis = BFALSE;
++bool
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
commit: 504ecda44c5f9d0e661f6af325fe587e83ff9a22
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 27 13:59:05 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 27 17:18:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=504ecda4
sci-geosciences/grass: Drop old
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
sci-geosciences/grass/Manifest | 3 -
sci-geosciences/grass/files/grass-7.2.0-gcc7.patch | 94 ---
.../grass/files/grass-7.2.0-glibc-2.26-1.patch | 10 -
.../grass/files/grass-7.2.0-glibc-2.26-2.patch | 32 ---
sci-geosciences/grass/grass-7.2.0-r1.ebuild| 265 ---
sci-geosciences/grass/grass-7.4.0.ebuild | 281
sci-geosciences/grass/grass-7.4.1.ebuild | 284 -
7 files changed, 969 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index ab09e66a39f..1fcbb8c2267 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,4 +1 @@
-DIST grass-7.2.0.tar.gz 48315008 BLAKE2B
927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6
SHA512
b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b
-DIST grass-7.4.0.tar.gz 56329374 BLAKE2B
924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df
SHA512
b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321
-DIST grass-7.4.1.tar.gz 57969640 BLAKE2B
1d3d0fd20611971ec349bf0e26ef7d886b7047e1ec48f48584f8ba2e5562f352433c9869420d7e030e66fb5a9e60de20e6a78d1fd5142380fbcab51f700766d8
SHA512
66616e495aa798cd1ad7a0284a386f7e99741918596b816a712788114e7dc491be0b5f19551f102b436518a5cabcdedbc61042acf0a9b06b9d8df12b4de26c90
DIST grass-7.4.4.tar.gz 58454921 BLAKE2B
bf8f85e4dad800a32ac0c23025b0844dde17c806aeec7d150d3263ff8fae80deab7b7052cfb664e138b2af1e5fbe3282db087d7545d42710db6d9890f0b285ee
SHA512
9971bd1184c4b2eb38ecf5efafd28094c2d05d22e9ae53a8b074a15e26c029dd13c4627b442a428bca4030fd9118e49422863515cf0fc58dd46e70d2923a9f83
diff --git a/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch
b/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch
deleted file mode 100644
index 97be4d7d860..000
--- a/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Index: releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/lextab.py
-===
a/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71218)
-+++ b/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71219)
-@@ -1,59 +1,8 @@
- # lextab.py. This file automatically created by PLY (version 2.2). Don't edit!
--_lextokens = {
--'RIGHT_OP': None,
--'RIGHT_ASSIGN': None,
--'DEC_OP': None,
--'PP_MACRO_PARAM': None,
--'DIV_ASSIGN': None,
--'PP_DEFINE': None,
--'PP_END_DEFINE': None,
--'PP_DEFINE_MACRO_NAME': None,
--'HEADER_NAME': None,
--'NEWLINE': None,
--'CHARACTER_CONSTANT': None,
--'PP_STRINGIFY': None,
--'AND_ASSIGN': None,
--'PTR_OP': None,
--'ELLIPSIS': None,
--'IDENTIFIER': None,
--'ADD_ASSIGN': None,
--'PERIOD': None,
--'AND_OP': None,
--'OTHER': None,
--'LPAREN': None,
--'LEFT_OP': None,
--'LE_OP': None,
--'OR_OP': None,
--'SUB_ASSIGN': None,
--'MOD_ASSIGN': None,
--'STRING_LITERAL': None,
--'PP_IDENTIFIER_PASTE': None,
--'PP_NUMBER': None,
--'PP_DEFINE_NAME': None,
--'XOR_ASSIGN': None,
--'OR_ASSIGN': None,
--'GE_OP': None,
--'MUL_ASSIGN': None,
--'LEFT_ASSIGN': None,
--'INC_OP': None,
--'NE_OP': None,
--'EQ_OP': None}
--_lexreflags = 0
--_lexliterals = ''
-+_lextokens= {'RIGHT_OP': None, 'RIGHT_ASSIGN': None, 'DEC_OP': None,
'PP_MACRO_PARAM': None, 'DIV_ASSIGN': None, 'PP_DEFINE': None, 'PP_END_DEFINE':
None, 'PP_DEFINE_MACRO_NAME': None, 'HEADER_NAME': None, 'NEWLINE': None,
'CHARACTER_CONSTANT': None, 'PP_STRINGIFY': None, 'AND_ASSIGN': None, 'PTR_OP':
None, 'ELLIPSIS': None, 'IDENTIFIER': None, 'ADD_ASSIGN': None, 'PERIOD': None,
'AND_OP': None, 'OTHER': None, 'LPAREN': None, 'LEFT_OP': None, 'LE_OP': None,
'OR_OP': None, 'SUB_ASSIGN': None, 'MOD_ASSIGN': None, 'STRING_LITERAL': None,
'PP_IDENTIFIER_PASTE': None, 'PP_NUMBER': None, 'PP_DEFINE_NAME': None,
'XOR_ASSIGN': None, 'OR_ASSIGN': None, 'GE_OP': None, 'MUL_ASSIGN': None,
'LEFT_ASSIGN': None, 'INC_OP': None, 'NE_OP': None, 'EQ_OP': None}
-+_lexreflags = 0
-+_lexliterals = ''
- _lexstateinfo = {'INITIAL': 'inclusive', 'DEFINE': 'exclusive'}
--_lexstatere = {
--'INITIAL': [
--
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
commit: f602ce29a225b52165cf735a263c65a6a8774f36
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Apr 4 21:01:04 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Apr 4 21:09:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f602ce29
sci-geosciences/grass: Fix build with glibc-2.26
Reported-by: Martin von Gagern gmx.net>
Thanks-to: MarisN gmail.com>
Closes: https://bugs.gentoo.org/588980
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../grass/files/grass-7.2.0-glibc-2.26-1.patch | 10 +++
.../grass/files/grass-7.2.0-glibc-2.26-2.patch | 32 ++
sci-geosciences/grass/grass-7.2.0-r1.ebuild| 1 +
3 files changed, 43 insertions(+)
diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch
b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch
new file mode 100644
index 000..115ff06febc
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch
@@ -0,0 +1,10 @@
+Index: /grass/trunk/lib/raster/R.h
+===
+--- /grass/trunk/lib/raster/R.h(revision 71264)
/grass/trunk/lib/raster/R.h(revision 71265)
+@@ -1,5 +1,4 @@
+ #include
+ #include
+-#include
+ #ifdef HAVE_GDAL
+ #include
diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch
b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch
new file mode 100644
index 000..c1361f6af08
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch
@@ -0,0 +1,32 @@
+Index: /grass/branches/releasebranch_7_2/lib/raster/get_row.c
+===
+--- /grass/branches/releasebranch_7_2/lib/raster/get_row.c (revision 71943)
/grass/branches/releasebranch_7_2/lib/raster/get_row.c (revision 71944)
+@@ -15,6 +15,4 @@
+ #include
+ #include
+-
+-#include /* need this for sgi */
+
+ #include
+Index: /grass/branches/releasebranch_7_2/lib/raster/open.c
+===
+--- /grass/branches/releasebranch_7_2/lib/raster/open.c(revision 71943)
/grass/branches/releasebranch_7_2/lib/raster/open.c(revision 71944)
+@@ -13,6 +13,4 @@
+ */
+
+-#include
+-#include
+ #include
+ #include
+Index: /grass/branches/releasebranch_7_2/lib/raster/range.c
+===
+--- /grass/branches/releasebranch_7_2/lib/raster/range.c (revision 71943)
/grass/branches/releasebranch_7_2/lib/raster/range.c (revision 71944)
+@@ -13,5 +13,4 @@
+
+ #include
+-#include /* need this for sgi */
+
+ #include
diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild
b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
index 00657af184e..233823e1fa4 100644
--- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
@@ -79,6 +79,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
"${FILESDIR}/${P}"-gcc7.patch
+ "${FILESDIR}/${P}"-glibc-2.26-{1,2}.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
commit: ecadec9b5efee4b6e3bb100ac7d16bba3f7a9e3f
Author: Amy Winston gentoo org>
AuthorDate: Sat Dec 5 13:14:45 2015 +
Commit: Amy Winston gentoo org>
CommitDate: Sat Dec 5 13:14:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecadec9b
sci-geosciences/grass: cleaning mess from package removal
Package-Manager: portage-2.2.20.1
.../grass/files/grass-6.4.0-html-nonviz.patch | 33 -
.../grass/files/grass-6.4.1-libav-0.8.patch| 60
.../grass/files/grass-6.4.1-libpng15.patch | 28
.../grass/files/grass-6.4.1-nopycompile.patch | 12
.../grass/files/grass-6.4.1-timer_flags.patch | 13
.../grass/files/grass-6.4.2-configure.patch| 26 ---
.../grass/files/grass-6.4.2-ffmpeg-1.patch | 79 --
.../grass/files/grass-6.4.2-libav-9.patch | 11 ---
sci-geosciences/grass/files/grass-pkgconf.patch| 22 --
sci-geosciences/grass/grass-7.0.1-r3.ebuild| 4 +-
sci-geosciences/grass/metadata.xml | 4 --
11 files changed, 2 insertions(+), 290 deletions(-)
diff --git a/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch
b/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch
deleted file mode 100644
index a5afd0d..000
--- a/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch
+++ /dev/null
@@ -1,33 +0,0 @@
tools/build_html_index.sh.old 2010-06-16 23:07:37.0 +0200
-+++ tools/build_html_index.sh 2010-06-16 23:10:00.0 +0200
-@@ -135,7 +135,6 @@
-
-
-
--nviz 3D visualization and animation
tool
- xganim tool for animating a raster
map series
-
-
-@@ -245,11 +244,11 @@
- #copy over CSS:
- cp -f grassdocs.css $HTMLDIR/
- mkdir -p $HTMLDIR/nviz/
--cp -f grassdocs.css $HTMLDIR/nviz/
-+#cp -f grassdocs.css $HTMLDIR/nviz/
- chmod a+r $HTMLDIR/grassdocs.css $HTMLDIR/nviz/grassdocs.css
- #copy over GRASS logo:
- cp -f grass_logo.png $HTMLDIR/
--cp -f grass_logo.png $HTMLDIR/nviz/
-+#cp -f grass_logo.png $HTMLDIR/nviz/
- chmod a+r $HTMLDIR/grass_logo.png $HTMLDIR/nviz/grass_logo.png
- if [ "$MACOSX" ] ; then
- cp -f grass_icon.png $HTMLDIR/
-@@ -302,7 +301,7 @@
- echo "r3.*
raster3D commands" >> "$FULLINDEX"
- echo "v.*
vector commands" >> "$FULLINDEX"
- echo "gis.m GUI
frontend to GIS menus and display" >> "$FULLINDEX"
--echo "nviz
visualization suite" >> "$FULLINDEX"
-+#echo "nviz
visualization suite" >> "$FULLINDEX"
- echo "wxGUI
wxPython-based GUI frontend" >> "$FULLINDEX"
- echo "xganim raster
map slideshow" >> "$FULLINDEX"
- echo "" >> "$FULLINDEX"
diff --git a/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch
b/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch
deleted file mode 100644
index 4864d88..000
--- a/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Adjust Grass 6.4.1 to work with ffmpeg 8.
-
-2011-11-17 Fabio Erculiani
-2011-12-08 Martin von Gagern
-
-References:
-https://bugs.gentoo.org/390827
-https://bugs.gentoo.org/392371
-
grass-6.4.1.orig/lib/ogsf/gsd_img_mpeg.c
-+++ grass-6.4.1/lib/ogsf/gsd_img_mpeg.c
-@@ -66,7 +66,7 @@ static AVStream *add_video_stream(AVForm
-
- c = st->codec;
- c->codec_id = codec_id;
--c->codec_type = CODEC_TYPE_VIDEO;
-+c->codec_type = AVMEDIA_TYPE_VIDEO;
-
- /* put sample parameters */
- c->bit_rate = 40;
-@@ -215,7 +215,7 @@ static void write_video_frame(AVFormatCo
-
- av_init_packet();
-
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- pkt.stream_index = st->index;
- pkt.data = (uint8_t *) picture;
- pkt.size = sizeof(AVPicture);
-@@ -236,7 +236,7 @@ static void write_video_frame(AVFormatCo
- av_rescale_q(c->coded_frame->pts, c->time_base,
-st->time_base);
- if (c->coded_frame->key_frame)
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- pkt.stream_index = st->index;
- pkt.data = video_outbuf;
- pkt.size = out_size;
-@@ -301,10 +301,10 @@ int gsd_init_mpeg(const char *filename)
- av_register_all();
-
- /* auto detect the output format from the name. default is mpeg. */
--fmt = guess_format(NULL, filename, NULL);
-+fmt = av_guess_format(NULL, filename, NULL);
- if (!fmt) {
- G_warning(_("Unable to deduce output format from file extension: using
MPEG"));
-- fmt = guess_format("mpeg", NULL, NULL);
-+ fmt = av_guess_format("mpeg", NULL, NULL);
- }
- if (!fmt) {
- G_warning(_("Unable to find suitable output format"));
-@@ -312,7 +312,7 @@ int gsd_init_mpeg(const char *filename)
- }
-
- /* allocate the output media context */
--oc = av_alloc_format_context();
-+oc = av_malloc(sizeof(AVFormatContext));
- if (!oc) {
- G_warning(_("Out of memory"));
-
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
commit: ea4be14d06c027b2e0dcdf0c3beab1b2cf45e3ee
Author: Ian Delaney gentoo org>
AuthorDate: Fri Oct 23 06:52:09 2015 +
Commit: Ian Delaney gentoo org>
CommitDate: Fri Oct 23 06:52:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea4be14d
sci-geosciences/grass: patch, fixes failure built with format-security
qa issue; error filed upstream by 'wraeth', patch rebased from the
upstream commit, runtested by myself, closes gentoo bug
Upstream patch: https://trac.osgeo.org/grass/changeset/66561
Gentoo bug: #563490
Package-Manager: portage-2.2.20.1
sci-geosciences/grass/files/7.0.1-sec-format.patch | 1026
sci-geosciences/grass/grass-7.0.1-r1.ebuild| 10 +-
2 files changed, 1032 insertions(+), 4 deletions(-)
diff --git a/sci-geosciences/grass/files/7.0.1-sec-format.patch
b/sci-geosciences/grass/files/7.0.1-sec-format.patch
new file mode 100644
index 000..a545a2b
--- /dev/null
+++ b/sci-geosciences/grass/files/7.0.1-sec-format.patch
@@ -0,0 +1,1026 @@
+rebased patch by 'wraeth' from
+https://trac.osgeo.org/grass/changeset/66561
+diff --git a/db/drivers/dbf/column.c b/db/drivers/dbf/column.c
+index ee0fd6e..1d2780e 100644
+--- a/db/drivers/dbf/column.c
b/db/drivers/dbf/column.c
+@@ -40,7 +40,7 @@ int add_column(int tab, int type, char *name, int width, int
decimals)
+ sprintf(buf, "DBMI-DBF driver: column name '%s'", name);
+ name[DBF_COL_NAME - 1] = '\0';
+ sprintf(buf + strlen(buf), " truncated to '%s'", name);
+- G_warning(buf);
++ G_warning("%s", buf);
+ }
+
+ /* Check if the column exists */
+diff --git a/db/drivers/ogr/select.c b/db/drivers/ogr/select.c
+index 27ae090..6584bd5 100644
+--- a/db/drivers/ogr/select.c
b/db/drivers/ogr/select.c
+@@ -48,7 +48,7 @@ int db__driver_open_select_cursor(dbString * sel, dbCursor *
dbc, int mode)
+
+ if (c->hLayer == NULL) {
+ db_d_append_error(_("Unable to select: \n"));
+- db_d_append_error(db_get_string(sel));
++ db_d_append_error("%s", db_get_string(sel));
+ db_d_append_error("\n");
+ db_d_report_error();
+ return DB_FAILED;
+diff --git a/db/drivers/postgres/db.c b/db/drivers/postgres/db.c
+index b02bade..5e171eb 100644
+--- a/db/drivers/postgres/db.c
b/db/drivers/postgres/db.c
+@@ -248,7 +248,7 @@ int create_delete_db(dbHandle *handle, int create)
+ if (PQstatus(pg_conn) == CONNECTION_BAD) {
+ db_d_append_error(_("Connection failed."));
+ db_d_append_error("\n");
+- db_d_append_error(PQerrorMessage(pg_conn));
++ db_d_append_error("%s", PQerrorMessage(pg_conn));
+ db_d_report_error();
+ PQfinish(pg_conn);
+ return DB_FAILED;
+@@ -269,7 +269,7 @@ int create_delete_db(dbHandle *handle, int create)
+ else
+ db_d_append_error(_("Unable to drop database <%s>"), name);
+ db_d_append_error("\n");
+- db_d_append_error(PQerrorMessage(pg_conn));
++ db_d_append_error("%s", PQerrorMessage(pg_conn));
+ db_d_report_error();
+
+ PQclear(res);
+diff --git a/imagery/i.landsat.toar/landsat_met.c
b/imagery/i.landsat.toar/landsat_met.c
+index 506d719..5b612a4 100644
+--- a/imagery/i.landsat.toar/landsat_met.c
b/imagery/i.landsat.toar/landsat_met.c
+@@ -384,14 +384,14 @@ void lsat_metadata(char *metafile, lsat_data * lsat)
+ sprintf(key, "Band%dGainSetting", lsat->band[i].code);
+ get_mtldata(mtldata, key, value);
+ if (value[0] == '\0') {
+- G_warning(key);
++G_warning("%s", key);
+ continue;
+ }
+ lsat->band[i].gain = atof(value);
+ sprintf(key, "Band%dBiasSetting", lsat->band[i].code);
+ get_mtldata(mtldata, key, value);
+ if (value[0] == '\0') {
+- G_warning(key);
++ G_warning("%s", key);
+ continue;
+ }
+ lsat->band[i].bias = atof(value);
+diff --git a/imagery/i.ortho.photo/i.ortho.rectify/cp.c
b/imagery/i.ortho.photo/i.ortho.rectify/cp.c
+index b8ec48c..86e5b33 100644
+--- a/imagery/i.ortho.photo/i.ortho.rectify/cp.c
b/imagery/i.ortho.photo/i.ortho.rectify/cp.c
+@@ -31,7 +31,7 @@ int get_conz_points(void)
+ default:
+ return 1;
+ }
+-G_fatal_error(msg);
++G_fatal_error("%s", msg);
+ }
+
+ int get_ref_points(void)
+@@ -61,6 +61,6 @@ int get_ref_points(void)
+ default:
+ return 1;
+ }
+-G_fatal_error(msg);
++G_fatal_error("%s", msg);
+ /* exit(1); shouldn't get here */
+ }
+diff --git a/imagery/i.ortho.photo/i.ortho.rectify/target.c
b/imagery/i.ortho.photo/i.ortho.rectify/target.c
+index 99f8480..462833a 100644
+--- a/imagery/i.ortho.photo/i.ortho.rectify/target.c
b/imagery/i.ortho.photo/i.ortho.rectify/target.c
+@@ -31,5 +31,5 @@ int get_target(char *group)
+ sprintf(buf, _("Mapset <%s> in target location <%s> - "), mapset,
location);
+ strcat(buf,
