1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
|
Description: Allow building against QtSystemInfo again
Author: Guido Berhoerster <guido+debian@berhoerster.name>
Abstract:
Since QtSystemInfo is deprecated upstream switched over to the
SailfishOS-specific libsystemsettings in
797d30fe756e1ec0e1a7cd1da78fd367dfaf3aaf. Add back optional support for it in
order to avoid the dependency.
Forwarded: not needed, Debian-specific
--- buteo-sync-plugins.orig/serverplugins/syncmlserver/syncmlserver.pro
+++ buteo-sync-plugins/serverplugins/syncmlserver/syncmlserver.pro
@@ -1,6 +1,12 @@
TARGET = syncml-server
CONFIG += link_pkgconfig
-PKGCONFIG += glib-2.0 buteosyncfw5 buteosyncml5 systemsettings
+PKGCONFIG += glib-2.0 buteosyncfw5 buteosyncml5
+packagesExist(systemsettings) {
+ PKGCONFIG += systemsettings
+ DEFINES += HAS_SYSTEMSETTINGS
+} else {
+ PKGCONFIG += Qt5SystemInfo
+}
INCLUDEPATH += . ../../syncmlcommon
LIBS += -L../../syncmlcommon
--- buteo-sync-plugins.orig/syncmlcommon/DeviceInfo.cpp
+++ buteo-sync-plugins/syncmlcommon/DeviceInfo.cpp
@@ -60,7 +60,11 @@ QString Buteo::DeviceInfo::getDeviceIMEI
FUNCTION_CALL_TRACE(lcSyncMLPluginTrace);
/// @todo returning first IMEI for now; needs fixing on multisim devices
+#if defined(HAS_SYSTEMSETTINGS)
return IMEI + deviceInfo.imeiNumbers().value(0, QString());
+#else
+ return IMEI + deviceInfo.imei(0);
+#endif
}
QString Buteo::DeviceInfo::getManufacturer()
@@ -82,7 +86,11 @@ QString Buteo::DeviceInfo::getSwVersion(
{
FUNCTION_CALL_TRACE(lcSyncMLPluginTrace);
+#if defined(HAS_SYSTEMSETTINGS)
return deviceInfo.osVersion();
+#else
+ return deviceInfo.version(QDeviceInfo::Firmware);
+#endif
}
--- buteo-sync-plugins.orig/syncmlcommon/DeviceInfo.h
+++ buteo-sync-plugins/syncmlcommon/DeviceInfo.h
@@ -29,7 +29,11 @@
#include <QMutex>
#include <QMap>
-#include <deviceinfo.h>
+#ifdef HAS_SYSTEMSETTINGS
+ #include <deviceinfo.h>
+#else
+ #include <QDeviceInfo>
+#endif
namespace Buteo {
@@ -128,7 +132,11 @@ namespace Buteo {
QString getDeviceIMEI();
QString getDeviceType();
+#if defined(HAS_SYSTEMSETTINGS)
::DeviceInfo deviceInfo;
+#else
+ QDeviceInfo deviceInfo;
+#endif
#ifdef SYNC_APP_UNITTESTS
friend class DeviceInfoTest;
--- buteo-sync-plugins.orig/syncmlcommon/syncmlcommon.pro
+++ buteo-sync-plugins/syncmlcommon/syncmlcommon.pro
@@ -4,7 +4,13 @@ DEPENDPATH += .
CONFIG += link_pkgconfig create_pc create_prl
TARGET = syncmlcommon5
-PKGCONFIG = buteosyncfw5 buteosyncml5 systemsettings
+PKGCONFIG = buteosyncfw5 buteosyncml5
+packagesExist(systemsettings) {
+ PKGCONFIG += systemsettings
+ DEFINES += HAS_SYSTEMSETTINGS
+} else {
+ PKGCONFIG += Qt5SystemInfo
+}
QT += sql xml
QT -= gui
--- buteo-sync-plugins.orig/clientplugins/syncmlclient/syncmlclient.pro
+++ buteo-sync-plugins/clientplugins/syncmlclient/syncmlclient.pro
@@ -3,7 +3,12 @@ DEPENDPATH += .
INCLUDEPATH += . ../../syncmlcommon
CONFIG += link_pkgconfig
-PKGCONFIG = buteosyncfw5 buteosyncml5 accounts-qt5 libsignon-qt5 systemsettings
+PKGCONFIG = buteosyncfw5 buteosyncml5 accounts-qt5 libsignon-qt5
+packagesExist(systemsettings) {
+ PKGCONFIG += systemsettings
+} else {
+ PKGCONFIG += Qt5SystemInfo
+}
LIBS += -lsyncmlcommon5
LIBS += -L../../syncmlcommon
|
