openkylin
/
ukui-screensaver
mirror of https://gitee.com/openkylin/ukui-screensaver.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove depends for libkysdk-system

This commit is contained in:
liudun 2024-01-26 17:49:14 +08:00
parent dca307b9b2
commit 9cfaa69087
7 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
debian/control vendored
View File

@ -12,13 +12,11 @@ Build-Depends: cmake (>=2.6),
libglib2.0-dev,
libgsettings-qt-dev,
libimlib2-dev,
# libinput-dev,
libkf5networkmanagerqt-dev,
libkf5screen-dev,
libkf5wayland-dev,
libkf5windowsystem-dev,
libkylin-nm-base (>=3.20.0.9-0k1),
libkysdk-system-dev,
liblayershellqtinterface-dev,
libmatemixer-dev,
libnm-dev,
@ -27,24 +25,13 @@ Build-Depends: cmake (>=2.6),
libqt5svg5-dev,
libqt5x11extras5-dev,
libukui-log4qt-dev,
<<<<<<< HEAD
# libukuiinputgatherclient-dev,
libx11-dev,
libxtst-dev,
qtbase5-dev,
qtmultimedia5-dev,
qttools5-dev,
qttools5-dev-tools,
# ukui-input-gather (>=1.0.0.2)
Standards-Version: 4.6.1.0
=======
libkysdk-sysinfo-dev (>> 1.1.0kylin1),
# ukui-input-gather (>=1.0.0.2),
# libinput-dev,
# libukuiinputgatherclient-dev,
liblayershellqtinterface-dev
qttools5-dev-tools
Standards-Version: 4.5.0
>>>>>>> e44ffbac59dbff49a5ed8df98a3a89af16d6b847
Rules-Requires-Root: no
Homepage: https://gitee.com/openkylin/ukui-screensaver
Vcs-Git: https://gitee.com/openkylin/ukui-screensaver.git
@ -56,14 +43,7 @@ Depends: ethtool,
layer-shell-qt,
libpam-biometric(>=3.20.0.10),
mate-desktop-common,
# ukui-input-gather(>=1.0.0.2),
ukui-session-manager,
<<<<<<< HEAD
=======
libpam-biometric(>=3.20.0.10),
# ukui-input-gather(>=1.0.0.2),
layer-shell-qt,
>>>>>>> e44ffbac59dbff49a5ed8df98a3a89af16d6b847
${misc:Depends},
${shlibs:Depends}
Replaces: ukui-screensaver-common (<< 2.0.0)

5
screensaver/CMakeLists.txt
View File

@ -1,7 +1,10 @@
pkg_check_modules(X11 REQUIRED x11)
pkg_check_modules(XTST REQUIRED xtst)
pkg_check_modules(QGS REQUIRED gsettings-qt)
pkg_check_modules(KDKINFO REQUIRED kysdk-sysinfo)
if (KDKINFO_FOUND)
add_definitions(-DKEKINFO_FOUND="true")
endif()
include_directories(${PROJECT_BINARY_DIR})
include_directories(${PROJECT_SOURCE_DIR}/Common)

8
screensaver/scconfiguration.cpp
View File

@ -21,7 +21,11 @@
#include <QSettings>
#include <QGSettings>
#include <QString>
#ifdef KDKINFO_FOUND
#include <kysdk/kysdk-system/libkysysinfo.h>
#endif
#include <QScreen>
#include <QApplication>
#include "glibinterface.h"
@ -143,7 +147,11 @@ QString SCConfiguration::getDefaultBackground()
if(ispicture(backgroundFile)) {
return backgroundFile;
} else {
#ifdef KDK_INFOFOUND
char *systemName = kdk_system_get_systemName();
#else
char *systemName = "none";
#endif
if (systemName) {
if (QString(systemName) == "openKylin") {
free(systemName);

5
set4kScale/CMakeLists.txt
View File

@ -3,7 +3,10 @@ project(set4kScale)
pkg_check_modules(X11 REQUIRED x11)
pkg_check_modules(XCB REQUIRED xcb)
pkg_check_modules(QGS REQUIRED gsettings-qt)
pkg_check_modules(KDKINFO REQUIRED kysdk-sysinfo)
if (KDKINFO_FOUND)
add_definitions(-DKEKINFO_FOUND="true")
endif()
include_directories(
${X11_INCLUDE_DIRS}

7
set4kScale/main.cpp
View File

@ -28,7 +28,10 @@
#include <QApplication>
#include <QWidget>
#include <QGSettings/QGSettings>
#ifdef KDKINFO_FOUND
#include <kysdk/kysdk-system/libkysysinfo.h>
#endif
extern "C" {
#include <X11/Xatom.h>
@ -228,7 +231,11 @@ end:
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
#ifdef KDK_INFOFOUND
QString platForm = kdk_system_get_hostCloudPlatform();
#else
QString platForm = "none";
#endif
if (platForm == "none") {
qDebug() << "platForm=" << platForm << ", 系统环境为实体机";
setHightResolutionScreenZoom(false);

6
src/CMakeLists.txt
View File

@ -7,7 +7,11 @@ pkg_check_modules(QGS REQUIRED gsettings-qt)
pkg_check_modules(GLIB REQUIRED glib-2.0)
pkg_check_modules(MMIX REQUIRED libmatemixer)
pkg_check_modules(kylin-nm-base REQUIRED kylin-nm-base)
pkg_check_modules(KDKINFO REQUIRED kysdk-sysinfo)
if (KDKINFO_FOUND)
add_definitions(-DKEKINFO_FOUND="true")
endif()
pkg_check_modules(IMLIB2 REQUIRED imlib2)
find_library(PAM_LIBRARIES pam)

11
src/configuration.cpp
View File

@ -26,7 +26,11 @@
#include <QGSettings>
#include <QMimeType>
#include <ctime>
#ifdef KDKINFO_FOUND
#include <kysdk/kysdk-system/libkysysinfo.h>
#endif
#include <QScreen>
#include <QApplication>
#include "glibinterface.h"
@ -221,8 +225,11 @@ QString Configuration::getBackground()
{
if(ispicture(background))
return background;
char *systemName = kdk_system_get_systemName();
#ifdef KDK_INFOFOUND
char *systemName = kdk_system_get_hostCloudPlatform();
#else
char *systemName = "none";
#endif
if (systemName) {
if (QString(systemName) == "openKylin") {
free(systemName);