From 29a741275c94aff88ad4d7abc8d5cb102f12df98 Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Fri, 3 Nov 2023 09:00:05 +0200 Subject: [PATCH] fix: remove unused dframeworkdbus (#109) It's no longer used. --- CMakeLists.txt | 2 -- debian/control | 2 +- rpm/deepin-calculator.spec | 1 - src/control/scientifickeypad.h | 1 - src/main.cpp | 1 + tests/CMakeLists.txt | 2 -- 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5b01dd1..36e0fa20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,8 +63,6 @@ find_package(Qt5Test REQUIRED) pkg_search_module(DtkWidget REQUIRED dtkwidget) pkg_search_module(DtkGui REQUIRED dtkgui) pkg_search_module(DtkCore REQUIRED dtkcore) -#find_package(DFrameworkDbus REQUIRED dframeworkdbus) -pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus) include_directories(${DtkWidget_INCLUDE_DIRS}) include_directories(${DtkGui_INCLUDE_DIRS}) diff --git a/debian/control b/debian/control index 26f8463f..a12cdcd1 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: deepin-calculator Section: utils Priority: optional Maintainer: Deepin Packages Builder -Build-Depends: debhelper (>= 9),cmake ,pkg-config, libdtkgui-dev, libdtkwidget-dev, libqt5svg5-dev, qttools5-dev-tools, libdframeworkdbus-dev, libgtest-dev, libgmock-dev +Build-Depends: debhelper (>= 9),cmake ,pkg-config, libdtkgui-dev, libdtkwidget-dev, libqt5svg5-dev, qttools5-dev-tools, libgtest-dev, libgmock-dev Standards-Version: 3.9.8 Homepage: http://www.deepin.org diff --git a/rpm/deepin-calculator.spec b/rpm/deepin-calculator.spec index 72f3689a..3cfc2a20 100644 --- a/rpm/deepin-calculator.spec +++ b/rpm/deepin-calculator.spec @@ -22,7 +22,6 @@ BuildRequires: qt5-devel BuildRequires: pkgconfig(dtkcore) BuildRequires: pkgconfig(dtkwidget) BuildRequires: pkgconfig(dtkgui) -BuildRequires: pkgconfig(dframeworkdbus) # BuildRequires: pkgconfig(Qt5Widgets) diff --git a/src/control/scientifickeypad.h b/src/control/scientifickeypad.h index aef41400..31786797 100644 --- a/src/control/scientifickeypad.h +++ b/src/control/scientifickeypad.h @@ -14,7 +14,6 @@ #include #include #include -#include #include #include diff --git a/src/main.cpp b/src/main.cpp index f4e0cfcf..8583248d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,6 +7,7 @@ #include "environments.h" #include "utils.h" +#include #include #include #include diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ea12c338..88fa2335 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -57,8 +57,6 @@ find_package(Qt5Test REQUIRED) find_package(DtkWidget REQUIRED dtkwidget) find_package(DtkGui REQUIRED dtkgui) find_package(DtkCore REQUIRED dtkcore) -#find_package(DFrameworkDbus REQUIRED dframeworkdbus) -pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus) include_directories(${DtkWidget_INCLUDE_DIRS}) include_directories(${DtkGui_INCLUDE_DIRS})