Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package karchive for openSUSE:Factory checked in at 2021-12-13 20:40:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/karchive (Old) and /work/SRC/openSUSE:Factory/.karchive.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "karchive" Mon Dec 13 20:40:26 2021 rev:97 rq:939189 version:5.89.0 Changes: -------- --- /work/SRC/openSUSE:Factory/karchive/karchive.changes 2021-11-15 15:25:55.997815650 +0100 +++ /work/SRC/openSUSE:Factory/.karchive.new.2520/karchive.changes 2021-12-13 20:43:38.884479578 +0100 @@ -1,0 +2,10 @@ +Sat Dec 4 22:56:20 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.89.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.89.0 +- Changes since 5.88.0: + * K7Zip: use functions instead of macros + +------------------------------------------------------------------- Old: ---- karchive-5.88.0.tar.xz karchive-5.88.0.tar.xz.sig New: ---- karchive-5.89.0.tar.xz karchive-5.89.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ karchive.spec ++++++ --- /var/tmp/diff_new_pack.XR6jmn/_old 2021-12-13 20:43:39.484479652 +0100 +++ /var/tmp/diff_new_pack.XR6jmn/_new 2021-12-13 20:43:39.488479653 +0100 @@ -17,7 +17,7 @@ %define lname libKF5Archive5 -%define _tar_path 5.88 +%define _tar_path 5.89 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without lang Name: karchive -Version: 5.88.0 +Version: 5.89.0 Release: 0 Summary: Qt 5 addon providing access to numerous types of archives License: LGPL-2.0-or-later ++++++ karchive-5.88.0.tar.xz -> karchive-5.89.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.88.0/CMakeLists.txt new/karchive-5.89.0/CMakeLists.txt --- old/karchive-5.88.0/CMakeLists.txt 2021-10-30 07:20:26.000000000 +0200 +++ new/karchive-5.89.0/CMakeLists.txt 2021-12-04 17:56:00.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.88.0") # handled by release scripts +set(KF_VERSION "5.89.0") # handled by release scripts project(KArchive VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.87.0 NO_MODULE) +find_package(ECM 5.89.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.88.0/LICENSES/CC0-1.0.txt new/karchive-5.89.0/LICENSES/CC0-1.0.txt --- old/karchive-5.88.0/LICENSES/CC0-1.0.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/karchive-5.89.0/LICENSES/CC0-1.0.txt 2021-12-04 17:56:00.000000000 +0100 @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.88.0/src/k7zip.cpp new/karchive-5.89.0/src/k7zip.cpp --- old/karchive-5.88.0/src/k7zip.cpp 2021-10-30 07:20:26.000000000 +0200 +++ new/karchive-5.89.0/src/k7zip.cpp 2021-12-04 17:56:00.000000000 +0100 @@ -36,14 +36,33 @@ static const unsigned char k7zip_signature[6] = {'7', 'z', 0xBC, 0xAF, 0x27, 0x1C}; // static const unsigned char XZ_HEADER_MAGIC[6] = { 0xFD, '7', 'z', 'X', 'Z', 0x00 }; -#define GetUi16(p, offset) (((unsigned char)p[offset + 0]) | (((unsigned char)p[1]) << 8)) +/* clang-format off */ +static QChar GetUi16(const char *p, quint64 offset) +{ + return QChar(static_cast<unsigned char>(p[offset + 0]) + | (static_cast<unsigned char>(p[1]) << 8)); +} -#define GetUi32(p, offset) \ - (((unsigned char)p[offset + 0]) | (((unsigned char)p[offset + 1]) << 8) | (((unsigned char)p[offset + 2]) << 16) | (((unsigned char)p[offset + 3]) << 24)) +static quint32 GetUi32(const char *p, quint64 offset) +{ + return (static_cast<unsigned char>(p[offset + 0]) + | (static_cast<unsigned char>(p[offset + 1]) << 8) + | (static_cast<unsigned char>(p[offset + 2]) << 16) + | (static_cast<unsigned char>(p[offset + 3]) << 24)); +} -#define GetUi64(p, offset) ((quint32)GetUi32(p, offset) | (((quint64)GetUi32(p, offset + 4)) << 32)) +static quint64 GetUi64(const char *p, quint64 offset) +{ + return (GetUi32(p, offset) + | (static_cast<quint64>(GetUi32(p, offset + 4)) << 32)); +} + +static quint32 lzma2_dic_size_from_prop(int p) +{ + return ((static_cast<quint32>(2) | (p & 1)) << ((p / 2) + 11)); +} -#define LZMA2_DIC_SIZE_FROM_PROP(p) (((quint32)2 | ((p)&1)) << ((p) / 2 + 11)) +/* clang-format on*/ #define FILE_ATTRIBUTE_READONLY 1 #define FILE_ATTRIBUTE_HIDDEN 2 @@ -635,7 +654,7 @@ QString p; for (int i = 0; i < len; i++, buf += 2) { - p += (wchar_t)GetUi16(buf, 0); + p += GetUi16(buf, 0); } pos += rem + 2; @@ -2067,7 +2086,7 @@ int dict; for (dict = 0; dict < 40; dict++) { - if (dictSize <= LZMA2_DIC_SIZE_FROM_PROP(dict)) { + if (dictSize <= lzma2_dic_size_from_prop(dict)) { break; } } @@ -2752,7 +2771,7 @@ // k_LZMA2 method int dict; for (dict = 0; dict < 40; dict++) { - if (dictSize <= LZMA2_DIC_SIZE_FROM_PROP(dict)) { + if (dictSize <= lzma2_dic_size_from_prop(dict)) { break; } }
