Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package quazip for openSUSE:Factory checked
in at 2022-04-17 23:50:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/quazip (Old)
and /work/SRC/openSUSE:Factory/.quazip.new.1941 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quazip"
Sun Apr 17 23:50:48 2022 rev:26 rq:970505 version:1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/quazip/quazip.changes 2021-11-13
22:49:12.645281477 +0100
+++ /work/SRC/openSUSE:Factory/.quazip.new.1941/quazip.changes 2022-04-17
23:52:15.774506260 +0200
@@ -1,0 +2,9 @@
+Sun Apr 17 07:10:13 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Update to 1.3
+ * All JlCompress methods are now public
+ * Default Qt major version is now detected automatically
+ * Minor CMake and pkg-config fixes and improvements
+- Add a Qt6 flavor
+
+-------------------------------------------------------------------
Old:
----
quazip-1.2.tar.gz
New:
----
_multibuild
quazip-1.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ quazip.spec ++++++
--- /var/tmp/diff_new_pack.Zz7gxg/_old 2022-04-17 23:52:16.226506879 +0200
+++ /var/tmp/diff_new_pack.Zz7gxg/_new 2022-04-17 23:52:16.230506884 +0200
@@ -1,7 +1,7 @@
#
# spec file for package quazip
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,103 +16,165 @@
#
+%global quazip_flavor @BUILD_FLAVOR@%{nil}
+%if "%{quazip_flavor}" == ""
+ExclusiveArch: do_not_build
+%endif
+%if "%{quazip_flavor}" == "qt6"
+%define qt6 1
+%define pkg_suffix -qt6
+# No pkgconfig file before 6.4
+%if %{pkg_vcmp cmake(Qt6Core) <= 6.4.0}
+%define no_pkgconfig 1
+%endif
+%endif
+%if "%{quazip_flavor}" == "qt5"
+%define qt5 1
+%define pkg_suffix -qt5
+%define no_pkgconfig 0
+%endif
%define so_ver 1
-%define lib_ver 1_0_0
-Name: quazip
-Version: 1.2
+%define lib_ver 1_3_0
+Name: quazip%{?pkg_suffix}
+Version: 1.3
Release: 0
Summary: C++ wrapper for ZIP/UNZIP
License: GPL-2.0-or-later OR LGPL-2.1-or-later
URL: https://github.com/stachenov/quazip
Source:
https://github.com/stachenov/quazip/archive/v%{version}.tar.gz#/quazip-%{version}.tar.gz
BuildRequires: cmake >= 3.15
-BuildRequires: dos2unix
-BuildRequires: doxygen
BuildRequires: fdupes
-BuildRequires: graphviz
-BuildRequires: graphviz-gnome
BuildRequires: pkgconfig
-BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: pkgconfig(Qt5Network)
-BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(zlib)
+%if 0%{?qt5}
+BuildRequires: doxygen
+BuildRequires: graphviz
+BuildRequires: graphviz-gnome
+BuildRequires: cmake(Qt5Core)
+BuildRequires: cmake(Qt5Network)
+BuildRequires: cmake(Qt5Test)
+%endif
+%if 0%{?qt6}
+BuildRequires: cmake(Qt6Core)
+BuildRequires: cmake(Qt6Core5Compat)
+BuildRequires: cmake(Qt6Network)
+BuildRequires: cmake(Qt6Test)
+%endif
%description
-A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Qt5 toolkit.
-Useful to access ZIP archives from Qt5 programs.
+A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Qt toolkit.
+Useful to access ZIP archives from Qt programs.
-%package -n libquazip%{so_ver}-qt5-%{lib_ver}
+%package -n libquazip%{so_ver}-%{quazip_flavor}-%{lib_ver}
Summary: C++ wrapper for ZIP/UNZIP
+%if 0%{?qt5}
Provides: libquazip%{so_ver} = %{version}
Obsoletes: libquazip%{so_ver} < %{version}
Provides: libquazip5-%{so_ver} = %{version}
Obsoletes: libquazip5-%{so_ver} < %{version}
+%endif
-%description -n libquazip%{so_ver}-qt5-%{lib_ver}
-A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Qt5 toolkit.
-Useful to access ZIP archives from Qt5 programs.
+%description -n libquazip%{so_ver}-%{quazip_flavor}-%{lib_ver}
+A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Qt toolkit.
+Useful to access ZIP archives from Qt programs.
%package devel
Summary: Development files for %{name}
-Requires: libquazip%{so_ver}-qt5-%{lib_ver} = %{version}
-Requires: pkgconfig(Qt5Core)
+Requires: libquazip%{so_ver}-%{quazip_flavor}-%{lib_ver} = %{version}
+%if 0%{?qt5}
+Requires: cmake(Qt5Core)
Provides: libquazip-qt5-devel = %{version}
Obsoletes: libquazip-qt5-devel < %{version}
-Provides: quazip-qt5-devel = %{version}
-Obsoletes: quazip-qt5-devel < %{version}
+Provides: quazip-devel = %{version}
+Obsoletes: quazip-devel < %{version}
+%endif
+%if 0%{?qt6}
+Requires: cmake(Qt6Core)
+Requires: cmake(Qt6Core5Compat)
+%endif
%description devel
The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+developing applications that use quazip.
-%package doc
+# Only build the doc package once
+%if 0%{?qt5}
+%package -n quazip-doc
Summary: Documentation for quazip, a C++ wrapper for ZIP/UNZIP
Provides: libquazip-qt5-doc = %{version}
Obsoletes: libquazip-qt5-doc < %{version}
Provides: quazip-qt5-doc = %{version}
Obsoletes: quazip-qt5-doc < %{version}
+BuildArch: noarch
+
+%description -n quazip-doc
+A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Qt toolkit.
+Useful to access ZIP archives from Qt programs.
-%description doc
-A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Qt5 toolkit.
-Useful to access ZIP archives from Qt5 programs.
+This package contains documentation for quazip.
+%endif
%prep
%autosetup -p1 -n quazip-%{version}
-dos2unix NEWS.txt
%build
+%if 0%{?qt6}
+%cmake_qt6
+%qt6_build
+%endif
+%if 0%{?qt5}
%cmake
%cmake_build
cd ..
-
sed -i 's/HTML_TIMESTAMP\s*= YES/HTML_TIMESTAMP=NO/' Doxyfile
doxygen -u
doxygen
+%endif
%install
+%if 0%{?qt6}
+%qt6_install
+%endif
+%if 0%{?qt5}
%cmake_install
+
# install docs
mkdir -pv %{buildroot}%{_defaultdocdir}/quazip-doc
cp -r doc/html %{buildroot}%{_defaultdocdir}/quazip-doc/
%fdupes -s %{buildroot}%{_defaultdocdir}/quazip-doc
+%endif
+
+%if %{no_pkgconfig}
+rm %{buildroot}%{_libdir}/pkgconfig/quazip%{so_ver}-qt6.pc
+%endif
-%post -n libquazip%{so_ver}-qt5-%{lib_ver} -p /sbin/ldconfig
-%postun -n libquazip%{so_ver}-qt5-%{lib_ver} -p /sbin/ldconfig
+%post -n libquazip%{so_ver}-%{quazip_flavor}-%{lib_ver} -p /sbin/ldconfig
+%postun -n libquazip%{so_ver}-%{quazip_flavor}-%{lib_ver} -p /sbin/ldconfig
-%files -n libquazip%{so_ver}-qt5-%{lib_ver}
+%files -n libquazip%{so_ver}-%{quazip_flavor}-%{lib_ver}
%license COPYING*
%doc NEWS.txt README*
-%{_libdir}/libquazip%{so_ver}-qt5.so.%{so_ver}*
+%{_libdir}/libquazip%{so_ver}-%{quazip_flavor}.so.%{so_ver}*
%files devel
%license COPYING*
%doc QuaZip-1.x-migration.md
+%if 0%{?qt5}
%{_includedir}/QuaZip-Qt5-%{version}
%{_libdir}/cmake/QuaZip-Qt5-%{version}
-%{_libdir}/libquazip%{so_ver}-qt5.so
-%{_libdir}/pkgconfig/quazip%{so_ver}-qt5.pc
+%endif
+%if 0%{?qt6}
+%{_includedir}/QuaZip-Qt6-%{version}
+%{_libdir}/cmake/QuaZip-Qt6-%{version}
+%endif
+%{_libdir}/libquazip%{so_ver}-%{quazip_flavor}.so
+%if !%{no_pkgconfig}
+%{_libdir}/pkgconfig/quazip%{so_ver}-%{quazip_flavor}.pc
+%endif
-%files doc
+%if 0%{?qt5}
+%files -n quazip-doc
%doc %{_defaultdocdir}/quazip-doc
+%endif
%changelog
++++++ _multibuild ++++++
<multibuild>
<flavor>qt5</flavor>
<flavor>qt6</flavor>
</multibuild>
++++++ quazip-1.2.tar.gz -> quazip-1.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/quazip-1.2/CMakeLists.txt
new/quazip-1.3/CMakeLists.txt
--- old/quazip-1.2/CMakeLists.txt 2021-11-13 13:52:26.000000000 +0100
+++ new/quazip-1.3/CMakeLists.txt 2022-04-16 14:46:16.000000000 +0200
@@ -1,18 +1,38 @@
# require 3.15 for GNUInstallDirs
cmake_minimum_required(VERSION 3.15...3.18)
-project(QuaZip VERSION 1.2)
+project(QuaZip VERSION 1.3)
set(CMAKE_CXX_STANDARD 14)
set(QUAZIP_LIB_VERSION ${QuaZip_VERSION})
-set(QUAZIP_LIB_SOVERSION 1.0.0)
+set(QUAZIP_LIB_SOVERSION 1.3.0)
option(BUILD_SHARED_LIBS "" ON)
option(QUAZIP_INSTALL "" ON)
option(QUAZIP_USE_QT_ZLIB "" OFF)
option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
-set(QUAZIP_QT_MAJOR_VERSION 5 CACHE STRING "Qt version to use (4 or 5),
defaults to 5")
+
+# Set the default value of `${QUAZIP_QT_MAJOR_VERSION}`.
+# We search quietly for Qt6, Qt5 and Qt4 in that order.
+# Qt6 and Qt5 provide config files for CMake.
+# Qt4 relies on `FindQt4.cmake`.
+find_package(
+ QT NAMES Qt6 Qt5
+ QUIET COMPONENTS Core
+)
+if (NOT QT_FOUND)
+ find_package(Qt4 QUIET COMPONENTS QtCore)
+ if (Qt4_FOUND)
+ set(QT_VERSION_MAJOR 4)
+ else()
+ # If neither 6, 5 nor 4 are found, we default to 5.
+ # The setup will fail further down.
+ set(QT_VERSION_MAJOR 5)
+ endif()
+endif()
+
+set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to
use (4, 5 or 6), defaults to ${QT_VERSION_MAJOR}")
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RELEASE)
@@ -34,23 +54,24 @@
OPTIONAL_COMPONENTS Network Test)
set(QUAZIP_LIB_LIBRARIES Qt6::Core Qt6::Core5Compat)
set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network
Qt6::Test)
- set(QUAZIP_PKGCONFIG_REQUIRES Qt6Core)
+ set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt6Core")
elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
find_package(Qt5 REQUIRED COMPONENTS Core
OPTIONAL_COMPONENTS Network Test)
set(QUAZIP_LIB_LIBRARIES Qt5::Core)
set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
- set(QUAZIP_PKGCONFIG_REQUIRES Qt5Core)
+ set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core")
elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
OPTIONAL_COMPONENTS QtNetwork QtTest)
set(QUAZIP_LIB_LIBRARIES Qt4::QtCore)
set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
- set(QUAZIP_PKGCONFIG_REQUIRES QtCore)
+ set(QUAZIP_PKGCONFIG_REQUIRES "zlib, QtCore")
else()
message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not
supported")
endif()
+message(STATUS "Using Qt version ${QUAZIP_QT_MAJOR_VERSION}")
set(QUAZIP_QT_ZLIB_USED OFF)
if(QUAZIP_USE_QT_ZLIB)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/quazip-1.2/Doxyfile new/quazip-1.3/Doxyfile
--- old/quazip-1.2/Doxyfile 2021-11-13 13:52:26.000000000 +0100
+++ new/quazip-1.3/Doxyfile 2022-04-16 14:46:16.000000000 +0200
@@ -38,7 +38,7 @@
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = quazip-1-2
+PROJECT_NUMBER = quazip-1-3
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/quazip-1.2/NEWS.txt new/quazip-1.3/NEWS.txt
--- old/quazip-1.2/NEWS.txt 2021-11-13 13:52:26.000000000 +0100
+++ new/quazip-1.3/NEWS.txt 2022-04-16 14:46:16.000000000 +0200
@@ -1,210 +1,213 @@
-QuaZip changes
-
-* 2021-11-13 1.2
- * Add CMake option to disable installation (Sebastian Rettenberger)
- * Qt's internal zlib can be used now (QUAZIP_USE_QT_ZLIB, OFF by
- default)
- * Make tests optional (QUAZIP_ENABLE_TESTS, OFF by default)
- (Gleb Ignatev)
- * Fix: QuaZip::close() can be safely called multiple times now
- * Fix: -lz added to pkgconfig
-
-* 2020-10-11 1.1
- * Fixed Unix symlink handling in JlCompress compression
- * Implemented Unix symlink handling in JlCompress extraction
- * Added 1.x migration guide
-
-* 2020-10-05 1.0
- * Preliminary Qt 6 support
- * Consistent naming of binaries (libquazip1-qt5 style)
- * Modern CMake support
- * Ditched qmake support
-
-* 2020-04-29 0.9
- * Support for extended timestamps
- * Various contributed CMake fixes
-
-* 2019-05-27 0.8.1
- * CMake regression fix
-
-* 2019-05-23 0.8
- * Support for UTF-8 in file names and comments (Denis Zavorotnyy)
- * get/setOsCode(), get/setDefaultOsCode()
- * Fixed Z_STREAM_END handling in QuaZioDevice
-
-* 2018-06-13 0.7.6
- * Fixed the Zip Slip vulnerability in JlCompress
- * Renamed crypt.h to minizip_crypt.h to avoid conflicts
-
-* 2018-05-20 0.7.5
- * Fixed target_link_libraries call in CMakeLists
- * Worked around a Qt 4.6 bug (QTBUG-15421) screwing up hidden
- files handling in JlCompress::compressDir()
- * Removed Q_FOREACH uses to avoid conflicts (SF patch #32)
-
-* 2017-02-05 0.7.4
- * Static analysis patch from Intel Deutschland GmbH
- * Replaced UNUSED with QUAZIP_UNUSED to avoid name clashes
- * Minor bug fixes
-
-* 2017-02-05 0.7.3
- * Symlink handling
- * Static linking exception for LGPL
- * Minor bug fixes
-
-* 2016-03-29 0.7.2
- * New JlCompress methods (QIODevice*-based API by Lukasz Kwiecinski)
- * Implemented QuaZioDevice::atEnd() and bytesAvailable()--these might
- break ABI, but pretty unlikely.
-
-* 2015-01-07 0.7.1
- * Fixed licensing issues (bug #45).
- * Added the convenience method QuaZipFileInfo::isEncrypted().
-
-* 2014-07-24 0.7
- * It is now possible to write ZIP files to sequential devices
- like sockets (only in mdCreate mode, so no self-extract, sorry).
- * A few zip64 fixes.
- * Several bug fixes and portability improvements.
-
-* 2014-02-09 0.6.2
- * QuaZipNewInfo / QuaZipFileInfo64 now provide API to access/set
- NTFS time stamps - useful even on non-NTFS systems if you
- need more precise dates and times than default ones.
- * QuaZipNewInfo may now be initialized from QuaZipFileInfo64.
- * No more crashes when using QSaveFile as QIODevice for ZIP.
- * The new QuaZip::setAutoClose() method allows to leave the
- QIODevice open when you close the QuaZip instance.
- * qztest now depends on quazip, no longer breaking the build.
-
-* 2014-01-26 0.6.1
- * Improved zip64 support.
- * A LOT more tests thanks to g++ --coverage / lcov.
- * JlCompress extraction methods now create files with default
- permissions if they are zero in the original archive.
- * Some QuaZipDir fixes (thanks to the new tests).
-
-* 2014-01-22 0.6
- * Minizip updated to 1.1 (with all the necessary modifications
- re-done), and that means that...
- * the long-awaited zip64 support is now available!
- * A few rather minor fixes.
-
-* 2014-01-19 0.5.2
- * Some minor bug fixes.
- * API to access file permissions subfield of the external
- attributes.
- * MS VS 2012 Express support.
- * API to set the default codec used to encode/decode file names
- (mainly for use by various wrappers such as JlCompress, when
- you don't have direct access to the underlying QuaZip instance).
-
-* 2013-03-02 0.5.1
- * Lots of QuaZipDir fixes, thanks to all bug reporters.
- * Full Qt Creator support.
- * MS VS 2010 Express support.
- * Qt5 support (didn't need any source code changes anyway).
- * Lots of minor bug fixes.
-
-* 2012-09-07 0.5
- * Added run_moc.bat files for building under Windows in case Qt
- integration is not available (e. g. VS 2008 Express).
- * Added the QuaZipDir class to simplify ZIP navigation in terms
- of directories.
- * Added the QuaGzipFile class for working with GZIP archives. It
- was added as a bonus since it has nothing to do with the main
- purpose of the library. It probably won't get any major
- improvements, although minor bug fixes are possible.
- * Added the QuaZIODevice class for working with zlib
- compression. It has nothing to do with the ZIP format, and
- therefore the same notice as for the QuaGzipFile applies.
- * The global comment is no longer erased when adding files to
- an archive.
- * Many bug fixes.
-
-* 2012-01-14 0.4.4
- * Fixed isSequential() test that was causing open() failures on
- Unix.
- * Fixed sub-directory compressing in JlCompress.
- * Added MS VS 2008 solution, compatible with the binary Qt
- distribution (tested on MS VS 2008 Express, had to run MOC
- manually due to the lack of plugin in Express).
- * Fixed extracting directories in JlCompress.
- * Fixed JlCompress.h includes in the test suite, which used
- lowercase names thus breaking on case-sensitive systems.
- * Implemented missing QuaZipFile::getZip() that was only
- declared.
- * Fixed reopening closed files.
- * Fixed possible memory leak in case of open error.
-
-* 2011-09-09 0.4.3
- * New test suite using QTestLib.
- * Fixed bytesAvailable(), pos() and atEnd().
- * Added ZIP v1.0 support and disabling data descriptor for
- compatibility with some older software.
- * Fixed DLL export/import issues for some symbols.
- * Added QUAZIP_STATIC macro for compiling as a static library or
- directly including the source.
- * Added getFileNameList() and getFileInfoList() convenience
- functions.
- * Added some buffering to JlCompress to improve performance.
-
-* 2011-08-10 0.4.2
- * Cmake patch (thanks to Bernhard Rosenkraenzer).
- * Symbian patch (thanks to Hamish Willee).
- * Documented the multiple files limitation of QuaZipFile.
- * Fixed relative paths handling in JlCompress.
- * Fixed linking to MinGW zlib.
-
-* 2011-05-26 0.4.1
- * License statement updated to avoid confusion. GPL license
- removed for the very same reason.
- * Parts of original package are now clearly marked as modified,
- just as their license requires.
-
-* 2011-05-23 0.4
- * QuaZip and QuaZipFile classes now use the Pimpl idiom. This
- means that future releases will probably be binary compatible
- with this one, but it also means that this one is binary
- incompatible with the old ones.
- * IO API has been rewritten using QIODevice instead of standard
- C library. Among other things it means that QuaZip now supports
- files up to 4 GB in size instead of 2 GB.
- * Added QuaZip methods allowing access to ZIP files represented
- by any seekable QIODevice implementation (QBuffer is a good
- example).
-
-* 2010-07-23 0.3
- * Fixed getComment() for global comments.
- * Added some useful classes for calculating checksums (thanks to
- Adam Walczak).
- * Added some utility classes for working with whole directories
- (thanks to Roberto Pompermaier). It would be nice if someone
- documents these in English, though.
- * Probably fixed some problems with passwords (thanks to Vasiliy
- Sorokin). I didn't test it, though.
-
-* 2008-09-17 0.2.3
- * Fixed license notices in sources.
-
-* SVN
- * Fixed a small bug in QuaZipFile::atEnd().
-
-* 2007-01-16 0.2.2
- * Added LGPL as alternative license.
- * Added FAQ documentation page.
-
-* 2006-03-21 0.2.1
- * Fixed setCommentCodec() bug.
- * Fixed bug that set month 1-12 instead of 0-11, as specified in
- zip.h.
- * Added workaround for Qt's bug that caused wrong timestamps.
- * Few documentation fixes and cosmetic changes.
-
-* 2005-07-08 0.2
- * Write support.
- * Extended QuaZipFile API, including size(), *pos() functions.
- * Support for comments encoding/decoding.
-
-* 2005-07-01 0.1
- * Initial version.
+* 2022-04-16 1.3
+ * All JlCompress methods are now public
+ * Default Qt major version is now detected automatically
+ * Minor CMake and pkg-config fixes and improvements
+
+* 2021-11-13 1.2
+ * Add CMake option to disable installation (Sebastian Rettenberger)
+ * Qt's internal zlib can be used now (QUAZIP_USE_QT_ZLIB, OFF by
+ default)
+ * Make tests optional (QUAZIP_ENABLE_TESTS, OFF by default)
+ (Gleb Ignatev)
+ * Fix: QuaZip::close() can be safely called multiple times now
+ * Fix: -lz added to pkgconfig
+
+* 2020-10-11 1.1
+ * Fixed Unix symlink handling in JlCompress compression
+ * Implemented Unix symlink handling in JlCompress extraction
+ * Added 1.x migration guide
+
+* 2020-10-05 1.0
+ * Preliminary Qt 6 support
+ * Consistent naming of binaries (libquazip1-qt5 style)
+ * Modern CMake support
+ * Ditched qmake support
+
+* 2020-04-29 0.9
+ * Support for extended timestamps
+ * Various contributed CMake fixes
+
+* 2019-05-27 0.8.1
+ * CMake regression fix
+
+* 2019-05-23 0.8
+ * Support for UTF-8 in file names and comments (Denis Zavorotnyy)
+ * get/setOsCode(), get/setDefaultOsCode()
+ * Fixed Z_STREAM_END handling in QuaZioDevice
+
+* 2018-06-13 0.7.6
+ * Fixed the Zip Slip vulnerability in JlCompress
+ * Renamed crypt.h to minizip_crypt.h to avoid conflicts
+
+* 2018-05-20 0.7.5
+ * Fixed target_link_libraries call in CMakeLists
+ * Worked around a Qt 4.6 bug (QTBUG-15421) screwing up hidden
+ files handling in JlCompress::compressDir()
+ * Removed Q_FOREACH uses to avoid conflicts (SF patch #32)
+
+* 2017-02-05 0.7.4
+ * Static analysis patch from Intel Deutschland GmbH
+ * Replaced UNUSED with QUAZIP_UNUSED to avoid name clashes
+ * Minor bug fixes
+
+* 2017-02-05 0.7.3
+ * Symlink handling
+ * Static linking exception for LGPL
+ * Minor bug fixes
+
+* 2016-03-29 0.7.2
+ * New JlCompress methods (QIODevice*-based API by Lukasz Kwiecinski)
+ * Implemented QuaZioDevice::atEnd() and bytesAvailable()--these might
+ break ABI, but pretty unlikely.
+
+* 2015-01-07 0.7.1
+ * Fixed licensing issues (bug #45).
+ * Added the convenience method QuaZipFileInfo::isEncrypted().
+
+* 2014-07-24 0.7
+ * It is now possible to write ZIP files to sequential devices
+ like sockets (only in mdCreate mode, so no self-extract, sorry).
+ * A few zip64 fixes.
+ * Several bug fixes and portability improvements.
+
+* 2014-02-09 0.6.2
+ * QuaZipNewInfo / QuaZipFileInfo64 now provide API to access/set
+ NTFS time stamps - useful even on non-NTFS systems if you
+ need more precise dates and times than default ones.
+ * QuaZipNewInfo may now be initialized from QuaZipFileInfo64.
+ * No more crashes when using QSaveFile as QIODevice for ZIP.
+ * The new QuaZip::setAutoClose() method allows to leave the
+ QIODevice open when you close the QuaZip instance.
+ * qztest now depends on quazip, no longer breaking the build.
+
+* 2014-01-26 0.6.1
+ * Improved zip64 support.
+ * A LOT more tests thanks to g++ --coverage / lcov.
+ * JlCompress extraction methods now create files with default
+ permissions if they are zero in the original archive.
+ * Some QuaZipDir fixes (thanks to the new tests).
+
+* 2014-01-22 0.6
+ * Minizip updated to 1.1 (with all the necessary modifications
+ re-done), and that means that...
+ * the long-awaited zip64 support is now available!
+ * A few rather minor fixes.
+
+* 2014-01-19 0.5.2
+ * Some minor bug fixes.
+ * API to access file permissions subfield of the external
+ attributes.
+ * MS VS 2012 Express support.
+ * API to set the default codec used to encode/decode file names
+ (mainly for use by various wrappers such as JlCompress, when
+ you don't have direct access to the underlying QuaZip instance).
+
+* 2013-03-02 0.5.1
+ * Lots of QuaZipDir fixes, thanks to all bug reporters.
+ * Full Qt Creator support.
+ * MS VS 2010 Express support.
+ * Qt5 support (didn't need any source code changes anyway).
+ * Lots of minor bug fixes.
+
+* 2012-09-07 0.5
+ * Added run_moc.bat files for building under Windows in case Qt
+ integration is not available (e. g. VS 2008 Express).
+ * Added the QuaZipDir class to simplify ZIP navigation in terms
+ of directories.
+ * Added the QuaGzipFile class for working with GZIP archives. It
+ was added as a bonus since it has nothing to do with the main
+ purpose of the library. It probably won't get any major
+ improvements, although minor bug fixes are possible.
+ * Added the QuaZIODevice class for working with zlib
+ compression. It has nothing to do with the ZIP format, and
+ therefore the same notice as for the QuaGzipFile applies.
+ * The global comment is no longer erased when adding files to
+ an archive.
+ * Many bug fixes.
+
+* 2012-01-14 0.4.4
+ * Fixed isSequential() test that was causing open() failures on
+ Unix.
+ * Fixed sub-directory compressing in JlCompress.
+ * Added MS VS 2008 solution, compatible with the binary Qt
+ distribution (tested on MS VS 2008 Express, had to run MOC
+ manually due to the lack of plugin in Express).
+ * Fixed extracting directories in JlCompress.
+ * Fixed JlCompress.h includes in the test suite, which used
+ lowercase names thus breaking on case-sensitive systems.
+ * Implemented missing QuaZipFile::getZip() that was only
+ declared.
+ * Fixed reopening closed files.
+ * Fixed possible memory leak in case of open error.
+
+* 2011-09-09 0.4.3
+ * New test suite using QTestLib.
+ * Fixed bytesAvailable(), pos() and atEnd().
+ * Added ZIP v1.0 support and disabling data descriptor for
+ compatibility with some older software.
+ * Fixed DLL export/import issues for some symbols.
+ * Added QUAZIP_STATIC macro for compiling as a static library or
+ directly including the source.
+ * Added getFileNameList() and getFileInfoList() convenience
+ functions.
+ * Added some buffering to JlCompress to improve performance.
+
+* 2011-08-10 0.4.2
+ * Cmake patch (thanks to Bernhard Rosenkraenzer).
+ * Symbian patch (thanks to Hamish Willee).
+ * Documented the multiple files limitation of QuaZipFile.
+ * Fixed relative paths handling in JlCompress.
+ * Fixed linking to MinGW zlib.
+
+* 2011-05-26 0.4.1
+ * License statement updated to avoid confusion. GPL license
+ removed for the very same reason.
+ * Parts of original package are now clearly marked as modified,
+ just as their license requires.
+
+* 2011-05-23 0.4
+ * QuaZip and QuaZipFile classes now use the Pimpl idiom. This
+ means that future releases will probably be binary compatible
+ with this one, but it also means that this one is binary
+ incompatible with the old ones.
+ * IO API has been rewritten using QIODevice instead of standard
+ C library. Among other things it means that QuaZip now supports
+ files up to 4 GB in size instead of 2 GB.
+ * Added QuaZip methods allowing access to ZIP files represented
+ by any seekable QIODevice implementation (QBuffer is a good
+ example).
+
+* 2010-07-23 0.3
+ * Fixed getComment() for global comments.
+ * Added some useful classes for calculating checksums (thanks to
+ Adam Walczak).
+ * Added some utility classes for working with whole directories
+ (thanks to Roberto Pompermaier). It would be nice if someone
+ documents these in English, though.
+ * Probably fixed some problems with passwords (thanks to Vasiliy
+ Sorokin). I didn't test it, though.
+
+* 2008-09-17 0.2.3
+ * Fixed license notices in sources.
+
+* SVN
+ * Fixed a small bug in QuaZipFile::atEnd().
+
+* 2007-01-16 0.2.2
+ * Added LGPL as alternative license.
+ * Added FAQ documentation page.
+
+* 2006-03-21 0.2.1
+ * Fixed setCommentCodec() bug.
+ * Fixed bug that set month 1-12 instead of 0-11, as specified in
+ zip.h.
+ * Added workaround for Qt's bug that caused wrong timestamps.
+ * Few documentation fixes and cosmetic changes.
+
+* 2005-07-08 0.2
+ * Write support.
+ * Extended QuaZipFile API, including size(), *pos() functions.
+ * Support for comments encoding/decoding.
+
+* 2005-07-01 0.1
+ * Initial version.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/quazip-1.2/quazip/JlCompress.cpp
new/quazip-1.3/quazip/JlCompress.cpp
--- old/quazip-1.2/quazip/JlCompress.cpp 2021-11-13 13:52:26.000000000
+0100
+++ new/quazip-1.3/quazip/JlCompress.cpp 2022-04-16 14:46:16.000000000
+0200
@@ -25,7 +25,7 @@
#include "JlCompress.h"
-static bool copyData(QIODevice &inFile, QIODevice &outFile)
+bool JlCompress::copyData(QIODevice &inFile, QIODevice &outFile)
{
while (!inFile.atEnd()) {
char buf[4096];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/quazip-1.2/quazip/JlCompress.h
new/quazip-1.3/quazip/JlCompress.h
--- old/quazip-1.2/quazip/JlCompress.h 2021-11-13 13:52:26.000000000 +0100
+++ new/quazip-1.3/quazip/JlCompress.h 2022-04-16 14:46:16.000000000 +0200
@@ -41,7 +41,8 @@
simple operations, such as mass ZIP packing or extraction.
*/
class QUAZIP_EXPORT JlCompress {
-private:
+public:
+ static bool copyData(QIODevice &inFile, QIODevice &outFile);
static QStringList extractDir(QuaZip &zip, const QString &dir);
static QStringList getFileList(QuaZip *zip);
static QString extractFile(QuaZip &zip, QString fileName, QString
fileDest);
@@ -81,7 +82,6 @@
*/
static bool removeFile(QStringList listFile);
-public:
/// Compress a single file.
/**
\param fileCompressed The name of the archive.
@@ -126,7 +126,6 @@
static bool compressDir(QString fileCompressed, QString dir,
bool recursive, QDir::Filters filters);
-public:
/// Extract a single file.
/**
\param fileCompressed The name of the archive.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/quazip-1.2/quazip/doc/index.dox
new/quazip-1.3/quazip/doc/index.dox
--- old/quazip-1.2/quazip/doc/index.dox 2021-11-13 13:52:26.000000000 +0100
+++ new/quazip-1.3/quazip/doc/index.dox 2022-04-16 14:46:16.000000000 +0200
@@ -104,11 +104,11 @@
To build the library, run:
\verbatim
$ cd /wherever/quazip/source/is/quazip-x.y.z
-$ cmake -S . -B wherever/you/want/your/build/to/be -D
QUAZIP_QT_MAJOR_VERSION=4, 5 or 6
+$ cmake -S . -B wherever/you/want/your/build/to/be -D
QUAZIP_QT_MAJOR_VERSION=6, 5 or 4
$ cmake --build wherever/you/want/your/build/to/be
\endverbatim
-\c QUAZIP_QT_MAJOR_VERSION is just one number, and it defaults to 5, so if
building with %Qt 5, it is optional.
+\c QUAZIP_QT_MAJOR_VERSION is just one number, and it defaults to the first Qt
major version that can be found by CMake.
On Windows, it may be required to use <tt>-G "MinGW Makefiles"</tt> or
something like that to convince
CMake that you really want to use, say, MinGW and not Visual Studio, for
example.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/quazip-1.2/quazip/quazip.pc.cmakein
new/quazip-1.3/quazip/quazip.pc.cmakein
--- old/quazip-1.2/quazip/quazip.pc.cmakein 2021-11-13 13:52:26.000000000
+0100
+++ new/quazip-1.3/quazip/quazip.pc.cmakein 2022-04-16 14:46:16.000000000
+0200
@@ -6,6 +6,6 @@
Name: QuaZip-Qt@QUAZIP_QT_MAJOR_VERSION@
Description: Minizip wrapper library for Qt @QUAZIP_QT_MAJOR_VERSION@.x
Version: @QUAZIP_LIB_VERSION@
-Libs: -l@QUAZIP_LIB_FILE_NAME@ -lz
+Libs: -l@QUAZIP_LIB_FILE_NAME@
Cflags: -I${includedir}/@QUAZIP_DIR_NAME@ -I${includedir}/@QUAZIP_INCLUDE_PATH@
Requires: @QUAZIP_PKGCONFIG_REQUIRES@
