Pārlūkot izejas kodu

package/quazip: enable for qt6

Signed-off-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Zoltan Gyarmati 2 gadi atpakaļ
vecāks
revīzija
6ca42939d6
2 mainītis faili ar 11 papildinājumiem un 4 dzēšanām
  1. 2 1
      package/quazip/Config.in
  2. 9 3
      package/quazip/quazip.mk

+ 2 - 1
package/quazip/Config.in

@@ -1,8 +1,9 @@
 config BR2_PACKAGE_QUAZIP
 config BR2_PACKAGE_QUAZIP
 	bool "quazip"
 	bool "quazip"
-	depends on BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
 	select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
+	select BR2_PACKAGE_QT6CORE5COMPAT if BR2_PACKAGE_QT6
 	help
 	help
 	  QuaZIP is a simple C++ wrapper over Gilles Vollant's
 	  QuaZIP is a simple C++ wrapper over Gilles Vollant's
 	  ZIP/UNZIP package that can be used to access ZIP
 	  ZIP/UNZIP package that can be used to access ZIP

+ 9 - 3
package/quazip/quazip.mk

@@ -7,9 +7,15 @@
 QUAZIP_VERSION = 1.4
 QUAZIP_VERSION = 1.4
 QUAZIP_SITE = $(call github,stachenov,quazip,v$(QUAZIP_VERSION))
 QUAZIP_SITE = $(call github,stachenov,quazip,v$(QUAZIP_VERSION))
 QUAZIP_INSTALL_STAGING = YES
 QUAZIP_INSTALL_STAGING = YES
-QUAZIP_DEPENDENCIES = \
-	zlib \
-	qt5base
+QUAZIP_DEPENDENCIES = zlib
+
+ifeq ($(BR2_PACKAGE_QT5BASE),y)
+QUAZIP_DEPENDENCIES +=  qt5base
+endif
+ifeq ($(BR2_PACKAGE_QT6BASE),y)
+QUAZIP_DEPENDENCIES +=  qt6base qt6core5compat
+endif
+
 QUAZIP_LICENSE = LGPL-2.1
 QUAZIP_LICENSE = LGPL-2.1
 QUAZIP_LICENSE_FILES = COPYING
 QUAZIP_LICENSE_FILES = COPYING
 QUAZIP_CPE_ID_VENDOR = quazip_project
 QUAZIP_CPE_ID_VENDOR = quazip_project