fix appstream-qt5

src/modules/packagechooser/CMakeLists.txt

@@ -25,9 +25,9 @@ endif()
 #
 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"
@@ -35,8 +35,8 @@ if(BUILD_APPSTREAM)
         TYPE OPTIONAL
     )
     if(AppStreamQt_FOUND)
-        add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt_VERSION_MAJOR})
-        list(APPEND _extra_libraries AppStreamQt)
+        add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt5_VERSION_MAJOR})
+        list(APPEND _extra_libraries AppStreamQt5)
         list(APPEND _extra_src ItemAppStream.cpp)
     endif()
 endif()

src/modules/packagechooser/Config.cpp

@@ -16,7 +16,7 @@
 
 #ifdef HAVE_APPSTREAM_VERSION
 #include "ItemAppStream.h"
-#include <AppStreamQt/pool.h>
+#include <AppStreamQt5/pool.h>
 #include <memory>
 #endif
 

src/modules/packagechooser/ItemAppStream.cpp

@@ -17,9 +17,9 @@
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
-#include <AppStreamQt/image.h>
-#include <AppStreamQt/pool.h>
-#include <AppStreamQt/screenshot.h>
+#include <AppStreamQt5/image.h>
+#include <AppStreamQt5/pool.h>
+#include <AppStreamQt5/screenshot.h>
 
 /// @brief Return number of pixels in a size, for < ordering purposes
 static inline quint64

src/modules/packagechooser/packagechooser.qrc

@@ -2,6 +2,5 @@
     <qresource prefix="/">
         <file>images/no-selection.png</file>
         <file>images/calamares.png</file>
-        <file>images/if.png</file>
     </qresource>
 </RCC>

src/modules/packagechooserq/CMakeLists.txt

@@ -36,9 +36,9 @@ endif()
 #
 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"
@@ -46,8 +46,8 @@ if(BUILD_APPSTREAM)
         TYPE OPTIONAL
     )
     if(AppStreamQt_FOUND)
-        add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt_VERSION_MAJOR})
-        list(APPEND _extra_libraries AppStreamQt)
+        add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt5_VERSION_MAJOR})
+        list(APPEND _extra_libraries AppStreamQt5)
         list(APPEND _extra_src ${_packagechooser}/ItemAppStream.cpp)
     endif()
 endif()