feat: update tinyxml2 to 11.0.0+dfsg-1

.gitignore

@@ -1 +1,24 @@
-.pc/
+# intermediate files
+Win32/
+x64/
+ipch/
+resources/out/
+tinyxml2/tinyxml2-cbp/bin/
+tinyxml2/tinyxml2-cbp/obj/
+tinyxml2/bin/
+tinyxml2/temp/
+.artifacts/
+.projects/
+*.sdf
+*.suo
+*.opensdf
+*.user
+*.depend
+*.layout
+*.o
+*.vc.db
+*.vc.opendb
+libtinyxml2.a
+xmltest
+vs/debug
+

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
-project(tinyxml2 VERSION 9.0.0)
+project(tinyxml2 VERSION 11.0.0)
 
 include(CTest)
 option(tinyxml2_BUILD_TESTING "Build tests for tinyxml2" "${BUILD_TESTING}")
@@ -31,6 +31,7 @@ target_compile_definitions(
     PUBLIC $<$<CONFIG:Debug>:TINYXML2_DEBUG>
     INTERFACE $<$<BOOL:${BUILD_SHARED_LIBS}>:TINYXML2_IMPORT>
     PRIVATE $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
+    PUBLIC _FILE_OFFSET_BITS=64
 )
 
 set_target_properties(
@@ -62,7 +63,9 @@ endif ()
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
-## Custom locations
+## Custom settings
+option(tinyxml2_INSTALL_PKGCONFIG "Create and install pkgconfig files" ON)
+
 set(tinyxml2_INSTALL_PKGCONFIGDIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
     CACHE PATH "Directory for pkgconfig files")
 
@@ -120,10 +123,12 @@ install(
 
 ## pkg-config
 
-configure_file(cmake/tinyxml2.pc.in tinyxml2.pc.gen @ONLY)
-file(GENERATE OUTPUT tinyxml2.pc INPUT "${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc.gen")
-install(
-    FILES "${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc"
-    DESTINATION "${tinyxml2_INSTALL_PKGCONFIGDIR}"
-    COMPONENT tinyxml2_development
-)
+if (tinyxml2_INSTALL_PKGCONFIG)
+    configure_file(cmake/tinyxml2.pc.in tinyxml2.pc.gen @ONLY)
+    file(GENERATE OUTPUT tinyxml2.pc INPUT "${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc.gen")
+    install(
+        FILES "${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc"
+        DESTINATION "${tinyxml2_INSTALL_PKGCONFIGDIR}"
+        COMPONENT tinyxml2_development
+    )
+endif ()

Makefile

@@ -10,7 +10,7 @@ ARFLAGS = cr
 RM = rm -f
 RANLIB = ranlib
 MKDIR = mkdir -p
-CXXFLAGS = -fPIC
+CXXFLAGS = -D_FILE_OFFSET_BITS=64 -fPIC
 
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL)

contrib/html5-printer.cpp

@@ -7,7 +7,7 @@
 
 //  In HTML5, there are 16 so-called "void" elements.  "void elements" NEVER have
 //  inner content (but they MAY have attributes), and are assumed to be self-closing.
-//  An example of a self-closig HTML5 element is "<br/>" (line break)
+//  An example of a self-closing HTML5 element is "<br/>" (line break)
 //  All other elements are called "non-void" and MUST never self-close.
 //  Examples: "<div class='lolcats'></div>".
 

debian/changelog

@@ -1,3 +1,61 @@
+tinyxml2 (11.0.0+dfsg-1) unstable; urgency=medium
+
+  * [cb69d19] New upstream version 11.0.0+dfsg
+  * [b97c731] Rename package for soname bump
+
+ -- Chow Loong Jin <hyperair@debian.org>  Mon, 17 Mar 2025 15:44:04 +0800
+
+tinyxml2 (10.1.0+dfsg-1) unstable; urgency=medium
+
+  * [e3fe268] New upstream version 10.1.0+dfsg
+    - Fixes CVE-2024-50615 (Closes: #1088814)
+  * [4b330c9] Refresh patches
+  * [870daa6] Update watch file to version 4 and use example from uscan manpage
+
+ -- Chow Loong Jin <hyperair@debian.org>  Fri, 14 Mar 2025 12:49:48 +0800
+
+tinyxml2 (10.0.0+dfsg-2) unstable; urgency=medium
+
+  [ Jenkins ]
+  * [c0b0d65] Set upstream metadata fields: Bug-Database, Bug-Submit,
+    Repository, Repository-Browse.
+    Changes-By: lintian-brush
+    Fixes: lintian: upstream-metadata-file-is-missing
+    Fixes: lintian: upstream-metadata-missing-bug-tracking
+    Fixes: lintian: upstream-metadata-missing-repository
+  * [089faba] Remove Section on libtinyxml2-9 that duplicates source.
+    Changes-By: lintian-brush
+    Fixes: lintian: binary-control-field-duplicates-source
+
+  [ Debian Janitor ]
+  * [5c99140] Use secure URI in Homepage field.
+    Changes-By: lintian-brush
+    Fixes: lintian: homepage-field-uses-insecure-uri
+  * [f16bddf] Bump debhelper from old 12 to 13.
+    Changes-By: lintian-brush
+    Fixes: lintian: package-uses-old-debhelper-compat-version
+  * [b8747ae] Remove constraints unnecessary since buster (oldstable)
+    * Build-Depends: Drop versioned constraint on dpkg-dev.
+    Changes-By: deb-scrub-obsolete
+
+ -- Chow Loong Jin <hyperair@debian.org>  Fri, 05 Jan 2024 23:29:38 +0800
+
+tinyxml2 (10.0.0+dfsg-1) unstable; urgency=medium
+
+  * [31b2418] New upstream version 10.0.0+dfsg
+  * [b38f32c] Refresh patches
+  * [d00e929] Rename binary package for soname bump
+  * [70c9b49] Update symbols file
+
+ -- Chow Loong Jin <hyperair@debian.org>  Fri, 05 Jan 2024 23:29:34 +0800
+
+tinyxml2 (9.0.0+dfsg-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install cmake files (Closes: #967045)
+
+ -- Jochen Sprickerhof <jspricke@debian.org>  Mon, 16 May 2022 11:14:34 +0200
+
 tinyxml2 (9.0.0+dfsg-3) unstable; urgency=medium
 
   * [a6e98f0] Drop Provides/Conflicts libtinyxml2-8 (Closes: #992602)

debian/control

@@ -1,20 +1,19 @@
 Source: tinyxml2
 Priority: optional
 Maintainer: Chow Loong Jin <hyperair@debian.org>
-Build-Depends: debhelper-compat (= 12),
-               dpkg-dev (>= 1.16.1),
+Build-Depends: debhelper-compat (= 13),
                cmake
 Build-Conflicts: libssl1.0.0 (= 1.0.2-1)
 Standards-Version: 4.1.3
 Section: libs
-Homepage: http://www.grinninglizard.com/tinyxml2/
+Homepage: https://www.grinninglizard.com/tinyxml2/
 Vcs-Browser: https://salsa.debian.org/debian/tinyxml2
 Vcs-Git: https://salsa.debian.org/debian/tinyxml2.git
 
 Package: libtinyxml2-dev
 Section: libdevel
 Architecture: any
-Depends: libtinyxml2-9 (= ${binary:Version}),
+Depends: libtinyxml2-11 (= ${binary:Version}),
          ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -34,8 +33,7 @@ Description: TinyXML2 library - header and static library
   - More modern C++, including a proper namespace
   - Proper and useful handling of whitespace
 
-Package: libtinyxml2-9
-Section: libs
+Package: libtinyxml2-11
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same