From 48bed9bcfc2c6afee3a74c9b448e4b51bc96cce8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sandro=20Knau=C3=9F?= Date: Wed, 18 May 2022 20:45:34 +0200 Subject: [PATCH] update patch hunks --- ...x-installationpath-of-dolphin-plugin.patch | 6 ++--- .../0003-Use-release-version-for-Debian.patch | 2 +- ...b42-Add-a-button-to-create-a-debug-a.patch | 24 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch b/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch index 8e3c4682c..777a3c206 100644 --- a/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch +++ b/debian/patches/0001-fix-installationpath-of-dolphin-plugin.patch @@ -14,8 +14,8 @@ so we need to push them to known places. --- a/shell_integration/dolphin/CMakeLists.txt +++ b/shell_integration/dolphin/CMakeLists.txt -@@ -29,13 +29,14 @@ set(OWNCLOUDDOLPHINHELPER ${APPLICATION_ - add_library(${OWNCLOUDDOLPHINHELPER} SHARED ownclouddolphinpluginhelper.cpp) +@@ -31,13 +31,14 @@ add_library(${OWNCLOUDDOLPHINHELPER} SHA + ownclouddolphinpluginhelper.cpp) target_link_libraries(${OWNCLOUDDOLPHINHELPER} Qt5::Network) generate_export_header(${OWNCLOUDDOLPHINHELPER} BASE_NAME ownclouddolphinpluginhelper) -install(TARGETS ${OWNCLOUDDOLPHINHELPER} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) @@ -30,7 +30,7 @@ so we need to push them to known places. #---ACTION PLUGIN--- set(OWNCLOUDDOLPHINACTIONPLUGIN ${APPLICATION_EXECUTABLE}dolphinactionplugin) -@@ -44,3 +45,4 @@ target_link_libraries(${OWNCLOUDDOLPHINA +@@ -46,3 +47,4 @@ target_link_libraries(${OWNCLOUDDOLPHINA configure_file(ownclouddolphinactionplugin.desktop.in ${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop ESCAPE_QUOTES @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) install(TARGETS ${OWNCLOUDDOLPHINACTIONPLUGIN} DESTINATION ${KDE_INSTALL_PLUGINDIR}) diff --git a/debian/patches/0003-Use-release-version-for-Debian.patch b/debian/patches/0003-Use-release-version-for-Debian.patch index a981315ba..507c9dc1f 100644 --- a/debian/patches/0003-Use-release-version-for-Debian.patch +++ b/debian/patches/0003-Use-release-version-for-Debian.patch @@ -11,7 +11,7 @@ Drop upstream git information from version output. --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -72,29 +72,12 @@ include(GNUInstallDirs) +@@ -73,29 +73,12 @@ include(GNUInstallDirs) include(DefineInstallationPaths) include(GenerateExportHeader) 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 index 6d1f7d10f..a77f4fd1f 100644 --- 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 @@ -11,16 +11,18 @@ Drop dependency on Qt5::GuiPrivate --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt -@@ -1,8 +1,5 @@ - project(gui) - find_package(Qt5 REQUIRED COMPONENTS Widgets Svg Qml Quick QuickControls2 Xml Network) +@@ -9,10 +9,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) -@@ -435,7 +432,6 @@ target_link_libraries(nextcloudCore + endif() +@@ -534,7 +530,6 @@ target_link_libraries(nextcloudCore PUBLIC Nextcloud::sync Qt5::Widgets @@ -30,14 +32,12 @@ Drop dependency on Qt5::GuiPrivate Qt5::Xml --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp -@@ -34,108 +34,22 @@ +@@ -34,106 +34,20 @@ #include "ignorelisteditor.h" #include "common/utility.h" -#include "logger.h" - #include "config.h" - #include "legalnotice.h" -#include @@ -139,7 +139,7 @@ Drop dependency on Qt5::GuiPrivate namespace OCC { GeneralSettings::GeneralSettings(QWidget *parent) -@@ -222,7 +136,6 @@ GeneralSettings::GeneralSettings(QWidget +@@ -224,7 +138,6 @@ GeneralSettings::GeneralSettings(QWidget _ui->monoIconsCheckBox->setVisible(Theme::instance()->monoIconsAvailable()); connect(_ui->ignoredFilesButton, &QAbstractButton::clicked, this, &GeneralSettings::slotIgnoreFilesEditor); @@ -147,7 +147,7 @@ Drop dependency on Qt5::GuiPrivate // accountAdded means the wizard was finished and the wizard might change some options. connect(AccountManager::instance(), &AccountManager::accountAdded, this, &GeneralSettings::loadMiscSettings); -@@ -419,17 +332,6 @@ void GeneralSettings::slotIgnoreFilesEdi +@@ -468,17 +381,6 @@ void GeneralSettings::slotIgnoreFilesEdi } } @@ -167,8 +167,8 @@ Drop dependency on Qt5::GuiPrivate auto notice = new LegalNotice(); --- a/src/gui/generalsettings.h +++ b/src/gui/generalsettings.h -@@ -48,7 +48,6 @@ private slots: - void slotToggleOptionalServerNotifications(bool); +@@ -51,7 +51,6 @@ private slots: + void slotToggleCallNotifications(bool); void slotShowInExplorerNavigationPane(bool); void slotIgnoreFilesEditor(); - void slotCreateDebugArchive(); -- 2.39.5