From 7658308ba3f7abaf81f068b998a3b8f215e5f810 Mon Sep 17 00:00:00 2001 From: Krul Ceter Date: Sun, 30 Oct 2022 05:35:32 +0300 Subject: [PATCH 1/8] libgdal: update to 3.5.3. --- common/shlibs | 2 +- srcpkgs/libgdal-python3 | 1 + srcpkgs/libgdal/patches/10-atoll.patch | 34 ++++++++++++ .../patches/20-userfaultfd-detection.patch | 13 +++++ srcpkgs/libgdal/patches/30-license.patch | 13 +++++ ...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 ------------------- ...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 ----------- srcpkgs/libgdal/patches/missing-include.patch | 12 ----- srcpkgs/libgdal/template | 52 ++++++++++++------ srcpkgs/libgdal/update | 2 +- 10 files changed, 99 insertions(+), 114 deletions(-) create mode 120000 srcpkgs/libgdal-python3 create mode 100644 srcpkgs/libgdal/patches/10-atoll.patch create mode 100644 srcpkgs/libgdal/patches/20-userfaultfd-detection.patch create mode 100644 srcpkgs/libgdal/patches/30-license.patch delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch delete mode 100644 srcpkgs/libgdal/patches/missing-include.patch diff --git a/common/shlibs b/common/shlibs index e48e6f352375..031d347a1778 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2508,7 +2508,7 @@ libu2f-host.so.0 libu2f-host-1.1.10_5 libu2f-server.so.0 libu2f-server-1.1.0_9 libsqlcipher.so.0 sqlcipher-4.3.0_3 libgta.so.1 libgta-1.2.0_1 -libgdal.so.26 libgdal-3.0.4_9 +libgdal.so.31 libgdal-3.5.3_1 libosgViewer.so.131 osg-3.4.1_1 libosgShadow.so.131 osg-3.4.1_1 libosgParticle.so.131 osg-3.4.1_1 diff --git a/srcpkgs/libgdal-python3 b/srcpkgs/libgdal-python3 new file mode 120000 index 000000000000..377d50dfc2b8 --- /dev/null +++ b/srcpkgs/libgdal-python3 @@ -0,0 +1 @@ +libgdal \ No newline at end of file diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch new file mode 100644 index 000000000000..a114098612c5 --- /dev/null +++ b/srcpkgs/libgdal/patches/10-atoll.patch @@ -0,0 +1,34 @@ +Author: Holger Jaekel +Summary: musl atoll() doesn't return ERANGE in case of overflow +---- + +--- a/port/cpl_conv.cpp ++++ b/port/cpl_conv.cpp +@@ -1011,8 +1011,6 @@ + #endif + } + +-#if defined(__MINGW32__) || defined(__sun__) +- + // mingw atoll() doesn't return ERANGE in case of overflow + static int CPLAtoGIntBigExHasOverflow(const char* pszString, GIntBig nVal) + { +@@ -1035,8 +1033,6 @@ + return strcmp(szBuffer, pszString) != 0; + } + +-#endif +- + /************************************************************************/ + /* CPLAtoGIntBigEx() */ + /************************************************************************/ +@@ -1065,9 +1061,7 @@ + GIntBig nVal = atol(pszString); + #endif + if( errno == ERANGE +-#if defined(__MINGW32__) || defined(__sun__) + || CPLAtoGIntBigExHasOverflow(pszString, nVal) +-#endif + ) + { + if( pbOverflow ) diff --git a/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch new file mode 100644 index 000000000000..1496581453b7 --- /dev/null +++ b/srcpkgs/libgdal/patches/20-userfaultfd-detection.patch @@ -0,0 +1,13 @@ +userfaultfd is disabled in musl + +--- a/cmake/helpers/configure.cmake ++++ b/cmake/helpers/configure.cmake +@@ -337,8 +337,6 @@ + set(DONT_DEPRECATE_SPRINTF 1) + add_definitions(-DDONT_DEPRECATE_SPRINTF) + endif () +- +- check_include_file("linux/userfaultfd.h" HAVE_USERFAULTFD_H) + endif () + + if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/srcpkgs/libgdal/patches/30-license.patch b/srcpkgs/libgdal/patches/30-license.patch new file mode 100644 index 000000000000..5c310c8c8e86 --- /dev/null +++ b/srcpkgs/libgdal/patches/30-license.patch @@ -0,0 +1,13 @@ +LICENSE.txt is placed separately to /usr/share/licenses. +There is no need to duplicate it to /usr/share. + +--- a/gdal.cmake ++++ b/gdal.cmake +@@ -576,7 +576,6 @@ + PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/port/cpl_config.h) + + set(GDAL_DATA_FILES +- LICENSE.TXT + data/GDALLogoBW.svg + data/GDALLogoColor.svg + data/GDALLogoGS.svg diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch deleted file mode 100644 index 968edeb32c77..000000000000 --- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Mon, 5 Oct 2020 12:11:52 +0200 -Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012) - ---- - gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++------- - gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +- - 2 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp -index 10a4f96f0ee..ebcac4010ce 100644 ---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp -+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp -@@ -94,13 +94,24 @@ - * File stream object. - \******************************************************************************/ - -+#if defined(PRIjas_seqent) -+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt) -+#else - static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt) -+#endif - { - jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj); - return static_cast(VSIFReadL(buf, 1, cnt, fileobj->fp)); - } - -+#if defined(JAS_INCLUDE_JP2_CODEC) -+// Jasper 2.0.21 -+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt) -+#elif defined(PRIjas_seqent) -+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt) -+#else - static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt) -+#endif - { - jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj); - return static_cast(VSIFWriteL(buf, 1, cnt, fileobj->fp)); - -diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp -index a5a6b258ed9..bd1e7763186 100644 ---- a/frmts/jpeg2000/jpeg2000dataset.cpp -+++ b/frmts/jpeg2000/jpeg2000dataset.cpp -@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage() - for ( iBand = 0; iBand < nBands; iBand++ ) - { - JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1); -- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) || -+ if (poBand->iDepth != static_cast(jas_image_cmptprec( psImage, iBand )) || - poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand )) - { - CPLError(CE_Failure, CPLE_AppDefined, diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch deleted file mode 100644 index 643eac882f6f..000000000000 --- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Mon, 10 Aug 2020 17:26:53 +0200 -Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844) - ---- - gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp -index 3e668ffe503..2d3f4e46876 100644 ---- a/frmts/jpeg2000/jpeg2000dataset.cpp -+++ b/frmts/jpeg2000/jpeg2000dataset.cpp -@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage() - /* the JP2 boxes match the ones of the code stream */ - if (nBands != 0) - { -- if (nBands != jas_image_numcmpts( psImage )) -+ if (nBands != static_cast(jas_image_numcmpts( psImage ))) - { - CPLError(CE_Failure, CPLE_AppDefined, - "The number of components indicated in the IHDR box (%d) mismatch " -@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo ) - - { - int iFormat; -- char *pszFormatName = nullptr; -+ const char *pszFormatName = nullptr; - - if (!Identify(poOpenInfo)) - return nullptr; diff --git a/srcpkgs/libgdal/patches/missing-include.patch b/srcpkgs/libgdal/patches/missing-include.patch deleted file mode 100644 index 71d194406838..000000000000 --- a/srcpkgs/libgdal/patches/missing-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp -=================================================================== ---- gdal-3.0.4.orig/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp -+++ gdal-3.0.4/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include - diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index ce58be57dc87..3269aa4e4750 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,29 +1,38 @@ # Template file for 'libgdal' pkgname=libgdal -version=3.0.4 -revision=12 +# armv7l-musl: "unrecognized -mtune target: generic" +# armv6l-musl: "error: static assertion failed: OFF_T should be 64 bits !" +#archs="~armv6l-* ~armv7l-*" +version=3.5.3 +revision=1 wrksrc="gdal-${version}" -build_style=gnu-configure -configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes" -hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel" -makedepends="freexl-devel geos-devel jasper-devel json-c-devel - libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel - libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel - proj-devel sqlite-devel ocl-icd-devel" +build_style=cmake +build_helper=python3 +configure_args="-DGDAL_USE_OPENCL=ON" +hostmakedepends="pkg-config bison swig python3-numpy" +makedepends="python3-devel armadillo-devel freexl-devel c-blosc-devel cfitsio-devel + geos-devel expat-devel jasper-devel giflib-devel json-c-devel + libcurl-devel libopenexr-devel libjpeg-turbo-devel libpng-devel tiff-devel + libqhull-devel libwebp-devel libxml2-devel liblzma-devel zlib-devel + libzstd-devel libdeflate-devel netcdf-devel opencl2-headers pcre2-devel + proj-devel sqlite-devel ocl-icd-devel libxerces-c-devel libspatialite-devel + postgresql-libs-devel" +checkdepends="python3-pytest" short_desc="Geospatial Data Abstraction Library" maintainer="Orphaned " license="MIT" -homepage="http://www.gdal.org/" -distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz" -checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277 -subpackages="libgdal-devel libgdal-tools" +homepage="https://www.gdal.org" +changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md" +distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz" +checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890 +subpackages="libgdal-devel libgdal-tools libgdal-python3" +python_version=3 if [ -z "$CROSS_BUILD" ]; then makedepends+=" hdf5-devel" fi post_install() { - vinstall gdal.pc 644 usr/lib/pkgconfig vlicense LICENSE.TXT } @@ -31,6 +40,8 @@ libgdal-tools_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - tools" pkg_install() { + vmove usr/share/man/man1 + vmove usr/share/bash-completion vmove usr/bin } } @@ -40,9 +51,18 @@ libgdal-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/bin/gdal-config + vmove usr/share/man/man1/gdal-config.1 vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +} + +libgdal-python3_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - python3 bindings" + pkg_install() { + vmove ${py3_sitelib} } } diff --git a/srcpkgs/libgdal/update b/srcpkgs/libgdal/update index 489f765d4370..64898fa33ad2 100644 --- a/srcpkgs/libgdal/update +++ b/srcpkgs/libgdal/update @@ -1,2 +1,2 @@ -site=http://trac.osgeo.org/gdal/wiki/DownloadSource +site=https://download.osgeo.org/gdal pattern='gdal-\K[\d]+\.[\d]+\.[\d]+' From 0706a8dacbcd7f7d2fab553ef1e2c7244baf1cd7 Mon Sep 17 00:00:00 2001 From: Krul Ceter Date: Sun, 30 Oct 2022 05:46:48 +0300 Subject: [PATCH 2/8] osg: revbump for libgdal Additionally: * fixed license to comply with xlint. * replaced "http" with "https" in homepage. --- srcpkgs/osg/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template index 08bf6d4b6591..6f2cb49b9cba 100644 --- a/srcpkgs/osg/template +++ b/srcpkgs/osg/template @@ -2,7 +2,7 @@ pkgname=osg reverts=3.6.0_1 version=3.4.1 -revision=12 +revision=13 wrksrc=OpenSceneGraph-OpenSceneGraph-${version} build_style=cmake build_helper="qemu" @@ -19,8 +19,8 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev depends="xrandr" short_desc="OpenSceneGraph: high performance real-time graphics toolkit" maintainer="Orphaned " -license="OSGPL-2.0-or-later" -homepage="http://www.openscenegraph.org" +license="custom:OSGPL-0.0-or-later" +homepage="https://www.openscenegraph.org" distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz" checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5 From 8749032d4f8ab935e0d7c326b2d2c79deb5f85cf Mon Sep 17 00:00:00 2001 From: Krul Ceter Date: Sun, 30 Oct 2022 05:54:42 +0300 Subject: [PATCH 3/8] postgis-postgresql14: revbump for libgdal --- srcpkgs/postgis-postgresql14/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template index a7540659ab5a..a58109d65246 100644 --- a/srcpkgs/postgis-postgresql14/template +++ b/srcpkgs/postgis-postgresql14/template @@ -1,7 +1,7 @@ # Template file for 'postgis-postgresql14' pkgname=postgis-postgresql14 version=3.2.1 -revision=2 +revision=3 wrksrc="postgis-${version}" build_style=gnu-configure configure_args=" From 9f6fe6deefa1af752aa47c50117c0b00dfd0512e Mon Sep 17 00:00:00 2001 From: Krul Ceter Date: Sun, 30 Oct 2022 05:54:43 +0300 Subject: [PATCH 4/8] postgis-postgresql13: revbump for libgdal --- srcpkgs/postgis-postgresql13/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template index f17ace2f9fb4..ea024d3093a7 100644 --- a/srcpkgs/postgis-postgresql13/template +++ b/srcpkgs/postgis-postgresql13/template @@ -1,7 +1,7 @@ # Template file for 'postgis-postgresql13' pkgname=postgis-postgresql13 version=3.2.1 -revision=1 +revision=2 wrksrc="postgis-${version}" build_style=gnu-configure configure_args=" From 5c46f6fe3a83407ff901cf03764a6f8a67d38dda Mon Sep 17 00:00:00 2001 From: Krul Ceter Date: Sun, 30 Oct 2022 05:54:43 +0300 Subject: [PATCH 5/8] OpenOrienteering-Mapper: revbump for libgdal, disable the sensors check --- srcpkgs/OpenOrienteering-Mapper/template | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template index fd29a08e75b6..fe114ce24e8e 100644 --- a/srcpkgs/OpenOrienteering-Mapper/template +++ b/srcpkgs/OpenOrienteering-Mapper/template @@ -1,7 +1,7 @@ # Template file for 'OpenOrienteering-Mapper' pkgname=OpenOrienteering-Mapper version=0.9.5 -revision=1 +revision=2 wrksrc="mapper-${version}" build_style=cmake hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools" @@ -18,3 +18,13 @@ checksum=619152ca01a370875c15e1930918ce961284ccbf5d2371c147d50caf5e5c2f00 build_options="location sensors" build_options_default="location sensors" + +do_check() { + cd build + + # FAIL! : SensorsTest::nmeaPositionSourceSimulatedTest() Compared values are not the same + # Actual (int(source->error())) : 3 + # Expected (int(QGeoPositionInfoSource::AccessError)): 0 + # Loc: [/builddir/mapper-0.9.5/test/sensors_t.cpp(150)] + ctest -E 'sensors_t' +} From 7942d76621487272340c60c796cb66230d9caffe Mon Sep 17 00:00:00 2001 From: Krul Ceter Date: Sun, 30 Oct 2022 06:07:26 +0300 Subject: [PATCH 6/8] grass: revbump for libgdal, fix build "#unverified" near python_version has been removed due to confirmed use of python 2. According to REQUIREMENTS.html from the distributed tarball, python 3 support should be present in version >=7.8.0. Updating this package to the latest release is challenging, meaning that it will take more time to do that. --- srcpkgs/grass/patches/c99-bool.patch | 157 +++++++++++++++++++++++++++ srcpkgs/grass/template | 4 +- 2 files changed, 159 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/grass/patches/c99-bool.patch diff --git a/srcpkgs/grass/patches/c99-bool.patch b/srcpkgs/grass/patches/c99-bool.patch new file mode 100644 index 000000000000..ce0cdfcd6928 --- /dev/null +++ b/srcpkgs/grass/patches/c99-bool.patch @@ -0,0 +1,157 @@ +From 1e0c11f526f64755f877957ce6c14b2159c3823f Mon Sep 17 00:00:00 2001 +From: nilason +Date: Wed, 19 May 2021 11:38:49 +0200 +Subject: [PATCH] libgis: Enable the C99 bool type (#1567) + +Enables globally the C99 'bool' type with its values 'true' and 'false'. + +The old boolean constants 'TRUE' and 'FALSE' are still valid but +redefined to 'true' and 'false' to emphasize their equivalence. + +(Re-)definitions of TRUE/FALSE in modules are removed. + +This change was originally triggered by a conflict of v.hull -- defining +a local bool type -- with GDAL 3.3 which introduced the inclusion of +stdbool.h (#1563). +--- + lib/lidar/lidar.h | 3 --- + raster/r.param.scale/param.h | 2 -- + raster/r.surf.idw/main.h | 2 -- + raster3d/r3.showdspf/Ball.c | 2 -- + raster3d/r3.showdspf/togif.c | 3 --- + vector/v.hull/chull.c | 20 ++++++++------------ + 7 files changed, 14 insertions(+), 27 deletions(-) + +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_BILINEAR 1 + #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 TRUE 1 +-#define FALSE 0 + + #define MELEMENT struct 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 ONHULL BTRUE +-#define REMOVED BTRUE +-#define VISIBLE BTRUE +-#define PROCESSED BTRUE ++#define ONHULL true ++#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 < 0) { + f->visible = VISIBLE; +- vis = BTRUE; ++ vis = true; + } + f = f->next; + } while (f != faces); +@@ -454,7 +450,7 @@ bool AddOne(tVertex p) + /* If no faces are visible from p, then p is inside the hull. */ + if (!vis) { + p->onhull = !ONHULL; +- return BFALSE; ++ return false; + } + + /* Mark edges in interior of visible region for deletion. +@@ -470,7 +466,7 @@ bool AddOne(tVertex p) + e->newface = MakeConeFace(e, p); + e = temp; + } while (e != edges); +- return BTRUE; ++ return true; + } + + /*--------------------------------------------------------------------- diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template index bccd691a8116..5863a61a300d 100644 --- a/srcpkgs/grass/template +++ b/srcpkgs/grass/template @@ -1,7 +1,7 @@ # Template file for 'grass' pkgname=grass version=7.6.1 -revision=4 +revision=5 _binver=${version//./} _binver=${_binver:0:2} build_style=gnu-configure @@ -17,7 +17,7 @@ license="GPL-2.0-or-later" homepage="https://grass.osgeo.org/" distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz" checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b -python_version=2 #unverified +python_version=2 nocross="tries to execute target binaries" post_install() { From 3852514ff82a0226fb98d6cb37d9bb82a2c7afe8 Mon Sep 17 00:00:00 2001 From: Krul Ceter Date: Tue, 1 Nov 2022 14:33:01 +0300 Subject: [PATCH 7/8] merkaartor: revbump for libgdal --- srcpkgs/merkaartor/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template index cffcfba1cf01..6603376111f2 100644 --- a/srcpkgs/merkaartor/template +++ b/srcpkgs/merkaartor/template @@ -1,7 +1,7 @@ # Template file for 'merkaartor' pkgname=merkaartor version=0.19.0 -revision=1 +revision=2 build_style=qmake configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5" hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools" From e343a799cb935f3c7363a8fe713d5b97bb95b7e2 Mon Sep 17 00:00:00 2001 From: Krul Ceter Date: Tue, 1 Nov 2022 14:33:59 +0300 Subject: [PATCH 8/8] sumo: revbump for libgdal --- srcpkgs/sumo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template index f3cc1c4490ae..39c47a46b44c 100644 --- a/srcpkgs/sumo/template +++ b/srcpkgs/sumo/template @@ -1,7 +1,7 @@ # Template file for 'sumo' pkgname=sumo version=1.12.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="libgdal-tools pkg-config swig python3-setuptools" makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel