diff --git a/common/shlibs b/common/shlibs index 41ee6616f37..0e23d08915a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2360,7 +2360,8 @@ libtelepathy-qt5-farstream.so.0 telepathy-qt5-farstream-0.9.5_1 libKF5Attica.so.5 attica-5.6.0_1 liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1 liblastfm5.so.1 liblastfm-qt5-1.0.9_1 -libquazip5.so.1 quazip-0.7.3_2 +libquazip1-qt5.so.1.4.0 quazip-1.4_1 +libquazip1-qt6.so.1.4.0 quazip-qt6-1.4_1 libjreen-qt5.so.1 jreen-1.3.0_1 libzen.so.0 libzen-0.4.31_1 libmediainfo.so.0 libmediainfo-0.7.75_1 diff --git a/srcpkgs/quazip-qt6 b/srcpkgs/quazip-qt6 new file mode 120000 index 00000000000..25332fc361d --- /dev/null +++ b/srcpkgs/quazip-qt6 @@ -0,0 +1 @@ +quazip \ No newline at end of file diff --git a/srcpkgs/quazip-qt6-devel b/srcpkgs/quazip-qt6-devel new file mode 120000 index 00000000000..25332fc361d --- /dev/null +++ b/srcpkgs/quazip-qt6-devel @@ -0,0 +1 @@ +quazip \ No newline at end of file diff --git a/srcpkgs/quazip/template b/srcpkgs/quazip/template index b9faea57e49..ccf5df3d0ff 100644 --- a/srcpkgs/quazip/template +++ b/srcpkgs/quazip/template @@ -1,28 +1,47 @@ # Template file for 'quazip' pkgname=quazip -version=0.8.1 +version=1.4 revision=1 build_style=cmake -makedepends="qt5-devel zlib-devel" +configure_args="-DQUAZIP_QT_MAJOR_VERSION=5" +hostmakedepends="qt5-host-tools qt5-devel qt6-tools qt6-base" +makedepends="qt5-devel qt6-base-devel qt6-qt5compat-devel zlib-devel" short_desc="Qt5/C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package" maintainer="Duncaen " license="LGPL-2.1-only" homepage="https://github.com/stachenov/quazip" distfiles="https://github.com/stachenov/quazip/archive/v${version}.tar.gz" -checksum=4fda4d4248e08015b5090d0369ef9e68bdc4475aa12494f7c0f6d79e43270d14 +checksum=79633fd3a18e2d11a7d5c40c4c79c1786ba0c74b59ad752e8429746fe1781dd6 -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-devel" +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DQUAZIP_ENABLE_TESTS=ON" fi +post_configure() { + configure_args="${configure_args/=5/=6}" + cmake_builddir="build-qt6" do_configure +} + +post_build() { + cmake_builddir="build-qt6" do_build +} + +post_check() { + cmake_builddir="build-qt6" do_check +} + +post_install() { + cmake_builddir="build-qt6" do_install +} + quazip-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { - vmove usr/include - vmove usr/share - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" + vmove "usr/include/*Qt5*" + vmove "usr/lib/cmake/*Qt5*" + vmove "usr/lib/pkgconfig/*qt5*" + vmove "usr/lib/*qt5.so" } } @@ -37,3 +56,21 @@ quazip-qt5-devel_package() { short_desc+=" (transitional dummy package)" depends="quazip-devel>=${version}_${revision}" } + +quazip-qt6_package() { + short_desc="${short_desc/Qt5/Qt6}" + pkg_install() { + vmove "usr/lib/*qt6.so.*" + } +} + +quazip-qt6-devel_package() { + depends="${sourcepkg}-qt6>=${version}_${revision}" + short_desc="${short_desc/Qt5/Qt6} - development files" + pkg_install() { + vmove "usr/include/*Qt6*" + vmove "usr/lib/cmake/*Qt6*" + vmove "usr/lib/pkgconfig/*qt6*" + vmove "usr/lib/*qt6.so" + } +}