diff --git a/.gitignore b/.gitignore index 91eaa49..90a8a78 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /owncloudclient-2.5.4.11654.tar.xz /owncloudclient-2.6.0.13018.tar.xz /owncloudclient-2.6.3.14058.tar.xz +/ownCloud-2.7.4.2934.tar.xz diff --git a/owncloud-client-2.6.0-syslibs.patch b/owncloud-client-2.6.0-syslibs.patch deleted file mode 100644 index da1e4dd..0000000 --- a/owncloud-client-2.6.0-syslibs.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- a/src/gui/application.h 2019-03-18 04:08:22.000000000 -0500 -+++ b/src/gui/application.h 2019-06-12 15:33:55.941943652 -0500 -@@ -22,7 +22,7 @@ - #include - #include - --#include "qtsingleapplication.h" -+#include - - #include "syncresult.h" - #include "logbrowser.h" ---- a/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2019-03-18 04:08:22.000000000 -0500 -+++ b/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2019-06-12 16:15:19.083450495 -0500 -@@ -27,7 +27,7 @@ - ** - ****************************************************************************/ - --#include -+#include - - #include - #include ---- a/src/gui/application.cpp 2019-03-18 04:08:22.000000000 -0500 -+++ b/src/gui/application.cpp 2019-06-12 16:16:39.396142159 -0500 -@@ -157,7 +157,7 @@ - } - - Application::Application(int &argc, char **argv) -- : SharedTools::QtSingleApplication(Theme::instance()->appName(), argc, argv) -+ : QtSingleApplication(Theme::instance()->appName(), argc, argv) - , _gui(0) - , _theme(Theme::instance()) - , _helpOnly(false) ---- a/src/gui/application.cpp 2019-06-12 16:16:39.000000000 -0500 -+++ b/src/gui/application.cpp 2019-06-12 16:17:37.579918781 -0500 -@@ -254,7 +254,7 @@ - - _folderManager.reset(new FolderMan); - -- connect(this, &SharedTools::QtSingleApplication::messageReceived, this, &Application::slotParseMessage); -+ connect(this, &QtSingleApplication::messageReceived, this, &Application::slotParseMessage); - - if (!AccountManager::instance()->restore()) { - // If there is an error reading the account settings, try again ---- a/src/gui/application.cpp 2019-06-12 16:17:37.000000000 -0500 -+++ b/src/gui/application.cpp 2019-06-12 16:19:07.878572107 -0500 -@@ -487,7 +487,7 @@ - _gui->slotComputeOverallSyncStatus(); - } - --void Application::slotParseMessage(const QString &msg, QObject *) -+void Application::slotParseMessage(const QString &msg) - { - if (msg.startsWith(QLatin1String("MSG_PARSEOPTIONS:"))) { - const int lengthOfMsgPrefix = 17; ---- a/src/gui/application.h 2019-03-18 04:08:22.000000000 -0500 -+++ b/src/gui/application.h 2019-06-12 16:20:21.895287942 -0500 -@@ -52,7 +52,7 @@ - * @brief The Application class - * @ingroup gui - */ --class Application : public SharedTools::QtSingleApplication -+class Application : public QtSingleApplication - { - Q_OBJECT - public: -@@ -94,7 +94,7 @@ - void folderStateChanged(Folder *); - - protected slots: -- void slotParseMessage(const QString &, QObject *); -+ void slotParseMessage(const QString &); - void slotCheckConnection(); - void slotUseMonoIconsChanged(bool); - void slotCleanup(); ---- a/src/gui/CMakeLists.txt 2019-03-18 04:08:22.000000000 -0500 -+++ b/src/gui/CMakeLists.txt 2019-06-12 16:21:29.097029941 -0500 -@@ -285,6 +285,8 @@ - target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml) - target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} ) - target_link_libraries( ${APPLICATION_EXECUTABLE} updater ) -+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5Solutions_LockedFile-2.4 ) -+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5Solutions_SingleApplication-2.6 ) - target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} ) - - target_include_directories(${APPLICATION_EXECUTABLE} PRIVATE ---- a/src/gui/application.cpp 2019-06-12 16:21:48.000000000 -0500 -+++ b/src/gui/application.cpp 2019-06-12 16:24:35.505314285 -0500 -@@ -759,7 +759,7 @@ - QTimer::singleShot(0, this, [this, fn] { openVirtualFile(fn); }); - } - #endif -- return SharedTools::QtSingleApplication::event(event); -+ return QtSingleApplication::event(event); - } - - } // namespace OCC ---- a/src/gui/CMakeLists.txt 2019-11-20 18:11:30.000000000 -0600 -+++ b/src/gui/CMakeLists.txt 2019-11-20 18:15:32.367903089 -0600 -@@ -150,18 +150,8 @@ - - set(3rdparty_SRC - ../3rdparty/QProgressIndicator/QProgressIndicator.cpp -- ../3rdparty/qtlockedfile/qtlockedfile.cpp -- ../3rdparty/qtsingleapplication/qtlocalpeer.cpp -- ../3rdparty/qtsingleapplication/qtsingleapplication.cpp -- ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp - ) - --if(NOT WIN32) -- list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_unix.cpp) --else() -- list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_win.cpp ) --endif() -- - - find_package(Qt5LinguistTools) - if(Qt5LinguistTools_FOUND) diff --git a/owncloud-client-2.6.3.14058-qt515.patch b/owncloud-client-2.6.3.14058-qt515.patch deleted file mode 100644 index 57dd209..0000000 --- a/owncloud-client-2.6.3.14058-qt515.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp ---- owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp 2020-06-12 14:35:04.000000000 +0200 -+++ owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp 2020-06-13 11:18:28.822842347 +0200 -@@ -31,6 +31,7 @@ - #include - #ifndef TOKEN_AUTH_ONLY - #include -+#include - #endif - - #include "networkjobs.h" diff --git a/owncloud-client-2.7.4-syslibs.patch b/owncloud-client-2.7.4-syslibs.patch new file mode 100644 index 0000000..be8291e --- /dev/null +++ b/owncloud-client-2.7.4-syslibs.patch @@ -0,0 +1,108 @@ +diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt +index 7d7774e..8891880 100644 +--- a/src/gui/CMakeLists.txt ++++ b/src/gui/CMakeLists.txt +@@ -103,18 +103,8 @@ set(client_SRCS + + set(3rdparty_SRC + ../3rdparty/QProgressIndicator/QProgressIndicator.cpp +- ../3rdparty/qtlockedfile/qtlockedfile.cpp +- ../3rdparty/qtsingleapplication/qtlocalpeer.cpp +- ../3rdparty/qtsingleapplication/qtsingleapplication.cpp +- ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp + ) + +-if(NOT WIN32) +- list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_unix.cpp) +-else() +- list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_win.cpp ) +-endif() +- + set( final_src + ${MIRALL_RC_SRC} + ${client_SRCS} +@@ -130,11 +120,9 @@ add_library(owncloudCore STATIC ${final_src}) + set_target_properties(owncloudCore PROPERTIES AUTOUIC ON AUTORCC ON) + target_link_libraries(owncloudCore PUBLIC Qt5::Widgets Qt5::Network Qt5::Xml +- ${synclib_NAME}) ++ ${synclib_NAME} Qt5Solutions_LockedFile-2.4 Qt5Solutions_SingleApplication-2.6) + + target_include_directories(owncloudCore PUBLIC + ${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator +- ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile +- ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication + ${CMAKE_CURRENT_BINARY_DIR} + ) + +diff --git a/src/gui/application.cpp b/src/gui/application.cpp +index fdee7ff..c973f67 100644 +--- a/src/gui/application.cpp ++++ b/src/gui/application.cpp +@@ -175,7 +175,7 @@ ownCloudGui *Application::gui() const + } + + Application::Application(int &argc, char **argv) +- : SharedTools::QtSingleApplication(Theme::instance()->appName(), argc, argv) ++ : QtSingleApplication(Theme::instance()->appName(), argc, argv) + , _gui(nullptr) + , _theme(Theme::instance()) + , _helpOnly(false) +@@ -295,7 +295,7 @@ Application::Application(int &argc, char **argv) + + _folderManager.reset(new FolderMan); + +- connect(this, &SharedTools::QtSingleApplication::messageReceived, this, &Application::slotParseMessage); ++ connect(this, &QtSingleApplication::messageReceived, this, &Application::slotParseMessage); + + if (!AccountManager::instance()->restore()) { + // If there is an error reading the account settings, try again +@@ -530,7 +530,7 @@ void Application::slotUseMonoIconsChanged(bool) + _gui->slotComputeOverallSyncStatus(); + } + +-void Application::slotParseMessage(const QString &msg, QObject *) ++void Application::slotParseMessage(const QString &msg) + { + if (msg.startsWith(QLatin1String("MSG_PARSEOPTIONS:"))) { + const int lengthOfMsgPrefix = 17; +@@ -809,7 +809,7 @@ bool Application::event(QEvent *event) + QTimer::singleShot(0, this, [this, fn] { openVirtualFile(fn); }); + } + #endif +- return SharedTools::QtSingleApplication::event(event); ++ return QtSingleApplication::event(event); + } + + } // namespace OCC +diff --git a/src/gui/application.h b/src/gui/application.h +index e44f1e4..7933bec 100644 +--- a/src/gui/application.h ++++ b/src/gui/application.h +@@ -21,8 +21,7 @@ + #include + #include + #include +- +-#include "3rdparty/qtsingleapplication/qtsingleapplication.h" ++#include + + #include "syncresult.h" + #include "logbrowser.h" +@@ -52,7 +51,7 @@ class SslErrorDialog; + * @brief The Application class + * @ingroup gui + */ +-class Application : public SharedTools::QtSingleApplication ++class Application : public QtSingleApplication + { + Q_OBJECT + public: +@@ -96,7 +95,7 @@ signals: + void folderStateChanged(Folder *); + + protected slots: +- void slotParseMessage(const QString &, QObject *); ++ void slotParseMessage(const QString &); + void slotCheckConnection(); + void slotUseMonoIconsChanged(bool); + void slotCleanup(); diff --git a/owncloud-client.spec b/owncloud-client.spec index 96452d2..163b8a8 100644 --- a/owncloud-client.spec +++ b/owncloud-client.spec @@ -1,13 +1,13 @@ Name: owncloud-client -Version: 2.6.3 -%global vertag 14058 +Version: 2.7.4 +%global vertag 2934 Release: 1%{?dist} Summary: The ownCloud Client # -libs are LGPLv2+, rest GPLv2 License: LGPLv2+ and GPLv2 Url: http://owncloud.org/sync-clients/ -Source0: https://download.owncloud.com/desktop/stable/owncloudclient-%{version}.%{vertag}.tar.xz +Source0: https://download.owncloud.com/desktop/ownCloud/stable/%{version}.%{vertag}/source/ownCloud-%{version}.%{vertag}.tar.xz Source1: owncloud.appdata.xml # The patch does 3 things: @@ -17,11 +17,7 @@ Source1: owncloud.appdata.xml # Application::slotParseMessage slot # These fix are needed because the system wide QtSingleApplication is slightly # different from the bundled one. -Patch0: owncloud-client-2.6.0-syslibs.patch - -# Qt 5.15+ fix from Gentoo by Bernard Cafarelli -# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdbacd407eb7482df2e52d2232b97daae639d8bc -Patch1: owncloud-client-2.6.3.14058-qt515.patch +Patch0: owncloud-client-2.7.4-syslibs.patch BuildRequires: check BuildRequires: cmake @@ -120,7 +116,7 @@ Requires: dolphin The owncloud desktop client dolphin extension. %prep -%autosetup -p1 -n owncloudclient-%{version}.%{vertag} +%autosetup -p1 -n ownCloud-%{version}.%{vertag} rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication @@ -161,14 +157,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/owncloud.a %{_libdir}/libowncloud_csync.so.* %doc README.md %license COPYING -%config %{_sysconfdir}/ownCloud/sync-exclude.lst +%config(noreplace) %{_sysconfdir}/ownCloud/sync-exclude.lst %dir %{_sysconfdir}/ownCloud -%{_libdir}/ownCloud/plugins/owncloudsync_vfs_suffix.so +%{_libdir}/qt5/plugins/owncloudsync_vfs_suffix.so %files devel %{_libdir}/libowncloudsync.so %{_includedir}/owncloudsync/ -%{_libdir}/libowncloudsync.so %{_libdir}/libowncloud_csync.so %files nautilus @@ -188,6 +183,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/owncloud.a %changelog +* Mon Dec 28 2020 Miro Hrončok - 2.7.4-1 +- Update to 2.7.4 +- Fixes: rhbz#1792390 + * Mon Dec 28 2020 Miro Hrončok - 2.6.3-1 - Update to 2.6.3 - https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds diff --git a/sources b/sources index 0ef26ca..9f88c16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (owncloudclient-2.6.3.14058.tar.xz) = e2159dc5668f263449e7a9a20ef10c6bb140ea5bd1128a6d3438abce03bc4913bb4eecbacc5160c8018398b6fa75ccfb2a9ab9ad637965e41caebc83994b80b3 +SHA512 (ownCloud-2.7.4.2934.tar.xz) = 7e04d987751d0b8e29fbe8ba8ae58f38fabd7f5007f7508d001532e595b00f58cce487b1d180928154286ffd6b01db1e6ca0407f7d675e8b101ec4ae8414f2a6