SHA256
8
0
forked from pool/zipios
Files
zipios/fix_cstdint_include.patch

55 lines
1.3 KiB
Diff
Raw Permalink Normal View History

Accepting request 1135970 from home:StefanBruens:branches:devel:libraries:c_c++ - Update to version 2.3.2: * Bugs: + As suggested, use argv[2] when ent is nullptr (#42). + Fixed an issue with empty files to avoid error. + Missed adding the signature to the last entry. + Fixed two operator = () which improperly returned a const &. + Really auto-init m_zs. + Require that chdir() & truncate() return 0. + Bumped the version to 2.3 since the CRC32 computation bug was a pretty major fix (#38). + Correctly clear the m_checked flag on a change of the FilePath. + Fixed a Logical OR (|| instead of |). + Fixed two ISO-8851-1 characters. + Removed the inverted question mark. + Fixed path to BUILD folder in ./mk script. * New Features / Enhancements + Extended public interface. + Added support for an std::istream when creating a ZipFile object. + Added support for a StreamEntry when creating a zip file. + Replaced new ... with std::make_shared<>() where possible. + Updated CMakeLists.txt (clean ups). + Removed the -std=c++17 option. I don't need it and it's better without. + Implemented the big endian version of the dosdatetime_convert_t union. + Added casts for signed/unsigned comparisons. + Added a function to compute CRC32 of local disk files. + Added the clear() and empty() functions to the FilePath class. + Use clear() instead of setting string to "". + Added support for -v (verbose) to the ./mk script. * Documentation + Made the search of the Doxygen tools quieter by default. + Added a note about the root branch renaming. It is "main" now. + Added a few comments (missing docs). + Ran ispell to fix the docs a bit. + Corrected links in README.md (especially use the https protocol) + Changed the o umlaut to use UTF-8. * Packaging (included Debian) + Changed Debian release name to bionic and then jammy. + Updated the compat to v10. + Removing the multiarch-support dependency. It's only for amd64 at the moment. + Remove dependency on old catch package. We now use snapcatch2. * Tests + Upgraded the tests to catch2 v3.x. + Renamed the tests catch_<name>.cpp. + Renamed the file with the main() function catch_main.cpp/hpp. + Enhanced the test of the project version. + Make use of the --tmp-path and --source-path of the new snapcatch2 main(). + Fixed test verifying DOS timestamps with +/- 1 hour (ugly but it works). + Removed the '&' in a CATCH_REQUIRE_THROWS_AS(). + Fixed the include and library linking for the tests. + Added CATCH_END_SECTION() everywhere. + Prepended CATCH_... to all the macros so they compile with the newer version. + Properly indent the test CMakeLists.txt file. + Removed the cmake_minimum_required(). It's only required in the main CMakeLists.txt. + Verify the versions in the tests to be more sure I catch discrepancies. + Added a new test to make sure issue #38 was fixed. + Made tests delete files upfront too (in case it breaks part way in a previous run). * Add fix_cstdint_include.patch OBS-URL: https://build.opensuse.org/request/show/1135970 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zipios?expand=0&rev=4
2024-01-02 08:27:19 +00:00
From 60b8c7bf79e6a4458e4c0d78f5fb14a81f4feac7 Mon Sep 17 00:00:00 2001
From: AlexisWilke <alexis@m2osw.com>
Date: Thu, 2 Nov 2023 16:02:59 -0700
Subject: [PATCH] Include <cstdint> instead of <cstdint.h>.
Removed two commented out #include's.
---
src/zipios_common.hpp | 2 +-
tools/appendzip.cpp | 2 +-
tools/zipdir.cpp | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/zipios_common.hpp b/src/zipios_common.hpp
index 33e171c..441476f 100644
--- a/src/zipios_common.hpp
+++ b/src/zipios_common.hpp
@@ -34,7 +34,7 @@
#include <vector>
#include <sstream>
-#include <stdint.h>
+#include <cstdint>
#if defined( ZIPIOS_WINDOWS )
typedef int32_t ssize_t;
diff --git a/tools/appendzip.cpp b/tools/appendzip.cpp
index 1c91bba..dbb6abd 100644
--- a/tools/appendzip.cpp
+++ b/tools/appendzip.cpp
@@ -32,7 +32,7 @@
#include <cstring>
#include <iostream>
#include <fstream>
-#include <stdint.h>
+#include <cstdint>
// static variables
diff --git a/tools/zipdir.cpp b/tools/zipdir.cpp
index d0871f1..c4e0a66 100644
--- a/tools/zipdir.cpp
+++ b/tools/zipdir.cpp
@@ -31,11 +31,9 @@
#include <zipios/directorycollection.hpp>
#include <zipios/zipfile.hpp>
-//#include <cstdlib>
#include <cstring>
#include <iostream>
#include <fstream>
-//#include <stdint.h>
// static variables