Description: Support building with appstream 1.0.x Following similar fixes in some KDE packages Author: Rik Mills --- a/src/modules/packagechooser/CMakeLists.txt +++ b/src/modules/packagechooser/CMakeLists.txt @@ -25,18 +25,18 @@ # option(BUILD_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON) if(BUILD_APPSTREAM) - find_package(AppStreamQt) + find_package(AppStreamQt5) set_package_properties( - AppStreamQt + AppStreamQt5 PROPERTIES DESCRIPTION "Support for AppStream (cache) data" URL "https://github.com/ximion/appstream" PURPOSE "AppStream provides package data" TYPE OPTIONAL ) - if(AppStreamQt_FOUND) - add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt_VERSION_MAJOR}) - list(APPEND _extra_libraries AppStreamQt) + if(AppStreamQt5_FOUND) + add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt5_VERSION_MAJOR}) + list(APPEND _extra_libraries AppStreamQt5) list(APPEND _extra_src ItemAppStream.cpp) endif() endif() --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -16,7 +16,7 @@ #ifdef HAVE_APPSTREAM_VERSION #include "ItemAppStream.h" -#include +#include #include #endif --- a/src/modules/packagechooser/ItemAppStream.cpp +++ b/src/modules/packagechooser/ItemAppStream.cpp @@ -17,9 +17,9 @@ #include "utils/Logger.h" #include "utils/Variant.h" -#include -#include -#include +#include +#include +#include /// @brief Return number of pixels in a size, for < ordering purposes static inline quint64 --- a/src/modules/packagechooserq/CMakeLists.txt +++ b/src/modules/packagechooserq/CMakeLists.txt @@ -36,18 +36,18 @@ # option(BUILD_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON) if(BUILD_APPSTREAM) - find_package(AppStreamQt) + find_package(AppStreamQt5) set_package_properties( - AppStreamQt + AppStreamQt5 PROPERTIES DESCRIPTION "Support for AppStream (cache) data" URL "https://github.com/ximion/appstream" PURPOSE "AppStream provides package data" TYPE OPTIONAL ) - if(AppStreamQt_FOUND) - add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt_VERSION_MAJOR}) - list(APPEND _extra_libraries AppStreamQt) + if(AppStreamQt5_FOUND) + add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt5_VERSION_MAJOR}) + list(APPEND _extra_libraries AppStreamQt5) list(APPEND _extra_src ${_packagechooser}/ItemAppStream.cpp) endif() endif()