Merge branch 'fix_dbus_glib_issues' into 'master'

[lipstick] Fix build issues. Contributes to JB#51115 See merge request mer-core/lipstick!169
sailfishos · Dec 9, 2020 · 67507f8 · 67507f8
2 parents e1b1883 + 0bb68cd
commit 67507f8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/rpm/lipstick-qt5.spec b/rpm/lipstick-qt5.spec
@@ -40,6 +40,7 @@ BuildRequires:  pkgconfig(usb-moded-qt5) >= 1.8
 BuildRequires:  pkgconfig(systemsettings) >= 0.5.28
 BuildRequires:  pkgconfig(nemodevicelock)
 BuildRequires:  pkgconfig(sailfishusermanager)
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  qt5-qttools-linguist
 BuildRequires:  qt5-qtgui-devel >= 5.2.1+git24
 BuildRequires:  qt5-qtwayland-wayland_egl-devel >= 5.4.0+git26

diff --git a/src/src.pro b/src/src.pro
@@ -142,6 +142,7 @@ CONFIG -= link_prl
 PKGCONFIG += \
     dbus-1 \
     dsme_dbus_if \
+    glib-2.0 \
     keepalive \
     libresourceqt5 \
     libsystemd \

diff --git a/tests/ut_volumecontrol/ut_volumecontrol.pro b/tests/ut_volumecontrol/ut_volumecontrol.pro
@@ -2,7 +2,7 @@ include(../common.pri)
 TARGET = ut_volumecontrol
 INCLUDEPATH += $$VOLUMESRCDIR $$UTILITYSRCDIR $$3RDPARTYSRCDIR
 CONFIG += link_pkgconfig
-PKGCONFIG += dbus-1 dbus-glib-1 libresourceqt5
+PKGCONFIG += dbus-1 libresourceqt5 glib-2.0
 QT += dbus qml quick
 QMAKE_CXXFLAGS += `pkg-config --cflags-only-I mlite5`