[packages/owncloudclient] build with system qtlockedfile, qtsingleapplication libs

[glen]

commit b570669f5d44e366c1a14363f85f8947c22c7d98
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Apr 13 01:07:05 2016 +0300

    build with system qtlockedfile, qtsingleapplication libs
    
    patch from fedora

 owncloudclient.spec |  9 +++++-
 syslibs.patch       | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 1 deletion(-)
---
diff --git a/owncloudclient.spec b/owncloudclient.spec
index 0a4ec28..ea3e068 100644
--- a/owncloudclient.spec
+++ b/owncloudclient.spec
@@ -15,18 +15,21 @@
 Summary:	The ownCloud client
 Name:		owncloudclient
 Version:	2.1.1
-Release:	0.16
+Release:	0.17
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	https://download.owncloud.com/desktop/stable/%{name}-%{version}.tar.xz
 # Source0-md5:	63a971158201a8dffe96a02c54b86819
+Patch0:		syslibs.patch
 URL:		https://www.owncloud.com/
 BuildRequires:	Qt5Concurrent-devel
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5DBus-devel >= %{qtver}
 BuildRequires:	Qt5Gui-devel >= %{qtver}
 BuildRequires:	Qt5Keychain-devel
+BuildRequires:	Qt5LockedFile-devel >= 2.4
 BuildRequires:	Qt5Network-devel >= %{qtver}
+BuildRequires:	Qt5SingleApplication-devel >= 2.6
 BuildRequires:	Qt5Sql-devel >= %{qtver}
 BuildRequires:	Qt5WebKit-devel >= %{qtver}
 BuildRequires:	Qt5Xml-devel >= %{qtver}
@@ -131,6 +134,10 @@ Nautilus file manager.
 
 %prep
 %setup -q
+%patch0 -p1
+
+rm -r src/3rdparty/qtlockedfile
+rm -r src/3rdparty/qtsingleapplication
 
 %build
 install -d build
diff --git a/syslibs.patch b/syslibs.patch
new file mode 100644
index 0000000..cd81824
--- /dev/null
+++ b/syslibs.patch
@@ -0,0 +1,88 @@
+diff -urNr client-2.1.1-orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h client-2.1.1/src/3rdparty/qtsingleapplication/qtlocalpeer.h
+--- client-2.1.1-orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h	2016-02-09 16:07:08.000000000 +0100
++++ client-2.1.1/src/3rdparty/qtsingleapplication/qtlocalpeer.h	2016-02-10 18:57:13.283239761 +0100
+@@ -27,7 +27,7 @@
+ **
+ ****************************************************************************/
+ 
+-#include <qtlockedfile.h>
++#include <qt5/QTSolutions/qtlockedfile.h>
+ 
+ #include <QLocalServer>
+ #include <QLocalSocket>
+diff -urNr client-2.1.1-orig/src/gui/application.cpp client-2.1.1/src/gui/application.cpp
+--- client-2.1.1-orig/src/gui/application.cpp	2016-02-09 16:07:08.000000000 +0100
++++ client-2.1.1/src/gui/application.cpp	2016-02-10 18:57:58.390257879 +0100
+@@ -92,7 +92,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),
+diff -urNr client-2.1.1-orig/src/gui/application.h client-2.1.1/src/gui/application.h
+--- client-2.1.1-orig/src/gui/application.h	2016-02-09 16:07:08.000000000 +0100
++++ client-2.1.1/src/gui/application.h	2016-02-10 18:59:17.073545113 +0100
+@@ -22,7 +22,7 @@
+ #include <QElapsedTimer>
+ #include <QNetworkConfigurationManager>
+ 
+-#include "qtsingleapplication.h"
++#include "qt5/QtSolutions/QtSingleApplication"
+ 
+ #include "syncresult.h"
+ #include "logbrowser.h"
+@@ -49,7 +49,7 @@
+  * @brief The Application class
+  * @ingroup gui
+  */
+-class Application : public SharedTools::QtSingleApplication
++class Application : public QtSingleApplication
+ {
+     Q_OBJECT
+ public:
+diff -urNr client-2.1.1-orig/src/gui/CMakeLists.txt client-2.1.1/src/gui/CMakeLists.txt
+--- client-2.1.1-orig/src/gui/CMakeLists.txt	2016-02-09 16:07:08.000000000 +0100
++++ client-2.1.1/src/gui/CMakeLists.txt	2016-02-10 19:01:30.585638842 +0100
+@@ -135,10 +135,6 @@
+ set(3rdparty_SRC
+     ../3rdparty/fancylineedit/fancylineedit.cpp
+     ../3rdparty/QProgressIndicator/QProgressIndicator.cpp
+-    ../3rdparty/qtlockedfile/qtlockedfile.cpp
+-    ../3rdparty/qtsingleapplication/qtlocalpeer.cpp
+-    ../3rdparty/qtsingleapplication/qtsingleapplication.cpp
+-    ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
+     ../3rdparty/certificates/p12topem.cpp
+    )
+ 
+@@ -150,19 +146,11 @@
+         )
+ endif()
+ 
+-if(NOT WIN32)
+-   list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_unix.cpp)
+-else()
+-   list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_win.cpp )
+-endif()
+-
+ set(3rdparty_INC
+     ${CMAKE_SOURCE_DIR}/src/3rdparty/fancylineedit
+     ${CMAKE_SOURCE_DIR}/src/3rdparty/qjson
+     ${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator
+-    ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile
+     ${CMAKE_SOURCE_DIR}/src/3rdparty/qtmacgoodies/src
+-    ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication
+     )
+ 
+ include_directories(${3rdparty_INC})
+@@ -281,6 +269,8 @@
+ target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
+ 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} )
+ 
+ if(WITH_CRASHREPORTER)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/owncloudclient.git/commitdiff/b570669f5d44e366c1a14363f85f8947c22c7d98