[neon/kf6/kf6-kio/Neon/unstable] debian: lint lint everywhere
Carlos De Maine
null at kde.org
Fri Nov 17 15:17:40 GMT 2023
Git commit 58dd75152edce6a14f391622a03141a5ce00c062 by Carlos De Maine.
Committed on 17/11/2023 at 16:17.
Pushed by carlosdem into branch 'Neon/unstable'.
lint lint everywhere
M +0 -380 debian/copyright
M +1 -3 debian/kf6-kio.lintian-overrides
D +0 -21 debian/patches/Disable-baloo-dependant-tests.patch
D +0 -34 debian/patches/Disable-flaky-test-1.patch
D +0 -31 debian/patches/Disable-flaky-test.patch
D +0 -60 debian/patches/report_error_removing_dirs
D +0 -22 debian/patches/wait_for_a_bit_longer
https://invent.kde.org/neon/kf6/kf6-kio/-/commit/58dd75152edce6a14f391622a03141a5ce00c062
diff --git a/debian/copyright b/debian/copyright
index 8af89c4..f0e97a4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -78,386 +78,6 @@ Copyright: 2006, Aaron J. Seigo <aseigo at kde.org>
2001, translate.org.za
License: LGPL-2+
-Files: autotests/deletejobtest.cpp
- autotests/deletejobtest.h
- autotests/http/httpfiltertest.cpp
- autotests/kcookiejar/kcookiejartest.cpp
- autotests/kmountpointtest.cpp
- autotests/kmountpointtest.h
- autotests/kprotocolinfotest.cpp
- autotests/kurifiltertest.cpp
- autotests/kurifiltertest.h
- autotests/kurlcompletiontest.cpp
- autotests/listdirtest.cpp
- autotests/listdirtest.h
- src/core/commands_p.h
- src/core/dataprotocol.cpp
- src/core/dataprotocol_p.h
- src/core/dataslave.cpp
- src/core/dataslave_p.h
- src/core/filejob.cpp
- src/core/filejob.h
- src/core/global.cpp
- src/core/global.h
- src/core/http_slave_defaults.h
- src/core/idleslave.cpp
- src/core/idleslave.h
- src/core/ioslave_defaults.h
- src/core/job_error.cpp
- src/core/jobtracker.cpp
- src/core/jobtracker.h
- src/core/kdiskfreespaceinfo.cpp
- src/core/kdiskfreespaceinfo.h
- src/core/kioglobal_p.h
- src/core/kioglobal_p_unix.cpp
- src/core/kioglobal_p_win.cpp
- src/core/kmountpoint.cpp
- src/core/kmountpoint.h
- src/core/knfsshare.cpp
- src/core/knfsshare.h
- src/core/kprotocolinfo.cpp
- src/core/kprotocolinfo.h
- src/core/kprotocolinfo_p.h
- src/core/kprotocolinfofactory.cpp
- src/core/kprotocolinfofactory_p.h
- src/core/kprotocolmanager.cpp
- src/core/kprotocolmanager.h
- src/core/kremoteencoding.cpp
- src/core/kremoteencoding.h
- src/core/ksambashare.cpp
- src/core/ksambashare.h
- src/core/metadata.cpp
- src/core/metadata.h
- src/core/scheduler.cpp
- src/core/scheduler_p.h
- src/core/slave.cpp
- src/core/slave.h
- src/core/slavebase.cpp
- src/core/slaveconfig.cpp
- src/core/slaveconfig.h
- src/core/slaveinterface.cpp
- src/core/slaveinterface_p.h
- src/core/udsentry.h
- src/core/usernotificationhandler.cpp
- src/core/usernotificationhandler_p.h
- src/filewidgets/kdiroperatordetailview.cpp
- src/filewidgets/kdiroperatordetailview_p.h
- src/filewidgets/kdirsortfilterproxymodel.cpp
- src/filewidgets/kdirsortfilterproxymodel.h
- src/filewidgets/kfilebookmarkhandler.cpp
- src/filewidgets/kfilebookmarkhandler_p.h
- src/filewidgets/kfileplaceeditdialog.cpp
- src/filewidgets/kfileplaceeditdialog.h
- src/filewidgets/kfileplacesitem.cpp
- src/filewidgets/kfileplacesitem_p.h
- src/filewidgets/kfileplacesmodel.cpp
- src/filewidgets/kfileplacesmodel.h
- src/filewidgets/kfileplacessharedbookmarks.cpp
- src/filewidgets/kfileplacessharedbookmarks_p.h
- src/filewidgets/kfileplacesview.cpp
- src/filewidgets/kfileplacesview.h
- src/filewidgets/kfileplacesview_p.h
- src/filewidgets/kstatusbarofflineindicator.cpp
- src/filewidgets/kstatusbarofflineindicator.h
- src/ioslaves/help/kio_help.cpp
- src/ioslaves/http/httpfilter.cpp
- src/ioslaves/http/httpfilter.h
- src/ioslaves/http/kcookiejar/kcookiejar.h
- src/ioslaves/http/kcookiejar/kcookieserver.h
- src/ioslaves/mailto/kmailservice.cpp
- src/kioslave/kioslave.cpp
- src/kntlm/kntlm.cpp
- src/kntlm/kntlm.h
- src/kpac/dhcp.h
- src/kpac/kpac_dhcp_helper.c
- src/widgets/kautomount.cpp
- src/widgets/kautomount.h
- src/widgets/kbuildsycocaprogressdialog.cpp
- src/widgets/kbuildsycocaprogressdialog.h
- src/widgets/kdesktopfileactions.cpp
- src/widgets/kdesktopfileactions.h
- src/widgets/kfile.cpp
- src/widgets/kfile.h
- src/widgets/kurlcombobox.cpp
- src/widgets/kurlcombobox.h
- src/widgets/kurlrequester.cpp
- src/widgets/kurlrequester.h
- src/widgets/paste.cpp
- src/widgets/paste.h
- src/widgets/pastedialog.cpp
- src/widgets/pastedialog_p.h
- src/widgets/pixmaploader.cpp
- src/widgets/pixmaploader.h
- src/widgets/skipdialog.cpp
- src/widgets/skipdialog.h
- tests/kdirmodeltest_gui.cpp
- tests/kioslavetest.cpp
- tests/kioslavetest.h
- tests/kmountpoint_debug.cpp
- tests/kruntest.cpp
- tests/kruntest.h
- tests/listrecursivetest.cpp
-Copyright: 2014, Alex Richardson <arichardson.kde at gmail.com>
- 2006, Allan Sandfeld Jensen <kde at carewolf.com>
- 2009-2010, Andreas Hartmetz <ahartmetz at gmail.com>
- 1999-2003, Carsten Pfeiffer <pfeiffer at kde.org>
- 2003, Cornelius Schumacher <schumacher at kde.org>
- 2000-2013, David Faure <faure at kde.org>
- 2000-2012, Dawit Alemayehu <adawit at kde.org>
- 2008, Dirk Mueller <mueller at kde.org>
- 2006, Dominic Battre <dominic at battre.de>
- 2004, Jan Schaefer <j_schaef at informatik.uni-kl.de>
- 2008, Jarosław Staniek <staniek at kde.org>
- 2007, Kevin Ottens <ervin at kde.org>
- 2002-2003, Leo Savernik <l.savernik at aon.at>
- 2001, Lubos Lunak <l.lunak at kde.org>
- 2001, Malte Starostik <malte at kde.org>
- 1999, Mario Weilguni <mweilguni at sime.com>
- 2013, Mark Gaiser <markg85 at gmail.com>
- 2015, Martin Blumenstingl <martin.blumenstingl at googlemail.com>
- 2006, Martin Pool <mbp at canonical.com>
- 1999, Matt Koss <koss at miesto.sk>
- 2000, Matthias Hoelzer-Kluepfel <hoelzer at kde.org>
- 2007-2008, Norbert Frese <nf2 at scheinwelt.at>
- 2006-2007, Peter Penz <peter.penz at gmx.at>
- 2008, Rafael Fernández López <ereslibre at kde.org>
- 2010, Rodrigo Belem <rclbelem at gmail.com>
- 2008, Sebastian Trug <trueg at kde.org>
- 2000, Simon Hausmann <hausmann at kde.org>
- 2000-2003, Stephan Kulow <coolo at kde.org>
- 2004, Szombathelyi Gy�gy <gyurco at freemail.hu>
- 2013, Teo Mrnjavac <teo at kde.org>
- 2003, Thiago Macieira <thiago.macieira at kdemail.net>
- 2007, Thiago Macieira <thiago at kde.org>
- 1999, Torben Weis <weis at kde.org>
- 2000, Waldo Bastain <bastain at kde.org>
- 1998-2004, Waldo Bastian <bastian at kde.org>
- 2007, Will Stephenson <wstephenson at kde.org>
-License: LGPL-2
-
-Files: autotests/kurlnavigatortest.cpp
- autotests/kurlnavigatortest.h
- src/ioslaves/http/kcookiejar/kcookiewin.h
- src/ioslaves/telnet/ktelnetservice.cpp
- src/ioslaves/trash/kcmtrash.cpp
- src/ioslaves/trash/kcmtrash.h
- src/kcms/kio/kcookiesmanagement.cpp
- src/kcms/kio/kcookiesmanagement.h
- src/kcms/kio/kcookiespolicies.cpp
- src/kcms/kio/kcookiespolicies.h
- src/kcms/kio/kcookiespolicyselectiondlg.cpp
- src/kcms/kio/kcookiespolicyselectiondlg.h
- src/kcms/kio/main.cpp
- src/kcms/kio/useragentinfo.cpp
- src/kcms/kio/useragentinfo.h
- src/kcms/kio/useragentselectordlg.cpp
- src/kcms/kio/useragentselectordlg.h
- src/kcms/webshortcuts/main.cpp
- src/kcms/webshortcuts/main.h
- src/kioexec/main.cpp
- src/kioexec/main.h
- src/urifilters/fixhost/fixhosturifilter.cpp
- src/urifilters/fixhost/fixhosturifilter.h
- src/urifilters/ikws/ikwsopts.cpp
- src/urifilters/ikws/ikwsopts.h
- src/urifilters/ikws/ikwsopts_p.h
- src/urifilters/ikws/kuriikwsfilter.cpp
- src/urifilters/ikws/kuriikwsfilter.h
- src/urifilters/ikws/kuriikwsfiltereng.cpp
- src/urifilters/ikws/kuriikwsfiltereng.h
- src/urifilters/ikws/kurisearchfilter.cpp
- src/urifilters/ikws/kurisearchfilter.h
- src/urifilters/ikws/searchprovider.cpp
- src/urifilters/ikws/searchprovider.h
- src/urifilters/ikws/searchproviderdlg.cpp
- src/urifilters/ikws/searchproviderdlg.h
- src/urifilters/localdomain/localdomainurifilter.cpp
- src/urifilters/localdomain/localdomainurifilter.h
- src/urifilters/shorturi/kshorturifilter.cpp
- src/urifilters/shorturi/kshorturifilter.h
- tests/listjobtest.cpp
- tests/udsentrybenchmark.cpp
-Copyright: 2000-2009, Alexander Neundorf <neundorf at kde.org>
- 2001, Andreas Hochsteger <e9625392 at student.tuwien.ac.at>
- 1998, David Faure
- 1999-2005, David Faure <faure at kde.org>
- 2000-2010, Dawit Alemayehu <adawit at kde.org>
- 2014, Frank Reininghaus <frank78ac at googlemail.com>
- 2002-2007, Lubos Lunak <llunak at suse.cz>
- 2000-2001, Malte Starostik <malte at kde.org>
- 2000, Malte Starostik <starosti at zedat.fu-berlin.de>
- 2000-2001, Marco Pinelli <pinmc at orion.it>
- 2009, Nick Shaforostoff <shaforostoff at kde.ru>
- 2008, Peter Penz <peter.penz at gmx.at>
- 1999-2000, Simon Hausmann <hausmann at kde.org>
- 2008, Tobias Koenig <tokoe at kde.org>
- 1998, Torben Weis
- 1998-1999, Torben Weis <weis at kde.org>
- 2008, Urs Wolfer <uwolfer at kde.org>
- 1998-2001, Waldo Bastian <bastian at kde.org>
- 1999-2000, Yves Arrouye <yves at realnames.com>
-License: GPL-2+
-
-Files: autotests/dropjobtest.cpp
- autotests/kdiroperatortest.cpp
- autotests/kfilecopytomenutest.cpp
- autotests/knewfilemenutest.cpp
- autotests/kurlrequestertest.cpp
- autotests/upurltest.cpp
- src/core/kfileitemlistproperties.cpp
- src/core/kfileitemlistproperties.h
- src/filewidgets/kfilecopytomenu.cpp
- src/filewidgets/kfilecopytomenu.h
- src/filewidgets/kfilecopytomenu_p.h
- src/filewidgets/knameandurlinputdialog.cpp
- src/filewidgets/knameandurlinputdialog.h
- src/filewidgets/kurlnavigatormenu.cpp
- src/filewidgets/kurlnavigatormenu_p.h
- src/kiod/kiod_main.cpp
- src/widgets/dropjob.cpp
- src/widgets/dropjob.h
- src/widgets/kabstractfileitemactionplugin.cpp
- src/widgets/kabstractfileitemactionplugin.h
- src/widgets/kfileitemactions.cpp
- src/widgets/kfileitemactions.h
- src/widgets/kfileitemactions_p.h
-Copyright: 1998-2015, David Faure <faure at kde.org>
- 2008, George Goldberg <grundleborg at googlemail.com>
- 2008, Peter Penz <peter.penz at gmx.at>
- 2009, Rahman Duran <rahman.duran at gmail.com>
- 2010, Sebastian Trueg <trueg at kde.org>
-License: LGPL-2+3+KDEeV
-
-Files: po/ca/kio5.po
- po/uk/kio5.po
- src/core/desktopexecparser.h
- src/core/hostinfo.cpp
- src/core/hostinfo.h
- src/core/kpasswdserver.cpp
- src/core/kpasswdserver_p.h
- src/core/kpasswdserverloop.cpp
- src/core/kpasswdserverloop_p.h
- src/core/ksambashare_p.h
- src/core/ksambasharedata.cpp
- src/core/ksambasharedata.h
- src/core/ksambasharedata_p.h
-Copyright: 2013, David Faure <faure at kde.org>
- 2009, Michael Leupold <lemma at confuego.org>
- 2010, Rodrigo Belem <rclbelem at gmail.com>
- 2008, Roland Harnau <tau at gmx.eu>
- 2014-2015, This_file_is_part_of_KDE
-License: LGPL-2.1+3+KDEeV
-
-Files: autotests/kfileplacesmodeltest.cpp
- src/ioslaves/trash/kinterprocesslock.cpp
- src/ioslaves/trash/kinterprocesslock.h
- src/ioslaves/trash/tests/lockingtest.cpp
- src/kcms/kio/cache.cpp
- src/kcms/kio/cache.h
- src/kcms/kio/kproxydlg.cpp
- src/kcms/kio/kproxydlg.h
- src/kcms/kio/useragentdlg.cpp
- src/kcms/kio/useragentdlg.h
- src/kpasswdserver/kpasswdserver.cpp
- src/kpasswdserver/kpasswdserver.h
-Copyright: 1998-2005, David Faure <faure at kde.org>
- 2000-2012, Dawit Alemayehu <adawit at kde.org>
- 2000, Dirk Mueller <mueller at kde.org>
- 1997, Kalle Dalheimer <kalle at kde.org>
- 2007, Kevin Ottens <ervin at kde.org>
- 2009, Tobias Koenig <tokoe at kde.org>
- 2002, Waldo Bastian <bastian at kde.org>
-License: GPL-2
-
-Files: src/core/krecentdocument.cpp
- src/core/krecentdocument.h
- src/filewidgets/krecentdirs.cpp
- src/filewidgets/krecentdirs.h
- src/widgets/imagefilter.cpp
- src/widgets/imagefilter_p.h
-Copyright: 2000, Daniel M. Duley <mosfet at kde.org>
- 2006-2008, Fredrik Höglund <fredrik at kde.org>
- 2002-2005, Maxim Shemanarev (http://www.antigrain.com)
- 2000, Waldo Bastian <bastian at kde.org>
- 2006, Zack Rusin <zack at kde.org>
-License: BSD-2-clause
-
-Files: src/ioslaves/http/http_cache_cleaner.cpp
- src/ioslaves/http/kcookiejar/kcookiejar.cpp
- src/ioslaves/http/kcookiejar/kcookieserver.cpp
- src/ioslaves/http/kcookiejar/kcookiewin.cpp
- src/ioslaves/http/kcookiejar/main.cpp
-Copyright: 2009, Andreas Hartmetz <ahartmetz at gmail.com>
- 2000-2001, Dawit Alemayehu <adawit at kde.org>
- 1998-2000, Waldo Bastian <bastian at kde.org>
-License: MIT/X11
-
-Files: COPYING.LIB
- src/core/kiocoredebug.cpp
- src/core/kiocoredebug.h
- src/widgets/kdynamicjobtracker.cpp
- src/widgets/kdynamicjobtracker_p.h
-Copyright: 1991-1999, Free Software Foundation, Inc
- 2008, Rob Scheepmaker <r.scheepmaker at student.utwente.nl>
- 2010, Shaun Reich <shaun.reich at kdemail.net>
-License: LGPL-2.1+
-
-Files: src/filewidgets/knewfilemenu.cpp
- src/filewidgets/knewfilemenu.h
- src/widgets/dndpopupmenuplugin.cpp
- src/widgets/dndpopupmenuplugin.h
-Copyright: 1998-2009, David Faure <faure at kde.org>
- 2009, Harald Hvaal <haraldhv at stud.ntnu.no>
-License: LGPL-2+3
-
-Files: src/kntlm/des.cpp
- src/kntlm/des.h
-Copyright: 2003, Nikos Mavroyanopoulos <nmav at hellug.gr>
- 1988-1991, Phil Karn <karn at ka9q.net>
- Taken from libmcrypt (http://mcrypt.hellug.gr/lib/index.html)
-License: LGPL_mcrypt
- 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.
- .
- 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
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA
- .
- Sofware DES functions
- written 12 Dec 1986 by Phil Karn, KA9Q; large sections adapted from
- the 1977 public-domain program by Jim Gillogly
- Modified for additional speed - 6 December 1988 Phil Karn
- Modified for parameterized key schedules - Jan 1991 Phil Karn
- Callers now allocate a key schedule as follows:
- kn = (char (*)[8])malloc(sizeof(char) * 8 * 16);
- or
- char kn[16][8];
- .
- modified in order to use the libmcrypt API by Nikos Mavroyanopoulos
- All modifications are placed under the license of libmcrypt.
-
-Files: cmake/FindACL.cmake
- cmake/FindGSSAPI.cmake
-Copyright: 2006, Pino Toscano <toscano.pino at tiscali.it>
-License: BSD-3-clause
-
-Files: src/kpasswdserver/tests/kpasswdservertest.cpp
-Copyright: 2010, David Faure <faure at kde.org>
- 2012, Dawit Alemayehu <adawit at kde.org>
-License: GPL-2+3+KDEeV
-
-Files: po/bg/kio5.po
-Copyright: 2009-2010, Yasen Pramatarov <yasen at lindeas.com>
- 2006-2008, Zlatko Popov <zlatkopopov at fsa-bg.org>
-License: GPL
-
Files: debian/*
Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
License: LGPL-2+
diff --git a/debian/kf6-kio.lintian-overrides b/debian/kf6-kio.lintian-overrides
index c069a2f..15950b3 100644
--- a/debian/kf6-kio.lintian-overrides
+++ b/debian/kf6-kio.lintian-overrides
@@ -5,6 +5,4 @@ kf6-kio: package-name-doesnt-match-sonames libKF6KIOCore6 libKF6KIOFileWidgets6
kf6-kio: shared-library-lacks-version usr/lib/*/libkuriikwsfiltereng_private.so libkuriikwsfiltereng_private.so
kf6-kio: unknown-locale-code tok
kf6-kio: mismatched-override lacks-unversioned-link-to-shared-library usr/lib/*/libkuriikwsfiltereng_private.so usr/lib/*/libkuriikwsfiltereng_private.so
-kf6-kio: mismatched-override shared-library-lacks-version usr/lib/*/libkuriikwsfiltereng_private.so libkuriikwsfiltereng_private.so
-kf6-kio: shared-library-lacks-version usr/lib/*/libkuriikwsfiltereng_private.so libkuriikwsfiltereng_private.so
-
\ No newline at end of file
+kf6-kio: mismatched-override shared-library-lacks-version usr/lib/*/libkuriikwsfiltereng_private.so libkuriikwsfiltereng_private.so
\ No newline at end of file
diff --git a/debian/patches/Disable-baloo-dependant-tests.patch b/debian/patches/Disable-baloo-dependant-tests.patch
deleted file mode 100644
index bb9c584..0000000
--- a/debian/patches/Disable-baloo-dependant-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Maximiliano Curia <maxy at gnuservers.com.ar>
-Date: Fri, 17 Aug 2018 13:08:56 +0200
-Subject: Disable baloo dependant tests
-
----
- autotests/kfileplacesviewtest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: kio/autotests/kfileplacesviewtest.cpp
-===================================================================
---- kio.orig/autotests/kfileplacesviewtest.cpp
-+++ kio/autotests/kfileplacesviewtest.cpp
-@@ -104,7 +104,7 @@ void KFilePlacesViewTest::testUrlChanged
- Q_EMIT pv.clicked(targetIndex);
- QTRY_COMPARE(urlChangedSpy.count(), 1);
- const QList<QVariant> args = urlChangedSpy.takeFirst();
-- QCOMPARE(args.at(0).toUrl().toString(), expectedUrl);
-+ // QCOMPARE(args.at(0).toUrl().toString(), expectedUrl);
- }
-
- QTEST_MAIN(KFilePlacesViewTest)
diff --git a/debian/patches/Disable-flaky-test-1.patch b/debian/patches/Disable-flaky-test-1.patch
deleted file mode 100644
index e7cd9de..0000000
--- a/debian/patches/Disable-flaky-test-1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Maximiliano Curia <maxy at gnuservers.com.ar>
-Date: Fri, 17 Aug 2018 14:07:23 +0200
-Subject: Disable flaky test
-
----
- autotests/kfilewidgettest.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/autotests/kfilewidgettest.cpp b/autotests/kfilewidgettest.cpp
-index 5225bae..3015bb3 100644
---- a/autotests/kfilewidgettest.cpp
-+++ b/autotests/kfilewidgettest.cpp
-@@ -156,17 +156,17 @@ private Q_SLOTS:
-
- KFileWidget fw(baseUrl);
- fw.show();
-- QVERIFY(QTest::qWaitForWindowActive(&fw));
-+ // QVERIFY(QTest::qWaitForWindowActive(&fw));
-
- // WHEN
- fw.setSelection(selection); // now deprecated, this test shows why ;)
-
- // THEN
-- QCOMPARE(fw.baseUrl().adjusted(QUrl::StripTrailingSlash), expectedBaseUrl);
-+ // QCOMPARE(fw.baseUrl().adjusted(QUrl::StripTrailingSlash), expectedBaseUrl);
- //if (QByteArray(QTest::currentDataTag()) == "filename") {
-- QEXPECT_FAIL("filename", "setSelection cannot work with filenames, bad API", Continue);
-+ // QEXPECT_FAIL("filename", "setSelection cannot work with filenames, bad API", Continue);
- //}
-- QCOMPARE(fw.locationEdit()->currentText(), expectedCurrentText);
-+ // QCOMPARE(fw.locationEdit()->currentText(), expectedCurrentText);
- }
-
- void testSetSelectedUrl_data()
diff --git a/debian/patches/Disable-flaky-test.patch b/debian/patches/Disable-flaky-test.patch
deleted file mode 100644
index 30b1003..0000000
--- a/debian/patches/Disable-flaky-test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Maximiliano Curia <maxy at gnuservers.com.ar>
-Date: Fri, 17 Aug 2018 13:07:14 +0200
-Subject: Disable flaky test
-
----
- autotests/kdirlistertest.cpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-Index: kio/autotests/kdirlistertest.cpp
-===================================================================
---- kio.orig/autotests/kdirlistertest.cpp
-+++ kio/autotests/kdirlistertest.cpp
-@@ -1347,12 +1347,12 @@ void KDirListerTest::testRemoveWatchedDi
- QVERIFY(QDir().rmdir(path + "abc"));
-
- // This should trigger an update.
-- QVERIFY(spyCompleted.wait(2000));
-- QVERIFY(m_dirLister.isFinished());
-- QCOMPARE(m_items.count(), 0);
-- QCOMPARE(m_dirLister.spyItemsDeleted.count(), 1);
-- const KFileItem deletedItem = m_dirLister.spyItemsDeleted.at(0).at(0).value<KFileItemList>().at(0);
-- QCOMPARE(item, deletedItem);
-+ /* QVERIFY(spyCompleted.wait(2000)); */
-+ /* QVERIFY(m_dirLister.isFinished()); */
-+ /* QCOMPARE(m_items.count(), 0); */
-+ /* QCOMPARE(m_dirLister.spyItemsDeleted.count(), 1); */
-+ /* const KFileItem deletedItem = m_dirLister.spyItemsDeleted.at(0).at(0).value<KFileItemList>().at(0); */
-+ /* QCOMPARE(item, deletedItem); */
- }
-
- void KDirListerTest::testDirPermissionChange()
diff --git a/debian/patches/report_error_removing_dirs b/debian/patches/report_error_removing_dirs
deleted file mode 100644
index 32fa3df..0000000
--- a/debian/patches/report_error_removing_dirs
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Thu, 31 Mar 2016 15:38:43 +0200
-Subject: report_error_removing_dirs
-
-===================================================================
----
- src/core/copyjob.cpp | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-Index: kio/src/core/copyjob.cpp
-===================================================================
---- kio.orig/src/core/copyjob.cpp
-+++ kio/src/core/copyjob.cpp
-@@ -227,6 +227,7 @@ public:
- , m_bOverwriteAllDirs(false)
- , m_bOverwriteWhenOlder(false)
- , m_conflictError(0)
-+ , m_dirsFailedError(0)
- , m_reportTimer(nullptr)
- {
- }
-@@ -301,6 +302,8 @@ public:
- };
-
- int m_conflictError;
-+ int m_dirsFailedError;
-+ QString m_dirsFailedErrorText;
-
- QTimer *m_reportTimer;
-
-@@ -2183,6 +2186,10 @@ void CopyJobPrivate::setNextDirAttribute
- m_reportTimer->stop();
- }
-
-+ if (m_dirsFailedError) {
-+ q->setError(m_dirsFailedError);
-+ q->setErrorText(m_dirsFailedErrorText);
-+ }
- q->emitResult();
- }
- }
-@@ -2254,12 +2261,14 @@ void CopyJobPrivate::slotTotalSize(KJob
- void CopyJobPrivate::slotResultDeletingDirs(KJob *job)
- {
- Q_Q(CopyJob);
-+ const QUrl url = static_cast<KIO::SimpleJob *>(job)->url();
- if (job->error()) {
-- // Couldn't remove directory. Well, perhaps it's not empty
-- // because the user pressed Skip for a given file in it.
-- // Let's not display "Could not remove dir ..." for each of those dir !
-+ m_dirsFailedError = job->error();
-+ m_dirsFailedErrorText = job->errorText();
-+ // Remove the parents
-+ skip(url, true);
- } else {
-- m_successSrcList.append(static_cast<KIO::SimpleJob *>(job)->url());
-+ m_successSrcList.append(url);
- }
- q->removeSubjob(job);
- Q_ASSERT(!q->hasSubjobs());
diff --git a/debian/patches/wait_for_a_bit_longer b/debian/patches/wait_for_a_bit_longer
deleted file mode 100644
index 25f45a5..0000000
--- a/debian/patches/wait_for_a_bit_longer
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Thu, 31 Mar 2016 15:38:43 +0200
-Subject: wait_for_a_bit_longer
-
-===================================================================
----
- autotests/kdirlistertest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: kio/autotests/kdirlistertest.cpp
-===================================================================
---- kio.orig/autotests/kdirlistertest.cpp
-+++ kio/autotests/kdirlistertest.cpp
-@@ -1347,7 +1347,7 @@ void KDirListerTest::testRemoveWatchedDi
- QVERIFY(QDir().rmdir(path + "abc"));
-
- // This should trigger an update.
-- QVERIFY(spyCompleted.wait(1000));
-+ QVERIFY(spyCompleted.wait(2000));
- QVERIFY(m_dirLister.isFinished());
- QCOMPARE(m_items.count(), 0);
- QCOMPARE(m_dirLister.spyItemsDeleted.count(), 1);
More information about the Neon-commits
mailing list