diff --git a/client-appimage-qt6/Dockerfile.build.qt-6.9.3.el8 b/client-appimage-qt6/Dockerfile.build.qt-6.9.3.el8 index 562ef2e6..abf91341 100644 --- a/client-appimage-qt6/Dockerfile.build.qt-6.9.3.el8 +++ b/client-appimage-qt6/Dockerfile.build.qt-6.9.3.el8 @@ -148,8 +148,9 @@ ENV PATH "$PATH:/root/linux-gcc-x86_64/dev-utils/bin" # Install binary dependencies RUN \ + rm -r /root/linux-gcc-x86_64/etc/blueprints/locations/desktop-client-blueprints && \ scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-4.0|" && \ - scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/desktop-client-blueprints.git|stable-4.0|" && \ + scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-nextcloud.git|stable-4.0|" && \ scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c craft && \ scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --install-deps nextcloud-client && \ scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --no-cache -i kde/frameworks/tier1/karchive && \ diff --git a/client-appimage-qt6/craftmaster.qt-6.9.3.ini b/client-appimage-qt6/craftmaster.qt-6.9.3.ini index 4f587a64..b0496d2b 100644 --- a/client-appimage-qt6/craftmaster.qt-6.9.3.ini +++ b/client-appimage-qt6/craftmaster.qt-6.9.3.ini @@ -3,7 +3,7 @@ [General] Branch = stable-4.0-qt-6.9.3 CraftUrl = https://github.com/nextcloud/craft.git -CraftRevision = 7a6af6465396c2271d3f4b49d5a4c13c052a3aeb +CraftRevision = 22cf36e8e0b6d0091b6ced384650588ddd5ad0ea ShallowClone = False # Variables defined here override the default value @@ -40,6 +40,8 @@ nextcloud-client.buildTests = True binary/mysql.useMariaDB = False libs/qt6.version = 6.9.3 craft/craft-blueprints-kde.revision = stable-4.0 +libs/zlib.version = 1.3.1 +libs/openssl.version = 3.5.7 [windows-msvc2022_64-cl] Packager/PackageType = NullsoftInstallerPackager