diff --git a/util/archive/quazip/actions.py b/util/archive/quazip/actions.py index 0d24c8b02a..5593e910b7 100644 --- a/util/archive/quazip/actions.py +++ b/util/archive/quazip/actions.py @@ -6,17 +6,28 @@ from pisi.actionsapi import cmaketools from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools from pisi.actionsapi import get def setup(): - cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ - -DQUAZIP_QT_MAJOR_VERSION=5 \ - -DBUILD_WITH_QT4:BOOL=OFF") + cmaketools.configure("-B build5 -DCMAKE_INSTALL_PREFIX=/usr \ + -DQUAZIP_QT_MAJOR_VERSION=5 \ + -DBUILD_WITH_QT4:BOOL=OFF") + + cmaketools.configure("-B build6 -DCMAKE_INSTALL_PREFIX=/usr \ + -DQUAZIP_QT_MAJOR_VERSION=6 \ + -DBUILD_WITH_QT4:BOOL=OFF") def build(): - cmaketools.make() + cmaketools.make("-C build5") + cmaketools.make("-C build6") def install(): + shelltools.cd("build5") cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + shelltools.cd("../build6") + cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + + shelltools.cd("..") pisitools.dodoc("COPYING", "README.md", "NEWS.txt") diff --git a/util/archive/quazip/pspec.xml b/util/archive/quazip/pspec.xml index 3667098661..6fb943975d 100644 --- a/util/archive/quazip/pspec.xml +++ b/util/archive/quazip/pspec.xml @@ -17,6 +17,8 @@ https://github.com/stachenov/quazip/archive/v1.4.tar.gz qt5-base-devel + qt6-base-devel + qt6-5compat-devel zlib-devel bzip2 cmake @@ -32,9 +34,23 @@ libgcc - /usr/lib + /usr/lib/libquazip1-qt5.so* /usr/share/doc - /usr/share/cmake/Modules/FindQuaZip5.cmake + + + + + + quazip-qt6 + + qt6-base + zlib + bzip2 + qt6-5compat + + + /usr/lib/libquazip1-qt6.so* + @@ -47,13 +63,35 @@ zlib-devel - /usr/include - /usr/lib/cmake - /usr/lib/pkgconfig + /usr/include/QuaZip-Qt5-*/ + /usr/lib/cmake/QuaZip-Qt5-* + /usr/lib/pkgconfig/quazip1-qt5.pc + + + + + quazip-qt6-devel + Development files for quazip + + quazip-qt6 + qt6-base-devel + zlib-devel + + + /usr/include/QuaZip-Qt6-*/ + /usr/lib/cmake/QuaZip-Qt6-* + /usr/lib/pkgconfig/quazip1-qt6.pc + + 2024-11-30 + 1.4 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-01-25 1.4