* Re: [PR PATCH] [Updated] libgdal: update to 3.8.4.
2024-02-19 1:02 [PR PATCH] ibgdal: update to 3.8.4 oreo639
@ 2024-02-19 2:44 ` oreo639
2024-02-19 4:23 ` oreo639
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-02-19 2:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1359 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libgdal
https://github.com/void-linux/void-packages/pull/48824
libgdal: update to 3.8.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
(currently not including `qgis` since it takes too long to compile, will add it with ci skip once CI is done)
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48824.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-48824.patch --]
[-- Type: text/x-diff, Size: 12683 bytes --]
From fdc19358f2478927db844a4c2d23cbd8ded64c04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 15:13:02 -0800
Subject: [PATCH 1/9] libgdal: update to 3.8.4.
---
common/shlibs | 2 +-
srcpkgs/libgdal/patches/10-atoll.patch | 34 --------------------------
srcpkgs/libgdal/template | 6 ++---
3 files changed, 4 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada87..f5b32693cae68 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2459,7 +2459,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.31 libgdal-3.5.3_1
+libgdal.so.34 libgdal-3.8.4_1
libosgViewer.so.161 osg-3.6.5_1
libosgShadow.so.161 osg-3.6.5_1
libosgParticle.so.161 osg-3.6.5_1
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
deleted file mode 100644
index a114098612c52..0000000000000
--- a/srcpkgs/libgdal/patches/10-atoll.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Holger Jaekel <holger.jaekel@gmx.de>
-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/template b/srcpkgs/libgdal/template
index d5850fb768f66..93d916099045c 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.5.3
-revision=12
+version=3.8.4
+revision=1
build_style=cmake
build_helper=python3
configure_args="-DGDAL_USE_OPENCL=ON
@@ -21,7 +21,7 @@ license="MIT"
homepage="https://www.gdal.org"
changelog="https://raw.githubusercontent.com/OSGeo/gdal/master/NEWS.md"
distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
+checksum=0c53ced95d29474236487202709b49015854f8e02e35e44ed0f4f4e12a7966ce
python_version=3
if [ -z "$CROSS_BUILD" ]; then
From 49cbec795434ea8b618401a62f58c62d7bcd0ef9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:39:18 -0800
Subject: [PATCH 2/9] libpdal: update to 2.6.3.
---
srcpkgs/libpdal/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
index e0d517c709ea9..87b9e18b15791 100644
--- a/srcpkgs/libpdal/template
+++ b/srcpkgs/libpdal/template
@@ -1,6 +1,6 @@
# Template file for 'libpdal'
pkgname=libpdal
-version=2.6.2
+version=2.6.3
revision=1
build_style=cmake
build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="Arjan Mossel <arjanmossel@gmail.com>"
license="BSD-3-Clause"
homepage="https://pdal.io/"
distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
-checksum=9d532d745339cd793fbcab49ca56f05eb66779b8bd3e9f5c188c0238fee87d21
+checksum=fd019d0382ac79cc09ab000b5c84ea9a26284244e92dbdefd54edd6d1e837b75
do_check() {
cd build
From 6686abc53e0d433f7ae0f5557bf369869002b5f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:42:40 -0800
Subject: [PATCH 3/9] grass: rebuild for libgdal 3.8
---
srcpkgs/grass/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index 8910865f17529..0dc590430d085 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=8.3.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr/lib --enable-shared --without-pdal
--with-bzlib --with-nls --with-pthread --with-readline --with-geos
From 23c21d104ed19edabce7563fd2dc869de895b4d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:11 -0800
Subject: [PATCH 4/9] osg: rebuild for libgdal 3.8
---
srcpkgs/osg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index a9ebbd287933b..8ef0efc599a1b 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -1,7 +1,7 @@
# Template file for 'osg'
pkgname=osg
version=3.6.5
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
# don't use /usr/lib64 on 64bit platforms
From e201cc31923a1a23bf6f06cce803823eea766a3f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:48 -0800
Subject: [PATCH 5/9] merkaartor: rebuild for libgdal 3.8
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index c5848acf7d22a..002a6f5b36c55 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.19.0
-revision=3
+revision=4
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From 6f5e776de9da28131a500c2e435c7368c0b2fd6f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:10 -0800
Subject: [PATCH 6/9] OpenOrienteering-Mapper: rebuild for libgdal 3.8
---
.../patches/fix-tests-qtpaint.patch | 69 +++++++++++++++++++
srcpkgs/OpenOrienteering-Mapper/template | 2 +-
2 files changed, 70 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
diff --git a/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
new file mode 100644
index 0000000000000..dd818c68eb3e7
--- /dev/null
+++ b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
@@ -0,0 +1,69 @@
+From 65cf9f2585b696b2819db928fb8b0f13a997113b Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Wed, 17 May 2023 11:26:12 +0300
+Subject: [PATCH] Make QPainterTest pass with Qt 5.15.9
+
+https://bugreports.qt.io/browse/QTBUG-100327 was fixed in 5.15.9,
+so now we have a good result from the beginning and don't need
+ImageTransparencyFixup.
+---
+ src/core/image_transparency_fixup.h | 5 +++++
+ test/qpainter_t.cpp | 6 ++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/image_transparency_fixup.h b/src/core/image_transparency_fixup.h
+index 1dfe2f51b..8bd930744 100644
+--- a/src/core/image_transparency_fixup.h
++++ b/src/core/image_transparency_fixup.h
+@@ -57,6 +57,9 @@ class ImageTransparencyFixup
+ *
+ * The image must be of QImage::Format_ARGB32_Premultiplied.
+ * It may be null.
++ *
++ * This fixup is needed for Qt5 < 5.15.9 and Qt6 < 6.2.4 which are
++ * affected by https://bugreports.qt.io/browse/QTBUG-100327.
+ */
+ inline ImageTransparencyFixup(QImage* image)
+ : dest(0), dest_end(0)
+@@ -81,11 +84,13 @@ class ImageTransparencyFixup
+ */
+ inline void operator()() const
+ {
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ for (QRgb* px = dest; px < dest_end; px++)
+ {
+ if (*px == 0x01000000) /* qRgba(0, 0, 0, 1) */
+ *px = 0x00000000; /* qRgba(0, 0, 0, 0) */
+ }
++#endif
+ }
+
+ protected:
+diff --git a/test/qpainter_t.cpp b/test/qpainter_t.cpp
+index 85b971c03..a9172b1c8 100644
+--- a/test/qpainter_t.cpp
++++ b/test/qpainter_t.cpp
+@@ -80,9 +80,10 @@ void QPainterTest::multiplyComposition()
+ QCOMPARE(compose(white_img, white_img, multiply).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, multiply).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Multiply incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, multiply);
+@@ -107,9 +108,10 @@ void QPainterTest::darkenComposition()
+ QCOMPARE(compose(white_img, white_img, darken).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, darken).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Darken incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, darken);
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index 611b9c7237b1a..f68337dab80a7 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=3
+revision=4
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
makedepends="qt5-devel clipper-devel proj-devel zlib-devel libgdal-devel
From d8abb6a59bcce9e38c9959d3f2cbd16ffd354187 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:53 -0800
Subject: [PATCH 7/9] postgis-postgresql15: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql15/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template
index ad5c7cc61bd39..ded20813af09b 100644
--- a/srcpkgs/postgis-postgresql15/template
+++ b/srcpkgs/postgis-postgresql15/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql15'
pkgname=postgis-postgresql15
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql15/bin
From 4bbe571ccceda909f301073dba213389f63131a2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:05 -0800
Subject: [PATCH 8/9] postgis-postgresql16: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql16/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql16/template b/srcpkgs/postgis-postgresql16/template
index 9d62f16f767e0..765df9d8a2f6b 100644
--- a/srcpkgs/postgis-postgresql16/template
+++ b/srcpkgs/postgis-postgresql16/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql16'
pkgname=postgis-postgresql16
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql16/bin
From 72a601e4dfa202aa72145945afdaf96793638876 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:25 -0800
Subject: [PATCH 9/9] sumo: rebuild for libgdal 3.8
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index a3fe134aa5acc..a730afa9fafa9 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=6
+revision=7
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.8.4.
2024-02-19 1:02 [PR PATCH] ibgdal: update to 3.8.4 oreo639
2024-02-19 2:44 ` [PR PATCH] [Updated] libgdal: " oreo639
@ 2024-02-19 4:23 ` oreo639
2024-02-19 5:01 ` oreo639
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-02-19 4:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libgdal
https://github.com/void-linux/void-packages/pull/48824
libgdal: update to 3.8.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
(currently not including `qgis` since it takes too long to compile, will add it with ci skip once CI is done)
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48824.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-48824.patch --]
[-- Type: text/x-diff, Size: 13376 bytes --]
From fdc19358f2478927db844a4c2d23cbd8ded64c04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 15:13:02 -0800
Subject: [PATCH 01/10] libgdal: update to 3.8.4.
---
common/shlibs | 2 +-
srcpkgs/libgdal/patches/10-atoll.patch | 34 --------------------------
srcpkgs/libgdal/template | 6 ++---
3 files changed, 4 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada87..f5b32693cae68 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2459,7 +2459,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.31 libgdal-3.5.3_1
+libgdal.so.34 libgdal-3.8.4_1
libosgViewer.so.161 osg-3.6.5_1
libosgShadow.so.161 osg-3.6.5_1
libosgParticle.so.161 osg-3.6.5_1
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
deleted file mode 100644
index a114098612c52..0000000000000
--- a/srcpkgs/libgdal/patches/10-atoll.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Holger Jaekel <holger.jaekel@gmx.de>
-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/template b/srcpkgs/libgdal/template
index d5850fb768f66..93d916099045c 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.5.3
-revision=12
+version=3.8.4
+revision=1
build_style=cmake
build_helper=python3
configure_args="-DGDAL_USE_OPENCL=ON
@@ -21,7 +21,7 @@ license="MIT"
homepage="https://www.gdal.org"
changelog="https://raw.githubusercontent.com/OSGeo/gdal/master/NEWS.md"
distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
+checksum=0c53ced95d29474236487202709b49015854f8e02e35e44ed0f4f4e12a7966ce
python_version=3
if [ -z "$CROSS_BUILD" ]; then
From 49cbec795434ea8b618401a62f58c62d7bcd0ef9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:39:18 -0800
Subject: [PATCH 02/10] libpdal: update to 2.6.3.
---
srcpkgs/libpdal/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
index e0d517c709ea9..87b9e18b15791 100644
--- a/srcpkgs/libpdal/template
+++ b/srcpkgs/libpdal/template
@@ -1,6 +1,6 @@
# Template file for 'libpdal'
pkgname=libpdal
-version=2.6.2
+version=2.6.3
revision=1
build_style=cmake
build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="Arjan Mossel <arjanmossel@gmail.com>"
license="BSD-3-Clause"
homepage="https://pdal.io/"
distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
-checksum=9d532d745339cd793fbcab49ca56f05eb66779b8bd3e9f5c188c0238fee87d21
+checksum=fd019d0382ac79cc09ab000b5c84ea9a26284244e92dbdefd54edd6d1e837b75
do_check() {
cd build
From 6686abc53e0d433f7ae0f5557bf369869002b5f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:42:40 -0800
Subject: [PATCH 03/10] grass: rebuild for libgdal 3.8
---
srcpkgs/grass/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index 8910865f17529..0dc590430d085 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=8.3.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr/lib --enable-shared --without-pdal
--with-bzlib --with-nls --with-pthread --with-readline --with-geos
From 23c21d104ed19edabce7563fd2dc869de895b4d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:11 -0800
Subject: [PATCH 04/10] osg: rebuild for libgdal 3.8
---
srcpkgs/osg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index a9ebbd287933b..8ef0efc599a1b 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -1,7 +1,7 @@
# Template file for 'osg'
pkgname=osg
version=3.6.5
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
# don't use /usr/lib64 on 64bit platforms
From e201cc31923a1a23bf6f06cce803823eea766a3f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:48 -0800
Subject: [PATCH 05/10] merkaartor: rebuild for libgdal 3.8
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index c5848acf7d22a..002a6f5b36c55 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.19.0
-revision=3
+revision=4
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From 6f5e776de9da28131a500c2e435c7368c0b2fd6f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:10 -0800
Subject: [PATCH 06/10] OpenOrienteering-Mapper: rebuild for libgdal 3.8
---
.../patches/fix-tests-qtpaint.patch | 69 +++++++++++++++++++
srcpkgs/OpenOrienteering-Mapper/template | 2 +-
2 files changed, 70 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
diff --git a/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
new file mode 100644
index 0000000000000..dd818c68eb3e7
--- /dev/null
+++ b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
@@ -0,0 +1,69 @@
+From 65cf9f2585b696b2819db928fb8b0f13a997113b Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Wed, 17 May 2023 11:26:12 +0300
+Subject: [PATCH] Make QPainterTest pass with Qt 5.15.9
+
+https://bugreports.qt.io/browse/QTBUG-100327 was fixed in 5.15.9,
+so now we have a good result from the beginning and don't need
+ImageTransparencyFixup.
+---
+ src/core/image_transparency_fixup.h | 5 +++++
+ test/qpainter_t.cpp | 6 ++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/image_transparency_fixup.h b/src/core/image_transparency_fixup.h
+index 1dfe2f51b..8bd930744 100644
+--- a/src/core/image_transparency_fixup.h
++++ b/src/core/image_transparency_fixup.h
+@@ -57,6 +57,9 @@ class ImageTransparencyFixup
+ *
+ * The image must be of QImage::Format_ARGB32_Premultiplied.
+ * It may be null.
++ *
++ * This fixup is needed for Qt5 < 5.15.9 and Qt6 < 6.2.4 which are
++ * affected by https://bugreports.qt.io/browse/QTBUG-100327.
+ */
+ inline ImageTransparencyFixup(QImage* image)
+ : dest(0), dest_end(0)
+@@ -81,11 +84,13 @@ class ImageTransparencyFixup
+ */
+ inline void operator()() const
+ {
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ for (QRgb* px = dest; px < dest_end; px++)
+ {
+ if (*px == 0x01000000) /* qRgba(0, 0, 0, 1) */
+ *px = 0x00000000; /* qRgba(0, 0, 0, 0) */
+ }
++#endif
+ }
+
+ protected:
+diff --git a/test/qpainter_t.cpp b/test/qpainter_t.cpp
+index 85b971c03..a9172b1c8 100644
+--- a/test/qpainter_t.cpp
++++ b/test/qpainter_t.cpp
+@@ -80,9 +80,10 @@ void QPainterTest::multiplyComposition()
+ QCOMPARE(compose(white_img, white_img, multiply).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, multiply).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Multiply incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, multiply);
+@@ -107,9 +108,10 @@ void QPainterTest::darkenComposition()
+ QCOMPARE(compose(white_img, white_img, darken).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, darken).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Darken incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, darken);
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index 611b9c7237b1a..f68337dab80a7 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=3
+revision=4
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
makedepends="qt5-devel clipper-devel proj-devel zlib-devel libgdal-devel
From d8abb6a59bcce9e38c9959d3f2cbd16ffd354187 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:53 -0800
Subject: [PATCH 07/10] postgis-postgresql15: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql15/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template
index ad5c7cc61bd39..ded20813af09b 100644
--- a/srcpkgs/postgis-postgresql15/template
+++ b/srcpkgs/postgis-postgresql15/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql15'
pkgname=postgis-postgresql15
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql15/bin
From 4bbe571ccceda909f301073dba213389f63131a2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:05 -0800
Subject: [PATCH 08/10] postgis-postgresql16: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql16/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql16/template b/srcpkgs/postgis-postgresql16/template
index 9d62f16f767e0..765df9d8a2f6b 100644
--- a/srcpkgs/postgis-postgresql16/template
+++ b/srcpkgs/postgis-postgresql16/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql16'
pkgname=postgis-postgresql16
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql16/bin
From 72a601e4dfa202aa72145945afdaf96793638876 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:25 -0800
Subject: [PATCH 09/10] sumo: rebuild for libgdal 3.8
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index a3fe134aa5acc..a730afa9fafa9 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=6
+revision=7
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
From c4bddf9ab99a4ae615f9e62a3b4f8d46ba2208bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 20:23:18 -0800
Subject: [PATCH 10/10] qgis: rebuild for libgdal 3.8
---
srcpkgs/qgis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 1c99d8277e819..3dd7af263aba6 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,7 +1,7 @@
# Template file for 'qgis'
pkgname=qgis
version=3.34.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
-DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.8.4.
2024-02-19 1:02 [PR PATCH] ibgdal: update to 3.8.4 oreo639
2024-02-19 2:44 ` [PR PATCH] [Updated] libgdal: " oreo639
2024-02-19 4:23 ` oreo639
@ 2024-02-19 5:01 ` oreo639
2024-02-19 5:01 ` oreo639
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-02-19 5:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1477 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libgdal
https://github.com/void-linux/void-packages/pull/48824
libgdal: update to 3.8.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
(currently not including `qgis` since it takes too long to compile, will add it with ci skip once CI is done)
[ci skip]
Tests were run without qgis here: https://github.com/void-linux/void-packages/actions/runs/7953878904
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48824.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-48824.patch --]
[-- Type: text/x-diff, Size: 22729 bytes --]
From fdc19358f2478927db844a4c2d23cbd8ded64c04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 15:13:02 -0800
Subject: [PATCH 01/16] libgdal: update to 3.8.4.
---
common/shlibs | 2 +-
srcpkgs/libgdal/patches/10-atoll.patch | 34 --------------------------
srcpkgs/libgdal/template | 6 ++---
3 files changed, 4 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada87..f5b32693cae68 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2459,7 +2459,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.31 libgdal-3.5.3_1
+libgdal.so.34 libgdal-3.8.4_1
libosgViewer.so.161 osg-3.6.5_1
libosgShadow.so.161 osg-3.6.5_1
libosgParticle.so.161 osg-3.6.5_1
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
deleted file mode 100644
index a114098612c52..0000000000000
--- a/srcpkgs/libgdal/patches/10-atoll.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Holger Jaekel <holger.jaekel@gmx.de>
-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/template b/srcpkgs/libgdal/template
index d5850fb768f66..93d916099045c 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.5.3
-revision=12
+version=3.8.4
+revision=1
build_style=cmake
build_helper=python3
configure_args="-DGDAL_USE_OPENCL=ON
@@ -21,7 +21,7 @@ license="MIT"
homepage="https://www.gdal.org"
changelog="https://raw.githubusercontent.com/OSGeo/gdal/master/NEWS.md"
distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
+checksum=0c53ced95d29474236487202709b49015854f8e02e35e44ed0f4f4e12a7966ce
python_version=3
if [ -z "$CROSS_BUILD" ]; then
From 49cbec795434ea8b618401a62f58c62d7bcd0ef9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:39:18 -0800
Subject: [PATCH 02/16] libpdal: update to 2.6.3.
---
srcpkgs/libpdal/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
index e0d517c709ea9..87b9e18b15791 100644
--- a/srcpkgs/libpdal/template
+++ b/srcpkgs/libpdal/template
@@ -1,6 +1,6 @@
# Template file for 'libpdal'
pkgname=libpdal
-version=2.6.2
+version=2.6.3
revision=1
build_style=cmake
build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="Arjan Mossel <arjanmossel@gmail.com>"
license="BSD-3-Clause"
homepage="https://pdal.io/"
distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
-checksum=9d532d745339cd793fbcab49ca56f05eb66779b8bd3e9f5c188c0238fee87d21
+checksum=fd019d0382ac79cc09ab000b5c84ea9a26284244e92dbdefd54edd6d1e837b75
do_check() {
cd build
From 6686abc53e0d433f7ae0f5557bf369869002b5f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:42:40 -0800
Subject: [PATCH 03/16] grass: rebuild for libgdal 3.8
---
srcpkgs/grass/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index 8910865f17529..0dc590430d085 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=8.3.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr/lib --enable-shared --without-pdal
--with-bzlib --with-nls --with-pthread --with-readline --with-geos
From 23c21d104ed19edabce7563fd2dc869de895b4d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:11 -0800
Subject: [PATCH 04/16] osg: rebuild for libgdal 3.8
---
srcpkgs/osg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index a9ebbd287933b..8ef0efc599a1b 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -1,7 +1,7 @@
# Template file for 'osg'
pkgname=osg
version=3.6.5
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
# don't use /usr/lib64 on 64bit platforms
From e201cc31923a1a23bf6f06cce803823eea766a3f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:48 -0800
Subject: [PATCH 05/16] merkaartor: rebuild for libgdal 3.8
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index c5848acf7d22a..002a6f5b36c55 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.19.0
-revision=3
+revision=4
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From 6f5e776de9da28131a500c2e435c7368c0b2fd6f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:10 -0800
Subject: [PATCH 06/16] OpenOrienteering-Mapper: rebuild for libgdal 3.8
---
.../patches/fix-tests-qtpaint.patch | 69 +++++++++++++++++++
srcpkgs/OpenOrienteering-Mapper/template | 2 +-
2 files changed, 70 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
diff --git a/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
new file mode 100644
index 0000000000000..dd818c68eb3e7
--- /dev/null
+++ b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
@@ -0,0 +1,69 @@
+From 65cf9f2585b696b2819db928fb8b0f13a997113b Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Wed, 17 May 2023 11:26:12 +0300
+Subject: [PATCH] Make QPainterTest pass with Qt 5.15.9
+
+https://bugreports.qt.io/browse/QTBUG-100327 was fixed in 5.15.9,
+so now we have a good result from the beginning and don't need
+ImageTransparencyFixup.
+---
+ src/core/image_transparency_fixup.h | 5 +++++
+ test/qpainter_t.cpp | 6 ++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/image_transparency_fixup.h b/src/core/image_transparency_fixup.h
+index 1dfe2f51b..8bd930744 100644
+--- a/src/core/image_transparency_fixup.h
++++ b/src/core/image_transparency_fixup.h
+@@ -57,6 +57,9 @@ class ImageTransparencyFixup
+ *
+ * The image must be of QImage::Format_ARGB32_Premultiplied.
+ * It may be null.
++ *
++ * This fixup is needed for Qt5 < 5.15.9 and Qt6 < 6.2.4 which are
++ * affected by https://bugreports.qt.io/browse/QTBUG-100327.
+ */
+ inline ImageTransparencyFixup(QImage* image)
+ : dest(0), dest_end(0)
+@@ -81,11 +84,13 @@ class ImageTransparencyFixup
+ */
+ inline void operator()() const
+ {
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ for (QRgb* px = dest; px < dest_end; px++)
+ {
+ if (*px == 0x01000000) /* qRgba(0, 0, 0, 1) */
+ *px = 0x00000000; /* qRgba(0, 0, 0, 0) */
+ }
++#endif
+ }
+
+ protected:
+diff --git a/test/qpainter_t.cpp b/test/qpainter_t.cpp
+index 85b971c03..a9172b1c8 100644
+--- a/test/qpainter_t.cpp
++++ b/test/qpainter_t.cpp
+@@ -80,9 +80,10 @@ void QPainterTest::multiplyComposition()
+ QCOMPARE(compose(white_img, white_img, multiply).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, multiply).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Multiply incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, multiply);
+@@ -107,9 +108,10 @@ void QPainterTest::darkenComposition()
+ QCOMPARE(compose(white_img, white_img, darken).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, darken).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Darken incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, darken);
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index 611b9c7237b1a..f68337dab80a7 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=3
+revision=4
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
makedepends="qt5-devel clipper-devel proj-devel zlib-devel libgdal-devel
From d8abb6a59bcce9e38c9959d3f2cbd16ffd354187 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:53 -0800
Subject: [PATCH 07/16] postgis-postgresql15: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql15/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template
index ad5c7cc61bd39..ded20813af09b 100644
--- a/srcpkgs/postgis-postgresql15/template
+++ b/srcpkgs/postgis-postgresql15/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql15'
pkgname=postgis-postgresql15
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql15/bin
From 4bbe571ccceda909f301073dba213389f63131a2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:05 -0800
Subject: [PATCH 08/16] postgis-postgresql16: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql16/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql16/template b/srcpkgs/postgis-postgresql16/template
index 9d62f16f767e0..765df9d8a2f6b 100644
--- a/srcpkgs/postgis-postgresql16/template
+++ b/srcpkgs/postgis-postgresql16/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql16'
pkgname=postgis-postgresql16
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql16/bin
From 72a601e4dfa202aa72145945afdaf96793638876 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:25 -0800
Subject: [PATCH 09/16] sumo: rebuild for libgdal 3.8
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index a3fe134aa5acc..a730afa9fafa9 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=6
+revision=7
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
From c4bddf9ab99a4ae615f9e62a3b4f8d46ba2208bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 20:23:18 -0800
Subject: [PATCH 10/16] qgis: rebuild for libgdal 3.8
---
srcpkgs/qgis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 1c99d8277e819..3dd7af263aba6 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,7 +1,7 @@
# Template file for 'qgis'
pkgname=qgis
version=3.34.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
-DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
From bf2a094bfbf44656ac36c8abc60af73417e00343 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 20:57:54 -0800
Subject: [PATCH 11/16] inkscape: fix build for libxml2 2.12
---
.../inkscape/patches/fix-libxml2-2.12.patch | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/inkscape/patches/fix-libxml2-2.12.patch
diff --git a/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch b/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch
new file mode 100644
index 0000000000000..dc5b0f53460c9
--- /dev/null
+++ b/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch
@@ -0,0 +1,33 @@
+From 694d8ae43d06efff21adebf377ce614d660b24cd Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Fri, 17 Nov 2023 22:30:42 +0100
+Subject: [PATCH] include missing header file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes build error:
+```
+/build/inkscape/src/inkscape/src/object/uri.cpp: In constructor ‘Inkscape::URI::URI(const gchar*, const char*)’:
+/build/inkscape/src/inkscape/src/object/uri.cpp:86:9: error: ‘xmlFree’ was not declared in this scope; did you mean ‘xmlFreeURI’?
+ 86 | xmlFree(full);
+```
+---
+ src/object/uri.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/object/uri.h b/src/object/uri.h
+index 381adec58cf..d5b211fe2b2 100644
+--- a/src/object/uri.h
++++ b/src/object/uri.h
+@@ -13,6 +13,7 @@
+ #define INKSCAPE_URI_H
+
+ #include <libxml/uri.h>
++#include <libxml/xmlmemory.h>
+ #include <memory>
+ #include <string>
+
+--
+GitLab
+
From d5a2698fc2790a3d10bfd654f5903533bbde1834 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 20:58:21 -0800
Subject: [PATCH 12/16] rdrview: fix build for libxml2 2.12
---
.../rdrview/patches/fix-libxml2-2.12.patch | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/rdrview/patches/fix-libxml2-2.12.patch
diff --git a/srcpkgs/rdrview/patches/fix-libxml2-2.12.patch b/srcpkgs/rdrview/patches/fix-libxml2-2.12.patch
new file mode 100644
index 0000000000000..eb8c8eb7709a8
--- /dev/null
+++ b/srcpkgs/rdrview/patches/fix-libxml2-2.12.patch
@@ -0,0 +1,26 @@
+From b5fdd379577e13d26784ffdeca3ecb02ff1d336e Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Sun, 18 Feb 2024 13:49:49 -0800
+Subject: [PATCH] Add missing include with libxml2 2.12+
+
+libxml2 2.12 removed extra includes, which causes stdlib.h to not get implicitly
+included anymore.
+
+The missing include results in a warning on gcc13 and below with the resulting
+binary truncating the pointer to an integer, gcc14+ makes this a hard error.
+---
+ src/rdrview.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/rdrview.h b/src/rdrview.h
+index 9365e7a..2eda156 100644
+--- a/src/rdrview.h
++++ b/src/rdrview.h
+@@ -26,6 +26,7 @@
+ #define RDRVIEW_H
+
+ #include <assert.h>
++#include <stdlib.h>
+ #include <stdbool.h>
+ #include <sys/types.h>
+ #include <regex.h>
From a6f487c662faaad6eae92b2cecf3d25077820740 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 20:58:50 -0800
Subject: [PATCH 13/16] cegui: fix build for libxml2 2.12
---
srcpkgs/cegui/patches/fix-libxml2-2.12.patch | 26 ++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/cegui/patches/fix-libxml2-2.12.patch
diff --git a/srcpkgs/cegui/patches/fix-libxml2-2.12.patch b/srcpkgs/cegui/patches/fix-libxml2-2.12.patch
new file mode 100644
index 0000000000000..f288ce9a66b09
--- /dev/null
+++ b/srcpkgs/cegui/patches/fix-libxml2-2.12.patch
@@ -0,0 +1,26 @@
+From 285ba5a2c0c435ed865c6e86afe314a822fd1e3f Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Sun, 18 Feb 2024 14:16:21 -0800
+Subject: [PATCH] Fix return type of xmlGetLastError for libxml2 2.12
+
+https://gitlab.gnome.org/GNOME/libxml2/-/commit/45470611b047db78106dcb2fdbd4164163c15ab7
+---
+ cegui/src/XMLParserModules/Libxml2/XMLParser.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp
+index 74a3dbddd..a408f9305 100644
+--- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp
++++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp
+@@ -109,7 +109,11 @@ void LibxmlParser::parseXML(XMLHandler& handler,
+
+ if (!doc)
+ {
++#if LIBXML_VERSION >= 21200
++ const xmlError* err = xmlGetLastError();
++#else
+ xmlError* err = xmlGetLastError();
++#endif
+
+ throw GenericException(
+ String("xmlParseMemory failed in file: '") +
From 80655a4510a87065dc2c45f1fb4331c9a2fff4f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 20:59:44 -0800
Subject: [PATCH 14/16] 0ad: fix build for gcc 13
---
srcpkgs/0ad/patches/fix-gcc13.patch | 48 +++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 srcpkgs/0ad/patches/fix-gcc13.patch
diff --git a/srcpkgs/0ad/patches/fix-gcc13.patch b/srcpkgs/0ad/patches/fix-gcc13.patch
new file mode 100644
index 0000000000000..ad40bceffc7cb
--- /dev/null
+++ b/srcpkgs/0ad/patches/fix-gcc13.patch
@@ -0,0 +1,48 @@
+From 093e1eb23519ab4a4633a999a555a58e4fd5343e Mon Sep 17 00:00:00 2001
+From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
+Date: Sat, 13 May 2023 12:08:23 +0000
+Subject: [PATCH] Fix compilation with GCC 13.
+
+gcc-13 less often includes cstdint so one might need to include it manually if needed.
+
+The headers already included in Message.h are included within namespace AtlasMessage which didn't break by chance, move them out and add cstdint.
+
+Patch by: @sera
+Reviewed by: @phosit
+Fixes: #6800
+Differential Revision: https://code.wildfiregames.com/D4997
+
+git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27644 3db68df2-c116-0410-a063-a993310a9797
+---
+ source/tools/atlas/GameInterface/Messages.h | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h
+index 2fa47809213..a486d93a687 100644
+--- a/source/tools/atlas/GameInterface/Messages.h
++++ b/source/tools/atlas/GameInterface/Messages.h
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2022 Wildfire Games.
++/* Copyright (C) 2023 Wildfire Games.
+ * This file is part of 0 A.D.
+ *
+ * 0 A.D. is free software: you can redistribute it and/or modify
+@@ -18,13 +18,15 @@
+ #ifndef INCLUDED_MESSAGES
+ #define INCLUDED_MESSAGES
+
++#include <cstdint>
++#include <string>
++#include <vector>
++
++// Opens namespace AtlasMessage, closes it on second inclusion!
+ #ifndef MESSAGES_SKIP_SETUP
+ #include "MessagesSetup.h"
+ #endif
+
+-#include <vector>
+-#include <string>
+-
+ // TODO: organisation, documentation, etc
+
+ #ifdef _MSC_VER // (can't use MSC_VERSION here since this file is included by Atlas too)
From 72318d8cc6137bdd4e988bfabfe5b5a7fb40dada Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 21:00:02 -0800
Subject: [PATCH 15/16] openmsx: fix build for gcc 13
---
srcpkgs/openmsx/patches/gcc13.patch | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/openmsx/patches/gcc13.patch
diff --git a/srcpkgs/openmsx/patches/gcc13.patch b/srcpkgs/openmsx/patches/gcc13.patch
new file mode 100644
index 0000000000000..8ab7880d127f9
--- /dev/null
+++ b/srcpkgs/openmsx/patches/gcc13.patch
@@ -0,0 +1,23 @@
+From b50d02069c09f11c687637c64ca1b459a5def28c Mon Sep 17 00:00:00 2001
+From: m9710797 <vermaelen.wouter@gmail.com>
+Date: Sat, 4 Feb 2023 16:37:39 +0100
+Subject: [PATCH] Added missing #include
+
+Thanks to 'musuruan' for reporting.
+https://github.com/openMSX/openMSX/issues/1487
+---
+ src/utils/hash_set.hh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/utils/hash_set.hh b/src/utils/hash_set.hh
+index fb4bb93933..c89883121e 100644
+--- a/src/utils/hash_set.hh
++++ b/src/utils/hash_set.hh
+@@ -11,6 +11,7 @@
+ #include "unreachable.hh"
+ #include "xrange.hh"
+ #include <cassert>
++#include <cstdint>
+ #include <cstdlib>
+ #include <functional>
+ #include <initializer_list>
From 9a1c893c0a28b3ffde97b18c8a61dc53487c6640 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 21:00:31 -0800
Subject: [PATCH 16/16] liblangtag: update to 0.6.7.
fixes build with gcc 13
---
srcpkgs/liblangtag/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/liblangtag/template b/srcpkgs/liblangtag/template
index 63eb8794148d2..c833c656b7358 100644
--- a/srcpkgs/liblangtag/template
+++ b/srcpkgs/liblangtag/template
@@ -1,6 +1,6 @@
# Template file for 'liblangtag'
pkgname=liblangtag
-version=0.6.4
+version=0.6.7
revision=1
build_style=gnu-configure
build_helper=gir
@@ -13,7 +13,7 @@ license="LGPL-3.0-or-later, MPL-2.0"
homepage="https://bitbucket.org/tagoh/liblangtag/src"
changelog="https://bitbucket.org/tagoh/liblangtag/raw/main/NEWS"
distfiles="https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-${version}.tar.bz2"
-checksum=5701062c17d3e73ddaa49956cbfa5d47d2f8221988dec561c0af2118c1c8a564
+checksum=5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e
build_options="gir"
build_options_default="gir"
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.8.4.
2024-02-19 1:02 [PR PATCH] ibgdal: update to 3.8.4 oreo639
` (2 preceding siblings ...)
2024-02-19 5:01 ` oreo639
@ 2024-02-19 5:01 ` oreo639
2024-02-19 5:02 ` oreo639
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-02-19 5:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1477 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libgdal
https://github.com/void-linux/void-packages/pull/48824
libgdal: update to 3.8.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
(currently not including `qgis` since it takes too long to compile, will add it with ci skip once CI is done)
[ci skip]
Tests were run without qgis here: https://github.com/void-linux/void-packages/actions/runs/7953878904
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48824.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-48824.patch --]
[-- Type: text/x-diff, Size: 22729 bytes --]
From fdc19358f2478927db844a4c2d23cbd8ded64c04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 15:13:02 -0800
Subject: [PATCH 01/16] libgdal: update to 3.8.4.
---
common/shlibs | 2 +-
srcpkgs/libgdal/patches/10-atoll.patch | 34 --------------------------
srcpkgs/libgdal/template | 6 ++---
3 files changed, 4 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada87..f5b32693cae68 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2459,7 +2459,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.31 libgdal-3.5.3_1
+libgdal.so.34 libgdal-3.8.4_1
libosgViewer.so.161 osg-3.6.5_1
libosgShadow.so.161 osg-3.6.5_1
libosgParticle.so.161 osg-3.6.5_1
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
deleted file mode 100644
index a114098612c52..0000000000000
--- a/srcpkgs/libgdal/patches/10-atoll.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Holger Jaekel <holger.jaekel@gmx.de>
-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/template b/srcpkgs/libgdal/template
index d5850fb768f66..93d916099045c 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.5.3
-revision=12
+version=3.8.4
+revision=1
build_style=cmake
build_helper=python3
configure_args="-DGDAL_USE_OPENCL=ON
@@ -21,7 +21,7 @@ license="MIT"
homepage="https://www.gdal.org"
changelog="https://raw.githubusercontent.com/OSGeo/gdal/master/NEWS.md"
distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
+checksum=0c53ced95d29474236487202709b49015854f8e02e35e44ed0f4f4e12a7966ce
python_version=3
if [ -z "$CROSS_BUILD" ]; then
From 49cbec795434ea8b618401a62f58c62d7bcd0ef9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:39:18 -0800
Subject: [PATCH 02/16] libpdal: update to 2.6.3.
---
srcpkgs/libpdal/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
index e0d517c709ea9..87b9e18b15791 100644
--- a/srcpkgs/libpdal/template
+++ b/srcpkgs/libpdal/template
@@ -1,6 +1,6 @@
# Template file for 'libpdal'
pkgname=libpdal
-version=2.6.2
+version=2.6.3
revision=1
build_style=cmake
build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="Arjan Mossel <arjanmossel@gmail.com>"
license="BSD-3-Clause"
homepage="https://pdal.io/"
distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
-checksum=9d532d745339cd793fbcab49ca56f05eb66779b8bd3e9f5c188c0238fee87d21
+checksum=fd019d0382ac79cc09ab000b5c84ea9a26284244e92dbdefd54edd6d1e837b75
do_check() {
cd build
From 6686abc53e0d433f7ae0f5557bf369869002b5f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:42:40 -0800
Subject: [PATCH 03/16] grass: rebuild for libgdal 3.8
---
srcpkgs/grass/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index 8910865f17529..0dc590430d085 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=8.3.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr/lib --enable-shared --without-pdal
--with-bzlib --with-nls --with-pthread --with-readline --with-geos
From 23c21d104ed19edabce7563fd2dc869de895b4d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:11 -0800
Subject: [PATCH 04/16] osg: rebuild for libgdal 3.8
---
srcpkgs/osg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index a9ebbd287933b..8ef0efc599a1b 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -1,7 +1,7 @@
# Template file for 'osg'
pkgname=osg
version=3.6.5
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
# don't use /usr/lib64 on 64bit platforms
From e201cc31923a1a23bf6f06cce803823eea766a3f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:48 -0800
Subject: [PATCH 05/16] merkaartor: rebuild for libgdal 3.8
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index c5848acf7d22a..002a6f5b36c55 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.19.0
-revision=3
+revision=4
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From 6f5e776de9da28131a500c2e435c7368c0b2fd6f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:10 -0800
Subject: [PATCH 06/16] OpenOrienteering-Mapper: rebuild for libgdal 3.8
---
.../patches/fix-tests-qtpaint.patch | 69 +++++++++++++++++++
srcpkgs/OpenOrienteering-Mapper/template | 2 +-
2 files changed, 70 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
diff --git a/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
new file mode 100644
index 0000000000000..dd818c68eb3e7
--- /dev/null
+++ b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
@@ -0,0 +1,69 @@
+From 65cf9f2585b696b2819db928fb8b0f13a997113b Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Wed, 17 May 2023 11:26:12 +0300
+Subject: [PATCH] Make QPainterTest pass with Qt 5.15.9
+
+https://bugreports.qt.io/browse/QTBUG-100327 was fixed in 5.15.9,
+so now we have a good result from the beginning and don't need
+ImageTransparencyFixup.
+---
+ src/core/image_transparency_fixup.h | 5 +++++
+ test/qpainter_t.cpp | 6 ++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/image_transparency_fixup.h b/src/core/image_transparency_fixup.h
+index 1dfe2f51b..8bd930744 100644
+--- a/src/core/image_transparency_fixup.h
++++ b/src/core/image_transparency_fixup.h
+@@ -57,6 +57,9 @@ class ImageTransparencyFixup
+ *
+ * The image must be of QImage::Format_ARGB32_Premultiplied.
+ * It may be null.
++ *
++ * This fixup is needed for Qt5 < 5.15.9 and Qt6 < 6.2.4 which are
++ * affected by https://bugreports.qt.io/browse/QTBUG-100327.
+ */
+ inline ImageTransparencyFixup(QImage* image)
+ : dest(0), dest_end(0)
+@@ -81,11 +84,13 @@ class ImageTransparencyFixup
+ */
+ inline void operator()() const
+ {
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ for (QRgb* px = dest; px < dest_end; px++)
+ {
+ if (*px == 0x01000000) /* qRgba(0, 0, 0, 1) */
+ *px = 0x00000000; /* qRgba(0, 0, 0, 0) */
+ }
++#endif
+ }
+
+ protected:
+diff --git a/test/qpainter_t.cpp b/test/qpainter_t.cpp
+index 85b971c03..a9172b1c8 100644
+--- a/test/qpainter_t.cpp
++++ b/test/qpainter_t.cpp
+@@ -80,9 +80,10 @@ void QPainterTest::multiplyComposition()
+ QCOMPARE(compose(white_img, white_img, multiply).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, multiply).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Multiply incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, multiply);
+@@ -107,9 +108,10 @@ void QPainterTest::darkenComposition()
+ QCOMPARE(compose(white_img, white_img, darken).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, darken).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Darken incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, darken);
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index 611b9c7237b1a..f68337dab80a7 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=3
+revision=4
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
makedepends="qt5-devel clipper-devel proj-devel zlib-devel libgdal-devel
From d8abb6a59bcce9e38c9959d3f2cbd16ffd354187 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:53 -0800
Subject: [PATCH 07/16] postgis-postgresql15: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql15/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template
index ad5c7cc61bd39..ded20813af09b 100644
--- a/srcpkgs/postgis-postgresql15/template
+++ b/srcpkgs/postgis-postgresql15/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql15'
pkgname=postgis-postgresql15
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql15/bin
From 4bbe571ccceda909f301073dba213389f63131a2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:05 -0800
Subject: [PATCH 08/16] postgis-postgresql16: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql16/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql16/template b/srcpkgs/postgis-postgresql16/template
index 9d62f16f767e0..765df9d8a2f6b 100644
--- a/srcpkgs/postgis-postgresql16/template
+++ b/srcpkgs/postgis-postgresql16/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql16'
pkgname=postgis-postgresql16
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql16/bin
From 72a601e4dfa202aa72145945afdaf96793638876 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:25 -0800
Subject: [PATCH 09/16] sumo: rebuild for libgdal 3.8
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index a3fe134aa5acc..a730afa9fafa9 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=6
+revision=7
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
From c4bddf9ab99a4ae615f9e62a3b4f8d46ba2208bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 20:23:18 -0800
Subject: [PATCH 10/16] qgis: rebuild for libgdal 3.8
---
srcpkgs/qgis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 1c99d8277e819..3dd7af263aba6 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,7 +1,7 @@
# Template file for 'qgis'
pkgname=qgis
version=3.34.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
-DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
From bf2a094bfbf44656ac36c8abc60af73417e00343 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 20:57:54 -0800
Subject: [PATCH 11/16] inkscape: fix build for libxml2 2.12
---
.../inkscape/patches/fix-libxml2-2.12.patch | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/inkscape/patches/fix-libxml2-2.12.patch
diff --git a/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch b/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch
new file mode 100644
index 0000000000000..dc5b0f53460c9
--- /dev/null
+++ b/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch
@@ -0,0 +1,33 @@
+From 694d8ae43d06efff21adebf377ce614d660b24cd Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Fri, 17 Nov 2023 22:30:42 +0100
+Subject: [PATCH] include missing header file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes build error:
+```
+/build/inkscape/src/inkscape/src/object/uri.cpp: In constructor ‘Inkscape::URI::URI(const gchar*, const char*)’:
+/build/inkscape/src/inkscape/src/object/uri.cpp:86:9: error: ‘xmlFree’ was not declared in this scope; did you mean ‘xmlFreeURI’?
+ 86 | xmlFree(full);
+```
+---
+ src/object/uri.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/object/uri.h b/src/object/uri.h
+index 381adec58cf..d5b211fe2b2 100644
+--- a/src/object/uri.h
++++ b/src/object/uri.h
+@@ -13,6 +13,7 @@
+ #define INKSCAPE_URI_H
+
+ #include <libxml/uri.h>
++#include <libxml/xmlmemory.h>
+ #include <memory>
+ #include <string>
+
+--
+GitLab
+
From d5a2698fc2790a3d10bfd654f5903533bbde1834 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 20:58:21 -0800
Subject: [PATCH 12/16] rdrview: fix build for libxml2 2.12
---
.../rdrview/patches/fix-libxml2-2.12.patch | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/rdrview/patches/fix-libxml2-2.12.patch
diff --git a/srcpkgs/rdrview/patches/fix-libxml2-2.12.patch b/srcpkgs/rdrview/patches/fix-libxml2-2.12.patch
new file mode 100644
index 0000000000000..eb8c8eb7709a8
--- /dev/null
+++ b/srcpkgs/rdrview/patches/fix-libxml2-2.12.patch
@@ -0,0 +1,26 @@
+From b5fdd379577e13d26784ffdeca3ecb02ff1d336e Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Sun, 18 Feb 2024 13:49:49 -0800
+Subject: [PATCH] Add missing include with libxml2 2.12+
+
+libxml2 2.12 removed extra includes, which causes stdlib.h to not get implicitly
+included anymore.
+
+The missing include results in a warning on gcc13 and below with the resulting
+binary truncating the pointer to an integer, gcc14+ makes this a hard error.
+---
+ src/rdrview.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/rdrview.h b/src/rdrview.h
+index 9365e7a..2eda156 100644
+--- a/src/rdrview.h
++++ b/src/rdrview.h
+@@ -26,6 +26,7 @@
+ #define RDRVIEW_H
+
+ #include <assert.h>
++#include <stdlib.h>
+ #include <stdbool.h>
+ #include <sys/types.h>
+ #include <regex.h>
From a6f487c662faaad6eae92b2cecf3d25077820740 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 20:58:50 -0800
Subject: [PATCH 13/16] cegui: fix build for libxml2 2.12
---
srcpkgs/cegui/patches/fix-libxml2-2.12.patch | 26 ++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/cegui/patches/fix-libxml2-2.12.patch
diff --git a/srcpkgs/cegui/patches/fix-libxml2-2.12.patch b/srcpkgs/cegui/patches/fix-libxml2-2.12.patch
new file mode 100644
index 0000000000000..f288ce9a66b09
--- /dev/null
+++ b/srcpkgs/cegui/patches/fix-libxml2-2.12.patch
@@ -0,0 +1,26 @@
+From 285ba5a2c0c435ed865c6e86afe314a822fd1e3f Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Sun, 18 Feb 2024 14:16:21 -0800
+Subject: [PATCH] Fix return type of xmlGetLastError for libxml2 2.12
+
+https://gitlab.gnome.org/GNOME/libxml2/-/commit/45470611b047db78106dcb2fdbd4164163c15ab7
+---
+ cegui/src/XMLParserModules/Libxml2/XMLParser.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp
+index 74a3dbddd..a408f9305 100644
+--- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp
++++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp
+@@ -109,7 +109,11 @@ void LibxmlParser::parseXML(XMLHandler& handler,
+
+ if (!doc)
+ {
++#if LIBXML_VERSION >= 21200
++ const xmlError* err = xmlGetLastError();
++#else
+ xmlError* err = xmlGetLastError();
++#endif
+
+ throw GenericException(
+ String("xmlParseMemory failed in file: '") +
From 80655a4510a87065dc2c45f1fb4331c9a2fff4f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 20:59:44 -0800
Subject: [PATCH 14/16] 0ad: fix build for gcc 13
---
srcpkgs/0ad/patches/fix-gcc13.patch | 48 +++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 srcpkgs/0ad/patches/fix-gcc13.patch
diff --git a/srcpkgs/0ad/patches/fix-gcc13.patch b/srcpkgs/0ad/patches/fix-gcc13.patch
new file mode 100644
index 0000000000000..ad40bceffc7cb
--- /dev/null
+++ b/srcpkgs/0ad/patches/fix-gcc13.patch
@@ -0,0 +1,48 @@
+From 093e1eb23519ab4a4633a999a555a58e4fd5343e Mon Sep 17 00:00:00 2001
+From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
+Date: Sat, 13 May 2023 12:08:23 +0000
+Subject: [PATCH] Fix compilation with GCC 13.
+
+gcc-13 less often includes cstdint so one might need to include it manually if needed.
+
+The headers already included in Message.h are included within namespace AtlasMessage which didn't break by chance, move them out and add cstdint.
+
+Patch by: @sera
+Reviewed by: @phosit
+Fixes: #6800
+Differential Revision: https://code.wildfiregames.com/D4997
+
+git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27644 3db68df2-c116-0410-a063-a993310a9797
+---
+ source/tools/atlas/GameInterface/Messages.h | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h
+index 2fa47809213..a486d93a687 100644
+--- a/source/tools/atlas/GameInterface/Messages.h
++++ b/source/tools/atlas/GameInterface/Messages.h
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2022 Wildfire Games.
++/* Copyright (C) 2023 Wildfire Games.
+ * This file is part of 0 A.D.
+ *
+ * 0 A.D. is free software: you can redistribute it and/or modify
+@@ -18,13 +18,15 @@
+ #ifndef INCLUDED_MESSAGES
+ #define INCLUDED_MESSAGES
+
++#include <cstdint>
++#include <string>
++#include <vector>
++
++// Opens namespace AtlasMessage, closes it on second inclusion!
+ #ifndef MESSAGES_SKIP_SETUP
+ #include "MessagesSetup.h"
+ #endif
+
+-#include <vector>
+-#include <string>
+-
+ // TODO: organisation, documentation, etc
+
+ #ifdef _MSC_VER // (can't use MSC_VERSION here since this file is included by Atlas too)
From 72318d8cc6137bdd4e988bfabfe5b5a7fb40dada Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 21:00:02 -0800
Subject: [PATCH 15/16] openmsx: fix build for gcc 13
---
srcpkgs/openmsx/patches/gcc13.patch | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/openmsx/patches/gcc13.patch
diff --git a/srcpkgs/openmsx/patches/gcc13.patch b/srcpkgs/openmsx/patches/gcc13.patch
new file mode 100644
index 0000000000000..8ab7880d127f9
--- /dev/null
+++ b/srcpkgs/openmsx/patches/gcc13.patch
@@ -0,0 +1,23 @@
+From b50d02069c09f11c687637c64ca1b459a5def28c Mon Sep 17 00:00:00 2001
+From: m9710797 <vermaelen.wouter@gmail.com>
+Date: Sat, 4 Feb 2023 16:37:39 +0100
+Subject: [PATCH] Added missing #include
+
+Thanks to 'musuruan' for reporting.
+https://github.com/openMSX/openMSX/issues/1487
+---
+ src/utils/hash_set.hh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/utils/hash_set.hh b/src/utils/hash_set.hh
+index fb4bb93933..c89883121e 100644
+--- a/src/utils/hash_set.hh
++++ b/src/utils/hash_set.hh
+@@ -11,6 +11,7 @@
+ #include "unreachable.hh"
+ #include "xrange.hh"
+ #include <cassert>
++#include <cstdint>
+ #include <cstdlib>
+ #include <functional>
+ #include <initializer_list>
From 023e443445b2526520f7bd15dc2fb0d5456e9b9a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 21:00:31 -0800
Subject: [PATCH 16/16] liblangtag: update to 0.6.7.
fixes build with gcc 13
---
srcpkgs/liblangtag/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/liblangtag/template b/srcpkgs/liblangtag/template
index 63eb8794148d2..c833c656b7358 100644
--- a/srcpkgs/liblangtag/template
+++ b/srcpkgs/liblangtag/template
@@ -1,6 +1,6 @@
# Template file for 'liblangtag'
pkgname=liblangtag
-version=0.6.4
+version=0.6.7
revision=1
build_style=gnu-configure
build_helper=gir
@@ -13,7 +13,7 @@ license="LGPL-3.0-or-later, MPL-2.0"
homepage="https://bitbucket.org/tagoh/liblangtag/src"
changelog="https://bitbucket.org/tagoh/liblangtag/raw/main/NEWS"
distfiles="https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-${version}.tar.bz2"
-checksum=5701062c17d3e73ddaa49956cbfa5d47d2f8221988dec561c0af2118c1c8a564
+checksum=5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e
build_options="gir"
build_options_default="gir"
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.8.4.
2024-02-19 1:02 [PR PATCH] ibgdal: update to 3.8.4 oreo639
` (3 preceding siblings ...)
2024-02-19 5:01 ` oreo639
@ 2024-02-19 5:02 ` oreo639
2024-02-22 19:51 ` oreo639
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-02-19 5:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1477 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libgdal
https://github.com/void-linux/void-packages/pull/48824
libgdal: update to 3.8.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
(currently not including `qgis` since it takes too long to compile, will add it with ci skip once CI is done)
[ci skip]
Tests were run without qgis here: https://github.com/void-linux/void-packages/actions/runs/7953878904
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48824.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-48824.patch --]
[-- Type: text/x-diff, Size: 13376 bytes --]
From fdc19358f2478927db844a4c2d23cbd8ded64c04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 15:13:02 -0800
Subject: [PATCH 01/10] libgdal: update to 3.8.4.
---
common/shlibs | 2 +-
srcpkgs/libgdal/patches/10-atoll.patch | 34 --------------------------
srcpkgs/libgdal/template | 6 ++---
3 files changed, 4 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada87..f5b32693cae68 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2459,7 +2459,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.31 libgdal-3.5.3_1
+libgdal.so.34 libgdal-3.8.4_1
libosgViewer.so.161 osg-3.6.5_1
libosgShadow.so.161 osg-3.6.5_1
libosgParticle.so.161 osg-3.6.5_1
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
deleted file mode 100644
index a114098612c52..0000000000000
--- a/srcpkgs/libgdal/patches/10-atoll.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Holger Jaekel <holger.jaekel@gmx.de>
-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/template b/srcpkgs/libgdal/template
index d5850fb768f66..93d916099045c 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.5.3
-revision=12
+version=3.8.4
+revision=1
build_style=cmake
build_helper=python3
configure_args="-DGDAL_USE_OPENCL=ON
@@ -21,7 +21,7 @@ license="MIT"
homepage="https://www.gdal.org"
changelog="https://raw.githubusercontent.com/OSGeo/gdal/master/NEWS.md"
distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
+checksum=0c53ced95d29474236487202709b49015854f8e02e35e44ed0f4f4e12a7966ce
python_version=3
if [ -z "$CROSS_BUILD" ]; then
From 49cbec795434ea8b618401a62f58c62d7bcd0ef9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:39:18 -0800
Subject: [PATCH 02/10] libpdal: update to 2.6.3.
---
srcpkgs/libpdal/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
index e0d517c709ea9..87b9e18b15791 100644
--- a/srcpkgs/libpdal/template
+++ b/srcpkgs/libpdal/template
@@ -1,6 +1,6 @@
# Template file for 'libpdal'
pkgname=libpdal
-version=2.6.2
+version=2.6.3
revision=1
build_style=cmake
build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="Arjan Mossel <arjanmossel@gmail.com>"
license="BSD-3-Clause"
homepage="https://pdal.io/"
distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
-checksum=9d532d745339cd793fbcab49ca56f05eb66779b8bd3e9f5c188c0238fee87d21
+checksum=fd019d0382ac79cc09ab000b5c84ea9a26284244e92dbdefd54edd6d1e837b75
do_check() {
cd build
From 6686abc53e0d433f7ae0f5557bf369869002b5f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:42:40 -0800
Subject: [PATCH 03/10] grass: rebuild for libgdal 3.8
---
srcpkgs/grass/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index 8910865f17529..0dc590430d085 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=8.3.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr/lib --enable-shared --without-pdal
--with-bzlib --with-nls --with-pthread --with-readline --with-geos
From 23c21d104ed19edabce7563fd2dc869de895b4d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:11 -0800
Subject: [PATCH 04/10] osg: rebuild for libgdal 3.8
---
srcpkgs/osg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index a9ebbd287933b..8ef0efc599a1b 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -1,7 +1,7 @@
# Template file for 'osg'
pkgname=osg
version=3.6.5
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
# don't use /usr/lib64 on 64bit platforms
From e201cc31923a1a23bf6f06cce803823eea766a3f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:48 -0800
Subject: [PATCH 05/10] merkaartor: rebuild for libgdal 3.8
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index c5848acf7d22a..002a6f5b36c55 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.19.0
-revision=3
+revision=4
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From 6f5e776de9da28131a500c2e435c7368c0b2fd6f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:10 -0800
Subject: [PATCH 06/10] OpenOrienteering-Mapper: rebuild for libgdal 3.8
---
.../patches/fix-tests-qtpaint.patch | 69 +++++++++++++++++++
srcpkgs/OpenOrienteering-Mapper/template | 2 +-
2 files changed, 70 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
diff --git a/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
new file mode 100644
index 0000000000000..dd818c68eb3e7
--- /dev/null
+++ b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
@@ -0,0 +1,69 @@
+From 65cf9f2585b696b2819db928fb8b0f13a997113b Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Wed, 17 May 2023 11:26:12 +0300
+Subject: [PATCH] Make QPainterTest pass with Qt 5.15.9
+
+https://bugreports.qt.io/browse/QTBUG-100327 was fixed in 5.15.9,
+so now we have a good result from the beginning and don't need
+ImageTransparencyFixup.
+---
+ src/core/image_transparency_fixup.h | 5 +++++
+ test/qpainter_t.cpp | 6 ++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/image_transparency_fixup.h b/src/core/image_transparency_fixup.h
+index 1dfe2f51b..8bd930744 100644
+--- a/src/core/image_transparency_fixup.h
++++ b/src/core/image_transparency_fixup.h
+@@ -57,6 +57,9 @@ class ImageTransparencyFixup
+ *
+ * The image must be of QImage::Format_ARGB32_Premultiplied.
+ * It may be null.
++ *
++ * This fixup is needed for Qt5 < 5.15.9 and Qt6 < 6.2.4 which are
++ * affected by https://bugreports.qt.io/browse/QTBUG-100327.
+ */
+ inline ImageTransparencyFixup(QImage* image)
+ : dest(0), dest_end(0)
+@@ -81,11 +84,13 @@ class ImageTransparencyFixup
+ */
+ inline void operator()() const
+ {
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ for (QRgb* px = dest; px < dest_end; px++)
+ {
+ if (*px == 0x01000000) /* qRgba(0, 0, 0, 1) */
+ *px = 0x00000000; /* qRgba(0, 0, 0, 0) */
+ }
++#endif
+ }
+
+ protected:
+diff --git a/test/qpainter_t.cpp b/test/qpainter_t.cpp
+index 85b971c03..a9172b1c8 100644
+--- a/test/qpainter_t.cpp
++++ b/test/qpainter_t.cpp
+@@ -80,9 +80,10 @@ void QPainterTest::multiplyComposition()
+ QCOMPARE(compose(white_img, white_img, multiply).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, multiply).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Multiply incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, multiply);
+@@ -107,9 +108,10 @@ void QPainterTest::darkenComposition()
+ QCOMPARE(compose(white_img, white_img, darken).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, darken).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Darken incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, darken);
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index 611b9c7237b1a..f68337dab80a7 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=3
+revision=4
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
makedepends="qt5-devel clipper-devel proj-devel zlib-devel libgdal-devel
From d8abb6a59bcce9e38c9959d3f2cbd16ffd354187 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:53 -0800
Subject: [PATCH 07/10] postgis-postgresql15: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql15/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template
index ad5c7cc61bd39..ded20813af09b 100644
--- a/srcpkgs/postgis-postgresql15/template
+++ b/srcpkgs/postgis-postgresql15/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql15'
pkgname=postgis-postgresql15
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql15/bin
From 4bbe571ccceda909f301073dba213389f63131a2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:05 -0800
Subject: [PATCH 08/10] postgis-postgresql16: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql16/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql16/template b/srcpkgs/postgis-postgresql16/template
index 9d62f16f767e0..765df9d8a2f6b 100644
--- a/srcpkgs/postgis-postgresql16/template
+++ b/srcpkgs/postgis-postgresql16/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql16'
pkgname=postgis-postgresql16
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql16/bin
From 72a601e4dfa202aa72145945afdaf96793638876 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:25 -0800
Subject: [PATCH 09/10] sumo: rebuild for libgdal 3.8
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index a3fe134aa5acc..a730afa9fafa9 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=6
+revision=7
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
From c4bddf9ab99a4ae615f9e62a3b4f8d46ba2208bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 20:23:18 -0800
Subject: [PATCH 10/10] qgis: rebuild for libgdal 3.8
---
srcpkgs/qgis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 1c99d8277e819..3dd7af263aba6 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,7 +1,7 @@
# Template file for 'qgis'
pkgname=qgis
version=3.34.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
-DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.8.4.
2024-02-19 1:02 [PR PATCH] ibgdal: update to 3.8.4 oreo639
` (4 preceding siblings ...)
2024-02-19 5:02 ` oreo639
@ 2024-02-22 19:51 ` oreo639
2024-02-25 3:20 ` oreo639
2024-02-25 3:24 ` [PR PATCH] [Merged]: " oreo639
7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-02-22 19:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1481 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libgdal
https://github.com/void-linux/void-packages/pull/48824
libgdal: update to 3.8.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
~~(currently not including `qgis` since it takes too long to compile, will add it with ci skip once CI is done)~~
[ci skip]
Tests were run without qgis here: https://github.com/void-linux/void-packages/actions/runs/7953878904
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48824.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-48824.patch --]
[-- Type: text/x-diff, Size: 13376 bytes --]
From 2dab02b1347d5d04adab430013d52de06357fbf5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 15:13:02 -0800
Subject: [PATCH 01/10] libgdal: update to 3.8.4.
---
common/shlibs | 2 +-
srcpkgs/libgdal/patches/10-atoll.patch | 34 --------------------------
srcpkgs/libgdal/template | 6 ++---
3 files changed, 4 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
diff --git a/common/shlibs b/common/shlibs
index cde1106f7dbef..6c553d20e5b8f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2459,7 +2459,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.31 libgdal-3.5.3_1
+libgdal.so.34 libgdal-3.8.4_1
libosgViewer.so.161 osg-3.6.5_1
libosgShadow.so.161 osg-3.6.5_1
libosgParticle.so.161 osg-3.6.5_1
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
deleted file mode 100644
index a114098612c52..0000000000000
--- a/srcpkgs/libgdal/patches/10-atoll.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Holger Jaekel <holger.jaekel@gmx.de>
-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/template b/srcpkgs/libgdal/template
index d5850fb768f66..93d916099045c 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.5.3
-revision=12
+version=3.8.4
+revision=1
build_style=cmake
build_helper=python3
configure_args="-DGDAL_USE_OPENCL=ON
@@ -21,7 +21,7 @@ license="MIT"
homepage="https://www.gdal.org"
changelog="https://raw.githubusercontent.com/OSGeo/gdal/master/NEWS.md"
distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
+checksum=0c53ced95d29474236487202709b49015854f8e02e35e44ed0f4f4e12a7966ce
python_version=3
if [ -z "$CROSS_BUILD" ]; then
From 16389572e85cdbed46011c78b0c0e374ea6d86bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:39:18 -0800
Subject: [PATCH 02/10] libpdal: update to 2.6.3.
---
srcpkgs/libpdal/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
index e0d517c709ea9..87b9e18b15791 100644
--- a/srcpkgs/libpdal/template
+++ b/srcpkgs/libpdal/template
@@ -1,6 +1,6 @@
# Template file for 'libpdal'
pkgname=libpdal
-version=2.6.2
+version=2.6.3
revision=1
build_style=cmake
build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="Arjan Mossel <arjanmossel@gmail.com>"
license="BSD-3-Clause"
homepage="https://pdal.io/"
distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
-checksum=9d532d745339cd793fbcab49ca56f05eb66779b8bd3e9f5c188c0238fee87d21
+checksum=fd019d0382ac79cc09ab000b5c84ea9a26284244e92dbdefd54edd6d1e837b75
do_check() {
cd build
From a87d49b6573f6ab80c50b091f29ffbe734f97792 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:42:40 -0800
Subject: [PATCH 03/10] grass: rebuild for libgdal 3.8
---
srcpkgs/grass/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index 8910865f17529..0dc590430d085 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=8.3.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr/lib --enable-shared --without-pdal
--with-bzlib --with-nls --with-pthread --with-readline --with-geos
From 46f249a5a00fcbc71b440f39df645cbf300df73d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:11 -0800
Subject: [PATCH 04/10] osg: rebuild for libgdal 3.8
---
srcpkgs/osg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index a9ebbd287933b..8ef0efc599a1b 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -1,7 +1,7 @@
# Template file for 'osg'
pkgname=osg
version=3.6.5
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
# don't use /usr/lib64 on 64bit platforms
From 86d3151d7cf9834e9b4bff505969a21097e27898 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:48 -0800
Subject: [PATCH 05/10] merkaartor: rebuild for libgdal 3.8
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index c5848acf7d22a..002a6f5b36c55 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.19.0
-revision=3
+revision=4
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From a36c67911cec86e82aa64392d587578281123da7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:10 -0800
Subject: [PATCH 06/10] OpenOrienteering-Mapper: rebuild for libgdal 3.8
---
.../patches/fix-tests-qtpaint.patch | 69 +++++++++++++++++++
srcpkgs/OpenOrienteering-Mapper/template | 2 +-
2 files changed, 70 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
diff --git a/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
new file mode 100644
index 0000000000000..dd818c68eb3e7
--- /dev/null
+++ b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
@@ -0,0 +1,69 @@
+From 65cf9f2585b696b2819db928fb8b0f13a997113b Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Wed, 17 May 2023 11:26:12 +0300
+Subject: [PATCH] Make QPainterTest pass with Qt 5.15.9
+
+https://bugreports.qt.io/browse/QTBUG-100327 was fixed in 5.15.9,
+so now we have a good result from the beginning and don't need
+ImageTransparencyFixup.
+---
+ src/core/image_transparency_fixup.h | 5 +++++
+ test/qpainter_t.cpp | 6 ++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/image_transparency_fixup.h b/src/core/image_transparency_fixup.h
+index 1dfe2f51b..8bd930744 100644
+--- a/src/core/image_transparency_fixup.h
++++ b/src/core/image_transparency_fixup.h
+@@ -57,6 +57,9 @@ class ImageTransparencyFixup
+ *
+ * The image must be of QImage::Format_ARGB32_Premultiplied.
+ * It may be null.
++ *
++ * This fixup is needed for Qt5 < 5.15.9 and Qt6 < 6.2.4 which are
++ * affected by https://bugreports.qt.io/browse/QTBUG-100327.
+ */
+ inline ImageTransparencyFixup(QImage* image)
+ : dest(0), dest_end(0)
+@@ -81,11 +84,13 @@ class ImageTransparencyFixup
+ */
+ inline void operator()() const
+ {
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ for (QRgb* px = dest; px < dest_end; px++)
+ {
+ if (*px == 0x01000000) /* qRgba(0, 0, 0, 1) */
+ *px = 0x00000000; /* qRgba(0, 0, 0, 0) */
+ }
++#endif
+ }
+
+ protected:
+diff --git a/test/qpainter_t.cpp b/test/qpainter_t.cpp
+index 85b971c03..a9172b1c8 100644
+--- a/test/qpainter_t.cpp
++++ b/test/qpainter_t.cpp
+@@ -80,9 +80,10 @@ void QPainterTest::multiplyComposition()
+ QCOMPARE(compose(white_img, white_img, multiply).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, multiply).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Multiply incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, multiply);
+@@ -107,9 +108,10 @@ void QPainterTest::darkenComposition()
+ QCOMPARE(compose(white_img, white_img, darken).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, darken).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Darken incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, darken);
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index 611b9c7237b1a..f68337dab80a7 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=3
+revision=4
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
makedepends="qt5-devel clipper-devel proj-devel zlib-devel libgdal-devel
From 71f73f5cdb866802c59d3ea123e208988bf0efa1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:53 -0800
Subject: [PATCH 07/10] postgis-postgresql15: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql15/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template
index ad5c7cc61bd39..ded20813af09b 100644
--- a/srcpkgs/postgis-postgresql15/template
+++ b/srcpkgs/postgis-postgresql15/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql15'
pkgname=postgis-postgresql15
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql15/bin
From 380b1c7d87ec3bd6d72ba1ff7e974d4c6b0b32cc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:05 -0800
Subject: [PATCH 08/10] postgis-postgresql16: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql16/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql16/template b/srcpkgs/postgis-postgresql16/template
index 9d62f16f767e0..765df9d8a2f6b 100644
--- a/srcpkgs/postgis-postgresql16/template
+++ b/srcpkgs/postgis-postgresql16/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql16'
pkgname=postgis-postgresql16
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql16/bin
From 3a76f16d1133cf227ddae60c77f61f8b80a83c68 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:25 -0800
Subject: [PATCH 09/10] sumo: rebuild for libgdal 3.8
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index a3fe134aa5acc..a730afa9fafa9 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=6
+revision=7
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
From bf8bbe80d8d77a55854eae56525705cc1fcb74c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 22 Feb 2024 11:51:00 -0800
Subject: [PATCH 10/10] qgis: rebuild for libgdal 3.8
---
srcpkgs/qgis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 3dd7af263aba6..56a97098f49c2 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,7 +1,7 @@
# Template file for 'qgis'
pkgname=qgis
version=3.34.3
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
-DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] libgdal: update to 3.8.4.
2024-02-19 1:02 [PR PATCH] ibgdal: update to 3.8.4 oreo639
` (5 preceding siblings ...)
2024-02-22 19:51 ` oreo639
@ 2024-02-25 3:20 ` oreo639
2024-02-25 3:24 ` [PR PATCH] [Merged]: " oreo639
7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-02-25 3:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1481 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libgdal
https://github.com/void-linux/void-packages/pull/48824
libgdal: update to 3.8.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
~~(currently not including `qgis` since it takes too long to compile, will add it with ci skip once CI is done)~~
[ci skip]
Tests were run without qgis here: https://github.com/void-linux/void-packages/actions/runs/7953878904
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48824.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgdal-48824.patch --]
[-- Type: text/x-diff, Size: 13402 bytes --]
From 1e49cfdb8f3edf13b6fcccee03f6b2b692d9c2da Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 15:13:02 -0800
Subject: [PATCH 01/10] libgdal: update to 3.8.4.
---
common/shlibs | 2 +-
srcpkgs/libgdal/patches/10-atoll.patch | 34 --------------------------
srcpkgs/libgdal/template | 6 ++---
3 files changed, 4 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/libgdal/patches/10-atoll.patch
diff --git a/common/shlibs b/common/shlibs
index 0750383d854a98..695794c63daed5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2459,7 +2459,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.31 libgdal-3.5.3_1
+libgdal.so.34 libgdal-3.8.4_1
libosgViewer.so.161 osg-3.6.5_1
libosgShadow.so.161 osg-3.6.5_1
libosgParticle.so.161 osg-3.6.5_1
diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch
deleted file mode 100644
index a114098612c522..00000000000000
--- a/srcpkgs/libgdal/patches/10-atoll.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Holger Jaekel <holger.jaekel@gmx.de>
-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/template b/srcpkgs/libgdal/template
index d5850fb768f669..93d916099045c0 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.5.3
-revision=12
+version=3.8.4
+revision=1
build_style=cmake
build_helper=python3
configure_args="-DGDAL_USE_OPENCL=ON
@@ -21,7 +21,7 @@ license="MIT"
homepage="https://www.gdal.org"
changelog="https://raw.githubusercontent.com/OSGeo/gdal/master/NEWS.md"
distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
+checksum=0c53ced95d29474236487202709b49015854f8e02e35e44ed0f4f4e12a7966ce
python_version=3
if [ -z "$CROSS_BUILD" ]; then
From e75540333fc93bdb93038a42eb02a83b20092e75 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:39:18 -0800
Subject: [PATCH 02/10] libpdal: update to 2.6.3.
---
srcpkgs/libpdal/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
index e0d517c709ea98..87b9e18b15791b 100644
--- a/srcpkgs/libpdal/template
+++ b/srcpkgs/libpdal/template
@@ -1,6 +1,6 @@
# Template file for 'libpdal'
pkgname=libpdal
-version=2.6.2
+version=2.6.3
revision=1
build_style=cmake
build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="Arjan Mossel <arjanmossel@gmail.com>"
license="BSD-3-Clause"
homepage="https://pdal.io/"
distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
-checksum=9d532d745339cd793fbcab49ca56f05eb66779b8bd3e9f5c188c0238fee87d21
+checksum=fd019d0382ac79cc09ab000b5c84ea9a26284244e92dbdefd54edd6d1e837b75
do_check() {
cd build
From a67f7a2a50d85cc327bc0dba6cb10041ed3faa4f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:42:40 -0800
Subject: [PATCH 03/10] grass: rebuild for libgdal 3.8
---
srcpkgs/grass/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index 8910865f17529a..0dc590430d085b 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=8.3.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr/lib --enable-shared --without-pdal
--with-bzlib --with-nls --with-pthread --with-readline --with-geos
From d6bc6c61be6cfb05950173dd5450b1246ecc9bfe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:11 -0800
Subject: [PATCH 04/10] osg: rebuild for libgdal 3.8
---
srcpkgs/osg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index a9ebbd287933bd..8ef0efc599a1b1 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -1,7 +1,7 @@
# Template file for 'osg'
pkgname=osg
version=3.6.5
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
# don't use /usr/lib64 on 64bit platforms
From bf1ed651b6094f84feb3245eca3ecb04b1db0a07 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:43:48 -0800
Subject: [PATCH 05/10] merkaartor: rebuild for libgdal 3.8
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index c5848acf7d22a2..002a6f5b36c55f 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.19.0
-revision=3
+revision=4
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From 1d4ba2b4adbbc9adf3f76656940e18c79ba882dd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:10 -0800
Subject: [PATCH 06/10] OpenOrienteering-Mapper: rebuild for libgdal 3.8
---
.../patches/fix-tests-qtpaint.patch | 69 +++++++++++++++++++
srcpkgs/OpenOrienteering-Mapper/template | 2 +-
2 files changed, 70 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
diff --git a/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
new file mode 100644
index 00000000000000..dd818c68eb3e78
--- /dev/null
+++ b/srcpkgs/OpenOrienteering-Mapper/patches/fix-tests-qtpaint.patch
@@ -0,0 +1,69 @@
+From 65cf9f2585b696b2819db928fb8b0f13a997113b Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Wed, 17 May 2023 11:26:12 +0300
+Subject: [PATCH] Make QPainterTest pass with Qt 5.15.9
+
+https://bugreports.qt.io/browse/QTBUG-100327 was fixed in 5.15.9,
+so now we have a good result from the beginning and don't need
+ImageTransparencyFixup.
+---
+ src/core/image_transparency_fixup.h | 5 +++++
+ test/qpainter_t.cpp | 6 ++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/image_transparency_fixup.h b/src/core/image_transparency_fixup.h
+index 1dfe2f51b..8bd930744 100644
+--- a/src/core/image_transparency_fixup.h
++++ b/src/core/image_transparency_fixup.h
+@@ -57,6 +57,9 @@ class ImageTransparencyFixup
+ *
+ * The image must be of QImage::Format_ARGB32_Premultiplied.
+ * It may be null.
++ *
++ * This fixup is needed for Qt5 < 5.15.9 and Qt6 < 6.2.4 which are
++ * affected by https://bugreports.qt.io/browse/QTBUG-100327.
+ */
+ inline ImageTransparencyFixup(QImage* image)
+ : dest(0), dest_end(0)
+@@ -81,11 +84,13 @@ class ImageTransparencyFixup
+ */
+ inline void operator()() const
+ {
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ for (QRgb* px = dest; px < dest_end; px++)
+ {
+ if (*px == 0x01000000) /* qRgba(0, 0, 0, 1) */
+ *px = 0x00000000; /* qRgba(0, 0, 0, 0) */
+ }
++#endif
+ }
+
+ protected:
+diff --git a/test/qpainter_t.cpp b/test/qpainter_t.cpp
+index 85b971c03..a9172b1c8 100644
+--- a/test/qpainter_t.cpp
++++ b/test/qpainter_t.cpp
+@@ -80,9 +80,10 @@ void QPainterTest::multiplyComposition()
+ QCOMPARE(compose(white_img, white_img, multiply).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, multiply).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Multiply incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, multiply).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, multiply);
+@@ -107,9 +108,10 @@ void QPainterTest::darkenComposition()
+ QCOMPARE(compose(white_img, white_img, darken).pixel(0,0), qRgba(255, 255, 255, 255));
+ QCOMPARE(compose(black_img, black_img, darken).pixel(0,0), qRgba(0, 0, 0, 255));
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 9) || (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 2, 4))
+ QEXPECT_FAIL("", "CompositionMode_Darken incorrectly composes full transparency.", Continue);
++#endif
+ QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 0));
+- QCOMPARE(compose(trans_img, trans_img, darken).pixel(0,0), qRgba(0, 0, 0, 1)); // This should fail!
+
+ // ImageTransparencyFixup fixes the particular issue.
+ QImage result = compose(trans_img, trans_img, darken);
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index 611b9c7237b1ab..f68337dab80a70 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=3
+revision=4
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
makedepends="qt5-devel clipper-devel proj-devel zlib-devel libgdal-devel
From cfcb45c770825547b597dfb16b04e48277079f6c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:44:53 -0800
Subject: [PATCH 07/10] postgis-postgresql15: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql15/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template
index ad5c7cc61bd393..ded20813af09bb 100644
--- a/srcpkgs/postgis-postgresql15/template
+++ b/srcpkgs/postgis-postgresql15/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql15'
pkgname=postgis-postgresql15
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql15/bin
From e6f67c15adb85ea2efe2eda3ea39f615333184ef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:05 -0800
Subject: [PATCH 08/10] postgis-postgresql16: rebuild for libgdal 3.8
---
srcpkgs/postgis-postgresql16/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgis-postgresql16/template b/srcpkgs/postgis-postgresql16/template
index 9d62f16f767e06..765df9d8a2f6b9 100644
--- a/srcpkgs/postgis-postgresql16/template
+++ b/srcpkgs/postgis-postgresql16/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql16'
pkgname=postgis-postgresql16
version=3.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--bindir=/usr/lib/psql16/bin
From 2335d7a16f49be4b6732a62a051b599bb0b447c8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 18 Feb 2024 16:45:25 -0800
Subject: [PATCH 09/10] sumo: rebuild for libgdal 3.8
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index a3fe134aa5acc2..a730afa9fafa92 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=6
+revision=7
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
From f8585fbb6ca8f53c63a5d09f7a303f9e544575f9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 22 Feb 2024 11:51:00 -0800
Subject: [PATCH 10/10] qgis: rebuild for libgdal 3.8
---
srcpkgs/qgis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 3dd7af263aba62..56a97098f49c24 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,7 +1,7 @@
# Template file for 'qgis'
pkgname=qgis
version=3.34.3
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
-DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Merged]: libgdal: update to 3.8.4.
2024-02-19 1:02 [PR PATCH] ibgdal: update to 3.8.4 oreo639
` (6 preceding siblings ...)
2024-02-25 3:20 ` oreo639
@ 2024-02-25 3:24 ` oreo639
7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-02-25 3:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1325 bytes --]
There's a merged pull request on the void-packages repository
libgdal: update to 3.8.4.
https://github.com/void-linux/void-packages/pull/48824
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
~~(currently not including `qgis` since it takes too long to compile, will add it with ci skip once CI is done)~~
[ci skip]
Tests were run without qgis here: https://github.com/void-linux/void-packages/actions/runs/7953878904
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 9+ messages in thread