From c740dc2cd72cd5a24013c6b5d889f449b13a295a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= <sebastien.blin@savoirfairelinux.com> Date: Fri, 28 Jan 2022 14:13:44 -0500 Subject: [PATCH] packaging: use Qt 6.2.3 Change-Id: I996b402c5eb9b03ea18a0309818c6a52c9d6e236 --- Makefile | 4 ++-- packaging/rules/debian/control | 6 +++--- scripts/build-package-rpm.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 81c780b4..f56a0367 100644 --- a/Makefile +++ b/Makefile @@ -47,8 +47,8 @@ DEBIAN_DSC_FILENAME := jami_$(DEBIAN_VERSION).dsc # Qt versions QT_MAJOR := 6 QT_MINOR := 2 -QT_PATCH := 2 -QT_TARBALL_CHECKSUM := 907994f78d42b30bdea95e290e91930c2d9b593f3f8dd994f44157e387feee0f +QT_PATCH := 3 +QT_TARBALL_CHECKSUM := f784998a159334d1f47617fd51bd0619b9dbfe445184567d2cd7c820ccb12771 DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-1 DEBIAN_QT_DSC_FILENAME := libqt-jami_$(DEBIAN_QT_VERSION).dsc QT_JAMI_PREFIX := /usr/lib/libqt-jami diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control index 66fef3fd..8b7ef62a 100644 --- a/packaging/rules/debian/control +++ b/packaging/rules/debian/control @@ -77,7 +77,7 @@ Depends: gnupg, Replaces: jami, jami-libclient, jami-daemon, - libqt-jami (>= 6), + libqt-jami (>= 6.2.3), Conflicts: jami, jami-libclient, jami-daemon, @@ -93,7 +93,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, jami-libclient (=${binary:Version}), - libqt-jami (>= 6) + libqt-jami (>= 6.2.3) Provides: jami-qt Replaces: jami-all Conflicts: jami-all @@ -121,7 +121,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, jami-daemon (=${binary:Version}), - libqt-jami (>= 6) + libqt-jami (>= 6.2.3) Description: Secure and distributed voice, video and chat platform - daemon Jami (jami.net) is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy diff --git a/scripts/build-package-rpm.sh b/scripts/build-package-rpm.sh index f46e4877..97d00208 100755 --- a/scripts/build-package-rpm.sh +++ b/scripts/build-package-rpm.sh @@ -43,7 +43,7 @@ PKG_CONFIG_PATH="${QT_JAMI_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" CMAKE_PREFIX_PATH="${QT_JAMI_PREFIX}/lib/cmake:${CMAKE_PREFIX_PATH}" QT_MAJOR=6 QT_MINOR=2 -QT_PATCH=1 +QT_PATCH=3 QT_MAJOR_MINOR=${QT_MAJOR}.${QT_MINOR} QT_MAJOR_MINOR_PATCH=${QT_MAJOR}.${QT_MINOR}.${QT_PATCH} @@ -51,7 +51,7 @@ QT_MAJOR_MINOR_PATCH=${QT_MAJOR}.${QT_MINOR}.${QT_PATCH} QT_TARBALL_URL=https://download.qt.io/archive/qt/$QT_MAJOR_MINOR/\ $QT_MAJOR_MINOR_PATCH/single/qt-everywhere-src-$QT_MAJOR_MINOR_PATCH.tar.xz -QT_TARBALL_SHA256="e03fffc5c3b5fea09dcc161444df7dfbbe24e8a8ce9377014ec21b66f48d43cd" +QT_TARBALL_SHA256="f784998a159334d1f47617fd51bd0619b9dbfe445184567d2cd7c820ccb12771" QT_TARBALL_FILE_NAME=$(basename "$QT_TARBALL_URL") CACHED_QT_TARBALL=$TARBALLS/$QT_TARBALL_FILE_NAME -- GitLab