Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: karchive

karchive (5.68.0-0ubuntu1) focal; urgency=medium * New upstream release (5.68.0) -- Rik Mills <rikmills@kde.org> Wed, 25 Mar 2020 20:55:41 +0000 karchive (5.67.0-0ubuntu1) focal; urgency=medium * New upstream release (5.67.0) -- Rik Mills <rikmills@kde.org> Sat, 08 Feb 2020 09:48:11 +0000 karchive (5.66.0-0ubuntu1) focal; urgency=medium * New upstream release (5.66.0) -- Rik Mills <rikmills@kde.org> Sat, 11 Jan 2020 13:17:19 +0000 karchive (5.65.0-0ubuntu1) focal; urgency=medium * New upstream release (5.65.0) -- José Manuel Santamaría Lema <panfaust@gmail.com> Sat, 14 Dec 2019 22:57:09 +0000 karchive (5.64.0-0ubuntu1) focal; urgency=medium * New upstream release (5.63.0) * New upstream release (5.64.0) -- Rik Mills <rikmills@kde.org> Sat, 09 Nov 2019 21:22:45 +0000 karchive (5.62.0-0ubuntu1) eoan; urgency=medium * New upstream release (5.62.0) -- Rik Mills <rikmills@kubuntu.org> Sat, 14 Sep 2019 08:05:11 +0100 karchive (5.61.0-0ubuntu1) eoan; urgency=medium * New upstream release (5.61.0) -- José Manuel Santamaría Lema <panfaust@gmail.com> Mon, 12 Aug 2019 10:40:43 +0100 karchive (5.60.0-0ubuntu1) eoan; urgency=medium * Move qdebug categories file to new location. * New upstream release (5.60.0) -- Rik Mills <rikmills@kubuntu.org> Sat, 20 Jul 2019 08:14:23 +0100 karchive (5.59.0-0ubuntu1) eoan; urgency=medium * New upstream release (5.59.0) -- Rik Mills <rikmills@kubuntu.org> Wed, 12 Jun 2019 11:17:37 +0100 karchive (5.58.0-0ubuntu1) eoan; urgency=medium * New upstream release (5.58.0) * Update symbols from build logs. -- Rik Mills <rikmills@kubuntu.org> Mon, 13 May 2019 15:38:22 +0100 karchive (5.57.0-0ubuntu1) eoan; urgency=medium * New upstream release (5.57.0) * Update symbols from build logs. -- Rik Mills <rikmills@kubuntu.org> Mon, 22 Apr 2019 08:36:07 +0100 karchive (5.56.0-0ubuntu1) disco; urgency=medium * New upstream release (5.56.0) -- José Manuel Santamaría Lema <panfaust@gmail.com> Sat, 09 Mar 2019 16:34:23 +0000 karchive (5.55.0-0ubuntu1) disco; urgency=medium * New upstream release (5.55.0) -- Rik Mills <rikmills@kubuntu.org> Wed, 13 Feb 2019 08:29:26 +0000 karchive (5.54.0-0ubuntu1) disco; urgency=medium * New upstream release (5.54.0) -- Rik Mills <rikmills@kubuntu.org> Sun, 13 Jan 2019 12:33:38 +0000 karchive (5.53.0-0ubuntu1) disco; urgency=medium * New upstream release (5.53.0) -- José Manuel Santamaría Lema <panfaust@gmail.com> Sun, 09 Dec 2018 20:47:30 +0000 karchive (5.52.0-0ubuntu1) disco; urgency=medium [ Rik Mills ] * New upstream release (5.51.0) [ José Manuel Santamaría Lema ] * New upstream release (5.52.0) -- José Manuel Santamaría Lema <panfaust@gmail.com> Thu, 22 Nov 2018 14:41:05 +0000 karchive (5.50.0-0ubuntu1) cosmic; urgency=medium [ Rik Mills ] * New upstream release (5.50.0) [ José Manuel Santamaría Lema ] * Update symbols files -- Rik Mills <rikmills@kubuntu.org> Mon, 10 Sep 2018 22:11:39 +0100 karchive (5.49.0-0ubuntu1) cosmic; urgency=medium [ Rik Mills ] * New upstream release (5.48.0) * New upstream release (5.49.0) [ José Manuel Santamaría Lema ] * Move away from dhmk and set compat level to 11 in order to reduce delta with Debian -- Rik Mills <rikmills@kubuntu.org> Tue, 21 Aug 2018 20:28:59 +0100 karchive (5.47.0-0ubuntu1) cosmic; urgency=medium * New upstream release (5.47.0) * Merge with debian, notes: - keep using dhmk and debhelper compat level = 9, see: https://phabricator.kde.org/w/kubuntu/black-operations/pyramid/ -- Rik Mills <rikmills@kubuntu.org> Thu, 14 Jun 2018 15:47:43 +0100

Modifications :
  1. Download patch LICENSES/BSD-2-Clause.txt

    --- 5.62.0-1/LICENSES/BSD-2-Clause.txt 1970-01-01 00:00:00.000000000 +0000 +++ 5.68.0-0ubuntu1/LICENSES/BSD-2-Clause.txt 2020-03-07 08:50:07.000000000 +0000 @@ -0,0 +1,22 @@ +Copyright (c) <year> <owner>. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  2. Download patch src/kfilterbase.h

    --- 5.62.0-1/src/kfilterbase.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kfilterbase.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2000 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2000 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef __kfilterbase__h
  3. Download patch src/kfilterdev.h

    --- 5.62.0-1/src/kfilterdev.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kfilterdev.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2000 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2000 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef __kfilterdev_h #define __kfilterdev_h @@ -55,8 +43,9 @@ public: */ static CompressionType compressionTypeForMimeType(const QString &mimetype); +#if KARCHIVE_ENABLE_DEPRECATED_SINCE(5, 0) /** - * @deprecated Use the constructor instead (if mimetype is empty), or KCompressionDevice (if + * @deprecated Since 5.0, use the constructor instead (if mimetype is empty), or KCompressionDevice (if * the mimetype is known). * * Use: @@ -94,8 +83,8 @@ public: * filter does not exist, the return value depends on @p forceFilter. * The returned KCompressionDevice has to be deleted after using. */ -#ifndef KARCHIVE_NO_DEPRECATED - KARCHIVE_DEPRECATED static KCompressionDevice *deviceForFile(const QString &fileName, + KARCHIVE_DEPRECATED_VERSION(5, 0, "See API docs") + static KCompressionDevice *deviceForFile(const QString &fileName, const QString &mimetype = QString(), bool forceFilter = false) { @@ -114,8 +103,9 @@ public: } #endif +#if KARCHIVE_ENABLE_DEPRECATED_SINCE(5, 0) /** - * @deprecated Use KCompressionDevice + * @deprecated Since 5.0, use KCompressionDevice * * Use: * KCompressionDevice::CompressionType type = KFilterDev::compressionTypeForMimeType(mimeType); @@ -140,8 +130,8 @@ public: * @param autoDeleteInDevice if true, @p inDevice will be deleted automatically * @return a KCompressionDevice that filters the original stream. Must be deleted after using */ -#ifndef KARCHIVE_NO_DEPRECATED - KARCHIVE_DEPRECATED static KCompressionDevice *device(QIODevice *inDevice, const QString &mimetype, + KARCHIVE_DEPRECATED_VERSION(5, 0, "See API docs") + static KCompressionDevice *device(QIODevice *inDevice, const QString &mimetype, bool autoDeleteInDevice = true) { if (inDevice == nullptr) {
  4. Download patch src/ktar.h

    --- 5.62.0-1/src/ktar.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/ktar.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,8 @@ /* This file is part of the KDE libraries - Copyright (C) 2000-2005 David Faure <faure@kde.org> - Copyright (C) 2003 Leo Savernik <l.savernik@aon.at> + SPDX-FileCopyrightText: 2000-2005 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2003 Leo Savernik <l.savernik@aon.at> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef KTAR_H #define KTAR_H
  5. Download patch src/kbzip2filter.h

    --- 5.62.0-1/src/kbzip2filter.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kbzip2filter.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2000 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2000 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef __kbzip2filter__h
  6. Download patch debian/tests/control

    --- 5.62.0-1/debian/tests/control 2019-09-20 17:12:52.000000000 +0000 +++ 5.68.0-0ubuntu1/debian/tests/control 2020-03-25 20:55:41.000000000 +0000 @@ -1,3 +1,7 @@ +# Tests: testsuite +# Depends: @, @builddeps@, build-essential +# Restrictions: build-needed + Tests: acc -Depends: dh-acc, exuberant-ctags, @ +Depends: @, dh-acc, exuberant-ctags Restrictions: allow-stderr
  7. Download patch src/karchivefile.h

    --- 5.62.0-1/src/karchivefile.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/karchivefile.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,22 +1,10 @@ /* This file is part of the KDE libraries - Copyright (C) 2000-2005 David Faure <faure@kde.org> - Copyright (C) 2003 Leo Savernik <l.savernik@aon.at> + SPDX-FileCopyrightText: 2000-2005 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2003 Leo Savernik <l.savernik@aon.at> Moved from ktar.h by Roberto Teixeira <maragato@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef KARCHIVEFILE_H #define KARCHIVEFILE_H
  8. Download patch src/knonefilter.cpp

    --- 5.62.0-1/src/knonefilter.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/knonefilter.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,23 +1,10 @@ /* This file is part of the KDE libraries - Copyright (C) 2011 Mario Bensi <mbensi@ipsquad.net> + SPDX-FileCopyrightText: 2011 Mario Bensi <mbensi@ipsquad.net> Based on kbzip2filter: - Copyright (C) 2000, 2009 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2000, 2009 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #include "knonefilter.h"
  9. Download patch src/k7zip.cpp

    --- 5.62.0-1/src/k7zip.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/k7zip.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2011 Mario Bensi <mbensi@ipsquad.net> + SPDX-FileCopyrightText: 2011 Mario Bensi <mbensi@ipsquad.net> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #include "k7zip.h" @@ -1114,7 +1102,7 @@ static uint toTimeT(const long long liTi QDateTime t(QDate(year, month, day), QTime(hour, minute, second)); t.setTimeSpec(Qt::UTC); - return t.toTime_t(); + return t.toSecsSinceEpoch(); } long long rtlSecondsSince1970ToSpecTime(quint32 seconds) @@ -1446,6 +1434,15 @@ static QByteArray decodeBCJ2(const QByte unsigned index = getIndex(prevByte, b); if (statusDecoder[index].decode(&rangeDecoder) == 1) { + if (b == 0xE8) { + if (callStreamPos + 4 > callStream.size()) { + return QByteArray(); + } + } else { + if (jumpStreamPos + 4 > jumpStream.size()) { + return QByteArray(); + } + } quint32 src = 0; for (int i = 0; i < 4; i++) { unsigned char b0; @@ -1683,6 +1680,10 @@ QByteArray K7Zip::K7ZipPrivate::readAndD inflatedDatas.clear(); if (folder->unpackCRCDefined) { + if ((size_t)inflated.size() < unpackSize) { + qCDebug(KArchiveLog) << "wrong crc size data"; + return QByteArray(); + } quint32 crc = crc32(0, (Bytef *)(inflated.data()), unpackSize); if (crc != folder->unpackCRC) { qCDebug(KArchiveLog) << "wrong crc"; @@ -1710,7 +1711,7 @@ void K7Zip::K7ZipPrivate::createItemsFro fileInfo->path = path + entry->name(); mTimesDefined.append(true); - mTimes.append(rtlSecondsSince1970ToSpecTime(entry->date().toTime_t())); + mTimes.append(rtlSecondsSince1970ToSpecTime(entry->date().toSecsSinceEpoch())); if (entry->isFile()) { const K7ZipFileEntry *fileEntry = static_cast<const K7ZipFileEntry *>(entry);
  10. Download patch tests/kziptest.cpp

    --- 5.62.0-1/tests/kziptest.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/tests/kziptest.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* - * Copyright (C) 2002-2013 David Faure <faure@kde.org> + * SPDX-FileCopyrightText: 2002-2013 David Faure <faure@kde.org> * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License version 2 as published by the Free Software Foundation; - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * SPDX-License-Identifier: LGPL-2.0-only */ #include "kzip.h"
  11. Download patch tests/ktartest.cpp

    --- 5.62.0-1/tests/ktartest.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/tests/ktartest.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* * Copyright (C) 2002 - 2005 David Faure <faure@kde.org> * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License version 2 as published by the Free Software Foundation; - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * SPDX-License-Identifier: LGPL-2.0-only */ #include "ktar.h"
  12. Download patch autotests/kfiltertest.h

    --- 5.62.0-1/autotests/kfiltertest.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/autotests/kfiltertest.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* - * Copyright (C) 2002-2005 David Faure <faure@kde.org> + * SPDX-FileCopyrightText: 2002-2005 David Faure <faure@kde.org> * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License version 2 as published by the Free Software Foundation; - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * SPDX-License-Identifier: LGPL-2.0-only */ #ifndef KFILTERTEST_H #define KFILTERTEST_H
  13. Download patch autotests/kcompressiondevicetest.cpp

    --- 5.62.0-1/autotests/kcompressiondevicetest.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/autotests/kcompressiondevicetest.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,7 @@ /* This file is part of the KDE project - Copyright (C) 2015 Luiz Romário Santana Rios <luizromario@gmail.com> + SPDX-FileCopyrightText: 2015 Luiz Romário Santana Rios <luizromario@gmail.com> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #include "kcompressiondevicetest.h"
  14. Download patch LICENSES/LicenseRef-KDE-Accepted-LGPL.txt

    --- 5.62.0-1/LICENSES/LicenseRef-KDE-Accepted-LGPL.txt 1970-01-01 00:00:00.000000000 +0000 +++ 5.68.0-0ubuntu1/LICENSES/LicenseRef-KDE-Accepted-LGPL.txt 2020-03-07 08:50:07.000000000 +0000 @@ -0,0 +1,12 @@ +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 3 of the license or (at your option) any later version +that is accepted by the membership of KDE e.V. (or its successor +approved by the membership of KDE e.V.), which shall act as a +proxy as defined in Section 6 of version 3 of the license. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. \ No newline at end of file
  15. Download patch karchive.categories

    --- 5.62.0-1/karchive.categories 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/karchive.categories 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -kf5.karchive KArchive DEFAULT_SEVERITY [WARNING] IDENTIFIER [KArchiveLog]
  16. Download patch autotests/kcompressiondevicetest.h

    --- 5.62.0-1/autotests/kcompressiondevicetest.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/autotests/kcompressiondevicetest.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,7 @@ /* This file is part of the KDE project - Copyright (C) 2015 Luiz Romário Santana Rios <luizromario@gmail.com> + SPDX-FileCopyrightText: 2015 Luiz Romário Santana Rios <luizromario@gmail.com> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef KCOMPRESSIONDEVICETEST_H
  17. Download patch src/k7zip.h

    --- 5.62.0-1/src/k7zip.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/k7zip.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2011 Mario Bensi <mbensi@ipsquad.net> + SPDX-FileCopyrightText: 2011 Mario Bensi <mbensi@ipsquad.net> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef K7ZIP_H #define K7ZIP_H
  18. Download patch src/krcc.cpp

    --- 5.62.0-1/src/krcc.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/krcc.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,21 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2014 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2014 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or modify - it under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2 of the License or - ( at your option ) version 3 or, at the discretion of KDE e.V. - ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #include "krcc.h"
  19. Download patch autotests/deprecatedtest.cpp

    --- 5.62.0-1/autotests/deprecatedtest.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/autotests/deprecatedtest.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,26 +1,13 @@ /* This file is part of the KDE project - Copyright (C) 2006, 2010 David Faure <faure@kde.org> - Copyright (C) 2012 Mario Bensi <mbensi@ipsquad.net> + SPDX-FileCopyrightText: 2006, 2010 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2012 Mario Bensi <mbensi@ipsquad.net> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #include <kzip.h> -#include <QtTest> +#include <QTest> static const char s_zipFileName[] = "deprecatedtest.zip"; @@ -28,7 +15,7 @@ class DeprecatedTest : public QObject { Q_OBJECT -#ifndef KARCHIVE_NO_DEPRECATED +#if KARCHIVE_ENABLE_DEPRECATED_SINCE(5, 0) private Q_SLOTS: void testKArchiveWriteFile() {
  20. Download patch debian/libkf5archive-dev.acc.in

    --- 5.62.0-1/debian/libkf5archive-dev.acc.in 2019-09-20 17:12:52.000000000 +0000 +++ 5.68.0-0ubuntu1/debian/libkf5archive-dev.acc.in 2020-03-25 20:55:41.000000000 +0000 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version='1.0' encoding='utf-8'?> <descriptor> <version> @@ -15,6 +15,7 @@ <gcc_options> -fPIC + -fno-keep-inline-functions -std=c++11 </gcc_options>
  21. Download patch src/karchiveentry.h

    --- 5.62.0-1/src/karchiveentry.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/karchiveentry.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,22 +1,10 @@ /* This file is part of the KDE libraries - Copyright (C) 2000-2005 David Faure <faure@kde.org> - Copyright (C) 2003 Leo Savernik <l.savernik@aon.at> + SPDX-FileCopyrightText: 2000-2005 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2003 Leo Savernik <l.savernik@aon.at> Moved from ktar.h by Roberto Teixeira <maragato@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef KARCHIVEENTRY_H #define KARCHIVEENTRY_H
  22. Download patch debian/control

    --- 5.62.0-1/debian/control 2019-09-20 17:12:52.000000000 +0000 +++ 5.68.0-0ubuntu1/debian/control 2020-03-25 20:55:41.000000000 +0000 @@ -3,31 +3,31 @@ Section: libs Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Maximiliano Curia <maxy@debian.org> -Build-Depends: cmake (>= 3.5~), +Build-Depends: cmake (>= 3.0~), debhelper (>= 11~), doxygen, - extra-cmake-modules (>= 5.62.0~), + extra-cmake-modules (>= 5.68.0~), graphviz, libbz2-dev, liblzma-dev, libqt5sql5-sqlite:native, pkg-kde-tools (>= 0.15.16~), - qtbase5-dev (>= 5.11.0~), - qttools5-dev, + qtbase5-dev (>= 5.8.0~), qttools5-dev-tools (>= 5.4), zlib1g-dev, Standards-Version: 4.1.4 Homepage: https://projects.kde.org/projects/frameworks/karchive -Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/karchive -Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/karchive.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/karchive +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/karchive Package: libkf5archive-dev -Section: libdevel Architecture: any +Section: libdevel Depends: libkf5archive5 (= ${binary:Version}), - qtbase5-dev (>= 5.11.0~), + qtbase5-dev (>= 5.8.0~), ${misc:Depends}, Recommends: libkf5archive-doc (= ${source:Version}) +Breaks: kdoctools-dev (<< 5.28) Description: development files for karchive Karchive is a Qt 5 addon providing access to numerous types of archives. . @@ -40,15 +40,11 @@ Description: development files for karch This package is part of KDE Frameworks 5. . This package contains the development files. -Breaks: kdoctools-dev (<< 5.28), - libkf5doctools-dev (<< 5.54), - libkf5emoticons-dev (<< 5.54), - libkf5khtml-dev (<< 5.54), - libkf5newstuff-dev (<< 5.54), Package: libkf5archive-doc Architecture: all Multi-Arch: foreign +Section: doc Depends: ${misc:Depends} Description: Qt 5 addon providing access to numerous types of archives (documentation) KArchive provides classes for easy reading, creation and manipulation of @@ -60,7 +56,6 @@ Description: Qt 5 addon providing access This package is part of KDE Frameworks 5. . This package contains the qch documentation files. -Section: doc Package: libkf5archive5 Architecture: any @@ -74,18 +69,3 @@ Description: Qt 5 addon providing access GZip format, via a subclass of QIODevice. . This package is part of KDE Frameworks 5. -Breaks: kdoctools5 (<< 5.54), - kimageformat-plugins (<< 5.54), - kio (<< 5.54), - kpackagetool5 (<< 5.54), - libkf5doctools5 (<< 5.54), - libkf5emoticons5 (<< 5.54), - libkf5filemetadata-bin (<< 5.54), - libkf5iconthemes5 (<< 5.54), - libkf5khtml-bin (<< 5.54), - libkf5khtml5 (<< 5.54), - libkf5newstuff5 (<< 5.54), - libkf5newstuffcore5 (<< 5.54), - libkf5package5 (<< 5.54), - libkf5plasma5 (<< 5.54), - libkf5texteditor5 (<< 5.54),
  23. Download patch tests/krcctest.cpp

    --- 5.62.0-1/tests/krcctest.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/tests/krcctest.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* * Copyright (C) 2002 - 2014 David Faure <faure@kde.org> * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License version 2 as published by the Free Software Foundation; - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * SPDX-License-Identifier: LGPL-2.0-only */ #include "krcc.h"
  24. Download patch LICENSES/LGPL-3.0-only.txt

    --- 5.62.0-1/LICENSES/LGPL-3.0-only.txt 1970-01-01 00:00:00.000000000 +0000 +++ 5.68.0-0ubuntu1/LICENSES/LGPL-3.0-only.txt 2020-03-07 08:50:07.000000000 +0000 @@ -0,0 +1,163 @@ +GNU LESSER GENERAL PUBLIC LICENSE + +Version 3, 29 June 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +This version of the GNU Lesser General Public License incorporates the terms +and conditions of version 3 of the GNU General Public License, supplemented +by the additional permissions listed below. + + 0. Additional Definitions. + + + +As used herein, "this License" refers to version 3 of the GNU Lesser General +Public License, and the "GNU GPL" refers to version 3 of the GNU General Public +License. + + + +"The Library" refers to a covered work governed by this License, other than +an Application or a Combined Work as defined below. + + + +An "Application" is any work that makes use of an interface provided by the +Library, but which is not otherwise based on the Library. Defining a subclass +of a class defined by the Library is deemed a mode of using an interface provided +by the Library. + + + +A "Combined Work" is a work produced by combining or linking an Application +with the Library. The particular version of the Library with which the Combined +Work was made is also called the "Linked Version". + + + +The "Minimal Corresponding Source" for a Combined Work means the Corresponding +Source for the Combined Work, excluding any source code for portions of the +Combined Work that, considered in isolation, are based on the Application, +and not on the Linked Version. + + + +The "Corresponding Application Code" for a Combined Work means the object +code and/or source code for the Application, including any data and utility +programs needed for reproducing the Combined Work from the Application, but +excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + +You may convey a covered work under sections 3 and 4 of this License without +being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + +If you modify a copy of the Library, and, in your modifications, a facility +refers to a function or data to be supplied by an Application that uses the +facility (other than as an argument passed when the facility is invoked), +then you may convey a copy of the modified version: + +a) under this License, provided that you make a good faith effort to ensure +that, in the event an Application does not supply the function or data, the +facility still operates, and performs whatever part of its purpose remains +meaningful, or + +b) under the GNU GPL, with none of the additional permissions of this License +applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + +The object code form of an Application may incorporate material from a header +file that is part of the Library. You may convey such object code under terms +of your choice, provided that, if the incorporated material is not limited +to numerical parameters, data structure layouts and accessors, or small macros, +inline functions and templates (ten or fewer lines in length), you do both +of the following: + +a) Give prominent notice with each copy of the object code that the Library +is used in it and that the Library and its use are covered by this License. + +b) Accompany the object code with a copy of the GNU GPL and this license document. + + 4. Combined Works. + +You may convey a Combined Work under terms of your choice that, taken together, +effectively do not restrict modification of the portions of the Library contained +in the Combined Work and reverse engineering for debugging such modifications, +if you also do each of the following: + +a) Give prominent notice with each copy of the Combined Work that the Library +is used in it and that the Library and its use are covered by this License. + +b) Accompany the Combined Work with a copy of the GNU GPL and this license +document. + +c) For a Combined Work that displays copyright notices during execution, include +the copyright notice for the Library among these notices, as well as a reference +directing the user to the copies of the GNU GPL and this license document. + + d) Do one of the following: + +0) Convey the Minimal Corresponding Source under the terms of this License, +and the Corresponding Application Code in a form suitable for, and under terms +that permit, the user to recombine or relink the Application with a modified +version of the Linked Version to produce a modified Combined Work, in the +manner specified by section 6 of the GNU GPL for conveying Corresponding Source. + +1) Use a suitable shared library mechanism for linking with the Library. A +suitable mechanism is one that (a) uses at run time a copy of the Library +already present on the user's computer system, and (b) will operate properly +with a modified version of the Library that is interface-compatible with the +Linked Version. + +e) Provide Installation Information, but only if you would otherwise be required +to provide such information under section 6 of the GNU GPL, and only to the +extent that such information is necessary to install and execute a modified +version of the Combined Work produced by recombining or relinking the Application +with a modified version of the Linked Version. (If you use option 4d0, the +Installation Information must accompany the Minimal Corresponding Source and +Corresponding Application Code. If you use option 4d1, you must provide the +Installation Information in the manner specified by section 6 of the GNU GPL +for conveying Corresponding Source.) + + 5. Combined Libraries. + +You may place library facilities that are a work based on the Library side +by side in a single library together with other library facilities that are +not Applications and are not covered by this License, and convey such a combined +library under terms of your choice, if you do both of the following: + +a) Accompany the combined library with a copy of the same work based on the +Library, uncombined with any other library facilities, conveyed under the +terms of this License. + +b) Give prominent notice with the combined library that part of it is a work +based on the Library, and explaining where to find the accompanying uncombined +form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + +The Free Software Foundation may publish revised and/or new versions of the +GNU Lesser General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to address +new problems or concerns. + +Each version is given a distinguishing version number. If the Library as you +received it specifies that a certain numbered version of the GNU Lesser General +Public License "or any later version" applies to it, you have the option of +following the terms and conditions either of that published version or of +any later version published by the Free Software Foundation. If the Library +as you received it does not specify a version number of the GNU Lesser General +Public License, you may choose any version of the GNU Lesser General Public +License ever published by the Free Software Foundation. + +If the Library as you received it specifies that a proxy can decide whether +future versions of the GNU Lesser General Public License shall apply, that +proxy's public statement of acceptance of any version is permanent authorization +for you to choose that version for the Library.
  25. Download patch src/karchive_p.h

    --- 5.62.0-1/src/karchive_p.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/karchive_p.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,8 @@ /* This file is part of the KDE libraries - Copyright (C) 2000-2005 David Faure <faure@kde.org> - Copyright (C) 2003 Leo Savernik <l.savernik@aon.at> + SPDX-FileCopyrightText: 2000-2005 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2003 Leo Savernik <l.savernik@aon.at> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef KARCHIVE_P_H
  26. Download patch src/karchive.cpp

    --- 5.62.0-1/src/karchive.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/karchive.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,22 +1,10 @@ /* This file is part of the KDE libraries - Copyright (C) 2000-2005 David Faure <faure@kde.org> - Copyright (C) 2003 Leo Savernik <l.savernik@aon.at> + SPDX-FileCopyrightText: 2000-2005 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2003 Leo Savernik <l.savernik@aon.at> Moved from ktar.cpp by Roberto Teixeira <maragato@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #include "karchive.h" @@ -290,13 +278,13 @@ bool KArchive::addLocalFile(const QStrin setErrorString( tr("Failed accessing the file %1 for adding to the archive. The error was: %2") .arg(fileName) - .arg(QLatin1Literal{strerror(errno)})); + .arg(QLatin1String{strerror(errno)})); return false; } if (fileInfo.isSymLink()) { QString symLinkTarget; - // Do NOT use fileInfo.readLink() for unix symlinks! + // Do NOT use fileInfo.symLinkTarget() for unix symlinks! // It returns the -full- path to the target, while we want the target string "as is". #if defined(Q_OS_UNIX) && !defined(Q_OS_OS2EMX) const QByteArray encodedFileName = QFile::encodeName(fileName); @@ -321,7 +309,7 @@ bool KArchive::addLocalFile(const QStrin } return writeSymLink(destName, symLinkTarget, fileInfo.owner(), fileInfo.group(), fi.st_mode, fileInfo.lastRead(), fileInfo.lastModified(), - fileInfo.created()); + fileInfo.birthTime()); }/*end if*/ qint64 size = fileInfo.size(); @@ -338,7 +326,7 @@ bool KArchive::addLocalFile(const QStrin } if (!prepareWriting(destName, fileInfo.owner(), fileInfo.group(), size, - fi.st_mode, fileInfo.lastRead(), fileInfo.lastModified(), fileInfo.created())) { + fi.st_mode, fileInfo.lastRead(), fileInfo.lastModified(), fileInfo.birthTime())) { //qCWarning(KArchiveLog) << " prepareWriting" << destName << "failed"; return false; } @@ -645,7 +633,7 @@ QDateTime KArchivePrivate::time_tToDateT if (time_t == uint(-1)) { return QDateTime(); } - return QDateTime::fromTime_t(time_t); + return QDateTime::fromSecsSinceEpoch(time_t); } //////////////////////////////////////////////////////////////////////// @@ -825,6 +813,10 @@ bool KArchiveFile::copyTo(const QString QFile f(dest + QLatin1Char('/') + name()); if (f.open(QIODevice::ReadWrite | QIODevice::Truncate)) { QIODevice *inputDev = createDevice(); + if (!inputDev) { + f.remove(); + return false; + } // Read and write data in chunks to minimize memory usage const qint64 chunkSize = 1024 * 1024;
  27. Download patch debian/libkf5archive5.symbols

    --- 5.62.0-1/debian/libkf5archive5.symbols 2019-09-20 17:12:52.000000000 +0000 +++ 5.68.0-0ubuntu1/debian/libkf5archive5.symbols 2020-03-25 20:55:41.000000000 +0000 @@ -1,8 +1,8 @@ -# SymbolsHelper-Confirmed: 5.61.0 amd64 +# SymbolsHelper-Confirmed: 5.58.0 amd64 arm64 armhf i386 ppc64el s390x libKF5Archive.so.5 libkf5archive5 #MINVER# - _ZN10KFilterDev11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.61.0 - _ZN10KFilterDev11qt_metacastEPKc@Base 5.61.0 - _ZN10KFilterDev16staticMetaObjectE@Base 5.61.0 + _ZN10KFilterDev11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.57.0 + _ZN10KFilterDev11qt_metacastEPKc@Base 5.57.0 + _ZN10KFilterDev16staticMetaObjectE@Base 5.57.0 _ZN10KFilterDev26compressionTypeForMimeTypeERK7QString@Base 4.96.0 _ZN10KFilterDevC1ERK7QString@Base 4.96.0 _ZN10KFilterDevC2ERK7QString@Base 4.96.0 @@ -48,7 +48,7 @@ libKF5Archive.so.5 libkf5archive5 #MINVE (optional=gccinternal)_ZN14K7ZipFileEntryD0Ev@Base 4.96.0 (optional=gccinternal)_ZN14K7ZipFileEntryD1Ev@Base 4.96.0 (optional=gccinternal)_ZN14K7ZipFileEntryD2Ev@Base 4.96.0 - _ZN17KArchiveDirectory10addEntryV2EP13KArchiveEntry@Base 5.61.0 + _ZN17KArchiveDirectory10addEntryV2EP13KArchiveEntry@Base 5.58.0 _ZN17KArchiveDirectory11removeEntryEP13KArchiveEntry@Base 4.96.0 _ZN17KArchiveDirectory12virtual_hookEiPv@Base 4.96.0 _ZN17KArchiveDirectory8addEntryEP13KArchiveEntry@Base 4.96.0 @@ -175,7 +175,7 @@ libKF5Archive.so.5 libkf5archive5 #MINVE _ZN8KArchive13finishWritingEx@Base 4.96.0 (optional=gccinternal|arch=!kfreebsd-any)_ZN8KArchive14prepareWritingERK7QStringS2_S2_xjRK9QDateTimeS5_S5_@Base 4.96.0 (optional=gccinternal|arch=kfreebsd-any)_ZN8KArchive14prepareWritingERK7QStringS2_S2_xtRK9QDateTimeS5_S5_@Base 5.11.0 - _ZN8KArchive14setErrorStringERK7QString@Base 5.35.0 + _ZN8KArchive14setErrorStringERK7QString@Base 5.30.0 _ZN8KArchive17addLocalDirectoryERK7QStringS2_@Base 4.96.0 _ZN8KArchive4openE6QFlagsIN9QIODevice12OpenModeFlagEE@Base 4.96.0 _ZN8KArchive5closeEv@Base 4.96.0 @@ -193,7 +193,7 @@ libKF5Archive.so.5 libkf5archive5 #MINVE _ZN8KArchiveD0Ev@Base 4.96.0 _ZN8KArchiveD1Ev@Base 4.96.0 _ZN8KArchiveD2Ev@Base 4.96.0 - _ZNK10KFilterDev10metaObjectEv@Base 5.61.0 + _ZNK10KFilterDev10metaObjectEv@Base 5.57.0 _ZNK11KFilterBase11filterFlagsEv@Base 4.96.0 _ZNK11KFilterBase13inBufferEmptyEv@Base 4.96.0 _ZNK11KFilterBase13outBufferFullEv@Base 4.96.0 @@ -232,7 +232,7 @@ libKF5Archive.so.5 libkf5archive5 #MINVE _ZNK18KCompressionDevice5errorEv@Base 5.50.0 _ZNK4KZip10extraFieldEv@Base 4.96.0 _ZNK4KZip11compressionEv@Base 4.96.0 - _ZNK8KArchive11errorStringEv@Base 5.35.0 + _ZNK8KArchive11errorStringEv@Base 5.30.0 _ZNK8KArchive4modeEv@Base 4.96.0 _ZNK8KArchive6deviceEv@Base 4.96.0 _ZNK8KArchive6isOpenEv@Base 4.96.0
  28. Download patch CMakeLists.txt

    --- 5.62.0-1/CMakeLists.txt 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/CMakeLists.txt 2020-03-07 08:50:07.000000000 +0000 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.62.0") # handled by release scripts +set(KF5_VERSION "5.68.0") # handled by release scripts project(KArchive VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.62.0 NO_MODULE) -set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") +find_package(ECM 5.68.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) @@ -15,10 +15,9 @@ include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) +include(ECMGenerateExportHeader) -include(GenerateExportHeader) - -set(REQUIRED_QT_VERSION 5.11.0) +set(REQUIRED_QT_VERSION 5.12.0) find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(ZLIB) @@ -52,6 +51,8 @@ include(ECMGenerateHeaders) include(ECMQtDeclareLoggingCategory) include(ECMAddQch) +set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") + option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") @@ -61,6 +62,7 @@ ecm_setup_version(PROJECT PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ArchiveConfigVersion.cmake" SOVERSION 5) add_definitions(-DQT_NO_FOREACH) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) add_subdirectory(src) if (BUILD_TESTING) @@ -104,6 +106,4 @@ install(EXPORT KF5ArchiveTargets FILE KF5ArchiveTargets.cmake NAMESPACE KF5::) -install(FILES karchive.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
  29. Download patch src/kar.cpp

    --- 5.62.0-1/src/kar.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kar.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2002 Laurence Anderson <l.d.anderson@warwick.ac.uk> + SPDX-FileCopyrightText: 2002 Laurence Anderson <l.d.anderson@warwick.ac.uk> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #include "kar.h"
  30. Download patch .gitignore

    --- 5.62.0-1/.gitignore 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/.gitignore 2020-03-07 08:50:07.000000000 +0000 @@ -18,3 +18,4 @@ random_seed /build*/ CMakeLists.txt.user* *.unc-backup* +.cmake/
  31. Download patch examples/unzipper/main.cpp

    --- 5.62.0-1/examples/unzipper/main.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/examples/unzipper/main.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,29 +1,8 @@ /* This file is part of the KDE project - Copyright (C) 2014 Maarten De Meyer <de.meyer.maarten@gmail.com> + SPDX-FileCopyrightText: 2014 Maarten De Meyer <de.meyer.maarten@gmail.com> - You may use this file under the terms of the BSD license as follows: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + SPDX-License-Identifier: BSD-2-Clause */ /*
  32. Download patch src/knonefilter.h

    --- 5.62.0-1/src/knonefilter.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/knonefilter.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,23 +1,10 @@ /* This file is part of the KDE libraries - Copyright (C) 2011 Mario Bensi <mbensi@ipsquad.net> + SPDX-FileCopyrightText: 2011 Mario Bensi <mbensi@ipsquad.net> Based on kbzip2filter: - Copyright (C) 2000, 2009 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2000, 2009 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef __knonefilter__h
  33. Download patch src/kfilterbase.cpp

    --- 5.62.0-1/src/kfilterbase.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kfilterbase.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2000-2005 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2000-2005 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #include "kfilterbase.h"
  34. Download patch tests/kartest.cpp

    --- 5.62.0-1/tests/kartest.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/tests/kartest.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,7 @@ /* This file is part of the KDE project - Copyright (C) 2002-2019 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2002-2019 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #include "kar.h"
  35. Download patch autotests/karchivetest.h

    --- 5.62.0-1/autotests/karchivetest.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/autotests/karchivetest.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,21 +1,8 @@ /* This file is part of the KDE project - Copyright (C) 2006 David Faure <faure@kde.org> - Copyright (C) 2012 Mario Bensi <mbensi@ipsquad.net> + SPDX-FileCopyrightText: 2006 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2012 Mario Bensi <mbensi@ipsquad.net> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef KARCHIVETEST_H
  36. Download patch debian/salsa-ci.yml

    --- 5.62.0-1/debian/salsa-ci.yml 2019-09-20 17:12:52.000000000 +0000 +++ 5.68.0-0ubuntu1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml -variables: - SALSA_CI_DISABLE_MISSING_BREAKS: 'no' - SALSA_CI_DISABLE_RC_BUGS: 'no' - SALSA_CI_REPROTEST_ARGS: '--variations=-build-path'
  37. Download patch LICENSES/LGPL-2.0-or-later.txt
  38. Download patch examples/tarlocalfiles/main.cpp

    --- 5.62.0-1/examples/tarlocalfiles/main.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/examples/tarlocalfiles/main.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,29 +1,8 @@ /* This file is part of the KDE project - Copyright (C) 2013 Maarten De Meyer <de.meyer.maarten@gmail.com> + SPDX-FileCopyrightText: 2013 Maarten De Meyer <de.meyer.maarten@gmail.com> - You may use this file under the terms of the BSD license as follows: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + SPDX-License-Identifier: BSD-2-Clause */ /*
  39. Download patch src/kcompressiondevice.h

    --- 5.62.0-1/src/kcompressiondevice.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kcompressiondevice.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,8 @@ /* This file is part of the KDE libraries - Copyright (C) 2000 David Faure <faure@kde.org> - Copyright (C) 2011 Mario Bensi <mbensi@ipsquad.net> + SPDX-FileCopyrightText: 2000 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2011 Mario Bensi <mbensi@ipsquad.net> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef __kcompressiondevice_h #define __kcompressiondevice_h
  40. Download patch src/kbzip2filter.cpp

    --- 5.62.0-1/src/kbzip2filter.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kbzip2filter.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2000-2005 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2000-2005 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #include "kbzip2filter.h"
  41. Download patch examples/helloworld/main.cpp

    --- 5.62.0-1/examples/helloworld/main.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/examples/helloworld/main.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,29 +1,8 @@ /* This file is part of the KDE project - Copyright (C) 2013 Maarten De Meyer <de.meyer.maarten@gmail.com> + SPDX-FileCopyrightText: 2013 Maarten De Meyer <de.meyer.maarten@gmail.com> - You may use this file under the terms of the BSD license as follows: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + SPDX-License-Identifier: BSD-2-Clause */ /*
  42. Download patch src/ktar.cpp

    --- 5.62.0-1/src/ktar.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/ktar.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,8 @@ /* This file is part of the KDE libraries - Copyright (C) 2000 David Faure <faure@kde.org> - Copyright (C) 2003 Leo Savernik <l.savernik@aon.at> + SPDX-FileCopyrightText: 2000 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2003 Leo Savernik <l.savernik@aon.at> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #include "ktar.h"
  43. Download patch src/kzipfileentry.h

    --- 5.62.0-1/src/kzipfileentry.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kzipfileentry.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2002 Holger Schroeder <holger-kde@holgis.net> + SPDX-FileCopyrightText: 2002 Holger Schroeder <holger-kde@holgis.net> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef KZIPFILEENTRY_H
  44. Download patch src/kzip.cpp

    --- 5.62.0-1/src/kzip.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kzip.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,8 @@ /* This file is part of the KDE libraries - Copyright (C) 2000 David Faure <faure@kde.org> - Copyright (C) 2002 Holger Schroeder <holger-kde@holgis.net> + SPDX-FileCopyrightText: 2000 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2002 Holger Schroeder <holger-kde@holgis.net> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #include "kzip.h" @@ -77,7 +65,7 @@ static uint transformFromMsDos(const cha QDate qd(y, o, d); QDateTime dt(qd, qt); - return dt.toTime_t(); + return dt.toSecsSinceEpoch(); } // == parsing routines for zip headers @@ -968,7 +956,7 @@ bool KZip::closeArchive() extfield[4] = 1 | 2 | 4; // specify flags from local field // (unless I misread the spec) // provide only modification time - unsigned long time = (unsigned long)it.value()->date().toTime_t(); + unsigned long time = (unsigned long)it.value()->date().toSecsSinceEpoch(); extfield[5] = char(time); extfield[6] = char(time >> 8); extfield[7] = char(time >> 16); @@ -1078,9 +1066,9 @@ bool KZip::doPrepareWriting(const QStrin return false; } - uint atime = accessTime.toTime_t(); - uint mtime = modificationTime.toTime_t(); - uint ctime = creationTime.toTime_t(); + uint atime = accessTime.toSecsSinceEpoch(); + uint mtime = modificationTime.toSecsSinceEpoch(); + uint ctime = creationTime.toSecsSinceEpoch(); // Find or create parent dir KArchiveDirectory *parentDir = rootDir();
  45. Download patch src/kgzipfilter.cpp

    --- 5.62.0-1/src/kgzipfilter.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kgzipfilter.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2000-2005 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2000-2005 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #include "kgzipfilter.h"
  46. Download patch src/klimitediodevice_p.h

    --- 5.62.0-1/src/klimitediodevice_p.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/klimitediodevice_p.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2001, 2002, 2007 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2001, 2002, 2007 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef klimitediodevice_p_h
  47. Download patch src/klimitediodevice.cpp

    --- 5.62.0-1/src/klimitediodevice.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/klimitediodevice.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2001, 2002, 2007 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2001, 2002, 2007 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #include "klimitediodevice_p.h"
  48. Download patch src/kxzfilter.h

    --- 5.62.0-1/src/kxzfilter.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kxzfilter.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,23 +1,10 @@ /* This file is part of the KDE libraries - Copyright (C) 2007-2008 Per Øyvind Karlsen <peroyvind@mandriva.org> + SPDX-FileCopyrightText: 2007-2008 Per Øyvind Karlsen <peroyvind@mandriva.org> Based on kbzip2filter: - Copyright (C) 2000 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2000 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef KXZFILTER_H
  49. Download patch debian/libkf5archive5.maintscript

    --- 5.62.0-1/debian/libkf5archive5.maintscript 2019-09-20 17:12:52.000000000 +0000 +++ 5.68.0-0ubuntu1/debian/libkf5archive5.maintscript 2020-03-25 20:55:41.000000000 +0000 @@ -1 +1 @@ -rm_conffile /etc/xdg/karchive.categories 5.61.0-1~~ +rm_conffile /etc/xdg/karchive.categories
  50. Download patch src/kzip.h

    --- 5.62.0-1/src/kzip.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kzip.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2002 Holger Schroeder <holger-kde@holgis.net> + SPDX-FileCopyrightText: 2002 Holger Schroeder <holger-kde@holgis.net> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef KZIP_H #define KZIP_H
  51. Download patch src/kar.h

    --- 5.62.0-1/src/kar.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kar.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2002 Laurence Anderson <l.d.anderson@warwick.ac.uk> + SPDX-FileCopyrightText: 2002 Laurence Anderson <l.d.anderson@warwick.ac.uk> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef KAR_H #define KAR_H
  52. Download patch autotests/klimitediodevicetest.cpp

    --- 5.62.0-1/autotests/klimitediodevicetest.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/autotests/klimitediodevicetest.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,27 +1,14 @@ /* This file is part of the KDE project - Copyright (C) 2009 Pino Toscano <pino@kde.org> + SPDX-FileCopyrightText: 2009 Pino Toscano <pino@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #include "klimitediodevicetest.h" #include "klimitediodevice_p.h" -#include <QtTest> +#include <QTest> QTEST_MAIN(KLimitedIODeviceTest)
  53. Download patch src/kcompressiondevice_p.h

    --- 5.62.0-1/src/kcompressiondevice_p.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kcompressiondevice_p.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,8 @@ /* This file is part of the KDE libraries - Copyright (C) 2000 David Faure <faure@kde.org> - Copyright (C) 2011 Mario Bensi <mbensi@ipsquad.net> + SPDX-FileCopyrightText: 2000 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2011 Mario Bensi <mbensi@ipsquad.net> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef __kcompressiondevice_p_h #define __kcompressiondevice_p_h
  54. Download patch src/kcompressiondevice.cpp

    --- 5.62.0-1/src/kcompressiondevice.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kcompressiondevice.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,8 @@ /* This file is part of the KDE libraries - Copyright (C) 2000 David Faure <faure@kde.org> - Copyright (C) 2011 Mario Bensi <mbensi@ipsquad.net> + SPDX-FileCopyrightText: 2000 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2011 Mario Bensi <mbensi@ipsquad.net> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #include "kcompressiondevice.h"
  55. Download patch src/karchivedirectory.h

    --- 5.62.0-1/src/karchivedirectory.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/karchivedirectory.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,22 +1,10 @@ /* This file is part of the KDE libraries - Copyright (C) 2000-2005 David Faure <faure@kde.org> - Copyright (C) 2003 Leo Savernik <l.savernik@aon.at> + SPDX-FileCopyrightText: 2000-2005 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2003 Leo Savernik <l.savernik@aon.at> Moved from ktar.h by Roberto Teixeira <maragato@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef KARCHIVEDIRECTORY_H #define KARCHIVEDIRECTORY_H
  56. Download patch autotests/klimitediodevicetest.h

    --- 5.62.0-1/autotests/klimitediodevicetest.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/autotests/klimitediodevicetest.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,7 @@ /* This file is part of the KDE project - Copyright (C) 2009 Pino Toscano <pino@kde.org> + SPDX-FileCopyrightText: 2009 Pino Toscano <pino@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef KLIMITEDIODEVICETEST_H
  57. Download patch src/kxzfilter.cpp

    --- 5.62.0-1/src/kxzfilter.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kxzfilter.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,23 +1,10 @@ /* This file is part of the KDE libraries - Copyright (C) 2007-2008 Per Øyvind Karlsen <peroyvind@mandriva.org> + SPDX-FileCopyrightText: 2007-2008 Per Øyvind Karlsen <peroyvind@mandriva.org> Based on kbzip2filter: - Copyright (C) 2000-2005 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2000-2005 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #include "kxzfilter.h" @@ -45,8 +32,6 @@ public: } lzma_stream zStream; - lzma_filter filters[5]; - unsigned char props[5]; int mode; bool isInitialized; KXzFilter::Flag flag; @@ -68,6 +53,13 @@ bool KXzFilter::init(int mode) return init(mode, AUTO, props); } +static void freeFilters(lzma_filter filters[]) +{ + for (int i = 0; filters[i].id != LZMA_VLI_UNKNOWN; i++) { + free(filters[i].options); + } +} + bool KXzFilter::init(int mode, Flag flag, const QVector<unsigned char> &properties) { if (d->isInitialized) { @@ -79,6 +71,10 @@ bool KXzFilter::init(int mode, Flag flag d->zStream.next_in = nullptr; d->zStream.avail_in = 0; if (mode == QIODevice::ReadOnly) { + // TODO when we can depend on Qt 5.12 Use a QScopeGuard to call freeFilters + lzma_filter filters[5]; + filters[0].id = LZMA_VLI_UNKNOWN; + switch (flag) { case AUTO: /* We set the memlimit for decompression to 100MiB which should be @@ -91,10 +87,10 @@ bool KXzFilter::init(int mode, Flag flag } break; case LZMA: { - d->filters[0].id = LZMA_FILTER_LZMA1; - d->filters[0].options = nullptr; - d->filters[1].id = LZMA_VLI_UNKNOWN; - d->filters[1].options = nullptr; + filters[0].id = LZMA_FILTER_LZMA1; + filters[0].options = nullptr; + filters[1].id = LZMA_VLI_UNKNOWN; + filters[1].options = nullptr; Q_ASSERT(properties.size() == 5); unsigned char props[5]; @@ -102,46 +98,49 @@ bool KXzFilter::init(int mode, Flag flag props[i] = properties[i]; } - result = lzma_properties_decode(&d->filters[0], nullptr, props, sizeof (props)); + result = lzma_properties_decode(&filters[0], nullptr, props, sizeof (props)); if (result != LZMA_OK) { qCWarning(KArchiveLog) << "lzma_properties_decode returned" << result; + freeFilters(filters); return false; } break; } case LZMA2: { - d->filters[0].id = LZMA_FILTER_LZMA2; - d->filters[0].options = nullptr; - d->filters[1].id = LZMA_VLI_UNKNOWN; - d->filters[1].options = nullptr; + filters[0].id = LZMA_FILTER_LZMA2; + filters[0].options = nullptr; + filters[1].id = LZMA_VLI_UNKNOWN; + filters[1].options = nullptr; Q_ASSERT(properties.size() == 1); unsigned char props[1]; props[0] = properties[0]; - result = lzma_properties_decode(&d->filters[0], nullptr, props, sizeof (props)); + result = lzma_properties_decode(&filters[0], nullptr, props, sizeof (props)); if (result != LZMA_OK) { qCWarning(KArchiveLog) << "lzma_properties_decode returned" << result; + freeFilters(filters); return false; } break; } case BCJ: { - d->filters[0].id = LZMA_FILTER_X86; - d->filters[0].options = nullptr; + filters[0].id = LZMA_FILTER_X86; + filters[0].options = nullptr; unsigned char props[5] = { 0x5d, 0x00, 0x00, 0x08, 0x00 } ; - d->filters[1].id = LZMA_FILTER_LZMA1; - d->filters[1].options = nullptr; - result = lzma_properties_decode(&d->filters[1], nullptr, props, sizeof (props)); + filters[1].id = LZMA_FILTER_LZMA1; + filters[1].options = nullptr; + result = lzma_properties_decode(&filters[1], nullptr, props, sizeof (props)); if (result != LZMA_OK) { qCWarning(KArchiveLog) << "lzma_properties_decode1 returned" << result; + freeFilters(filters); return false; } - d->filters[2].id = LZMA_VLI_UNKNOWN; - d->filters[2].options = nullptr; + filters[2].id = LZMA_VLI_UNKNOWN; + filters[2].options = nullptr; break; } @@ -155,27 +154,30 @@ bool KXzFilter::init(int mode, Flag flag } if (flag != AUTO) { - result = lzma_raw_decoder(&d->zStream, d->filters); + result = lzma_raw_decoder(&d->zStream, filters); if (result != LZMA_OK) { qCWarning(KArchiveLog) << "lzma_raw_decoder returned" << result; + freeFilters(filters); return false; } } + freeFilters(filters); } else if (mode == QIODevice::WriteOnly) { if (flag == AUTO) { result = lzma_easy_encoder(&d->zStream, LZMA_PRESET_DEFAULT, LZMA_CHECK_CRC32); } else { + lzma_filter filters[5]; if (flag == LZMA2) { lzma_options_lzma lzma_opt; lzma_lzma_preset(&lzma_opt, LZMA_PRESET_DEFAULT); - d->filters[0].id = LZMA_FILTER_LZMA2; - d->filters[0].options = &lzma_opt; - d->filters[1].id = LZMA_VLI_UNKNOWN; - d->filters[1].options = nullptr; + filters[0].id = LZMA_FILTER_LZMA2; + filters[0].options = &lzma_opt; + filters[1].id = LZMA_VLI_UNKNOWN; + filters[1].options = nullptr; } - result = lzma_raw_encoder(&d->zStream, d->filters); + result = lzma_raw_encoder(&d->zStream, filters); } if (result != LZMA_OK) { qCWarning(KArchiveLog) << "lzma_easy_encoder returned" << result;
  58. Download patch docs/Doxyfile.local

    --- 5.62.0-1/docs/Doxyfile.local 1970-01-01 00:00:00.000000000 +0000 +++ 5.68.0-0ubuntu1/docs/Doxyfile.local 2020-03-07 08:50:07.000000000 +0000 @@ -0,0 +1,7 @@ +### KApiDox Project-specific Overrides File + +# define so that deprecated API is not skipped +PREDEFINED += \ + "KARCHIVE_ENABLE_DEPRECATED_SINCE(x, y)=1" \ + "KARCHIVE_BUILD_DEPRECATED_SINCE(x, y)=1" \ + "KARCHIVE_DEPRECATED_VERSION(x, y, t)="
  59. Download patch autotests/karchivetest.cpp

    --- 5.62.0-1/autotests/karchivetest.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/autotests/karchivetest.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,21 +1,8 @@ /* This file is part of the KDE project - Copyright (C) 2006, 2010 David Faure <faure@kde.org> - Copyright (C) 2012 Mario Bensi <mbensi@ipsquad.net> + SPDX-FileCopyrightText: 2006, 2010 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2012 Mario Bensi <mbensi@ipsquad.net> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #include "karchivetest.h" @@ -25,10 +12,13 @@ #include <k7zip.h> #include <krcc.h> -#include <QtTest> +#include <QTest> +#include <QTextCodec> +#include <QSaveFile> #include <QFileInfo> #include <kfilterdev.h> #include <qtemporarydir.h> +#include <QRegularExpression> #ifndef Q_OS_WIN #include <unistd.h> // symlink @@ -314,7 +304,7 @@ static void testCopyTo(KArchive *archive const QFileInfo fileInfo5(fileName); QVERIFY(fileInfo5.exists()); QVERIFY(fileInfo5.isFile()); - // Do not use fileInfo.readLink() for unix symlinks + // Do not use fileInfo.symLinkTarget() for unix symlinks // It returns the -full- path to the target, while we want the target string "as is". QString symLinkTarget; const QByteArray encodedFileName = QFile::encodeName(fileName); @@ -493,7 +483,7 @@ void KArchiveTest::testReadTar() // test const QString owner = localFileData.owner(); const QString group = localFileData.group(); const QString emptyTime = QDateTime().toString(QStringLiteral("dd.MM.yyyy hh:mm:ss")); - const QDateTime creationTime = QFileInfo(fileName).created(); + const QDateTime creationTime = QFileInfo(fileName).birthTime(); // 1.6-1.7 ms per interaction, 2908428 instruction loads // After the "no tempfile when writing fix" this went down @@ -538,13 +528,13 @@ void KArchiveTest::testReadTar() // test // This one was added with addLocalFile, so ignore mode. QString str = listing[14]; - str.replace(QRegExp(QStringLiteral("mode.*user=")), QStringLiteral("user=")); + str.replace(QRegularExpression(QStringLiteral("mode.*user=")), QStringLiteral("user=")); compareEntryWithTimestamp(str, QString("user=%1 group=%2 path=z/test3 type=file size=13").arg(owner).arg(group), creationTime); #ifndef Q_OS_WIN str = listing[15]; - str.replace(QRegExp(QStringLiteral("mode.*path=")), QStringLiteral("path=")); + str.replace(QRegularExpression(QStringLiteral("mode.*path=")), QStringLiteral("path=")); compareEntryWithTimestamp(str, QString("path=z/test3_symlink type=file size=0 symlink=test3"), creationTime); #endif @@ -1006,11 +996,11 @@ void KArchiveTest::testReadZip() QCOMPARE(listing[14], QString("mode=40777 path=z type=dir")); // This one was added with addLocalFile, so ignore mode QString str = listing[15]; - str.replace(QRegExp(QStringLiteral("mode.*path=")), QStringLiteral("path=")); + str.replace(QRegularExpression(QStringLiteral("mode.*path=")), QStringLiteral("path=")); QCOMPARE(str, QString("path=z/test3 type=file size=13")); #ifndef Q_OS_WIN str = listing[16]; - str.replace(QRegExp(QStringLiteral("mode.*path=")), QStringLiteral("path=")); + str.replace(QRegularExpression(QStringLiteral("mode.*path=")), QStringLiteral("path=")); QCOMPARE(str, QString("path=z/test3_symlink type=file size=5 symlink=test3")); #endif @@ -1397,11 +1387,11 @@ void KArchiveTest::testRead7Zip() // tes QCOMPARE(listing[13], QString("mode=40777 path=z type=dir")); // This one was added with addLocalFile, so ignore mode/user/group. QString str = listing[14]; - str.replace(QRegExp(QStringLiteral("mode.*path=")), QStringLiteral("path=")); + str.replace(QRegularExpression(QStringLiteral("mode.*path=")), QStringLiteral("path=")); QCOMPARE(str, QString("path=z/test3 type=file size=13")); #ifndef Q_OS_WIN str = listing[15]; - str.replace(QRegExp(QStringLiteral("mode.*path=")), QStringLiteral("path=")); + str.replace(QRegularExpression(QStringLiteral("mode.*path=")), QStringLiteral("path=")); QCOMPARE(str, QString("path=z/test3_symlink type=file size=0 symlink=test3")); #endif
  60. Download patch src/kfilterdev.cpp

    --- 5.62.0-1/src/kfilterdev.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kfilterdev.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2000, 2006 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2000, 2006 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #include "kfilterdev.h"
  61. Download patch src/karchive.h

    --- 5.62.0-1/src/karchive.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/karchive.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,22 +1,10 @@ /* This file is part of the KDE libraries - Copyright (C) 2000-2005 David Faure <faure@kde.org> - Copyright (C) 2003 Leo Savernik <l.savernik@aon.at> + SPDX-FileCopyrightText: 2000-2005 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2003 Leo Savernik <l.savernik@aon.at> Moved from ktar.h by Roberto Teixeira <maragato@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only */ #ifndef KARCHIVE_H #define KARCHIVE_H @@ -191,14 +179,15 @@ public: mode_t perm = 0120755, const QDateTime &atime = QDateTime(), const QDateTime &mtime = QDateTime(), const QDateTime &ctime = QDateTime()); +#if KARCHIVE_ENABLE_DEPRECATED_SINCE(5, 0) /** * @deprecated since 5.0, use writeFile(const QString&,const QByteArray&,mode_t,const QString&,const QString&,const QDateTime&,const QDateTime&,const QDateTime&) */ -#ifndef KARCHIVE_NO_DEPRECATED - KARCHIVE_DEPRECATED bool writeFile(const QString &name, const QString &user, const QString &group, - const char *data, qint64 size, - mode_t perm = 0100644, const QDateTime &atime = QDateTime(), - const QDateTime &mtime = QDateTime(), const QDateTime &ctime = QDateTime()) + KARCHIVE_DEPRECATED_VERSION(5, 0, "Use KArchive::writeFile(const QString&,const QByteArray&,mode_t,const QString&,const QString&,const QDateTime&,const QDateTime&,const QDateTime&)") + bool writeFile(const QString &name, const QString &user, const QString &group, + const char *data, qint64 size, + mode_t perm = 0100644, const QDateTime &atime = QDateTime(), + const QDateTime &mtime = QDateTime(), const QDateTime &ctime = QDateTime()) { QByteArray array(data, size); return writeFile(name, array, perm, user, group, atime, mtime, ctime);
  62. Download patch examples/bzip2gzip/main.cpp

    --- 5.62.0-1/examples/bzip2gzip/main.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/examples/bzip2gzip/main.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,29 +1,8 @@ /* This file is part of the KDE project - Copyright (C) 2014 Maarten De Meyer <de.meyer.maarten@gmail.com> + SPDX-FileCopyrightText: 2014 Maarten De Meyer <de.meyer.maarten@gmail.com> - You may use this file under the terms of the BSD license as follows: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + SPDX-License-Identifier: BSD-2-Clause */ /*
  63. Download patch src/CMakeLists.txt

    --- 5.62.0-1/src/CMakeLists.txt 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/CMakeLists.txt 2020-03-07 08:50:07.000000000 +0000 @@ -40,11 +40,20 @@ ecm_qt_declare_logging_category(karchive IDENTIFIER KArchiveLog CATEGORY_NAME kf5.karchive DEFAULT_SEVERITY Warning + DESCRIPTION "KArchive" + EXPORT KARCHIVE ) add_library(KF5Archive ${karchive_SRCS} ${karchive_OPTIONAL_SRCS}) -generate_export_header(KF5Archive BASE_NAME KArchive) add_library(KF5::Archive ALIAS KF5Archive) +ecm_generate_export_header(KF5Archive + BASE_NAME KArchive + GROUP_BASE_NAME KF + VERSION ${KF5_VERSION} + DEPRECATED_BASE_VERSION 0 + DEPRECATION_VERSIONS 5.0 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} +) target_include_directories(KF5Archive INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KArchive>" @@ -100,6 +109,12 @@ install(FILES DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KArchive COMPONENT Devel) +ecm_qt_install_logging_categories( + EXPORT KARCHIVE + FILE karchive.categories + DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} +) + if(BUILD_QCH) ecm_add_qch( KF5Archive_QCH @@ -112,9 +127,12 @@ if(BUILD_QCH) MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" LINK_QCHS Qt5Core_QCH + INCLUDE_DIRS + ${CMAKE_CURRENT_BINARY_DIR} BLANK_MACROS KARCHIVE_EXPORT KARCHIVE_DEPRECATED + "KARCHIVE_DEPRECATED_VERSION(x, y, t)" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel
  64. Download patch src/kgzipfilter.h

    --- 5.62.0-1/src/kgzipfilter.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/kgzipfilter.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,20 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2000, 2009 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2000, 2009 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef __kgzipfilter__h
  65. Download patch debian/copyright
  66. Download patch tests/k7ziptest.cpp

    --- 5.62.0-1/tests/k7ziptest.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/tests/k7ziptest.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,19 +1,7 @@ /* - * Copyright (C) 2011 Mario Bensi <mbensi@ipsquad.net> + * SPDX-FileCopyrightText: 2011 Mario Bensi <mbensi@ipsquad.net> * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License version 2 as published by the Free Software Foundation; - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * SPDX-License-Identifier: LGPL-2.0-only */ #include "k7zip.h"
  67. Download patch LICENSES/LGPL-2.0-only.txt
  68. Download patch autotests/CMakeLists.txt

    --- 5.62.0-1/autotests/CMakeLists.txt 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/autotests/CMakeLists.txt 2020-03-07 08:50:07.000000000 +0000 @@ -17,7 +17,6 @@ ecm_add_tests( LINK_LIBRARIES KF5::Archive Qt5::Test ) -target_compile_definitions(deprecatedtest PRIVATE KARCHIVE_DEPRECATED=) target_link_libraries(kfiltertest ${ZLIB_LIBRARIES}) ########### klimitediodevicetest ###############
  69. Download patch autotests/kfiltertest.cpp

    --- 5.62.0-1/autotests/kfiltertest.cpp 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/autotests/kfiltertest.cpp 2020-03-07 08:50:07.000000000 +0000 @@ -1,24 +1,16 @@ /* - * Copyright (C) 2002-2005 David Faure <faure@kde.org> + * SPDX-FileCopyrightText: 2002-2005 David Faure <faure@kde.org> * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License version 2 as published by the Free Software Foundation; - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * SPDX-License-Identifier: LGPL-2.0-only */ #include "kfiltertest.h" -#include <QtTest> +#include <QTest> +#include <QBuffer> +#include <QTextCodec> +#include <QSaveFile> +#include <QRandomGenerator> #include <config-compression.h> #include "kfilterdev.h" @@ -94,9 +86,10 @@ void KFilterTest::test_biggerWrites() // Find the out-of-bounds from #157706/#188415 QByteArray data; data.reserve(10000); + auto *generator = QRandomGenerator::global(); // Prepare test data for (int i = 0; i < 8170; ++i) { - data.append((char)(qrand() % 256)); + data.append((char)(generator->bounded(256))); } QCOMPARE(data.size(), 8170); // 8170 random bytes compress to 8194 bytes due to the gzip header/footer. @@ -110,7 +103,7 @@ void KFilterTest::test_biggerWrites() // Test data is valid test_readall(outFile, QString::fromLatin1("application/x-gzip"), data); - data.append((char)(qrand() % 256)); + data.append((char)(generator->bounded(256))); } }
  70. Download patch src/krcc.h

    --- 5.62.0-1/src/krcc.h 2019-09-07 12:32:34.000000000 +0000 +++ 5.68.0-0ubuntu1/src/krcc.h 2020-03-07 08:50:07.000000000 +0000 @@ -1,21 +1,7 @@ /* This file is part of the KDE libraries - Copyright (C) 2014 David Faure <faure@kde.org> + SPDX-FileCopyrightText: 2014 David Faure <faure@kde.org> - This library is free software; you can redistribute it and/or modify - it under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2 of the License or - ( at your option ) version 3 or, at the discretion of KDE e.V. - ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: LGPL-2.0-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ #ifndef KRCC_H #define KRCC_H
  1. karchive