commit 71f6aa39818e3b4973e05c473254a8c843ce0729
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sun Dec 15 22:31:18 2024 +0100
- rel 3, fix gcc 14 whinery
gcc14.patch | 22 ++++++++++++++++++++++
liblas.spec | 22 ++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
---
diff --git a/liblas.spec b/liblas.spec
index e83ee17..befc08b 100644
--- a/liblas.spec
+++ b/liblas.spec
@@ -8,7 +8,7 @@ Summary: LAS 1.0/1.1/1.2 ASPRS LiDAR data translation
toolset
Summary(pl.UTF-8): Narzędzia do tłumaczenia danych LiDARowych ASPRS LAS
1.0/1.1/1.2
Name: liblas
Version: 1.8.1
-Release: 2
+Release: 3
License: BSD with Boost v1.0 and MIT parts
Group: Libraries
Source0: http://download.osgeo.org/liblas/libLAS-%{version}.tar.bz2
@@ -29,6 +29,7 @@ Patch5: %{name}-CVE-2018-20537.patch
Patch6: %{name}-CVE-2018-20540.patch
Patch7: %{name}-pkgconfig.patch
Patch8: %{name}-cxxstd.patch
+Patch9: gcc14.patch
URL: https://liblas.org/
BuildRequires: boost-devel >= 1.38
BuildRequires: cmake >= 2.6.0
@@ -91,15 +92,16 @@ Dokumentacja API biblioteki libLAS.
%prep
%setup -q -n libLAS-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 5 -p1
+%patch -P 6 -p1
+%patch -P 7 -p1
+%patch -P 8 -p1
+%patch -P 9 -p1
%build
install -d build
diff --git a/gcc14.patch b/gcc14.patch
new file mode 100644
index 0000000..e207a8a
--- /dev/null
+++ b/gcc14.patch
@@ -0,0 +1,22 @@
+--- libLAS-1.8.1/src/gt_wkt_srs.cpp~ 2024-12-15 22:20:30.000000000 +0100
++++ libLAS-1.8.1/src/gt_wkt_srs.cpp 2024-12-15 22:24:45.708903231 +0100
+@@ -90,7 +90,7 @@
+ /* LibgeotiffOneTimeInit() */
+ /************************************************************************/
+
+-static void* hMutex = NULL;
++static CPLMutex* hMutex = NULL;
+
+ void LibgeotiffOneTimeInit()
+ {
+--- libLAS-1.8.1/apps/las2col.c~ 2016-08-23 18:44:16.000000000 +0200
++++ libLAS-1.8.1/apps/las2col.c 2024-12-15 22:28:58.215576856 +0100
+@@ -1045,7 +1045,7 @@
+ fflush(files_out[i]);
+ if (verbose)
+ printf("close file %d\n", i);
+- fsync(files_out[i]);
++ fsync((int)files_out[i]);
+ fclose(files_out[i]);
+ }
+ free(files_out);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/liblas.git/commitdiff/71f6aa39818e3b4973e05c473254a8c843ce0729
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
