Merge pull request #56 from sailfishos/remove_ssu_lib

[crash-reporter] Replace ssu library dependency with systemsettings. JB#57126
sailfishos · Mar 28, 2024 · 8ea96e9 · 8ea96e9
2 parents 7879975 + 743b7e3
commit 8ea96e9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/rpm/crash-reporter.spec b/rpm/crash-reporter.spec
@@ -9,14 +9,14 @@ BuildRequires:          qt5-qtdeclarative-devel
 BuildRequires:          qt5-qtgui-devel
 BuildRequires:          qt5-qtnetwork-devel
 BuildRequires:          qt5-qttools-linguist
-BuildRequires:          ssu-devel
 BuildRequires:          pkgconfig(dbus-1)
 BuildRequires:          pkgconfig(libiphb)
 BuildRequires:          pkgconfig(libudev)
 BuildRequires:          pkgconfig(libsystemd)
 BuildRequires:          pkgconfig(mce)
 BuildRequires:          pkgconfig(qt5-boostable)
 BuildRequires:          pkgconfig(nemonotifications-qt5)
+BuildRequires:          pkgconfig(systemsettings)
 BuildRequires:          pkgconfig(usb-moded-qt5)
 BuildRequires:          pkgconfig(systemd)
 BuildRequires:          oneshot

diff --git a/src/libs/libs.pro b/src/libs/libs.pro
@@ -35,13 +35,12 @@ QT = \
 
 CONFIG += link_pkgconfig
 PKGCONFIG += mce \
-             usb-moded-qt5
+             usb-moded-qt5 \
+             nemonotifications-qt5 \
+             systemsettings
 
 DEFINES += CREPORTER_EXPORTS
 
-CONFIG += link_pkgconfig
-PKGCONFIG += nemonotifications-qt5
-
 message(Building architecture: $$system(uname -m))
 
 # Enable Qt Bearer Management API.
@@ -110,8 +109,6 @@ HEADERS += $$PUBLIC_HEADERS \
             settings/creportersettingsbase_p.h \
             settings/creportersettingsinit_p.h \
 
-LIBS += -lssu
-
 TARGET = $$qtLibraryTarget(crashreporter)
 
 target.path += $$[QT_INSTALL_LIBS]

diff --git a/src/libs/utils/creporterutils.cpp b/src/libs/utils/creporterutils.cpp
@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 
 #ifndef CREPORTER_UNIT_TEST
-#include <ssudeviceinfo.h>
+#include <deviceinfo.h>
 #endif
 
 #include <QDebug>
@@ -194,7 +194,7 @@ QString CReporterUtils::deviceUid()
     reply.waitForFinished();
     if (reply.isError()) {
         qCWarning(cr) << "DBus unavailable, UUID might be incorrect.";
-        return SsuDeviceInfo().deviceUid();
+        return DeviceInfo(true).deviceUid();
     } else {
         return reply.value();
     }
@@ -206,7 +206,7 @@ QString CReporterUtils::deviceUid()
 QString CReporterUtils::deviceModel()
 {
 #ifndef CREPORTER_UNIT_TEST
-    return SsuDeviceInfo().deviceModel();
+    return DeviceInfo(true).model();
 #else
     return "Device";
 #endif