Attachment 877052 Details for Bug 1079062 – Use system qtlockedfile and qtsingleapplication instead of bundled ones

[patch] Use system qtlockedfile and qtsingleapplication instead of bundled ones

Use-system-qtlockedfile-and-qtsingleapplication-in.patch (text/plain), 5.75 KB, created by Ville Skyttä on 2014-03-20 21:32:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-20 21:32:53 UTC

Size: 5.75 KB

patch

obsolete

>From 92b8a81411858630fab626a459055b51aaf9c459 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Thu, 20 Mar 2014 23:31:31 +0200
>Subject: [PATCH] Use system qtlockedfile and qtsingleapplication instead of
> bundled ones
>
>---
> mirall-1.5.3-syslibs.patch | 104 +++++++++++++++++++++++++++++++++++++++++++++
> mirall.spec                |   9 +++-
> 2 files changed, 112 insertions(+), 1 deletion(-)
> create mode 100644 mirall-1.5.3-syslibs.patch
>
>diff --git a/mirall-1.5.3-syslibs.patch b/mirall-1.5.3-syslibs.patch
>new file mode 100644
>index 0000000..9c0c4a9
>--- /dev/null
>+++ b/mirall-1.5.3-syslibs.patch
>@@ -0,0 +1,104 @@
>+diff --git a/src/3rdparty/qtsingleapplication/qtlocalpeer.h b/src/3rdparty/qtsingleapplication/qtlocalpeer.h
>+index b28caad..a821030 100644
>+--- a/src/3rdparty/qtsingleapplication/qtlocalpeer.h
>++++ b/src/3rdparty/qtsingleapplication/qtlocalpeer.h
>+@@ -28,7 +28,7 @@
>+ **
>+ **************************************************************************/
>+ 
>+-#include "qtlockedfile.h"
>++#include <QtSolutions/QtLockedFile>
>+ 
>+ #include <QLocalServer>
>+ #include <QLocalSocket>
>+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
>+index 6213e2c..a1f29a0 100644
>+--- a/src/CMakeLists.txt
>++++ b/src/CMakeLists.txt
>+@@ -30,33 +30,18 @@ if(SPARKLE_FOUND)
>+ endif(SPARKLE_FOUND)
>+ 
>+ set(3rdparty_SRC
>+-3rdparty/qtsingleapplication/qtsingleapplication.cpp
>+-3rdparty/qtsingleapplication/qtlocalpeer.cpp
>+-3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
>+-3rdparty/qtlockedfile/qtlockedfile.cpp
>+ 3rdparty/fancylineedit/fancylineedit.cpp
>+ 3rdparty/QProgressIndicator/QProgressIndicator.cpp
>+ )
>+ 
>+ set(3rdparty_HEADER
>+-3rdparty/qtsingleapplication/qtlocalpeer.h
>+-3rdparty/qtsingleapplication/qtsingleapplication.h
>+-3rdparty/qtsingleapplication/qtsinglecoreapplication.h
>+ 3rdparty/fancylineedit/fancylineedit.h
>+ 3rdparty/QProgressIndicator/QProgressIndicator.h
>+ )
>+ 
>+ qt_wrap_cpp(3rdparty_MOC ${3rdparty_HEADER})
>+ 
>+-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_CURRENT_SOURCE_DIR}/3rdparty/qtlockedfile
>+-    ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication
>+     ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/QProgressIndicator
>+     ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/fancylineedit
>+     ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qjson
>+@@ -415,6 +400,8 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
>+ 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} QtSolutions_LockedFile-2.4 )
>++target_link_libraries( ${APPLICATION_EXECUTABLE} QtSolutions_SingleApplication-2.6 )
>+ target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
>+ 
>+ install(TARGETS ${APPLICATION_EXECUTABLE}
>+diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
>+index 6c51aac..8347398 100644
>+--- a/src/mirall/application.cpp
>++++ b/src/mirall/application.cpp
>+@@ -79,7 +79,7 @@ QString applicationTrPath()
>+ // ----------------------------------------------------------------------------------
>+ 
>+ Application::Application(int &argc, char **argv) :
>+-    SharedTools::QtSingleApplication(argc, argv),
>++    QtSingleApplication(argc, argv),
>+     _gui(0),
>+     _theme(Theme::instance()),
>+     _helpOnly(false),
>+@@ -472,7 +472,7 @@ bool Application::winEventFilter(MSG *pMsg, long *result)
>+         return true;
>+     }
>+ 
>+-    return SharedTools::QtSingleApplication::winEventFilter(pMsg, result);
>++    return QtSingleApplication::winEventFilter(pMsg, result);
>+ }
>+ #endif
>+ 
>+diff --git a/src/mirall/application.h b/src/mirall/application.h
>+index 95939e8..c699946 100644
>+--- a/src/mirall/application.h
>++++ b/src/mirall/application.h
>+@@ -19,7 +19,7 @@
>+ #include <QPointer>
>+ #include <QQueue>
>+ 
>+-#include "qtsingleapplication.h"
>++#include <QtSolutions/QtSingleApplication>
>+ 
>+ #include "mirall/syncresult.h"
>+ #include "mirall/logbrowser.h"
>+@@ -37,7 +37,7 @@ class Folder;
>+ class SslErrorDialog;
>+ class SocketApi;
>+ 
>+-class Application : public SharedTools::QtSingleApplication
>++class Application : public QtSingleApplication
>+ {
>+     Q_OBJECT
>+ public:
>diff --git a/mirall.spec b/mirall.spec
>index 5c99368..5dbc5b8 100644
>--- a/mirall.spec
>+++ b/mirall.spec
>@@ -1,10 +1,11 @@
> Name:           mirall
> Version:        1.5.3
>-Release:        2%{?dist}
>+Release:        3%{?dist}
> License:        GPLv2+
> Summary:        The ownCloud Client
> Url:            http://owncloud.org/sync-clients/
> Source0:        http://download.owncloud.com/desktop/stable/%{name}-%{version}.tar.bz2
>+Patch0:         %{name}-1.5.3-syslibs.patch
> 
> BuildRequires:  cmake
> BuildRequires:  qt4-devel
>@@ -17,6 +18,8 @@ BuildRequires:  doxygen
> BuildRequires:  gcc-c++
> BuildRequires:  sqlite-devel
> BuildRequires:  python-sphinx
>+BuildRequires:  qtlockedfile-devel
>+BuildRequires:  qtsingleapplication-devel
> 
> Requires:       %{name}-common%{?_isa} = %{version}-%{release}
> Requires:       neon
>@@ -63,6 +66,8 @@ The ownCloud desktop client, lets you sync directly to your ownCloud server.
> 
> %prep
> %setup -q %{name}-%{version}
>+%patch0 -p1
>+rm -r src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication
> 
> %build
> mkdir build
>@@ -121,6 +126,8 @@ fi
> %{_includedir}/httpbf.h
> 
> %changelog
>+* Thu Mar 20 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.5.3-3
>+- Use system qtlockedfile and qtsingleapplication instead of bundled ones
> * Wed Mar 19 2014 Joseph Marrero <jmarrero@fedoraproject.org> - 1.5.3-2
> - Updated Obsoletes for each subpackage
> * Sun Mar 16 2014 Joseph Marrero <jmarrero@fedoraproject.org> - 1.5.3-1
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1079062: 877052