/[packages]/cauldron/nextcloud-client/current/SOURCES/nextcloud-client-2.2.4-syslibs.patch
ViewVC logotype

Annotation of /cauldron/nextcloud-client/current/SOURCES/nextcloud-client-2.2.4-syslibs.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1082996 - (hide annotations) (download)
Sun Jan 22 16:48:38 2017 UTC (7 years, 4 months ago) by daviddavid
File size: 3433 byte(s)
- add patch to fix wrong library name in nextclouddolphinactionplugin.desktop file (mga#20156)
- rebase syslibs patch like fedora

1 daviddavid 1082996 diff -urNr client-orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h client/src/3rdparty/qtsingleapplication/qtlocalpeer.h
2     --- client-orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2016-09-27 10:53:37.000000000 +0200
3     +++ client/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2016-10-11 07:58:58.953393364 +0200
4 neoclust 1064247 @@ -27,7 +27,7 @@
5     **
6     ****************************************************************************/
7    
8     -#include <qtlockedfile.h>
9     +#include <QTSolutions/qtlockedfile.h>
10    
11     #include <QLocalServer>
12     #include <QLocalSocket>
13 daviddavid 1082996 diff -urNr client-orig/src/gui/application.cpp client/src/gui/application.cpp
14     --- client-orig/src/gui/application.cpp 2016-09-27 10:53:37.000000000 +0200
15     +++ client/src/gui/application.cpp 2016-10-11 08:00:25.875964871 +0200
16 neoclust 1064247 @@ -92,7 +92,7 @@
17     // ----------------------------------------------------------------------------------
18    
19     Application::Application(int &argc, char **argv) :
20     - SharedTools::QtSingleApplication(Theme::instance()->appName() ,argc, argv),
21     + QtSingleApplication(Theme::instance()->appName() ,argc, argv),
22     _gui(0),
23     _theme(Theme::instance()),
24     _helpOnly(false),
25 daviddavid 1082996 diff -urNr client-orig/src/gui/application.h client/src/gui/application.h
26     --- client-orig/src/gui/application.h 2016-09-27 10:53:37.000000000 +0200
27     +++ client/src/gui/application.h 2016-10-11 08:01:58.240768785 +0200
28 neoclust 1064247 @@ -22,7 +22,7 @@
29     #include <QElapsedTimer>
30     #include <QNetworkConfigurationManager>
31    
32     -#include "qtsingleapplication.h"
33     +#include "QtSolutions/QtSingleApplication"
34    
35     #include "syncresult.h"
36     #include "logbrowser.h"
37     @@ -49,7 +49,7 @@
38     * @brief The Application class
39     * @ingroup gui
40     */
41     -class Application : public SharedTools::QtSingleApplication
42     +class Application : public QtSingleApplication
43     {
44     Q_OBJECT
45     public:
46 daviddavid 1082996 diff -urNr client-orig/src/gui/CMakeLists.txt client/src/gui/CMakeLists.txt
47     --- client-orig/src/gui/CMakeLists.txt 2016-09-27 10:53:37.000000000 +0200
48     +++ client/src/gui/CMakeLists.txt 2016-10-11 08:05:03.906753374 +0200
49 neoclust 1064247 @@ -143,10 +143,6 @@
50    
51     set(3rdparty_SRC
52     ../3rdparty/QProgressIndicator/QProgressIndicator.cpp
53     - ../3rdparty/qtlockedfile/qtlockedfile.cpp
54     - ../3rdparty/qtsingleapplication/qtlocalpeer.cpp
55     - ../3rdparty/qtsingleapplication/qtsingleapplication.cpp
56     - ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
57     ../3rdparty/certificates/p12topem.cpp
58     )
59    
60     @@ -158,18 +154,10 @@
61     )
62     endif()
63    
64     -if(NOT WIN32)
65     - list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_unix.cpp)
66     -else()
67     - list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_win.cpp )
68     -endif()
69     -
70     set(3rdparty_INC
71     ${CMAKE_SOURCE_DIR}/src/3rdparty/qjson
72     ${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator
73     - ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile
74     ${CMAKE_SOURCE_DIR}/src/3rdparty/qtmacgoodies/src
75     - ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication
76     )
77    
78     include_directories(${3rdparty_INC})
79     @@ -288,6 +276,8 @@
80     target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
81     target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
82     target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
83     +target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5Solutions_LockedFile-2.4 )
84     +target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5Solutions_SingleApplication-2.6 )
85     target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
86    
87     if(WITH_CRASHREPORTER)

  ViewVC Help
Powered by ViewVC 1.1.30