From: Sandro Knauß Date: Fri, 3 Feb 2023 17:00:31 +0000 (+0100) Subject: Remove upstream applied patch. X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~110 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5027929b111b3031c82d283faf5892e80225c490;p=nextcloud-desktop.git Remove upstream applied patch. --- diff --git a/debian/patches/0004-Revert-8fb673457b42-Add-a-button-to-create-a-debug-a.patch b/debian/patches/0004-Revert-8fb673457b42-Add-a-button-to-create-a-debug-a.patch deleted file mode 100644 index 05d3c9c69..000000000 --- a/debian/patches/0004-Revert-8fb673457b42-Add-a-button-to-create-a-debug-a.patch +++ /dev/null @@ -1,185 +0,0 @@ -From: =?utf-8?q?Christian_G=C3=B6ttsche?= -Date: Sun, 3 Jan 2021 00:52:13 +0100 -Subject: Revert: 8fb673457b42 ("Add a button to create a debug archive") - -Drop dependency on Qt5::GuiPrivate ---- - src/gui/CMakeLists.txt | 5 --- - src/gui/generalsettings.cpp | 95 --------------------------------------------- - src/gui/generalsettings.h | 1 - - 3 files changed, 101 deletions(-) - -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index 7639f95..481a8f5 100644 ---- a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -10,10 +10,6 @@ if(QUICK_COMPILER) - ) - endif() - --if (NOT TARGET Qt5::GuiPrivate) -- message(FATAL_ERROR "Could not find GuiPrivate component of Qt5. It might be shipped as a separate package, please check that.") --endif() -- - if(CMAKE_BUILD_TYPE MATCHES Debug) - add_definitions(-DQT_QML_DEBUG) - endif() -@@ -513,7 +509,6 @@ target_link_libraries(nextcloudCore - PUBLIC - Nextcloud::sync - Qt5::Widgets -- Qt5::GuiPrivate - Qt5::Svg - Qt5::Network - Qt5::Xml -diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp -index 6a5164a..cb54493 100644 ---- a/src/gui/generalsettings.cpp -+++ b/src/gui/generalsettings.cpp -@@ -34,103 +34,20 @@ - - #include "ignorelisteditor.h" - #include "common/utility.h" --#include "logger.h" - - #include "legalnotice.h" - --#include --#include - #include - #include - #include - #include - --#include -- - #define QTLEGACY (QT_VERSION < QT_VERSION_CHECK(5,9,0)) - - #if !(QTLEGACY) - #include - #endif - --namespace { --struct ZipEntry { -- QString localFilename; -- QString zipFilename; --}; -- --ZipEntry fileInfoToZipEntry(const QFileInfo &info) --{ -- return { -- info.absoluteFilePath(), -- info.fileName() -- }; --} -- --ZipEntry fileInfoToLogZipEntry(const QFileInfo &info) --{ -- auto entry = fileInfoToZipEntry(info); -- entry.zipFilename.prepend(QStringLiteral("logs/")); -- return entry; --} -- --ZipEntry syncFolderToZipEntry(OCC::Folder *f) --{ -- const auto journalPath = f->journalDb()->databaseFilePath(); -- const auto journalInfo = QFileInfo(journalPath); -- return fileInfoToZipEntry(journalInfo); --} -- --QVector createFileList() --{ -- auto list = QVector(); -- OCC::ConfigFile cfg; -- -- list.append(fileInfoToZipEntry(QFileInfo(cfg.configFile()))); -- -- const auto logger = OCC::Logger::instance(); -- -- if (!logger->logDir().isEmpty()) { -- list.append({QString(), QStringLiteral("logs")}); -- -- QDir dir(logger->logDir()); -- const auto infoList = dir.entryInfoList(QDir::Files); -- std::transform(std::cbegin(infoList), std::cend(infoList), -- std::back_inserter(list), -- fileInfoToLogZipEntry); -- } else if (!logger->logFile().isEmpty()) { -- list.append(fileInfoToZipEntry(QFileInfo(logger->logFile()))); -- } -- -- const auto folders = OCC::FolderMan::instance()->map().values(); -- std::transform(std::cbegin(folders), std::cend(folders), -- std::back_inserter(list), -- syncFolderToZipEntry); -- -- return list; --} -- --void createDebugArchive(const QString &filename) --{ -- const auto entries = createFileList(); -- -- // TODO: Port away from this private API (best to port to KArchive) -- QZipWriter zip(filename); -- zip.setCreationPermissions(zip.creationPermissions() | QFile::ReadOther); -- for (const auto &entry : entries) { -- if (entry.localFilename.isEmpty()) { -- zip.addDirectory(entry.zipFilename); -- } else { -- QFile file(entry.localFilename); -- if (!file.open(QFile::ReadOnly)) { -- continue; -- } -- zip.addFile(entry.zipFilename, &file); -- } -- } -- -- zip.addFile("__nextcloud_client_parameters.txt", QCoreApplication::arguments().join(' ').toUtf8()); -- -- const auto buildInfo = QString(OCC::Theme::instance()->about() + "\n\n" + OCC::Theme::instance()->aboutDetails()); -- zip.addFile("__nextcloud_client_buildinfo.txt", buildInfo.toUtf8()); --} --} -- - namespace OCC { - - GeneralSettings::GeneralSettings(QWidget *parent) -@@ -226,7 +138,6 @@ GeneralSettings::GeneralSettings(QWidget *parent) - _ui->monoIconsCheckBox->setVisible(Theme::instance()->monoIconsAvailable()); - - connect(_ui->ignoredFilesButton, &QAbstractButton::clicked, this, &GeneralSettings::slotIgnoreFilesEditor); -- connect(_ui->debugArchiveButton, &QAbstractButton::clicked, this, &GeneralSettings::slotCreateDebugArchive); - - // accountAdded means the wizard was finished and the wizard might change some options. - connect(AccountManager::instance(), &AccountManager::accountAdded, this, &GeneralSettings::loadMiscSettings); -@@ -474,17 +385,6 @@ void GeneralSettings::slotIgnoreFilesEditor() - } - } - --void GeneralSettings::slotCreateDebugArchive() --{ -- const auto filename = QFileDialog::getSaveFileName(this, tr("Create Debug Archive"), QString(), tr("Zip Archives") + " (*.zip)"); -- if (filename.isEmpty()) { -- return; -- } -- -- createDebugArchive(filename); -- QMessageBox::information(this, tr("Debug Archive Created"), tr("Debug archive is created at %1").arg(filename)); --} -- - void GeneralSettings::slotShowLegalNotice() - { - auto notice = new LegalNotice(); -diff --git a/src/gui/generalsettings.h b/src/gui/generalsettings.h -index acc8793..e7176f1 100644 ---- a/src/gui/generalsettings.h -+++ b/src/gui/generalsettings.h -@@ -51,7 +51,6 @@ private slots: - void slotToggleCallNotifications(bool); - void slotShowInExplorerNavigationPane(bool); - void slotIgnoreFilesEditor(); -- void slotCreateDebugArchive(); - void loadMiscSettings(); - void slotShowLegalNotice(); - #if defined(BUILD_UPDATER) diff --git a/debian/patches/series b/debian/patches/series index 78918e18f..6a1289818 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 0001-fix-installationpath-of-dolphin-plugin.patch 0002-use_system_buildflags.patch 0003-Use-release-version-for-Debian.patch -0004-Revert-8fb673457b42-Add-a-button-to-create-a-debug-a.patch