Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: now require AppStreamQt 1.0 #284

Merged
merged 1 commit into from
May 21, 2024
Merged

chore: now require AppStreamQt 1.0 #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@

cmake_minimum_required(VERSION 3.10)

if(NOT DEFINED VERSION)
set(VERSION 0.6.11)
endif()

project(dde-launchpad VERSION ${VERSION})
project(dde-launchpad VERSION 0.6.12)

option(BUILD_TEST "Whether or not to build the tests" OFF)

Expand All @@ -30,7 +26,7 @@ set(ASQT_NS AppStreamQt)
find_package(QT NAMES ${QT_NS} REQUIRED COMPONENTS Core)
find_package(${QT_NS} REQUIRED COMPONENTS Core Gui Concurrent Qml Svg Quick QuickControls2 LinguistTools)
find_package(${DTK_NS} REQUIRED COMPONENTS Core Gui)
find_package(${ASQT_NS} 1.0)
find_package(${ASQT_NS} 1.0 REQUIRED)

set_package_properties(${ASQT_NS} PROPERTIES
DESCRIPTION "Library that lists Appstream resources"
Expand Down
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Build-Depends:
libdtk6gui-dev,
libdtk6declarative-dev,
libdde-shell-dev (>= 0.0.10),
libappstreamqt-dev
libappstreamqt-dev (>= 1.0.0)
Standards-Version: 4.6.0
Rules-Requires-Root: no

Expand Down
2 changes: 0 additions & 2 deletions desktopintegration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
#include <appinfo.h>
#include <appmgr.h>

#ifndef NO_APPSTREAM_QT
#include <AppStreamQt/pool.h>
#endif

#include "appwiz.h"
#include "ddedock.h"
Expand Down
12 changes: 1 addition & 11 deletions src/ddeintegration/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,4 @@ target_link_libraries(dde-integration-dbus
PUBLIC
Qt::Concurrent
PRIVATE
Qt::Core Qt::Gui ${DTK_NS}::Core launcher-utils)

if (${ASQT_NS}_FOUND)
target_link_libraries(dde-integration-dbus
PRIVATE
${ASQT_NS})
else()
target_compile_definitions(dde-integration-dbus
PUBLIC NO_APPSTREAM_QT
)
endif()
Qt::Core Qt::Gui ${DTK_NS}::Core ${ASQT_NS} launcher-utils)
Loading