[packages/libkml] - updated to 1.3.0 + git patch and new bunch of build fixes
qboosh
qboosh at pld-linux.org
Thu Mar 27 20:40:32 CET 2025
commit 7dc73220225711a1420ce042acbfd7d298cb471a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Mar 27 20:30:20 2025 +0100
- updated to 1.3.0 + git patch and new bunch of build fixes
libkml-include.patch | 10 -
libkml-link.patch | 119 ----
libkml-minizip-git.patch | 40 ++
libkml-minizip-nocrypt.patch | 11 +
libkml-pc.patch | 19 +
libkml-python.patch | 11 +
libkml-sh.patch | 13 -
libkml-system-libs.patch | 1237 ------------------------------------------
libkml.spec | 118 ++--
9 files changed, 139 insertions(+), 1439 deletions(-)
---
diff --git a/libkml.spec b/libkml.spec
index fe2cfff..0436e16 100644
--- a/libkml.spec
+++ b/libkml.spec
@@ -6,40 +6,40 @@
Summary: Library to parse, generate and operate on KML
Summary(pl.UTF-8): Biblioteka do analizy, generowania i operowania na danych KML
Name: libkml
-Version: 1.2.0
+Version: 1.3.0
Release: 1
License: BSD
Group: Libraries
-#Source0Download: https://github.com/google/libkml/releases
-#Source0: https://github.com/google/libkml/archive/release-1.2/%{name}-%{version}.tar.gz
-Source0: http://libkml.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: 25d534437f971bf55a945608e39fea79
-Patch0: %{name}-sh.patch
-Patch1: %{name}-system-libs.patch
-Patch2: %{name}-link.patch
-Patch3: %{name}-include.patch
-URL: https://github.com/google/libkml
-BuildRequires: autoconf >= 2.59
-BuildRequires: automake >= 1:1.9.6
-BuildRequires: boost-devel >= 1.34.0
+#Source0Download: https://github.com/libkml/libkml/releases
+Source0: https://github.com/libkml/libkml/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: e663141e9ebd480538b25d226e1b2979
+Patch0: %{name}-python.patch
+Patch1: %{name}-minizip-git.patch
+Patch2: %{name}-minizip-nocrypt.patch
+Patch3: %{name}-pc.patch
+URL: https://github.com/libkml/libkml
+BuildRequires: boost-devel >= 1.44.0
+BuildRequires: cmake >= 2.8
BuildRequires: curl-devel >= 7.12.3
BuildRequires: expat-devel >= 2.0
-BuildRequires: gtest-devel
+BuildRequires: gtest-devel >= 1.7.0
%{?with_java:BuildRequires: jdk >= 1.5}
-BuildRequires: libstdc++-devel >= 6:4.0
+BuildRequires: libstdc++-devel >= 6:4.5
BuildRequires: libtool >= 2:1.5
-BuildRequires: python-devel >= 2.3
+BuildRequires: minizip-devel >= 1.2.8
+BuildRequires: python-devel >= 1:2.7
BuildRequires: rpm-pythonprov
%{?with_java:BuildRequires: rpm-javaprov}
BuildRequires: rpmbuild(macros) >= 1.219
BuildRequires: sed >= 4.0
-BuildRequires: swig >= 1.3.35
-BuildRequires: swig-python >= 1.3.35
+BuildRequires: swig >= 2.0
+BuildRequires: swig-python >= 2.0
BuildRequires: uriparser-devel >= 0.7.5
-BuildRequires: zlib-devel >= 1.2.3
+BuildRequires: zlib-devel >= 1.2.8
Requires: expat >= 2.0
+Requires: minizip >= 1.2.8
Requires: uriparser >= 0.7.5
-Requires: zlib >= 1.2.3
+Requires: zlib >= 1.2.8
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -64,10 +64,11 @@ Summary(pl.UTF-8): Pliki nagłówkowe bibliotek KML
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: expat-devel >= 2.0
-Requires: boost-devel >= 1.34.0
-Requires: libstdc++-devel >= 6:4.0
+Requires: boost-devel >= 1.44.0
+Requires: libstdc++-devel >= 6:4.5
+Requires: minizip-devel >= 1.2.8
Requires: uriparser-devel >= 0.7.5
-Requires: zlib-devel >= 1.2.3
+Requires: zlib-devel >= 1.2.8
%description devel
Header files for KML libraries.
@@ -120,37 +121,43 @@ Oparte na SWIG-u wiązania Pythona do bibliotek KML.
%patch -P2 -p1
%patch -P3 -p1
-# error: ISO C++ 1998 does not support 'long long'
-%{__sed} -i -e 's/ -Werror//' configure.ac $(find . -name Makefile.am | xargs grep -l -e '-Werror')
-
%build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-CXXFLAGS="%{rpmcxxflags} -std=c++11"
-%configure \
- %{!?with_java:--disable-java} \
- %{?with_java:--with-java-include-dir=%{_jvmdir}/java/include} \
- %{?with_java:--with-java-lib-dir=%{_jvmdir}/java/lib} \
- %{!?with_static_libs:--disable-static}
+%if %{with static_libs}
+install -d build-static
+cd build-static
+%cmake .. \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DWITH_SWIG=OFF
+
+%{__make}
+cd ..
+%endif
+
+install -d build
+cd build
+%cmake .. \
+ -DJNI_INSTALL_DIR=%{_libdir}/libkml \
+ -DPYTHON_EXECUTABLE=%{__python} \
+ -DWITH_JAVA=%{__true_false java} \
+ -DWITH_PYTHON=ON \
+ -DWITH_SWIG=ON
+
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%if %{with static_libs}
+%{__make} -C build-static install \
DESTDIR=$RPM_BUILD_ROOT
-
-%if %{with java}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libkml/libkml*_swig_java.*a
%endif
+%{__make} -C build install \
+ DESTDIR=$RPM_BUILD_ROOT
+
%py_comp $RPM_BUILD_ROOT%{py_sitedir}
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%py_postclean
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libkml/libkml*_swig_python.*
%clean
rm -rf $RPM_BUILD_ROOT
@@ -160,21 +167,19 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog README.md
%attr(755,root,root) %{_libdir}/libkmlbase.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkmlbase.so.0
+%attr(755,root,root) %ghost %{_libdir}/libkmlbase.so.1
%attr(755,root,root) %{_libdir}/libkmlconvenience.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkmlconvenience.so.0
+%attr(755,root,root) %ghost %{_libdir}/libkmlconvenience.so.1
%attr(755,root,root) %{_libdir}/libkmldom.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkmldom.so.0
+%attr(755,root,root) %ghost %{_libdir}/libkmldom.so.1
%attr(755,root,root) %{_libdir}/libkmlengine.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkmlengine.so.0
-%attr(755,root,root) %{_libdir}/libkmlminizip.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkmlminizip.so.0
+%attr(755,root,root) %ghost %{_libdir}/libkmlengine.so.1
%attr(755,root,root) %{_libdir}/libkmlregionator.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkmlregionator.so.0
+%attr(755,root,root) %ghost %{_libdir}/libkmlregionator.so.1
%attr(755,root,root) %{_libdir}/libkmlxsd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkmlxsd.so.0
+%attr(755,root,root) %ghost %{_libdir}/libkmlxsd.so.1
%files devel
%defattr(644,root,root,755)
@@ -182,17 +187,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libkmlconvenience.so
%attr(755,root,root) %{_libdir}/libkmldom.so
%attr(755,root,root) %{_libdir}/libkmlengine.so
-%attr(755,root,root) %{_libdir}/libkmlminizip.so
%attr(755,root,root) %{_libdir}/libkmlregionator.so
%attr(755,root,root) %{_libdir}/libkmlxsd.so
-%{_libdir}/libkmlbase.la
-%{_libdir}/libkmlconvenience.la
-%{_libdir}/libkmldom.la
-%{_libdir}/libkmlengine.la
-%{_libdir}/libkmlminizip.la
-%{_libdir}/libkmlregionator.la
-%{_libdir}/libkmlxsd.la
%{_includedir}/kml
+%{_pkgconfigdir}/libkml.pc
+%{_libdir}/cmake/libkml
%if %{with static_libs}
%files static
@@ -201,7 +200,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libkmlconvenience.a
%{_libdir}/libkmldom.a
%{_libdir}/libkmlengine.a
-%{_libdir}/libkmlminizip.a
%{_libdir}/libkmlregionator.a
%{_libdir}/libkmlxsd.a
%endif
diff --git a/libkml-include.patch b/libkml-include.patch
deleted file mode 100644
index 96e6f5f..0000000
--- a/libkml-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libkml-1.2.0/src/kml/base/file_posix.cc.old 2010-01-14 01:16:30.000000000 +0100
-+++ libkml-1.2.0/src/kml/base/file_posix.cc 2014-02-17 15:42:51.044404305 +0100
-@@ -31,6 +31,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <unistd.h>
-
- namespace kmlbase {
-
diff --git a/libkml-link.patch b/libkml-link.patch
deleted file mode 100644
index 1b2a2cd..0000000
--- a/libkml-link.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- libkml-1.2.0/src/kml/dom/Makefile.am.orig 2012-01-18 17:36:46.875861374 +0100
-+++ libkml-1.2.0/src/kml/dom/Makefile.am 2012-01-18 18:40:03.842655177 +0100
-@@ -6,6 +6,7 @@
- endif
-
- lib_LTLIBRARIES = libkmldom.la
-+libkmldom_la_LIBADD = $(top_builddir)/src/kml/base/libkmlbase.la -lexpat
- libkmldom_la_SOURCES = \
- abstractlatlonbox.cc \
- abstractview.cc \
---- libkml-1.2.0/src/kml/engine/Makefile.am.orig 2012-01-18 20:05:05.902826013 +0100
-+++ libkml-1.2.0/src/kml/engine/Makefile.am 2012-01-18 20:05:32.092826890 +0100
-@@ -36,6 +36,7 @@
- update.cc
-
- libkmlengine_la_LIBADD = \
-+ $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
- # These header files will be installed in $(includedir)/kml/engine for use in
---- libkml-1.2.0/src/kml/xsd/Makefile.am.orig 2012-01-18 17:36:46.885861375 +0100
-+++ libkml-1.2.0/src/kml/xsd/Makefile.am 2012-01-18 18:41:50.752658758 +0100
-@@ -6,6 +6,7 @@
- endif
-
- lib_LTLIBRARIES = libkmlxsd.la
-+libkmlxsd_la_LIBADD = $(top_builddir)/src/kml/base/libkmlbase.la
- libkmlxsd_la_SOURCES = \
- xsd_complex_type.cc \
- xsd_element.cc \
---- libkml-1.2.0/src/kml/convenience/Makefile.am.orig 2012-01-18 17:36:46.885861375 +0100
-+++ libkml-1.2.0/src/kml/convenience/Makefile.am 2012-01-18 18:43:45.442662597 +0100
-@@ -11,6 +11,10 @@
- http_client_test_util.h
-
- lib_LTLIBRARIES = libkmlconvenience.la
-+libkmlconvenience_la_LIBADD = \
-+ $(top_builddir)/src/kml/engine/libkmlengine.la \
-+ $(top_builddir)/src/kml/dom/libkmldom.la \
-+ $(top_builddir)/src/kml/base/libkmlbase.la
- libkmlconvenience_la_SOURCES = \
- atom_util.cc \
- convenience.cc \
---- libkml-1.2.0/src/kml/regionator/Makefile.am.orig 2012-01-18 17:36:46.882528041 +0100
-+++ libkml-1.2.0/src/kml/regionator/Makefile.am 2012-01-18 18:45:17.802665690 +0100
-@@ -7,6 +7,11 @@
- endif
-
- lib_LTLIBRARIES = libkmlregionator.la
-+libkmlregionator_la_LIBADD = \
-+ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
-+ $(top_builddir)/src/kml/engine/libkmlengine.la \
-+ $(top_builddir)/src/kml/dom/libkmldom.la \
-+ $(top_builddir)/src/kml/base/libkmlbase.la
- libkmlregionator_la_SOURCES = \
- feature_list_region_handler.cc \
- regionator.cc \
---- libkml-1.2.0/src/kml/Makefile.am.orig 2009-07-23 21:05:48.000000000 +0200
-+++ libkml-1.2.0/src/kml/Makefile.am 2012-01-18 18:45:48.796000062 +0100
-@@ -1,5 +1,5 @@
- # base must be built before engine.
--SUBDIRS = . base convenience dom engine regionator xsd
-+SUBDIRS = . base dom engine convenience regionator xsd
-
- domincludedir = $(includedir)/kml
- dominclude_HEADERS = dom.h engine.h
---- libkml-1.2.0/src/swig/Makefile.am.orig 2012-01-18 20:07:59.759498501 +0100
-+++ libkml-1.2.0/src/swig/Makefile.am 2012-01-18 20:44:29.316238482 +0100
-@@ -26,6 +26,7 @@
- libkmlbase_swig_java_la_SOURCES = kmlbase_java.cc
- libkmlbase_swig_java_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(JAVA_INCLUDE_DIR) -I$(JAVA_INCLUDE_DIR)/$(PLATFORM)
- libkmlbase_swig_java_la_LIBADD = $(COMMONLIBS)
-+libkmlbase_swig_java_la_LDFLAGS = -module -avoid-version
- kmlbase_java.cc: kmlbase.i
- mkdir -p $(java_package_dir)
- $(SWIG) -c++ $(AM_CPPFLAGS) -java -o kmlbase_java.cc \
-@@ -35,7 +36,7 @@
- libkmlbase_swig_python_la_SOURCES = kmlbase_python.cc kmlbase.py
- libkmlbase_swig_python_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PYTHON_INCLUDE_DIR)
- libkmlbase_swig_python_la_LIBADD = $(COMMONLIBS)
--libkmlbase_swig_python_la_LDFLAGS = -dynamiclib -python -lexpat
-+libkmlbase_swig_python_la_LDFLAGS = -dynamiclib -python -module -avoid-version -lexpat
- kmlbase_python.cc: kmlbase.i
- $(SWIG) -c++ $(AM_CPPFLAGS) -python -o kmlbase_python.cc \
- $(top_srcdir)/src/swig/kmlbase.i
-@@ -44,6 +44,7 @@
- libkmldom_swig_java_la_SOURCES = kmldom_java.cc
- libkmldom_swig_java_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(JAVA_INCLUDE_DIR) -I$(JAVA_INCLUDE_DIR)/$(PLATFORM)
- libkmldom_swig_java_la_LIBADD = $(COMMONLIBS)
-+libkmldom_swig_java_la_LDFLAGS = -module -avoid-version
- kmldom_java.cc: kmldom.i
- mkdir -p $(java_package_dir)
- $(SWIG) -c++ $(AM_CPPFLAGS) -java -o kmldom_java.cc \
-@@ -52,7 +53,7 @@
- libkmldom_swig_python_la_SOURCES = kmldom_python.cc kmldom.py
- libkmldom_swig_python_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PYTHON_INCLUDE_DIR)
- libkmldom_swig_python_la_LIBADD = $(COMMONLIBS)
--libkmldom_swig_python_la_LDFLAGS = -dynamiclib -python -lexpat
-+libkmldom_swig_python_la_LDFLAGS = -dynamiclib -python -module -avoid-version -lexpat
- kmldom_python.cc: kmldom.i
- $(SWIG) -c++ $(AM_CPPFLAGS) -python -o kmldom_python.cc \
- $(top_srcdir)/src/swig/kmldom.i
-@@ -61,6 +62,7 @@
- libkmlengine_swig_java_la_SOURCES = kmlengine_java.cc
- libkmlengine_swig_java_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(JAVA_INCLUDE_DIR) -I$(JAVA_INCLUDE_DIR)/$(PLATFORM)
- libkmlengine_swig_java_la_LIBADD = $(COMMONLIBS)
-+libkmlengine_swig_java_la_LDFLAGS = -module -avoid-version
- kmlengine_java.cc: kmlengine.i
- mkdir -p $(java_package_dir)
- $(SWIG) -c++ $(AM_CPPFLAGS) -java -o kmlengine_java.cc \
-@@ -69,7 +70,7 @@
- libkmlengine_swig_python_la_SOURCES = kmlengine_python.cc kmlengine.py
- libkmlengine_swig_python_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PYTHON_INCLUDE_DIR)
- libkmlengine_swig_python_la_LIBADD = $(COMMONLIBS)
--libkmlengine_swig_python_la_LDFLAGS = -dynamiclib -python -lexpat
-+libkmlengine_swig_python_la_LDFLAGS = -dynamiclib -python -module -avoid-version -lexpat
- kmlengine_python.cc: kmlengine.i
- $(SWIG) -c++ $(AM_CPPFLAGS) -python -o kmlengine_python.cc \
- $(top_srcdir)/src/swig/kmlengine.i
diff --git a/libkml-minizip-git.patch b/libkml-minizip-git.patch
new file mode 100644
index 0000000..66b3da9
--- /dev/null
+++ b/libkml-minizip-git.patch
@@ -0,0 +1,40 @@
+From effc0b816531f769e83d5650785778d40f2043b4 Mon Sep 17 00:00:00 2001
+From: Rashad <mohammedrashadkm at gmail.com>
+Date: Sun, 27 Dec 2015 18:07:58 +0100
+Subject: [PATCH] use correct type in struct as in minizip
+
+---
+ src/kml/base/contrib/minizip/unzip.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/kml/base/contrib/minizip/unzip.c b/src/kml/base/contrib/minizip/unzip.c
+index a062863a..b4c1b001 100644
+--- a/src/kml/base/contrib/minizip/unzip.c
++++ b/src/kml/base/contrib/minizip/unzip.c
+@@ -148,10 +148,13 @@ typedef struct
+ file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
+ file if we are decompressing it */
+ int encrypted;
+-# ifndef NOUNCRYPT
+- unsigned long keys[3]; /* keys defining the pseudo-random sequence */
+- const z_crc_t* pcrc_32_tab;
+-# endif
++
++#ifndef NOUNCRYPT
++ unsigned long keys[3]; /* keys defining the pseudo-random sequence */
++ /* const z_crc_t* pcrc_32_tab; */
++ const unsigned long* pcrc_32_tab;
++#endif
++
+ } unz_s;
+
+ void init_unz_s(unz_s* un)
+@@ -1197,7 +1200,7 @@ extern int ZEXPORT libkml_unzOpenCurrentFile3 (file, method, level, raw, passwor
+ if (password != NULL)
+ {
+ int i;
+- s->pcrc_32_tab = get_crc_table();
++ s->pcrc_32_tab = (const unsigned long*)get_crc_table();
+ init_keys(password,s->keys,s->pcrc_32_tab);
+ if (ZSEEK(s->z_filefunc, s->filestream,
+ s->pfile_in_zip_read->pos_in_zipfile +
diff --git a/libkml-minizip-nocrypt.patch b/libkml-minizip-nocrypt.patch
new file mode 100644
index 0000000..4625588
--- /dev/null
+++ b/libkml-minizip-nocrypt.patch
@@ -0,0 +1,11 @@
+--- libkml-1.3.0/src/kml/base/contrib/minizip/unzip.c.orig 2015-12-21 18:23:05.000000000 +0100
++++ libkml-1.3.0/src/kml/base/contrib/minizip/unzip.c 2025-03-22 09:13:02.733026724 +0100
+@@ -42,7 +42,7 @@ woven in by Terry Thorsen 1/2003.
+ #include <zlib.h> //RR
+ #include "unzip.h"
+ #include "iomem_simple.h"
+-#undef NOUNCRYPT
++#define NOUNCRYPT
+
+ #ifdef STDC
+ # include <stddef.h>
diff --git a/libkml-pc.patch b/libkml-pc.patch
new file mode 100644
index 0000000..d5da0ec
--- /dev/null
+++ b/libkml-pc.patch
@@ -0,0 +1,19 @@
+--- libkml-1.3.0/cmake/libkml.pc.in.orig 2015-12-21 18:23:05.000000000 +0100
++++ libkml-1.3.0/cmake/libkml.pc.in 2025-03-22 10:19:13.691514196 +0100
+@@ -2,14 +2,13 @@
+
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+
+ Name: LibKML
+ Description: Reference implementation of OGC KML 2.2
+ Version: @VERSION_STRING@
+-##Requires: expat zlib boost
+-##minizip
++Requires.private: expat zlib minizip liburiparser
+ Conflicts:
+ Libs: -L${libdir} -lkmlbase -lkmldom -lkmlengine -lkmlxsd -lkmlregionator
+ Cflags: -I${includedir}
diff --git a/libkml-python.patch b/libkml-python.patch
new file mode 100644
index 0000000..65af65e
--- /dev/null
+++ b/libkml-python.patch
@@ -0,0 +1,11 @@
+--- libkml-1.3.0/src/swig/CMakeLists.txt.orig 2015-12-21 18:23:05.000000000 +0100
++++ libkml-1.3.0/src/swig/CMakeLists.txt 2025-03-22 08:07:26.674350184 +0100
+@@ -10,7 +10,7 @@ if(WITH_PYTHON)
+
+ if(NOT DEFINED PYTHON_INSTALL_DIR)
+ execute_process(COMMAND
+- ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)"
++ ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix='/usr'))"
+ OUTPUT_VARIABLE PYTHON_INSTALL_DIR
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
+ endif(NOT DEFINED PYTHON_INSTALL_DIR)
diff --git a/libkml-sh.patch b/libkml-sh.patch
deleted file mode 100644
index 3f974c6..0000000
--- a/libkml-sh.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libkml-1.2.0/configure.ac.orig 2010-01-14 01:16:35.000000000 +0100
-+++ libkml-1.2.0/configure.ac 2012-01-16 21:02:52.827156120 +0100
-@@ -88,10 +88,6 @@
- AC_CHECK_PROG(SWIG, swig, swig)
- if test "x$SWIG" != x; then
- SWIG_VERSION=`swig -version 2>&1|grep Version|cut -d" " -f3`
-- if test ${SWIG_VERSION:4} -lt 35; then
-- AC_MSG_WARN([You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built.])
-- SWIG=
-- fi
- fi
- fi
- AM_CONDITIONAL(WITH_SWIG, [test "x$SWIG" != x])
diff --git a/libkml-system-libs.patch b/libkml-system-libs.patch
deleted file mode 100644
index 87d22f8..0000000
--- a/libkml-system-libs.patch
+++ /dev/null
@@ -1,1237 +0,0 @@
---- libkml-1.2.0/examples/engine/Makefile.am.orig 2025-03-21 22:00:34.528278379 +0100
-+++ libkml-1.2.0/examples/engine/Makefile.am 2025-03-21 22:01:01.014801556 +0100
-@@ -1,5 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/boost_1_34_1
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-
- if GCC
- AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
---- libkml-1.2.0/examples/gpx/Makefile.am.orig 2025-03-21 22:00:34.528278379 +0100
-+++ libkml-1.2.0/examples/gpx/Makefile.am 2025-03-21 22:01:51.731193468 +0100
-@@ -1,5 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/boost_1_34_1
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-
- if GCC
- AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
---- libkml-1.2.0/examples/gx/Makefile.am.orig 2025-03-21 22:00:34.551611586 +0100
-+++ libkml-1.2.0/examples/gx/Makefile.am 2025-03-21 22:02:18.354382572 +0100
-@@ -1,5 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/boost_1_34_1
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-
- if GCC
- AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
---- libkml-1.2.0/examples/hellonet/Makefile.am.orig 2025-03-21 22:00:34.554944901 +0100
-+++ libkml-1.2.0/examples/hellonet/Makefile.am 2025-03-21 22:02:43.487579747 +0100
-@@ -1,7 +1,6 @@
- if HAVE_CURL
- AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/examples/hellonet \
-- -I$(top_srcdir)/third_party/boost_1_34_1
-+ -I$(top_srcdir)/examples/hellonet
-
- if GCC
- AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
---- libkml-1.2.0.orig/examples/helloworld/Makefile.am 2012-01-16 21:24:24.740532712 +0100
-+++ libkml-1.2.0/examples/helloworld/Makefile.am 2012-01-17 16:37:15.879515482 +0100
-@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/examples/helloworld \
-- -I$(top_srcdir)/third_party/boost_1_34_1
-+ -I$(top_srcdir)/examples/helloworld
-
-
- if GCC
-@@ -10,7 +9,7 @@
- noinst_LTLIBRARIES = libhelloutil.la
-
- libhelloutil_la_SOURCES = print.cc
--libhelloutil_la_LIBADD = $(top_builddir)/third_party/libminizip.la
-+libhelloutil_la_LIBADD = $(top_builddir)/third_party/libkmlminizip.la
-
- noinst_PROGRAMS = countkml createkml checklinks circlegen helloattrs helloenum \
- hellofeatures hellofolder hellogeometry hellohref hellokmz \
---- libkml-1.2.0/examples/regionator/Makefile.am.orig 2025-03-21 22:03:22.034037589 +0100
-+++ libkml-1.2.0/examples/regionator/Makefile.am 2025-03-21 22:32:29.411237901 +0100
-@@ -1,6 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/boost_1_34_1 \
-- -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-
- if GCC
- AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
---- libkml-1.2.0/examples/xsd/Makefile.am.orig 2025-03-21 22:03:22.037370905 +0100
-+++ libkml-1.2.0/examples/xsd/Makefile.am 2025-03-21 22:32:41.884503661 +0100
-@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/examples/xsd \
-- -I$(top_srcdir)/third_party/boost_1_34_1
-+ -I$(top_srcdir)/examples/xsd
-
- if GCC
- AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
---- libkml-1.2.0.orig/src/kml/base/Makefile.am 2012-01-16 21:24:24.750532711 +0100
-+++ libkml-1.2.0/src/kml/base/Makefile.am 2012-01-17 16:27:14.232828670 +0100
-@@ -1,7 +1,4 @@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/boost_1_34_1 \
-- -I$(top_srcdir)/third_party/googletest-r108/include \
-- -I$(top_srcdir)/third_party/uriparser-0.7.5/include \
- -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
-
- if GCC
-@@ -31,8 +28,8 @@
- zip_file.cc
-
- libkmlbase_la_LIBADD = \
-- $(top_builddir)/third_party/libminizip.la \
-- $(top_builddir)/third_party/liburiparser.la
-+ $(top_builddir)/third_party/libkmlminizip.la \
-+ -luriparser
-
- # These header files will be installed in $(includedir)/kml/base
- libkmlbaseincludedir = $(includedir)/kml/base
-@@ -97,116 +94,93 @@
-
- attributes_test_SOURCES = attributes_test.cc
- attributes_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--attributes_test_LDADD = libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+attributes_test_LDADD = libkmlbase.la -lgtest
-
- color32_test_SOURCES = color32_test.cc
- color32_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--color32_test_LDADD = libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+color32_test_LDADD = libkmlbase.la -lgtest
-
- csv_splitter_test_SOURCES = csv_splitter_test.cc
- csv_splitter_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
--csv_splitter_test_LDADD = libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+csv_splitter_test_LDADD = libkmlbase.la -lgtest
-
- date_time_test_SOURCES = date_time_test.cc
- date_time_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--date_time_test_LDADD = libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+date_time_test_LDADD = libkmlbase.la -lgtest
-
- expat_handler_ns_test_SOURCES = expat_handler_ns_test.cc
- expat_handler_ns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--expat_handler_ns_test_LDADD = libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+expat_handler_ns_test_LDADD = libkmlbase.la -lgtest
-
- expat_parser_test_SOURCES = expat_parser_test.cc
- expat_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
--expat_parser_test_LDADD = libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+expat_parser_test_LDADD = libkmlbase.la -lgtest
-
- file_test_SOURCES = file_test.cc
- file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
--file_test_LDADD = libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+file_test_LDADD = libkmlbase.la -lgtest
-
- math_util_test_SOURCES = math_util_test.cc
- math_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--math_util_test_LDADD = libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+math_util_test_LDADD = libkmlbase.la -lgtest
-
- net_cache_test_SOURCES = net_cache_test.cc
- net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
--net_cache_test_LDADD = libkmlbase.la \
-- $(top_builddir)/third_party/liburiparser.la \
-- $(top_builddir)/third_party/libgtest.la
-+net_cache_test_LDADD = libkmlbase.la -luriparser -lgtest
-
- referent_test_SOURCES = referent_test.cc
- referent_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--referent_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+referent_test_LDADD= libkmlbase.la -lgtest
-
- string_util_test_SOURCES = string_util_test.cc
- string_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--string_util_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+string_util_test_LDADD= libkmlbase.la -lgtest
-
- tempfile_test_SOURCES = tempfile_test.cc
- tempfile_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
--tempfile_test_LDADD = libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+tempfile_test_LDADD = libkmlbase.la -lgtest
-
- time_util_test_SOURCES = time_util_test.cc
- time_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--time_util_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+time_util_test_LDADD= libkmlbase.la -lgtest
-
- uri_parser_test_SOURCES = uri_parser_test.cc
- uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
--uri_parser_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/liburiparser.la \
-- $(top_builddir)/third_party/libgtest.la
-+uri_parser_test_LDADD= libkmlbase.la -luriparser -lgtest
-
- util_test_SOURCES = util_test.cc
- util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--util_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+util_test_LDADD= libkmlbase.la -lgtest
-
- vec3_test_SOURCES = vec3_test.cc
- vec3_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--vec3_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+vec3_test_LDADD= libkmlbase.la -lgtest
-
- version_test_SOURCES = version_test.cc
- version_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--version_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+version_test_LDADD= libkmlbase.la -lgtest
-
- xml_element_test_SOURCES = xml_element_test.cc
- xml_element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--xml_element_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+xml_element_test_LDADD= libkmlbase.la -lgtest
-
- xml_file_test_SOURCES = xml_file_test.cc
- xml_file_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--xml_file_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+xml_file_test_LDADD= libkmlbase.la -lgtest
-
- xml_namespaces_test_SOURCES = xml_namespaces_test.cc
- xml_namespaces_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--xml_namespaces_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+xml_namespaces_test_LDADD= libkmlbase.la -lgtest
-
- xmlns_test_SOURCES = xmlns_test.cc
- xmlns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
--xmlns_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+xmlns_test_LDADD= libkmlbase.la -lgtest
-
- zip_file_test_SOURCES = zip_file_test.cc
- zip_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- zip_file_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/libminizip.la \
-- $(top_builddir)/third_party/libgtest.la
-+ $(top_builddir)/third_party/libkmlminizip.la \
-+ -lgtest
-
- CLEANFILES = check_PROGRAMS
-
---- libkml-1.2.0/src/kml/convenience/Makefile.am.orig 2010-01-14 01:16:31.000000000 +0100
-+++ libkml-1.2.0/src/kml/convenience/Makefile.am 2025-03-21 22:35:05.593725121 +0100
-@@ -1,6 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/boost_1_34_1 \
-- -I$(top_srcdir)/third_party/googletest-r108/include
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-
- if GCC
- AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
-@@ -66,7 +64,7 @@ atom_util_test_LDADD = libkmlconvenience
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- convenience_test_SOURCES = convenience_test.cc
- convenience_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
-@@ -74,7 +72,7 @@ convenience_test_LDADD = libkmlconvenien
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- csv_file_test_SOURCES = csv_file_test.cc
- csv_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
-@@ -82,7 +80,7 @@ csv_file_test_LDADD = libkmlconvenience.
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- csv_parser_test_SOURCES = csv_parser_test.cc
- csv_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
-@@ -90,7 +88,7 @@ csv_parser_test_LDADD = libkmlconvenienc
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- element_counter_test_SOURCES = element_counter_test.cc
- element_counter_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
-@@ -98,7 +96,7 @@ element_counter_test_LDADD = libkmlconve
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- feature_list_test_SOURCES = feature_list_test.cc
- feature_list_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
-@@ -106,7 +104,7 @@ feature_list_test_LDADD = libkmlconvenie
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- google_doc_list_test_SOURCES = google_doc_list_test.cc
- google_doc_list_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
-@@ -114,7 +112,7 @@ google_doc_list_test_LDADD = libkmlconve
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- google_maps_data_test_SOURCES = google_maps_data_test.cc
- google_maps_data_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
-@@ -122,7 +120,7 @@ google_maps_data_test_LDADD = libkmlconv
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- google_picasa_web_test_SOURCES = google_picasa_web_test.cc
- google_picasa_web_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
-@@ -130,7 +128,7 @@ google_picasa_web_test_LDADD = libkmlcon
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- google_spreadsheets_test_SOURCES = google_spreadsheets_test.cc
- google_spreadsheets_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
-@@ -138,7 +136,7 @@ google_spreadsheets_test_LDADD = libkmlc
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- gpx_trk_pt_handler_test_SOURCES = gpx_trk_pt_handler_test.cc
- gpx_trk_pt_handler_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
-@@ -146,13 +144,13 @@ gpx_trk_pt_handler_test_LDADD = libkmlco
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- http_client_test_SOURCES = http_client_test.cc
- http_client_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- http_client_test_LDADD = http_client.o \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kmz_check_links_test_SOURCES = kmz_check_links_test.cc
- kmz_check_links_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
-@@ -160,6 +158,6 @@ kmz_check_links_test_LDADD = libkmlconve
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- CLEANFILES = check_PROGRAMS
---- libkml-1.2.0/src/kml/dom/Makefile.am.orig 2010-01-14 01:16:22.000000000 +0100
-+++ libkml-1.2.0/src/kml/dom/Makefile.am 2025-03-21 22:35:16.526999224 +0100
-@@ -1,6 +1,4 @@
--AM_CPPFLAGS= -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/boost_1_34_1 \
-- -I$(top_srcdir)/third_party/googletest-r108/include
-+AM_CPPFLAGS= -I$(top_srcdir)/src
-
- if GCC
- AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
-@@ -180,306 +178,306 @@ abstractlatlonbox_test_SOURCES = abstrac
- abstractlatlonbox_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- abstractlatlonbox_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- abstractview_test_SOURCES = abstractview_test.cc
- abstractview_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- abstractview_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- atom_test_SOURCES = atom_test.cc
- atom_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- atom_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- balloonstyle_test_SOURCES = balloonstyle_test.cc
- balloonstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- balloonstyle_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- colorstyle_test_SOURCES = colorstyle_test.cc
- colorstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- colorstyle_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- container_test_SOURCES = container_test.cc
- container_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- container_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- document_test_SOURCES = document_test.cc
- document_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- document_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- element_test_SOURCES = element_test.cc
- element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- element_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- extendeddata_test_SOURCES = extendeddata_test.cc
- extendeddata_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- extendeddata_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- feature_test_SOURCES = feature_test.cc
- feature_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- feature_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- folder_test_SOURCES = folder_test.cc
- folder_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- folder_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- geometry_test_SOURCES = geometry_test.cc
- geometry_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- geometry_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- hotspot_test_SOURCES = hotspot_test.cc
- hotspot_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- hotspot_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- iconstyle_test_SOURCES = iconstyle_test.cc
- iconstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- iconstyle_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kml_cast_test_SOURCES = kml_cast_test.cc
- kml_cast_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- kml_cast_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kml_test_SOURCES = kml_test.cc
- kml_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- kml_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kml_factory_test_SOURCES = kml_factory_test.cc
- kml_factory_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- kml_factory_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kml22_test_SOURCES = kml22_test.cc
- kml22_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- kml22_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- labelstyle_test_SOURCES = labelstyle_test.cc
- labelstyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- labelstyle_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- linestyle_test_SOURCES = linestyle_test.cc
- linestyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- linestyle_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- link_test_SOURCES = link_test.cc
- link_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- link_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- liststyle_test_SOURCES = liststyle_test.cc
- liststyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- liststyle_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- model_test_SOURCES = model_test.cc
- model_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- model_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- networklink_test_SOURCES = networklink_test.cc
- networklink_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- networklink_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- networklinkcontrol_test_SOURCES = networklinkcontrol_test.cc
- networklinkcontrol_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- networklinkcontrol_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- object_test_SOURCES = object_test.cc
- object_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- object_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- overlay_test_SOURCES = overlay_test.cc
- overlay_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- overlay_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- placemark_test_SOURCES = placemark_test.cc
- placemark_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- placemark_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- polystyle_test_SOURCES = polystyle_test.cc
- polystyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- polystyle_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- region_test_SOURCES = region_test.cc
- region_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- region_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- round_trip_test_SOURCES = round_trip_test.cc
- round_trip_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- round_trip_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- schema_test_SOURCES = schema_test.cc
- schema_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- schema_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- snippet_test_SOURCES = snippet_test.cc
- snippet_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- snippet_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- style_test_SOURCES = style_test.cc
- style_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- style_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- stylemap_test_SOURCES = stylemap_test.cc
- stylemap_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- stylemap_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- styleselector_test_SOURCES = styleselector_test.cc
- styleselector_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- styleselector_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- substyle_test_SOURCES = substyle_test.cc
- substyle_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- substyle_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- timeprimitive_test_SOURCES = timeprimitive_test.cc
- timeprimitive_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- timeprimitive_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- gx_timeprimitive_test_SOURCES = gx_timeprimitive_test.cc
- gx_timeprimitive_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- gx_timeprimitive_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- gx_tour_test_SOURCES = gx_tour_test.cc
- gx_tour_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- gx_tour_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- vec2_test_SOURCES = vec2_test.cc
- vec2_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- vec2_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- unknown_test_SOURCES = unknown_test.cc
- unknown_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- unknown_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kml_handler_test_SOURCES = kml_handler_test.cc
- kml_handler_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- kml_handler_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kml_handler_ns_test_SOURCES = kml_handler_ns_test.cc
- kml_handler_ns_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- kml_handler_ns_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- parser_test_SOURCES = parser_test.cc
- parser_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- parser_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- serializer_test_SOURCES = serializer_test.cc
- serializer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- serializer_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- xal_test_SOURCES = xal_test.cc
- xal_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- xal_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- xml_serializer_test_SOURCES = xml_serializer_test.cc
- xml_serializer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- xml_serializer_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- xsd_test_SOURCES = xsd_test.cc
- xsd_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- xsd_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- visitor_test_SOURCES = visitor_test.cc
- visitor_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- visitor_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- visitor_driver_test_SOURCES = visitor_driver_test.cc
- visitor_driver_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- visitor_driver_test_LDADD= libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- CLEANFILES = check_PROGRAMS
---- libkml-1.2.0/src/kml/engine/Makefile.am.orig 2009-10-26 22:45:29.000000000 +0100
-+++ libkml-1.2.0/src/kml/engine/Makefile.am 2025-03-21 22:35:30.073592502 +0100
-@@ -1,6 +1,4 @@
--AM_CPPFLAGS= -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/boost_1_34_1 \
-- -I$(top_srcdir)/third_party/googletest-r108/include
-+AM_CPPFLAGS= -I$(top_srcdir)/src
-
- if GCC
- AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
-@@ -129,224 +127,224 @@ bbox_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- bbox_test_LDADD = libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- clone_test_SOURCES = clone_test.cc
- clone_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- clone_test_LDADD = libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- entity_mapper_test_SOURCES = entity_mapper_test.cc
- entity_mapper_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- entity_mapper_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- feature_balloon_test_SOURCES = feature_balloon_test.cc
- feature_balloon_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- feature_balloon_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- feature_view_test_SOURCES = feature_view_test.cc
- feature_view_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- feature_view_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- feature_visitor_test_SOURCES = feature_visitor_test.cc
- feature_visitor_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- feature_visitor_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- find_test_SOURCES = find_test.cc
- find_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- find_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- get_link_parents_test_SOURCES = get_link_parents_test.cc
- get_link_parents_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- get_link_parents_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- get_links_test_SOURCES = get_links_test.cc
- get_links_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- get_links_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- href_test_SOURCES = href_test.cc
- href_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- href_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- id_mapper_test_SOURCES = id_mapper_test.cc
- id_mapper_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- id_mapper_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kml_cache_test_SOURCES = kml_cache_test.cc
- kml_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- kml_cache_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kml_file_test_SOURCES = kml_file_test.cc
- kml_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- kml_file_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kml_stream_test_SOURCES = kml_stream_test.cc
- kml_stream_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- kml_stream_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kml_uri_test_SOURCES = kml_uri_test.cc
- kml_uri_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- kml_uri_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kmz_cache_test_SOURCES = kmz_cache_test.cc
- kmz_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- kmz_cache_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- kmz_file_test_SOURCES = kmz_file_test.cc
- kmz_file_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- kmz_file_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- link_util_test_SOURCES = link_util_test.cc
- link_util_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- link_util_test_LDADD = libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- location_util_test_SOURCES = location_util_test.cc
- location_util_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- location_util_test_LDADD = libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- merge_test_SOURCES = merge_test.cc
- merge_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- merge_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- object_id_parser_observer_test_SOURCES = object_id_parser_observer_test.cc
- object_id_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- object_id_parser_observer_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- old_schema_parser_observer_test_SOURCES = old_schema_parser_observer_test.cc
- old_schema_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- old_schema_parser_observer_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- parse_old_schema_test_SOURCES = parse_old_schema_test.cc
- parse_old_schema_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- parse_old_schema_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- schema_parser_observer_test_SOURCES = schema_parser_observer_test.cc
- schema_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- schema_parser_observer_test_LDADD= \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- shared_style_parser_observer_test_SOURCES = shared_style_parser_observer_test.cc
- shared_style_parser_observer_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- shared_style_parser_observer_test_LDADD= \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- style_inliner_test_SOURCES = style_inliner_test.cc
- style_inliner_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- style_inliner_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/liburiparser.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -luriparser \
-+ -lgtest
-
- style_merger_test_SOURCES = style_merger_test.cc
- style_merger_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- style_merger_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- style_resolver_test_SOURCES = style_resolver_test.cc
- style_resolver_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- style_resolver_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- style_splitter_test_SOURCES = style_splitter_test.cc
- style_splitter_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- style_splitter_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- update_processor_test_SOURCES = update_processor_test.cc
- update_processor_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- update_processor_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- update_test_SOURCES = update_test.cc
- update_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- update_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- find_xml_namespaces_test_SOURCES = find_xml_namespaces_test.cc
- find_xml_namespaces_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- find_xml_namespaces_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- CLEANFILES = check_PROGRAMS
---- libkml-1.2.0.orig/src/kml/regionator/Makefile.am 2012-01-16 21:24:24.750532711 +0100
-+++ libkml-1.2.0/src/kml/regionator/Makefile.am 2012-01-17 16:35:02.576177685 +0100
-@@ -1,6 +1,4 @@
--AM_CPPFLAGS= -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/boost_1_34_1 \
-- -I$(top_srcdir)/third_party/googletest-r108/include
-+AM_CPPFLAGS= -I$(top_srcdir)/src
-
-
- if GCC
-@@ -38,7 +36,7 @@
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- regionator_test_SOURCES = regionator_test.cc
- regionator_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
-@@ -47,7 +45,7 @@
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- regionator_qid_test_SOURCES = regionator_qid_test.cc
- regionator_qid_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
-@@ -56,7 +54,7 @@
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- regionator_util_test_SOURCES = regionator_util_test.cc
- regionator_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
-@@ -65,6 +63,6 @@
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- CLEANFILES = check_PROGRAMS
---- libkml-1.2.0/src/kml/xsd/Makefile.am.orig 2009-07-23 21:05:48.000000000 +0200
-+++ libkml-1.2.0/src/kml/xsd/Makefile.am 2025-03-21 22:37:59.352783788 +0100
-@@ -1,6 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/boost_1_34_1 \
-- -I$(top_srcdir)/third_party/googletest-r108/include
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-
- if GCC
- AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
-@@ -49,54 +47,54 @@ xsd_complex_type_test_SOURCES = xsd_comp
- xsd_complex_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- xsd_complex_type_test_LDADD = libkmlxsd.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- xsd_file_test_SOURCES = xsd_file_test.cc
- xsd_file_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- xsd_file_test_LDADD = libkmlxsd.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- xsd_element_test_SOURCES = xsd_element_test.cc
- xsd_element_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- xsd_element_test_LDADD = libkmlxsd.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- xsd_handler_test_SOURCES = xsd_handler_test.cc
- xsd_handler_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- xsd_handler_test_LDADD = libkmlxsd.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- xsd_primitive_type_test_SOURCES = xsd_primitive_type_test.cc
- xsd_primitive_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- xsd_primitive_type_test_LDADD = libkmlxsd.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- xsd_schema_test_SOURCES = xsd_schema_test.cc
- xsd_schema_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- xsd_schema_test_LDADD = libkmlxsd.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- xsd_simple_type_test_SOURCES = xsd_simple_type_test.cc
- xsd_simple_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- xsd_simple_type_test_LDADD = libkmlxsd.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- xsd_util_test_SOURCES = xsd_util_test.cc
- xsd_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- xsd_util_test_LDADD = libkmlxsd.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- xst_parser_test_SOURCES = xst_parser_test.cc
- xst_parser_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- xst_parser_test_LDADD = libkmlxsd.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/libgtest.la
-+ -lgtest
-
- CLEANFILES = check_PROGRAMS
---- libkml-1.2.0.orig/src/swig/Makefile.am 2010-01-14 01:16:31.000000000 +0100
-+++ libkml-1.2.0/src/swig/Makefile.am 2012-01-17 16:24:10.812822528 +0100
-@@ -1,8 +1,6 @@
- SUBDIRS = java python
-
--AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/boost_1_34_1 \
-- -I$(top_srcdir)/third_party/uriparser-0.7.5/include
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-
- COMMONLIBS = $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
---- libkml-1.2.0/third_party/Makefile.am.orig 2010-02-18 21:07:01.000000000 +0100
-+++ libkml-1.2.0/third_party/Makefile.am 2012-01-18 17:25:38.089172314 +0100
-@@ -1,92 +1,18 @@
- uriparser = uriparser-0.7.5
-
--AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
-- -I$(top_srcdir)/third_party/$(uriparser)/include \
-- -I$(top_srcdir)/third_party/googletest-r108 \
-- -I$(top_srcdir)/third_party/googletest-r108/include
-+AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
-
--lib_LTLIBRARIES = libminizip.la liburiparser.la
--noinst_LTLIBRARIES = libgtest.la
-+lib_LTLIBRARIES = libkmlminizip.la
-
--libminizip_la_SOURCES = \
-+libkmlminizip_la_SOURCES = \
- zlib-1.2.3/contrib/minizip/unzip.c \
- zlib-1.2.3/contrib/minizip/ioapi.c \
- zlib-1.2.3/contrib/minizip/iomem_simple.c \
- zlib-1.2.3/contrib/minizip/zip.c
--libminizip_la_LDFLAGS = -lz
--
--liburiparser_la_SOURCES = \
-- $(uriparser)/lib/UriCommon.c \
-- $(uriparser)/lib/UriCommon.h \
-- $(uriparser)/lib/UriCompare.c \
-- $(uriparser)/lib/UriEscape.c \
-- $(uriparser)/lib/UriFile.c \
-- $(uriparser)/lib/UriIp4.c \
-- $(uriparser)/lib/UriIp4Base.c \
-- $(uriparser)/lib/UriIp4Base.h \
-- $(uriparser)/lib/UriNormalize.c \
-- $(uriparser)/lib/UriNormalizeBase.c \
-- $(uriparser)/lib/UriNormalizeBase.h \
-- $(uriparser)/lib/UriParse.c \
-- $(uriparser)/lib/UriParseBase.c \
-- $(uriparser)/lib/UriParseBase.h \
-- $(uriparser)/lib/UriQuery.c \
-- $(uriparser)/lib/UriRecompose.c \
-- $(uriparser)/lib/UriResolve.c \
-- $(uriparser)/lib/UriShorten.c
--liburiparser_la_LDFLAGS = -version-info 1:5:0
-+libkmlminizip_la_LDFLAGS = -lz
-
- boost_root = boost_1_34_1
- boost = $(boost_root)/boost
--boostinc = $(includedir)/kml/third_party/$(boost)
--libboostincludedir = $(boostinc)
--libboostinclude_HEADERS = \
-- ${boost}/assert.hpp \
-- ${boost}/checked_delete.hpp \
-- ${boost}/config.hpp \
-- ${boost}/intrusive_ptr.hpp \
-- ${boost}/scoped_ptr.hpp
--
--libboostdetailincludedir = $(boostinc)/detail
--libboostdetailinclude_HEADERS = \
-- $(boost)/detail/workaround.hpp
--
--libboostconfigincludedir = $(boostinc)/config
--libboostconfiginclude_HEADERS = \
-- $(boost)/config/posix_features.hpp \
-- $(boost)/config/select_compiler_config.hpp \
-- $(boost)/config/select_stdlib_config.hpp \
-- $(boost)/config/select_platform_config.hpp \
-- $(boost)/config/suffix.hpp \
-- $(boost)/config/user.hpp
--
--libboostconfigcompilerincludedir = $(boostinc)/config/compiler
--libboostconfigcompilerinclude_HEADERS = \
-- $(boost)/config/compiler/gcc.hpp
--
--libboostconfigno_tr1includedir = $(boostinc)/config/no_tr1
--libboostconfigno_tr1include_HEADERS = \
-- $(boost)/config/no_tr1/utility.hpp
--
--libboostconfigstdlibincludedir = $(boostinc)/config/stdlib
--libboostconfigstdlibinclude_HEADERS = \
-- $(boost)/config/stdlib/libstdcpp3.hpp
--
--libboostconfigplatformincludedir = $(boostinc)/config/platform
--libboostconfigplatforminclude_HEADERS = \
-- $(boost)/config/platform/linux.hpp \
-- $(boost)/config/platform/macos.hpp
--
--googletest = googletest-r108
--libgtest_la_SOURCES = \
-- $(googletest)/src/gtest.cc \
-- $(googletest)/src/gtest-death-test.cc \
-- $(googletest)/src/gtest-filepath.cc \
-- $(googletest)/src/gtest-internal-inl.h \
-- $(googletest)/src/gtest-port.cc \
-- $(googletest)/src/gtest-test-part.cc \
-- $(googletest)/src/gtest-typed-test.cc
--
- EXTRA_DIST = \
- expat.win32/expat.h \
- expat.win32/expat_external.h \
---- libkml-1.2.0/src/kml/base/Makefile.am.orig 2025-03-21 22:38:22.332659295 +0100
-+++ libkml-1.2.0/src/kml/base/Makefile.am 2025-03-22 07:16:59.930747462 +0100
-@@ -1,5 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-
- if GCC
- AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libkml.git/commitdiff/7dc73220225711a1420ce042acbfd7d298cb471a
More information about the pld-cvs-commit
mailing list